From c3006e3a032c7e9a99680c3fa3b361044f070956 Mon Sep 17 00:00:00 2001 From: augusto Date: Wed, 23 Jul 1997 15:47:36 +0000 Subject: [PATCH] - Settaggio colonne sheet con Set_sheetcolumn dell'oggetto livelli di mag - aggiornamento runtime del campo esercizio_comp git-svn-id: svn://10.65.10.50/trunk@4897 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mg/mg1100.cpp | 47 +++++++++-------------------------------------- mg/mg1100.h | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 61 deletions(-) diff --git a/mg/mg1100.cpp b/mg/mg1100.cpp index 1ef34c633..55bcbf351 100755 --- a/mg/mg1100.cpp +++ b/mg/mg1100.cpp @@ -67,39 +67,11 @@ TMask_movmag::TMask_movmag(TCodgiac_livelli *l_m,TMov_mag * m_m) // setta i campi della maschera // per la pagina giacenze TSheet_field &fld_righe= (TSheet_field &)field(F_RIGHE); - // disabilita le colonne quando non sono utilizzati i livelli di giacenza - if (livelli_giac->enabled(1)) { - fld_righe.sheet_mask().field(F_LIV1).show(); - fld_righe.set_column_header(fld_righe.cid2index(F_LIV1),livelli_giac->name(1)); - fld_righe.sheet_mask().field(F_LIV1).set_prompt(livelli_giac->name(1)); - } else { - fld_righe.sheet_mask().field(F_LIV1).hide(); - fld_righe.delete_column(fld_righe.cid2index(F_LIV1)); - } - if (livelli_giac->enabled(2)) { - fld_righe.sheet_mask().field(F_LIV2).show(); - fld_righe.set_column_header(fld_righe.cid2index(F_LIV2),livelli_giac->name(2)); - fld_righe.sheet_mask().field(F_LIV2).set_prompt(livelli_giac->name(2)); - } else { - fld_righe.sheet_mask().field(F_LIV2).hide(); - fld_righe.delete_column(fld_righe.cid2index(F_LIV2)); - } - if (livelli_giac->enabled(3)) { - fld_righe.sheet_mask().field(F_LIV3).show(); - fld_righe.set_column_header(fld_righe.cid2index(F_LIV3),livelli_giac->name(3)); - fld_righe.sheet_mask().field(F_LIV3).set_prompt(livelli_giac->name(3)); - } else { - fld_righe.sheet_mask().field(F_LIV3).hide(); - fld_righe.delete_column(fld_righe.cid2index(F_LIV3)); - } - if (livelli_giac->enabled(4)) { - fld_righe.sheet_mask().field(F_LIV4).show(); - fld_righe.set_column_header(fld_righe.cid2index(F_LIV4),livelli_giac->name(4)); - fld_righe.sheet_mask().field(F_LIV4).set_prompt(livelli_giac->name(4)); - } else { - fld_righe.sheet_mask().field(F_LIV4).hide(); - fld_righe.delete_column(fld_righe.cid2index(F_LIV4)); - } + // setta le colonne in base all'abilitazione dei livelli di giacenza + livelli_giac->set_sheetcolumn(fld_righe,F_LIV1,1); + livelli_giac->set_sheetcolumn(fld_righe,F_LIV2,2); + livelli_giac->set_sheetcolumn(fld_righe,F_LIV3,3); + livelli_giac->set_sheetcolumn(fld_righe,F_LIV4,4); TConfig prassid(CONFIG_DITTA, "ve"); // apre il file di configurazione della ditta corrente if (prassid.get_bool("GES", NULL, A_LISTINI)) @@ -318,14 +290,13 @@ bool TMask_movmag::handle_codcaus(TMask_field &fld, KEY k) bool TMask_movmag::handle_datacomp(TMask_field &fld, KEY k) { - if (k == K_TAB && fld.focusdirty()) + if (k == K_TAB) // && fld.focusdirty()) { - int codes=((TMask_movmag &)fld.mask()).mov_mag->codice_esercizio(TDate(fld.get())); - if (codes>0) + if (codes>0) { fld.mask().field(F_ANNOES).set(codes); - else - { + fld.mask().field(H_ANNOES).set(codes); + } else { fld.error_box("La data indicata non appartiene a nessuno degli esercizi contabili inseriti ") ; return FALSE; } diff --git a/mg/mg1100.h b/mg/mg1100.h index d91f8a94c..1e50c408a 100755 --- a/mg/mg1100.h +++ b/mg/mg1100.h @@ -1,32 +1,33 @@ #define F_NUMREG 101 #define F_DATAREG 102 -#define F_ANNOES 103 -#define F_DATACOMP 104 -#define F_DESCR 105 +#define F_ANNOES 103 +#define F_DATACOMP 104 +#define F_DESCR 105 #define F_RIFADOC 106 -#define F_NUMDOC 107 -#define F_ANNODOC 108 -#define F_CODCAUS 109 -#define F_DESCAU 110 -#define F_TIPOCF 111 -#define F_CODCLI 112 -#define F_CODFOR 113 -#define F_RAGSOC 114 -#define F_CATVEN 115 -#define F_CODLIST 116 -#define F_CODCONTR 117 -#define F_CODOFF 118 -#define F_TIPOCONDV 119 -#define F_RIGHE 120 -#define F_NUMPROVV 121 -#define F_CODCF 122 -#define F_CODCONDV 123 +#define F_CODNUM 107 +#define F_NUMDOC 108 +#define F_ANNODOC 109 +#define F_CODCAUS 110 +#define F_DESCAU 111 +#define F_TIPOCF 112 +#define F_CODCLI 113 +#define F_CODFOR 114 +#define F_RAGSOC 115 +#define F_CATVEN 116 +#define F_CODLIST 117 +#define F_CODCONTR 118 +#define F_CODOFF 119 +#define F_TIPOCONDV 120 +#define F_RIGHE 121 +#define F_NUMPROVV 122 +#define F_CODCF 123 +#define F_CODCONDV 124 #define H_NUMREG 131 #define H_DATAREG 132 -#define H_ANNOES 133 -#define H_DATACOMP 134 -#define H_DESCR 135 +#define H_ANNOES 133 +#define H_DATACOMP 134 +#define H_DESCR 135 #define G_DEFMOV 1