From f74d8f5dad74565634ac37ae5f3f0a5cb7aeee98 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 13 May 2005 13:05:41 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:2.2=20?= =?UTF-8?q?nopatch=20Files=20correlati=20=20=20=20=20:ca3=20&=20friends=20?= =?UTF-8?q?Ricompilazione=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20:sistemate=20ulteriormente=20le=20stampe=20di?= =?UTF-8?q?=20contabilit=C3=A0=20analitica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@13082 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca3.cpp | 2 +- ca/ca3.h | 2 +- ca/ca3100.cpp | 195 +++++++++++++++++++++++++++++++++++ ca/ca3100a.h | 47 +++++++++ ca/ca3100a.uml | 275 +++++++++++++++++++++++++++++++++++++++++++++++++ ca/ca3200.cpp | 62 ++++++++--- ca/ca3200a.h | 21 ++-- ca/ca3200a.uml | 135 ++++++++++-------------- ca/ca3300.cpp | 29 +----- ca/ca3300a.h | 24 ++--- ca/ca3300a.uml | 112 +++++++------------- 11 files changed, 680 insertions(+), 224 deletions(-) create mode 100755 ca/ca3100.cpp create mode 100755 ca/ca3100a.h create mode 100755 ca/ca3100a.uml diff --git a/ca/ca3.cpp b/ca/ca3.cpp index 2af8ceb3a..4ec501452 100755 --- a/ca/ca3.cpp +++ b/ca/ca3.cpp @@ -9,7 +9,7 @@ int main(int argc, char** argv) { case 1: ca3200(argc, argv); break; // stampa mastrini case 2: ca3300(argc, argv); break; // stampa bilancio - default: ca3200(argc, argv); break; // stampa movimenti + default: ca3100(argc, argv); break; // stampa movimenti } exit(0); return 0; diff --git a/ca/ca3.h b/ca/ca3.h index e9cef7e7f..0e5387e8d 100755 --- a/ca/ca3.h +++ b/ca/ca3.h @@ -1,7 +1,7 @@ #ifndef __CA3_H #define __CA3_H -//int ca3100(int argc, char* argv[]); +int ca3100(int argc, char* argv[]); int ca3200(int argc, char* argv[]); int ca3300(int argc, char* argv[]); diff --git a/ca/ca3100.cpp b/ca/ca3100.cpp new file mode 100755 index 000000000..7b154ac4f --- /dev/null +++ b/ca/ca3100.cpp @@ -0,0 +1,195 @@ +#include +#include +#include + +#include "rmovana.h" + +#include "ca3.h" +#include "ca3100a.h" +#include "calib01.h" +#include "calib02.h" + +//////////////////////////////////////////////////////// +// MASCHERA +//////////////////////////////////////////////////////// +class TPrint_movimenti_ca_mask : public TAutomask +{ +protected: + bool on_field_event(TOperable_field& o, TField_event e, long jolly) {return true;} + void create_page2(); + int create_page2_sheet(int lf, int& y, short& dlg, bool required); +public: + TPrint_movimenti_ca_mask(); + virtual ~TPrint_movimenti_ca_mask() {} +}; + +int TPrint_movimenti_ca_mask::create_page2_sheet(int lf, int& y, short& dlg, bool required) +{ + TSheet_field& sf = sfield(F_RIGHE); + TMask& sm = sf.sheet_mask(); + + const int h = ca_create_fields(sm, 0, lf, 1, y, dlg, dlg+50); + + for (int i = 0; i < h; i++) + { + TEdit_field& fld = sm.efield(dlg+i); + int logic = lf; + if (logic == LF_FASI) + { + const TMultilevel_code_info& fasinfo = ca_multilevel_code_info(LF_FASI); + if (fasinfo.parent() != 0) + { + const TMultilevel_code_info& parinfo = ca_multilevel_code_info(fasinfo.parent()); + if (i < parinfo.levels()) + logic = fasinfo.parent(); + } + } + + const char* fieldname = NULL; + switch(logic) + { + case LF_CDC : fieldname = RMOVANA_CODCCOSTO; break; + case LF_COMMESSE: fieldname = RMOVANA_CODCMS; break; + case LF_FASI : fieldname = RMOVANA_CODFASE; break; + default : fieldname = RMOVANA_CODCONTO; break; + } + TFieldref* f = (TFieldref*)fld.field(); + f->set_name(fieldname); + + fld.check_type(required ? CHECK_REQUIRED : CHECK_NORMAL); + + TEdit_field& dfld = sm.efield(dlg+50+i); + dfld.set_field(EMPTY_STRING); // Toglie campi che fan saltare gli output! + } + + y += h+1; + dlg += h; + + return h; +} + +void TPrint_movimenti_ca_mask::create_page2() +{ + TSheet_field& sf = sfield(F_RIGHE); + TMask& sm = sf.sheet_mask(); + sm.hide(-1); + + const TMultilevel_code_info& fasinfo = ca_multilevel_code_info(LF_FASI); + + TConfig_anal ini; + const bool fsc_req = ini.get_bool("FscRequired"); + + int y = 1; + short dlg = S_CDC1 + 100; // id del primo campo da generare + + for (int i = 0; i < 2; i++) + { + const TString& level = ini.get("Level", NULL, i+1); // Legge il livello 1 o 2 + if (level == "CDC") // Crea centro di costo + { + if (fasinfo.parent() == LF_CDC) + create_page2_sheet(LF_FASI, y, dlg, fsc_req); + else + { + const bool cdc_req = ini.get_bool("CdcRequired"); + create_page2_sheet(LF_CDC, y, dlg, cdc_req); + } + } else + if (level == "CMS") // Crea commessa + { + if (fasinfo.parent() == LF_COMMESSE) + create_page2_sheet(LF_FASI, y, dlg, fsc_req); + else + { + const bool cms_req = ini.get_bool("CmsRequired"); + create_page2_sheet(LF_COMMESSE, y, dlg, cms_req); + } + } + } + + if (fasinfo.levels() > 0 && fasinfo.parent() <= 0) + create_page2_sheet(LF_FASI, y, dlg, fsc_req); + + for (short id = S_CDC12+100; id >= S_CDC1+100; id--) + { + const int pos = sm.id2pos(id); + if (pos >= 0) + { + TMask_field& f = sm.fld(pos); + const int size = f.size(); + const TString& prompt = f.prompt(); + sf.set_column_header(id, prompt); + sf.set_column_justify(id, f.is_kind_of(CLASS_REAL_FIELD)); + sf.set_column_width(id, (max(3+size, prompt.len()+1)) * CHARX); + } + else + sf.delete_column(id); + } +} + + +TPrint_movimenti_ca_mask::TPrint_movimenti_ca_mask() + :TAutomask("ca3100a") +{ + TConfig_anal cfg; + const bool use_pdcc = cfg.get_bool("UsePdcc"); + + const int logicnum = use_pdcc ? LF_PCON : LF_PCONANA; + const int nfields = ca_create_fields(*this, 0, logicnum, 2, 5, F_CDC1_INI, F_DES1_INI, 0x0, "#DACONTO"); + ca_create_fields(*this, 0, logicnum, 2, 11, F_CDC1_FIN, F_DES1_FIN, 0x0, "#ACONTO"); + + for (int i = 0; i < nfields; i++) + { + TMask_field& daconto = field(F_CDC1_INI + i); + daconto.set_group(1); + daconto.check_type(CHECK_NORMAL); + TMask_field& aconto = field(F_CDC1_FIN + i); + aconto.set_group(2); + aconto.check_type(CHECK_NORMAL); + } + // creazione dei campi della seconda pagina della maschera + create_page2(); +} + + +//////////////////////////////////////////////////////// +// APPLICAZIONE +//////////////////////////////////////////////////////// +class TPrint_movimenti_ca : public TSkeleton_application +{ + TPrint_movimenti_ca_mask * _mask; + +protected: + bool create(); + bool destroy(); + +public: + virtual void main_loop(); +}; + +bool TPrint_movimenti_ca::create() +{ + _mask = new TPrint_movimenti_ca_mask; + return TSkeleton_application::create(); +} + +bool TPrint_movimenti_ca::destroy() +{ + delete _mask; + return TSkeleton_application::destroy(); +} + +void TPrint_movimenti_ca::main_loop() +{ + while (_mask->run() == K_ENTER) + { + //costruzione del ciclo di scansione principale in base ai parametri della maschera + } +} + +int ca3100(int argc, char* argv[]) +{ + TPrint_movimenti_ca a; + a.run(argc, argv, TR("Stampa movimenti")); + return 0; +} \ No newline at end of file diff --git a/ca/ca3100a.h b/ca/ca3100a.h new file mode 100755 index 000000000..11dc12d87 --- /dev/null +++ b/ca/ca3100a.h @@ -0,0 +1,47 @@ +#ifndef __CA3100A_H +#define __CA3100A_H + +//pag. stampa mastrini +#define F_CODDITTA 301 +#define F_RAGSOC 302 +#define F_DATASTAMPA 303 +#define F_ANNO 304 + +//campi generati dal pdc +#define F_CDC1_INI 306 +#define F_CDC12_INI 321 +#define F_CDC1_FIN 326 +#define F_CDC12_FIN 341 +#define F_DES1_INI 346 +#define F_DES12_INI 361 +#define F_DES1_FIN 366 +#define F_DES12_FIN 381 + +//campi sulla maschera +#define F_DATAINI 390 +#define F_DATAFINE 391 +#define F_STAMPA_PROG_ATT 392 +#define F_STAMPA_SALDI_PROG 393 +#define F_STAMPA_SALDI_SCAL 394 +#define F_SELEZ_STAMPA 395 + +#define F_MEMORIZZA 396 + +//sheet di pagina 2 +#define F_RIGHE 400 + +#define S_CDC1 101 +#define S_CDC2 102 +#define S_CDC3 103 +#define S_CDC4 104 +#define S_CDC5 105 +#define S_CDC6 106 +#define S_CDC7 107 +#define S_CDC8 108 +#define S_CDC9 109 +#define S_CDC10 110 +#define S_CDC11 111 +#define S_CDC12 112 + +#endif // __CA3100A_H + diff --git a/ca/ca3100a.uml b/ca/ca3100a.uml new file mode 100755 index 000000000..f67d1a191 --- /dev/null +++ b/ca/ca3100a.uml @@ -0,0 +1,275 @@ +#include "ca3100a.h" + +TOOLBAR "" 0 -2 0 2 + +BUTTON DLG_PRINT 18 2 +BEGIN + PROMPT -13 -11 "~Stampa" + MESSAGE EXIT,K_ENTER +END + +BUTTON F_MEMORIZZA 18 2 +BEGIN + PROMPT -23 -11 "~Memorizza scelte" +END + +BUTTON DLG_QUIT 18 2 +BEGIN + PROMPT -33 -11 "" +END + +ENDPAGE + +PAGE "Parametri stampa" -1 -1 78 20 + +NUMBER F_CODDITTA 5 +BEGIN + PROMPT 1 1 "Ditta " + FLAGS "FRD" + USE LF_NDITTE KEY 1 + CHECKTYPE REQUIRED + INPUT CODDITTA F_CODDITTA + DISPLAY "Codice" CODDITTA + DISPLAY "Ragione sociale @50" RAGSOC + OUTPUT F_CODDITTA CODDITTA + OUTPUT F_RAGSOC RAGSOC +END + +STRING F_RAGSOC 50 +BEGIN + PROMPT 15 1 "" + FLAGS "D" +END + +DATE F_DATASTAMPA +BEGIN + PROMPT 1 2 "Data di stampa " + FLAGS "A" +END + +NUMBER F_ANNO 4 +BEGIN + PROMPT 49 2 "Esercizio " + USE ESC + INPUT CODTAB F_ANNO + DISPLAY "Codice Esercizio" CODTAB + DISPLAY "Data inizio esercizio" D0 + DISPLAY "Data fine esercizio " D1 + OUTPUT F_ANNO CODTAB + CHECKTYPE NORMAL + CHECKTYPE NORMAL + MESSAGE HIDE,98|HIDE,99|SHOW,96|SHOW,97 + MESSAGE EMPTY HIDE,96|HIDE,97|SHOW,98|SHOW,99 + FLAGS "RZ" + ADD NONE +END + +GROUPBOX DLG_NULL 76 6 +BEGIN + PROMPT 1 4 "@bDa:" +END + +GROUPBOX DLG_NULL 76 6 +BEGIN + PROMPT 1 10 "@bA:" +END + +GROUPBOX DLG_NULL 76 7 +BEGIN + PROMPT 1 16 "@bOpzioni stampa" +END + +TEXT 96 +BEGIN + PROMPT 2 17 "Dalla data competenza" +END + +TEXT 97 +BEGIN + PROMPT 40 17 "Alla data competenza " +END + +TEXT 98 +BEGIN + PROMPT 2 17 "Dalla data operazione " +END + +TEXT 99 +BEGIN + PROMPT 40 17 "Alla data operazione " +END + +DATE F_DATAINI +BEGIN + PROMPT 26 17 "" +END + +DATE F_DATAFINE +BEGIN + PROMPT 62 17 "" +END + +BOOLEAN F_STAMPA_PROG_ATT +BEGIN + PROMPT 2 18 "Stampa progressivi attuali" +END + +BOOLEAN F_STAMPA_SALDI_PROG +BEGIN + PROMPT 2 19 "Stampa saldi progressivi" +END + +BOOLEAN F_STAMPA_SALDI_SCAL +BEGIN + PROMPT 2 20 "Stampa saldo scalare" +END + +LIST F_SELEZ_STAMPA 34 +BEGIN + PROMPT 2 21 "Selezione mastrini " + ITEM "1|Movimentati nel periodo" + ITEM "2|Con saldo diverso da 0" + ITEM "3|Tutti" +END + +ENDPAGE + +PAGE "Selezioni" -1 -1 78 20 + +SPREADSHEET F_RIGHE -1 -2 +BEGIN + PROMPT 0 2 "" + ITEM "Cdc1" + ITEM "Cdc2" + ITEM "Cdc3" + ITEM "Cdc4" + ITEM "Cdc5" + ITEM "Cdc6" + ITEM "Cdc7" + ITEM "Cdc8" + ITEM "Cdc9" + ITEM "Cdc10" + ITEM "Cdc11" + ITEM "Cdc12" +END + +ENDPAGE + +ENDMASK + +PAGE "Riga" -1 -1 78 19 + +STRING S_CDC1 20 +BEGIN + PROMPT 1 2 "Cdc1" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC2 20 +BEGIN + PROMPT 21 2 "Cdc2" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC3 20 +BEGIN + PROMPT 41 2 "Cdc3" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC4 20 +BEGIN + PROMPT 61 2 "Cdc4" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC5 20 +BEGIN + PROMPT 1 3 "Cdc5" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC6 20 +BEGIN + PROMPT 21 3 "Cdc6" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC7 20 +BEGIN + PROMPT 41 3 "Cdc7" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC8 20 +BEGIN + PROMPT 61 3 "Cdc8" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC9 20 +BEGIN + PROMPT 1 4 "Cdc9" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC10 20 +BEGIN + PROMPT 21 4 "Cdc10" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC11 20 +BEGIN + PROMPT 41 4 "Cdc11" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +STRING S_CDC12 20 +BEGIN + PROMPT 61 4 "Cdc12" + FLAGS "B" + CHECKTYPE NORMAL + GROUP 1 +END + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -13 -1 "" +END + +BUTTON DLG_DELREC 10 2 +BEGIN + PROMPT -23 -1 "" +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -33 -1 "" +END + +ENDPAGE + +ENDMASK \ No newline at end of file diff --git a/ca/ca3200.cpp b/ca/ca3200.cpp index ace00e7b4..0bf31270d 100755 --- a/ca/ca3200.cpp +++ b/ca/ca3200.cpp @@ -65,21 +65,6 @@ int TPrint_mastrini_ca_mask::create_page2_sheet(int lf, int& y, short& dlg, bool y += h+1; dlg += h; - for (short id = S_CON4+100; id >= S_CDC1+100; id--) - { - const int pos = sm.id2pos(id); - if (pos >= 0) - { - TMask_field& f = sm.fld(pos); - const int size = f.size(); - const TString& prompt = f.prompt(); - sf.set_column_header(id, prompt); - sf.set_column_justify(id, f.is_kind_of(CLASS_REAL_FIELD)); - sf.set_column_width(id, (max(3+size, prompt.len()+1)) * CHARX); - } - else - sf.delete_column(id); - } return h; } @@ -94,7 +79,7 @@ void TPrint_mastrini_ca_mask::create_page2() TConfig_anal ini; const bool fsc_req = ini.get_bool("FscRequired"); - int y = 3; + int y = 1; short dlg = S_CDC1 + 100; // id del primo campo da generare for (int i = 0; i < 2; i++) @@ -124,6 +109,22 @@ void TPrint_mastrini_ca_mask::create_page2() if (fasinfo.levels() > 0 && fasinfo.parent() <= 0) create_page2_sheet(LF_FASI, y, dlg, fsc_req); + + for (short id = S_CDC12+100; id >= S_CDC1+100; id--) + { + const int pos = sm.id2pos(id); + if (pos >= 0) + { + TMask_field& f = sm.fld(pos); + const int size = f.size(); + const TString& prompt = f.prompt(); + sf.set_column_header(id, prompt); + sf.set_column_justify(id, f.is_kind_of(CLASS_REAL_FIELD)); + sf.set_column_width(id, (max(3+size, prompt.len()+1)) * CHARX); + } + else + sf.delete_column(id); + } } @@ -182,7 +183,34 @@ void TPrint_mastrini_ca::main_loop() { while (_mask->run() == K_ENTER) { - //costruzione del ciclo di scansione principale in base ai parametri della maschera + //costruzione della query x il report in base ai parametri della maschera + TSheet_field& sheet = _mask->sfield(F_RIGHE); + const int n_righe_sheet = sheet.items(); + //se lo sheet è vuoto aggiunge una riga vuota + if (n_righe_sheet == 0) + sheet.insert(); + + //report e book + TReport_book book; //book dei report + TString path = _mask->get(F_REPORT); + if (path.empty()) + path = "ca3200a"; + + FOR_EACH_SHEET_ROW(sheet, r, row) + { + TAnal_report rep; + rep.load(path); + + TString query; + query << "USE RMOVANA"; + rep.set_recordset(query); + + rep.mask2report(*_mask); + book.add(rep); + + } + + book.print_or_preview(); //stampa il book dei report } } diff --git a/ca/ca3200a.h b/ca/ca3200a.h index c0d7a8300..2671b9e1e 100755 --- a/ca/ca3200a.h +++ b/ca/ca3200a.h @@ -6,6 +6,7 @@ #define F_RAGSOC 302 #define F_DATASTAMPA 303 #define F_ANNO 304 +#define F_REPORT 305 //campi generati dal pdc #define F_CDC1_INI 306 @@ -34,18 +35,14 @@ #define S_CDC2 102 #define S_CDC3 103 #define S_CDC4 104 -#define S_CMS1 105 -#define S_CMS2 106 -#define S_CMS3 107 -#define S_CMS4 108 -#define S_FAS1 109 -#define S_FAS2 110 -#define S_FAS3 111 -#define S_FAS4 112 -#define S_CON1 113 -#define S_CON2 114 -#define S_CON3 115 -#define S_CON4 116 +#define S_CDC5 105 +#define S_CDC6 106 +#define S_CDC7 107 +#define S_CDC8 108 +#define S_CDC9 109 +#define S_CDC10 110 +#define S_CDC11 111 +#define S_CDC12 112 #endif // __CA3200A_H diff --git a/ca/ca3200a.uml b/ca/ca3200a.uml index 610baf635..7806bc25d 100755 --- a/ca/ca3200a.uml +++ b/ca/ca3200a.uml @@ -116,22 +116,27 @@ END BOOLEAN F_STAMPA_SALDI_PROG BEGIN - PROMPT 2 19 "Stampa saldi progressivi" + PROMPT 30 18 "Stampa saldi progressivi" END BOOLEAN F_STAMPA_SALDI_SCAL BEGIN - PROMPT 2 20 "Stampa saldo scalare" + PROMPT 55 18 "Stampa saldo scalare" END LIST F_SELEZ_STAMPA 34 BEGIN - PROMPT 2 21 "Selezione mastrini " + PROMPT 2 19 "Selezione mastrini " ITEM "1|Movimentati nel periodo" ITEM "2|Con saldo diverso da 0" ITEM "3|Tutti" END +STRING F_REPORT 256 64 +BEGIN + PROMPT 2 21 "Report " +END + ENDPAGE PAGE "Selezioni" -1 -1 78 20 @@ -139,22 +144,18 @@ PAGE "Selezioni" -1 -1 78 20 SPREADSHEET F_RIGHE -1 -2 BEGIN PROMPT 0 2 "" - ITEM "Cdc 1" - ITEM "Cdc 2" - ITEM "Cdc 3" - ITEM "Cdc 4" - ITEM "Cms 1" - ITEM "Cms 2" - ITEM "Cms 3" - ITEM "Cms 4" - ITEM "Fas 1" - ITEM "Fas 2" - ITEM "Fas 3" - ITEM "Fas 4" - ITEM "Con 1" - ITEM "Con 2" - ITEM "Con 3" - ITEM "Con 4" + ITEM "Cdc1" + ITEM "Cdc2" + ITEM "Cdc3" + ITEM "Cdc4" + ITEM "Cdc5" + ITEM "Cdc6" + ITEM "Cdc7" + ITEM "Cdc8" + ITEM "Cdc9" + ITEM "Cdc10" + ITEM "Cdc11" + ITEM "Cdc12" END ENDPAGE @@ -165,128 +166,96 @@ PAGE "Riga" -1 -1 78 19 STRING S_CDC1 20 BEGIN - PROMPT 1 2 "Cdc 1" - USE LF_CDC + PROMPT 1 2 "Cdc1" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC2 20 BEGIN - PROMPT 21 2 "Cdc 2" - COPY USE S_CDC1 + PROMPT 21 2 "Cdc2" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC3 20 BEGIN - PROMPT 41 2 "Cdc 3" - COPY USE S_CDC1 + PROMPT 41 2 "Cdc3" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC4 20 BEGIN - PROMPT 61 2 "Cdc 4" - COPY USE S_CDC1 + PROMPT 61 2 "Cdc4" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS1 20 +STRING S_CDC5 20 BEGIN - PROMPT 1 3 "Cms 1" - USE LF_COMMESSE + PROMPT 1 3 "Cdc5" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS2 20 +STRING S_CDC6 20 BEGIN - PROMPT 21 3 "Cms 2" - COPY USE S_CMS1 + PROMPT 21 3 "Cdc6" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS3 20 +STRING S_CDC7 20 BEGIN - PROMPT 41 3 "Cms 3" - COPY USE S_CMS1 + PROMPT 41 3 "Cdc7" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS4 20 +STRING S_CDC8 20 BEGIN - PROMPT 61 3 "Cms 4" - COPY USE S_CMS1 + PROMPT 61 3 "Cdc8" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS1 20 +STRING S_CDC9 20 BEGIN - PROMPT 1 4 "Fas 1" - USE LF_FASI + PROMPT 1 4 "Cdc9" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS2 20 +STRING S_CDC10 20 BEGIN - PROMPT 21 4 "Fas 2" - COPY USE S_FAS1 + PROMPT 21 4 "Cdc10" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS3 20 +STRING S_CDC11 20 BEGIN - PROMPT 41 4 "Fas 3" - COPY USE S_FAS1 + PROMPT 41 4 "Cdc11" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS4 20 +STRING S_CDC12 20 BEGIN - PROMPT 61 4 "Fas 4" - COPY USE S_FAS1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON1 20 -BEGIN - PROMPT 1 5 "Con 1" - USE LF_PCON - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON2 20 -BEGIN - PROMPT 21 5 "Con 2" - COPY USE S_CON1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON3 20 -BEGIN - PROMPT 41 5 "Con 3" - COPY USE S_CON1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON4 20 -BEGIN - PROMPT 61 5 "Con 4" - COPY USE S_CON1 + PROMPT 61 4 "Cdc12" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END diff --git a/ca/ca3300.cpp b/ca/ca3300.cpp index cfbef4f90..2545ed526 100755 --- a/ca/ca3300.cpp +++ b/ca/ca3300.cpp @@ -65,21 +65,6 @@ int TPrint_bilancio_ca_mask::create_page2_sheet(int lf, int& y, short& dlg, bool y += h+1; dlg += h; - for (short id = S_CON4+100; id >= S_CDC1+100; id--) - { - const int pos = sm.id2pos(id); - if (pos >= 0) - { - TMask_field& f = sm.fld(pos); - const int size = f.size(); - const TString& prompt = f.prompt(); - sf.set_column_header(id, prompt); - sf.set_column_justify(id, f.is_kind_of(CLASS_REAL_FIELD)); - sf.set_column_width(id, (max(3+size, prompt.len()+1)) * CHARX); - } - else - sf.delete_column(id); - } return h; } @@ -94,7 +79,7 @@ void TPrint_bilancio_ca_mask::create_page2() TConfig_anal ini; const bool fsc_req = ini.get_bool("FscRequired"); - int y = 13; + int y = 1; short dlg = S_CDC1 + 100; // id del primo campo da generare for (int i = 0; i < 2; i++) @@ -125,8 +110,7 @@ void TPrint_bilancio_ca_mask::create_page2() if (fasinfo.levels() > 0 && fasinfo.parent() <= 0) create_page2_sheet(LF_FASI, y, dlg, fsc_req); -//ordina i campi sheet -/* for (short id = S_CON4+100; id >= S_CDC1+100; id--) + for (short id = S_CDC12+100; id >= S_CDC1+100; id--) { const int pos = sm.id2pos(id); if (pos >= 0) @@ -139,11 +123,8 @@ void TPrint_bilancio_ca_mask::create_page2() sf.set_column_width(id, (max(3+size, prompt.len()+1)) * CHARX); } else - { sf.delete_column(id); - } - }*/ - + } } @@ -155,8 +136,8 @@ TPrint_bilancio_ca_mask::TPrint_bilancio_ca_mask() const int logicnum = use_pdcc ? LF_PCON : LF_PCONANA; - const int nfields = ca_create_fields(*this, 0, logicnum, 2, 11, F_CDC1_INI, F_DES1_INI, 0x0, "#DACONTO"); - ca_create_fields(*this, 0, logicnum, 2, 17, F_CDC1_FIN, F_DES1_FIN, 0x0, "#ACONTO"); + const int nfields = ca_create_fields(*this, 0, logicnum, 2, 9, F_CDC1_INI, F_DES1_INI, 0x0, "#DACONTO"); + ca_create_fields(*this, 0, logicnum, 2, 15, F_CDC1_FIN, F_DES1_FIN, 0x0, "#ACONTO"); for (int i = 0; i < nfields; i++) { diff --git a/ca/ca3300a.h b/ca/ca3300a.h index 3709d5504..791f062d7 100755 --- a/ca/ca3300a.h +++ b/ca/ca3300a.h @@ -25,7 +25,8 @@ #define F_DES1_FIN 376 #define F_DES12_FIN 391 -//sheet&friends +#define F_REPORT 395 + //sheet di pagina 2 #define F_RIGHE 400 @@ -33,19 +34,14 @@ #define S_CDC2 102 #define S_CDC3 103 #define S_CDC4 104 -#define S_CMS1 105 -#define S_CMS2 106 -#define S_CMS3 107 -#define S_CMS4 108 -#define S_FAS1 109 -#define S_FAS2 110 -#define S_FAS3 111 -#define S_FAS4 112 -#define S_CON1 113 -#define S_CON2 114 -#define S_CON3 115 -#define S_CON4 116 - +#define S_CDC5 105 +#define S_CDC6 106 +#define S_CDC7 107 +#define S_CDC8 108 +#define S_CDC9 109 +#define S_CDC10 110 +#define S_CDC11 111 +#define S_CDC12 112 // #endif // __CA3300A_H diff --git a/ca/ca3300a.uml b/ca/ca3300a.uml index 77875342a..5e5762ffe 100755 --- a/ca/ca3300a.uml +++ b/ca/ca3300a.uml @@ -132,19 +132,23 @@ END GROUPBOX DLG_NULL 78 6 BEGIN - PROMPT 0 10 "@bDa:" + PROMPT 0 8 "@bDa:" END GROUPBOX DLG_NULL 78 6 BEGIN - PROMPT 0 16 "@bA:" + PROMPT 0 14 "@bA:" +END + +STRING F_REPORT 256 64 +BEGIN + PROMPT 1 20 "Report " END ENDPAGE PAGE "Selezioni" -1 -1 74 20 - SPREADSHEET F_RIGHE -1 -2 BEGIN PROMPT 0 2 "" @@ -160,10 +164,6 @@ BEGIN ITEM "Fas 2" ITEM "Fas 3" ITEM "Fas 4" - ITEM "Con 1" - ITEM "Con 2" - ITEM "Con 3" - ITEM "Con 4" END ENDPAGE @@ -174,128 +174,96 @@ PAGE "Riga" -1 -1 78 19 STRING S_CDC1 20 BEGIN - PROMPT 1 2 "Cdc 1" - USE LF_CDC + PROMPT 1 2 "Cdc1" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC2 20 BEGIN - PROMPT 21 2 "Cdc 2" - COPY USE S_CDC1 + PROMPT 21 2 "Cdc2" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC3 20 BEGIN - PROMPT 41 2 "Cdc 3" - COPY USE S_CDC1 + PROMPT 41 2 "Cdc3" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END STRING S_CDC4 20 BEGIN - PROMPT 61 2 "Cdc 4" - COPY USE S_CDC1 + PROMPT 61 2 "Cdc4" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS1 20 +STRING S_CDC5 20 BEGIN - PROMPT 1 3 "Cms 1" - USE LF_COMMESSE + PROMPT 1 3 "Cdc5" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS2 20 +STRING S_CDC6 20 BEGIN - PROMPT 21 3 "Cms 2" - COPY USE S_CMS1 + PROMPT 21 3 "Cdc6" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS3 20 +STRING S_CDC7 20 BEGIN - PROMPT 41 3 "Cms 3" - COPY USE S_CMS1 + PROMPT 41 3 "Cdc7" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_CMS4 20 +STRING S_CDC8 20 BEGIN - PROMPT 61 3 "Cms 4" - COPY USE S_CMS1 + PROMPT 61 3 "Cdc8" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS1 20 +STRING S_CDC9 20 BEGIN - PROMPT 1 4 "Fas 1" - USE LF_FASI + PROMPT 1 4 "Cdc9" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS2 20 +STRING S_CDC10 20 BEGIN - PROMPT 21 4 "Fas 2" - COPY USE S_FAS1 + PROMPT 21 4 "Cdc10" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS3 20 +STRING S_CDC11 20 BEGIN - PROMPT 41 4 "Fas 3" - COPY USE S_FAS1 + PROMPT 41 4 "Cdc11" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END -STRING S_FAS4 20 +STRING S_CDC12 20 BEGIN - PROMPT 61 4 "Fas 4" - COPY USE S_FAS1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON1 20 -BEGIN - PROMPT 1 5 "Con 1" - USE LF_PCON - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON2 20 -BEGIN - PROMPT 21 5 "Con 2" - COPY USE S_CON1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON3 20 -BEGIN - PROMPT 41 5 "Con 3" - COPY USE S_CON1 - CHECKTYPE NORMAL - GROUP 1 -END - -STRING S_CON4 20 -BEGIN - PROMPT 61 5 "Con 4" - COPY USE S_CON1 + PROMPT 61 4 "Cdc12" + FLAGS "B" CHECKTYPE NORMAL GROUP 1 END @@ -317,4 +285,4 @@ END ENDPAGE -ENDMASK +ENDMASK \ No newline at end of file