From a1878347ee86ea26b33609f884da1cc842ca53b9 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 12 Oct 2004 13:12:28 +0000 Subject: [PATCH] Patch level :2.2 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : maschera e gestore parametri CA (per adesso!) git-svn-id: svn://10.65.10.50/trunk@12388 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca0.cpp | 1 + ca/ca0.h | 1 + ca/ca0100.cpp | 4 - ca/ca0300.cpp | 2 + ca/ca0300a.h | 10 +++ ca/ca0300a.uml | 221 +++++++++++++++++++++++++++++++++++++------------ 6 files changed, 182 insertions(+), 57 deletions(-) diff --git a/ca/ca0.cpp b/ca/ca0.cpp index 5a42c523e..b2970c135 100755 --- a/ca/ca0.cpp +++ b/ca/ca0.cpp @@ -9,6 +9,7 @@ int main(int argc, char** argv) { // case 1: ca0200(argc,argv); break; // stampa tabelle case 2: ca0300(argc,argv); break; // parametri configurazione Contabilita' Analitica +// case 3: ca0400(argc,argv); break; //immissione dati nei files CDC,CMS,FSC // case 5: ca0600(argc,argv); break; // ribaltamenti default: ca0100(argc,argv); break; // gestione tabelle } diff --git a/ca/ca0.h b/ca/ca0.h index d3c0af631..208cd8e56 100755 --- a/ca/ca0.h +++ b/ca/ca0.h @@ -4,6 +4,7 @@ int ca0100(int argc, char* argv[]); //int ca0200(int argc, char* argv[]); int ca0300(int argc, char* argv[]); +//int ca0400(int argc, char* argv[]); //int ca0600(int argc, char* argv[]); #endif // __CA0_H diff --git a/ca/ca0100.cpp b/ca/ca0100.cpp index 97070b5b4..04eea9564 100755 --- a/ca/ca0100.cpp +++ b/ca/ca0100.cpp @@ -4,10 +4,6 @@ #include #include -#include "catbcdc.h" -#include "catbcms.h" -#include "catbfsc.h" - //////////////////////////////////////////////////////////////////////// //MASCHERA //////////////////////////////////////////////////////////////////////// diff --git a/ca/ca0300.cpp b/ca/ca0300.cpp index cfe8d4249..84f92bd12 100755 --- a/ca/ca0300.cpp +++ b/ca/ca0300.cpp @@ -43,7 +43,9 @@ bool TConf_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) } TList_field& lev2 = (TList_field&)field(F_LEVEL_2); + const TString4 laccio = lev2.get(); lev2.replace_items(cod, desc); + lev2.set(laccio); } break; diff --git a/ca/ca0300a.h b/ca/ca0300a.h index 7bbf82d92..5f9a6b902 100755 --- a/ca/ca0300a.h +++ b/ca/ca0300a.h @@ -31,3 +31,13 @@ #define F_DESFASE_2 127 #define F_DESFASE_3 128 #define F_DESFASE_4 129 + +#define F_PDCI_1 130 +#define F_DESPDCI_1 131 +#define F_PDCI_2 132 +#define F_DESPDCI_2 133 +#define F_PDCI_3 134 +#define F_DESPDCI_3 135 +#define F_PDCI_4 136 +#define F_DESPDCI_4 137 +#define F_USE_PDCC 138 diff --git a/ca/ca0300a.uml b/ca/ca0300a.uml index e08e5bc6f..8750a6b9c 100755 --- a/ca/ca0300a.uml +++ b/ca/ca0300a.uml @@ -61,195 +61,310 @@ BEGIN FIELD FathFasi END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 78 7 BEGIN PROMPT 1 8 "@bCentro di costo" END +TEXT -1 +BEGIN + PROMPT 4 9 "Formato codice" +END + +TEXT -1 +BEGIN + PROMPT 27 9 "Descrizione" +END + STRING F_CDC_1 20 BEGIN - PROMPT 2 9 "" - MESSAGE EMPTY CLEAR,F_DESCDC_1|CLEAR,F_CDC_2 - MESSAGE ENABLE,F_DESCDC_1|ENABLE,F_CDC_2 + PROMPT 2 10 "1 " + MESSAGE EMPTY CLEAR,F_CDC_2|CLEAR,F_DESCDC_2|K_TAB,F_CDC_2|RESET,F_DESCDC_1 + MESSAGE ENABLE,F_CDC_2|ENABLE,F_DESCDC_2 FIELD CdC(1) END STRING F_DESCDC_1 50 BEGIN - PROMPT 26 9 "" + PROMPT 27 10 "" + FIELD CdCDes(1) END STRING F_CDC_2 20 BEGIN - PROMPT 2 10 "" - MESSAGE EMPTY CLEAR,F_DESCDC_2|CLEAR,F_CDC_3 - MESSAGE ENABLE,F_DESCDC_2|ENABLE,F_CDC_3 + PROMPT 2 11 "2 " + MESSAGE EMPTY CLEAR,F_CDC_3|CLEAR,F_DESCDC_3|K_TAB,F_CDC_3|RESET,F_DESCDC_2 + MESSAGE ENABLE,F_CDC_3|ENABLE,F_DESCDC_3 FLAGS "G" FIELD CdC(2) END STRING F_DESCDC_2 50 BEGIN - PROMPT 26 10 "" + PROMPT 27 11 "" + FIELD CdCDes(2) END STRING F_CDC_3 20 BEGIN - PROMPT 2 11 "" - MESSAGE EMPTY CLEAR,F_DESCDC_3|CLEAR,F_CDC_4 - MESSAGE ENABLE,F_DESCDC_3|ENABLE,F_CDC_4 + PROMPT 2 12 "3 " + MESSAGE EMPTY CLEAR,F_CDC_4|CLEAR,F_DESCDC_4|K_TAB,F_CDC_4|RESET,F_DESCDC_3 + MESSAGE ENABLE,F_CDC_4|ENABLE,F_DESCDC_4 FLAGS "G" FIELD CdC(3) END STRING F_DESCDC_3 50 BEGIN - PROMPT 26 11 "" + PROMPT 27 12 "" + FIELD CdCDes(3) END STRING F_CDC_4 20 BEGIN - PROMPT 2 12 "" - MESSAGE EMPTY CLEAR,F_DESCDC_4 - MESSAGE ENABLE,F_DESCDC_4 + PROMPT 2 13 "4 " + MESSAGE EMPTY RESET,F_DESCDC_4 FLAGS "G" FIELD CdC(4) END STRING F_DESCDC_4 50 BEGIN - PROMPT 26 12 "" + PROMPT 27 13 "" + FIELD CdCDes(4) END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 78 7 BEGIN - PROMPT 1 14 "@bCommessa" + PROMPT 1 15 "@bCommessa" +END + +TEXT -1 +BEGIN + PROMPT 4 16 "Formato codice" +END + +TEXT -1 +BEGIN + PROMPT 27 16 "Descrizione" END STRING F_CMS_1 20 BEGIN - PROMPT 2 15 "" - MESSAGE EMPTY CLEAR,F_DESCMS_1|CLEAR,F_CMS_2 - MESSAGE ENABLE,F_DESCMS_1|ENABLE,F_CMS_2 + PROMPT 2 17 "1 " + MESSAGE EMPTY CLEAR,F_CMS_2|CLEAR,F_DESCMS_2|K_TAB,F_CMS_2|RESET,F_DESCMS_1 + MESSAGE ENABLE,F_CMS_2|ENABLE,F_DESCMS_2 FIELD Cms(1) END STRING F_DESCMS_1 50 BEGIN - PROMPT 26 15 "" + PROMPT 27 17 "" + FIELD CmsDes(1) END STRING F_CMS_2 20 BEGIN - PROMPT 2 16 "" - MESSAGE EMPTY CLEAR,F_DESCMS_2|CLEAR,F_CMS_3 - MESSAGE ENABLE,F_DESCMS_2|ENABLE,F_CMS_3 + PROMPT 2 18 "2 " + MESSAGE EMPTY CLEAR,F_CMS_3|CLEAR,F_DESCMS_3|K_TAB,F_CMS_3|RESET,F_DESCMS_2 + MESSAGE ENABLE,F_CMS_3|ENABLE,F_DESCMS_3 FLAGS "G" FIELD Cms(2) END STRING F_DESCMS_2 50 BEGIN - PROMPT 26 16 "" + PROMPT 27 18 "" + FIELD CmsDes(2) END STRING F_CMS_3 20 BEGIN - PROMPT 2 17 "" - MESSAGE EMPTY CLEAR,F_DESCMS_3|CLEAR,F_CMS_4 - MESSAGE ENABLE,F_DESCMS_3|ENABLE,F_CMS_4 + PROMPT 2 19 "3 " + MESSAGE EMPTY CLEAR,F_CMS_4|CLEAR,F_DESCMS_4|K_TAB,F_CMS_4|RESET,F_DESCMS_3 + MESSAGE ENABLE,F_CMS_4|ENABLE,F_DESCMS_4 FLAGS "G" FIELD Cms(3) END STRING F_DESCMS_3 50 BEGIN - PROMPT 26 17 "" + PROMPT 27 19 "" + FIELD CmsDes(3) END STRING F_CMS_4 20 BEGIN - PROMPT 2 18 "" - MESSAGE EMPTY CLEAR,F_DESCMS_4 - MESSAGE ENABLE,F_DESCMS_4 + PROMPT 2 20 "4 " + MESSAGE EMPTY RESET,F_DESCMS_4 FLAGS "G" FIELD Cms(4) END STRING F_DESCMS_4 50 BEGIN - PROMPT 26 18 "" + PROMPT 27 20 "" + FIELD CmsDes(4) END ENDPAGE PAGE "Pagina 2" -1 -1 78 10 -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 78 7 BEGIN PROMPT 1 1 "@bFase" END +TEXT -1 +BEGIN + PROMPT 4 2 "Formato codice" +END + +TEXT -1 +BEGIN + PROMPT 17 2 "Descrizione" +END + STRING F_FASE_1 10 BEGIN - PROMPT 2 2 "" - MESSAGE EMPTY CLEAR,F_DESFASE_1|CLEAR,F_FASE_2 - MESSAGE ENABLE,F_DESFASE_1|ENABLE,F_FASE_2 + PROMPT 2 3 "1 " + MESSAGE EMPTY CLEAR,F_FASE_2|CLEAR,F_DESFASE_2|K_TAB,F_FASE_2|RESET,F_DESFASE_1 + MESSAGE ENABLE,F_FASE_2|ENABLE,F_DESFASE_2 FIELD Cfs(1) END STRING F_DESFASE_1 50 BEGIN - PROMPT 16 2 "" + PROMPT 17 3 "" + FIELD CfsDes(1) END STRING F_FASE_2 10 BEGIN - PROMPT 2 3 "" - MESSAGE EMPTY CLEAR,F_DESFASE_2|CLEAR,F_FASE_3 - MESSAGE ENABLE,F_DESFASE_2|ENABLE,F_FASE_3 + PROMPT 2 4 "2 " + MESSAGE EMPTY CLEAR,F_FASE_3|CLEAR,F_DESFASE_3|K_TAB,F_FASE_3|RESET,F_DESFASE_2 + MESSAGE ENABLE,F_FASE_3|ENABLE,F_DESFASE_3 FLAGS "G" FIELD Cfs(2) END STRING F_DESFASE_2 50 BEGIN - PROMPT 16 3 "" + PROMPT 17 4 "" + FIELD CfsDes(2) END STRING F_FASE_3 10 BEGIN - PROMPT 2 4 "" - MESSAGE EMPTY CLEAR,F_DESFASE_3|CLEAR,F_FASE_4 - MESSAGE ENABLE,F_DESFASE_3|ENABLE,F_FASE_4 + PROMPT 2 5 "3 " + MESSAGE EMPTY CLEAR,F_FASE_4|CLEAR,F_DESFASE_4|K_TAB,F_FASE_4|RESET,F_DESFASE_3 + MESSAGE ENABLE,F_FASE_4|ENABLE,F_DESFASE_4 FLAGS "G" FIELD Cfs(3) END STRING F_DESFASE_3 50 BEGIN - PROMPT 16 4 "" + PROMPT 17 5 "" + FIELD CfsDes(3) END STRING F_FASE_4 10 BEGIN - PROMPT 2 5 "" - MESSAGE EMPTY CLEAR,F_DESFASE_4 - MESSAGE ENABLE,F_DESFASE_4 + PROMPT 2 6 "4 " + MESSAGE EMPTY RESET,F_DESFASE_4 FLAGS "G" FIELD Cfs(4) END STRING F_DESFASE_4 50 BEGIN - PROMPT 16 5 "" + PROMPT 17 6 "" + FIELD CfsDes(4) END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 78 8 BEGIN PROMPT 1 8 "@bPiano dei conti industriale" END +BOOLEAN F_USE_PDCC +BEGIN + PROMPT 2 9 "Utilizza il piano dei conti contabile" + MESSAGE TRUE CLEAR,F_PDCI_1|CLEAR,F_DESPDCI_1 + MESSAGE FALSE ENABLE,F_PDCI_1|ENABLE,F_DESPDCI_1 + FIELD UsePdcc +END + +TEXT -1 +BEGIN + PROMPT 4 10 "Formato codice" +END + +TEXT -1 +BEGIN + PROMPT 27 10 "Descrizione" +END + +STRING F_PDCI_1 20 +BEGIN + PROMPT 2 11 "1 " + MESSAGE EMPTY CLEAR,F_PDCI_2|CLEAR,F_DESPDCI_2|K_TAB,F_PDCI_2|RESET,F_DESPDCI_1 + MESSAGE ENABLE,F_PDCI_2|ENABLE,F_DESPDCI_2 + FIELD Pdci(1) +END + +STRING F_DESPDCI_1 50 +BEGIN + PROMPT 27 11 "" + FIELD PdciDes(1) +END + +STRING F_PDCI_2 20 +BEGIN + PROMPT 2 12 "2 " + MESSAGE EMPTY CLEAR,F_PDCI_3|CLEAR,F_DESPDCI_3|K_TAB,F_PDCI_3|RESET,F_DESPDCI_2 + MESSAGE ENABLE,F_PDCI_3|ENABLE,F_DESPDCI_3 + FLAGS "G" + FIELD Pdci(2) +END + +STRING F_DESPDCI_2 50 +BEGIN + PROMPT 27 12 "" + FIELD PdciDes(2) +END + +STRING F_PDCI_3 20 +BEGIN + PROMPT 2 13 "3 " + MESSAGE EMPTY CLEAR,F_PDCI_4|CLEAR,F_DESPDCI_4|K_TAB,F_PDCI_4|RESET,F_DESPDCI_3 + MESSAGE ENABLE,F_PDCI_4|ENABLE,F_DESPDCI_4 + FLAGS "G" + FIELD Pdci(3) +END + +STRING F_DESPDCI_3 50 +BEGIN + PROMPT 27 13 "" + FIELD PdciDes(3) +END + +STRING F_PDCI_4 20 +BEGIN + PROMPT 2 14 "4 " + MESSAGE EMPTY RESET,F_DESPDCI_4 + FLAGS "G" + FIELD Pdci(4) +END + +STRING F_DESPDCI_4 50 +BEGIN + PROMPT 27 14 "" + FIELD PdciDes(4) +END + ENDPAGE ENDMASK \ No newline at end of file