From dd1994e6a765b6ba3d67f915d469ad97fc50fd99 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 21 Dec 2004 16:05:17 +0000 Subject: [PATCH] Patch level :2.2 nopatch Files correlati :ca & friends Ricompilazione Demo : [ ] Commento : aggiunti i programmi di immissione dati per files 147,148,149;sistemate anche le maschere con i nuovi campi git-svn-id: svn://10.65.10.50/trunk@12558 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca0.cpp | 4 +- ca/ca0.h | 4 +- ca/ca0100.cpp | 12 +---- ca/ca0500.cpp | 3 ++ ca/ca0500a.h | 9 ++-- ca/ca0600.cpp | 38 +++++++++++++ ca/ca0600a.h | 88 ++++++++++++++++-------------- ca/ca0600a.uml | 144 ++++++++++++++++++++++++++++++++++++++++++------- ca/ca0700.cpp | 38 +++++++++++++ ca/ca0700a.h | 2 +- ca/ca0700a.uml | 13 +---- ca/calib01.cpp | 1 - 12 files changed, 263 insertions(+), 93 deletions(-) create mode 100755 ca/ca0600.cpp create mode 100755 ca/ca0700.cpp diff --git a/ca/ca0.cpp b/ca/ca0.cpp index daabed4d7..9cab908ec 100755 --- a/ca/ca0.cpp +++ b/ca/ca0.cpp @@ -11,8 +11,8 @@ int main(int argc, char** argv) case 2: ca0300(argc,argv); break; // parametri configurazione Contabilita' Analitica case 3: ca0400(argc,argv); break; //immissione piano dei conti case 4: ca0500(argc,argv); break; //gestione centri di costo -// case 5: ca0600(argc,argv); break; //gestione commesse -// case 6: ca0700(argc,argv); break; //gestione fasi + case 5: ca0600(argc,argv); break; //gestione commesse + case 6: ca0700(argc,argv); break; //gestione fasi // case 7: ca0800(argc,argv); break; // ribaltamenti default: ca0100(argc,argv); break; // gestione tabelle } diff --git a/ca/ca0.h b/ca/ca0.h index 1265f1de4..6d3d581a5 100755 --- a/ca/ca0.h +++ b/ca/ca0.h @@ -6,8 +6,8 @@ int ca0200(int argc, char* argv[]); int ca0300(int argc, char* argv[]); int ca0400(int argc, char* argv[]); int ca0500(int argc, char* argv[]); -//int ca0600(int argc, char* argv[]); -//int ca0700(int argc, char* argv[]); +int ca0600(int argc, char* argv[]); +int ca0700(int argc, char* argv[]); //int ca0800(int argc, char* argv[]); #endif // __CA0_H diff --git a/ca/ca0100.cpp b/ca/ca0100.cpp index f024cf087..bda619d9d 100755 --- a/ca/ca0100.cpp +++ b/ca/ca0100.cpp @@ -4,17 +4,7 @@ #include #include "calib01.h" - -//identificatori dei campi automatici delle maschere (messi qui per evitare di ripeterli nel .h -//di ogni maschera) -#define F_KEY1 101 -#define F_KEY2 102 -#define F_KEY3 103 -#define F_KEY4 104 -#define F_DES1 111 -#define F_DES2 112 -#define F_DES3 113 -#define F_DES4 114 +#include "calibmsk.h" //////////////////////////////////////////////////////////////////////// //MASCHERA GENERICA DI TABELLA NON GERARCHICA diff --git a/ca/ca0500.cpp b/ca/ca0500.cpp index 6f5a4d995..22a0bdfc6 100755 --- a/ca/ca0500.cpp +++ b/ca/ca0500.cpp @@ -5,6 +5,9 @@ #include "calib01.h" #include "ca0500a.h" +//////////////////////////////////////////////////////////////////////// +//MASCHERA +//////////////////////////////////////////////////////////////////////// class TCdc_anal_msk : public TSimple_anal_msk { protected: diff --git a/ca/ca0500a.h b/ca/ca0500a.h index aab70ac48..144e9ddc1 100755 --- a/ca/ca0500a.h +++ b/ca/ca0500a.h @@ -1,7 +1,6 @@ //id campi maschera ca0500a (file centri di costo) //campi normali -#define F_CDC_DESCRIZ 201 -#define F_CDC_DESCRAGG 202 -#define F_CDC_ADDETTI 203 -#define F_CDC_GESTFASI 204 -#define F_CDC_APPOGGIO 205 +#define F_CDC_DESCRAGG 201 +#define F_CDC_ADDETTI 202 +#define F_CDC_GESTFASI 203 +#define F_CDC_APPOGGIO 204 diff --git a/ca/ca0600.cpp b/ca/ca0600.cpp new file mode 100755 index 000000000..2488f0392 --- /dev/null +++ b/ca/ca0600.cpp @@ -0,0 +1,38 @@ +// gestione files Contabilita' Analitica: COMMESSE +#include +#include + +#include "calib01.h" +#include "ca0600a.h" + +//////////////////////////////////////////////////////////////////////// +//MASCHERA +//////////////////////////////////////////////////////////////////////// +class TCms_anal_msk : public TSimple_anal_msk +{ +protected: + virtual int get_logicnum() const { return LF_COMMESSE; } + virtual const char* get_key_var() const { return "Cms"; } + virtual const char* get_des_var() const { return "CmsDes"; } + +public: + TCms_anal_msk() { read("ca0600a"); } +}; + +//////////////////////////////////////////////////////////////////////// +//APPLICAZIONE +//////////////////////////////////////////////////////////////////////// +// applicazione per la gestione delle commesse +class TCms_app : public TAnal_app +{ +protected: + virtual TAnal_msk* create_mask() const { return new TCms_anal_msk; } +}; + +int ca0600(int argc, char* argv[]) +{ + TCms_app a; + a.run(argc, argv, TR("Commesse")); + return 0; +} + diff --git a/ca/ca0600a.h b/ca/ca0600a.h index b203ffcae..8a0e6576e 100755 --- a/ca/ca0600a.h +++ b/ca/ca0600a.h @@ -1,6 +1,5 @@ //id campi maschera ca0600a (file commesse) //campi normali -#define F_CMS_DESCRIZ 201 #define F_CMS_DESCRAGG 202 #define F_CMS_ANNO 203 #define F_CMS_LOCDIV 204 @@ -8,43 +7,50 @@ #define F_CMS_CIV 206 #define F_CMS_LOC 207 #define F_CMS_STATO 208 -#define F_CMS_COM 209 -#define F_CMS_CAP 210 -#define F_CMS_CODCF 211 -#define F_CMS_REGIVA 212 -#define F_CMS_PRORATA 213 -#define F_CMS_PUBBLICA 214 -#define F_CMS_RENDIC 215 -#define F_CMS_DATAINIZIO 216 -#define F_CMS_DATAFINE 217 -#define F_CMS_AVANZ 218 -#define F_CMS_CHIUSA 219 -#define F_CMS_PROROGA 220 -#define F_CMS_DATAPROR 221 -#define F_CMS_CODRESP 222 -#define F_CMS_CODTIPO 223 -#define F_CMS_CODTIPCM 224 -#define F_CMS_GESTFASI 225 -#define F_CMS_RIFER 226 -#define F_CMS_DATAPREV 227 -#define F_CMS_PROVVP 228 -#define F_CMS_ANNOP 229 -#define F_CMS_CODNUMP 230 -#define F_CMS_NDOCP 231 -#define F_CMS_APPOGGIO 232 -#define F_CMS_CONTRATTO 233 -#define F_CMS_ANNOC 234 -#define F_CMS_NROCONT 235 -#define F_CMS_DATAGARA 236 -#define F_CMS_IMPORTOB 237 -#define F_CMS_RIBASSO 238 -#define F_CMS_AUMENTO 239 -#define F_CMS_GARANZIA 240 -#define F_CMS_ANTICIPO 241 -#define F_CMS_DATAANTIC 242 -#define F_CMS_DATAULT 243 -#define F_CMS_DATAULTP 244 -#define F_CMS_DATACOLL 245 -#define F_CMS_DATACOLLP 246 -#define F_CMS_DATAGAR 247 -#define F_CMS_SALMIN 248 +#define F_CMS_DESTATO 209 +#define F_CMS_COM 210 +#define F_CMS_CAP 211 +#define F_CMS_PROV 212 +#define F_CMS_DEN 213 +#define F_CMS_CODCF 214 +#define F_CMS_CRAGSOC 215 +#define F_CMS_REGIVA 216 +#define F_CMS_PRORATA 217 +#define F_CMS_PUBBLICA 218 +#define F_CMS_RENDIC 219 +#define F_CMS_DATAINIZIO 220 +#define F_CMS_DATAFINE 221 +#define F_CMS_AVANZ 222 +#define F_CMS_CHIUSA 223 +#define F_CMS_PROROGA 224 +#define F_CMS_DATAPROR 225 +#define F_CMS_CODRESP 226 +#define F_CMS_DESRESP 255 +#define F_CMS_CODTIPOL 227 +#define F_CMS_DESTIPOL 253 +#define F_CMS_CODTIPCM 228 +#define F_CMS_DESTIPCM 254 +#define F_CMS_GESTFASI 229 +#define F_CMS_RIFER 230 +#define F_CMS_DATAPREV 231 +#define F_CMS_PROVVP 232 +#define F_CMS_ANNOP 233 +#define F_CMS_CODNUMP 234 +#define F_CMS_NDOCP 235 +#define F_CMS_APPOGGIO 236 +#define F_CMS_CONTRATTO 237 +#define F_CMS_ANNOC 238 +#define F_CMS_NROCONT 239 +#define F_CMS_DATAGARA 240 +#define F_CMS_IMPORTOB 241 +#define F_CMS_RIBASSO 242 +#define F_CMS_AUMENTO 243 +#define F_CMS_GARANZIA 244 +#define F_CMS_ANTICIPO 245 +#define F_CMS_DATAANTIC 246 +#define F_CMS_DATAULT 247 +#define F_CMS_DATAULTP 248 +#define F_CMS_DATACOLL 249 +#define F_CMS_DATACOLLP 250 +#define F_CMS_DATAGAR 251 +#define F_CMS_SALMIN 252 diff --git a/ca/ca0600a.uml b/ca/ca0600a.uml index 540fc3fa2..511fb6382 100755 --- a/ca/ca0600a.uml +++ b/ca/ca0600a.uml @@ -11,12 +11,6 @@ BEGIN PROMPT 1 0 "@bCodici" END -STRING F_CMS_DESCRIZ 50 -BEGIN - PROMPT 2 7 "Descrizione " - FIELD DESCRIZ -END - MEMO F_CMS_DESCRAGG 78 5 BEGIN PROMPT 2 8 "Descrizione aggiuntiva" @@ -58,22 +52,74 @@ BEGIN FIELD LOC END +STRING F_CMS_STATO 3 +BEGIN + PROMPT 2 19 "Stato " + FIELD STATO + FLAGS "Z" + USE %STA + INPUT CODTAB F_CMS_STATO + DISPLAY "Codice" CODTAB + DISPLAY "Stato@50" S0 + OUTPUT F_CMS_STATO CODTAB + OUTPUT F_CMS_DESTATO S0 + CHECKTYPE NORMAL + WARNING "Stato assente" +END + +STRING F_CMS_DESTATO 50 +BEGIN + PROMPT 20 19 "" + USE %STA KEY 2 + INPUT S0 F_CMS_DESTATO + DISPLAY "Stato@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT F_CMS_STATO +END + STRING F_CMS_COM 4 BEGIN - PROMPT 2 19 "Comune " + PROMPT 2 20 "Comune " FIELD COM + FLAGS "U" + USE LF_COMUNI + INPUT STATO F_CMS_STATO + INPUT COM F_CMS_COM + DISPLAY "Cod." COM + DISPLAY "Denominazione@50" DENCOM + DISPLAY "Pr" PROVCOM + DISPLAY " CAP " CAPCOM + OUTPUT F_CMS_STATO STATO + OUTPUT F_CMS_COM COM + OUTPUT F_CMS_PROV PROVCOM + OUTPUT F_CMS_CAP CAPCOM + OUTPUT F_CMS_DEN DENCOM + CHECKTYPE NORMAL + WARNING "Comune assente" +END + +STRING F_CMS_PROV 2 +BEGIN + PROMPT 21 20 "Provincia " + FLAGS "D" END STRING F_CMS_CAP 5 BEGIN - PROMPT 2 20 "CAP " + PROMPT 38 20 "CAP " FIELD CAP END -STRING F_CMS_STATO 3 +STRING F_CMS_DEN 50 BEGIN - PROMPT 2 21 "Stato " - FIELD STATO + PROMPT 2 21 " " + USE LF_COMUNI KEY 2 + INPUT DENCOM F_CMS_DEN + DISPLAY "Denominazione@50" DENCOM + DISPLAY "Cod." COM + DISPLAY "Pr" PROVCOM + DISPLAY " CAP " CAPCOM + COPY OUTPUT F_CMS_COM END ENDPAGE @@ -82,8 +128,29 @@ PAGE "Pagina 2" -1 -1 64 6 STRING F_CMS_CODCF 6 BEGIN - PROMPT 2 1 "Codice cliente " + PROMPT 2 1 "Cliente " FIELD CODCF + USE LF_CLIFO + INPUT TIPOCF "C" + INPUT CODCF F_CMS_CODCF + DISPLAY "Codice" CODCF + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@12" PAIV + OUTPUT F_CMS_CODCF CODCF + OUTPUT F_CMS_CRAGSOC RAGSOC + CHECKTYPE NORMAL +END + +STRING F_CMS_CRAGSOC 50 +BEGIN + PROMPT 20 1 "" + USE LF_CLIFO KEY 2 + INPUT TIPOCF "C" + INPUT RAGSOC F_CMS_CRAGSOC + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Codice" CODCF + DISPLAY "Partita IVA@12" PAIV + COPY OUTPUT F_CMS_CODCF END LIST F_CMS_REGIVA 2 14 @@ -163,28 +230,69 @@ STRING F_CMS_CODTIPCM 5 BEGIN PROMPT 2 8 "Tipologia di commessa " FIELD CODTIPCM + USE TPC + INPUT CODTAB F_CMS_CODTIPCM + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CMS_CODTIPCM CODTAB + OUTPUT F_CMS_DESTIPCM S0 + CHECKTYPE NORMAL END -/*STRING F_CMS_DESTIPCM 50 +STRING F_CMS_DESTIPCM 50 42 BEGIN PROMPT 32 8 "" -END*/ + USE TPC KEY 2 + INPUT S0 F_CMS_DESTIPCM + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT F_CMS_CODTIPCM +END -STRING F_CMS_CODTIPO 5 +STRING F_CMS_CODTIPOL 5 BEGIN PROMPT 2 9 "Tipologia di lavoro " FIELD CODTIPO + USE TPL + INPUT CODTAB F_CMS_CODTIPOL + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CMS_CODTIPOL CODTAB + OUTPUT F_CMS_DESTIPOL S0 + CHECKTYPE NORMAL END -/*STRING F_CMS_DESTIPO 50 +STRING F_CMS_DESTIPOL 50 42 BEGIN PROMPT 32 9 "" -END*/ + USE TPL KEY 2 + INPUT S0 F_CMS_DESTIPOL + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT F_CMS_CODTIPOL +END STRING F_CMS_CODRESP 10 BEGIN - PROMPT 2 10 "Responsabile " + PROMPT 2 10 "Responsabile " FIELD CODRESP + USE RSP + INPUT CODTAB F_CMS_CODRESP + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CMS_CODRESP CODTAB + OUTPUT F_CMS_DESRESP S0 + CHECKTYPE NORMAL +END + +STRING F_CMS_DESRESP 50 42 +BEGIN + PROMPT 32 10 "" + USE RSP KEY 2 + INPUT S0 F_CMS_DESRESP + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT F_CMS_CODRESP END BOOLEAN F_CMS_GESTFASI diff --git a/ca/ca0700.cpp b/ca/ca0700.cpp new file mode 100755 index 000000000..81e143037 --- /dev/null +++ b/ca/ca0700.cpp @@ -0,0 +1,38 @@ +// gestione files Contabilita' Analitica: FASI +#include +#include + +#include "calib01.h" +#include "ca0700a.h" + +//////////////////////////////////////////////////////////////////////// +//MASCHERA +//////////////////////////////////////////////////////////////////////// +class TFsc_anal_msk : public TSimple_anal_msk +{ +protected: + virtual int get_logicnum() const { return LF_FASI; } + virtual const char* get_key_var() const { return "Fsc"; } + virtual const char* get_des_var() const { return "FscDes"; } + +public: + TFsc_anal_msk() { read("ca0700a"); } +}; + +//////////////////////////////////////////////////////////////////////// +//APPLICAZIONE +//////////////////////////////////////////////////////////////////////// +// applicazione per la gestione delle fasi +class TFsc_app : public TAnal_app +{ +protected: + virtual TAnal_msk* create_mask() const { return new TFsc_anal_msk; } +}; + +int ca0700(int argc, char* argv[]) +{ + TFsc_app a; + a.run(argc, argv, TR("Fasi")); + return 0; +} + diff --git a/ca/ca0700a.h b/ca/ca0700a.h index b14e6037b..ade0441af 100755 --- a/ca/ca0700a.h +++ b/ca/ca0700a.h @@ -1,3 +1,3 @@ //id maschera ca0700a(file fasi) //campi normali -#define F_FSC_DESCRIZ 201 + diff --git a/ca/ca0700a.uml b/ca/ca0700a.uml index 13e3b026a..fcb6641ae 100755 --- a/ca/ca0700a.uml +++ b/ca/ca0700a.uml @@ -8,18 +8,7 @@ PAGE "Fasi" -1 -1 64 6 GROUPBOX DLG_NULL 78 6 BEGIN - PROMPT 1 0 "@bCodici Centri di Costo / Commesse" -END - -GROUPBOX DLG_NULL 78 6 -BEGIN - PROMPT 1 8 "@bCodici" -END - -STRING F_FSC_DESCRIZ 50 -BEGIN - PROMPT 2 15 "Descrizione " - FIELD DESCRIZ + PROMPT 1 0 "@bCodici" END ENDPAGE diff --git a/ca/calib01.cpp b/ca/calib01.cpp index c384af841..c16de1de1 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -159,7 +159,6 @@ void TAnal_msk::read(const char* name) if (line.starts_with("PR")) // Ho trovato un prompt sulla prima pagina { TToken_string l(line, ' '); - l.strip_d_spaces(); int x = l.get_int(1); if (x >= 0) {