From 40540815146ff39976957c76d2ec178aec985694 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 1 Apr 2005 15:16:14 +0000 Subject: [PATCH] Patch level : 2.2 66 Files correlati : ca1.exe Ricompilazione Demo : [ ] Commento : Funziona un'po stampe anagrafiche git-svn-id: svn://10.65.10.50/trunk@12894 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca1400.cpp | 12 ++++++++---- ca/ca1400.rep | 6 +++--- ca/ca1400a.uml | 4 ++-- ca/ca1500.cpp | 10 ++++++++-- ca/ca1500.rep | 6 +++--- ca/ca1500a.uml | 4 ++-- ca/ca1600.cpp | 12 ++++++++---- ca/ca1600.rep | 6 +++--- ca/ca1600a.uml | 4 ++-- ca/ca1700.cpp | 31 +++++++++++++++++++++++++++---- ca/ca1700.rep | 22 +++++++++++----------- 11 files changed, 77 insertions(+), 40 deletions(-) diff --git a/ca/ca1400.cpp b/ca/ca1400.cpp index d3681e4a4..f744860ae 100755 --- a/ca/ca1400.cpp +++ b/ca/ca1400.cpp @@ -20,12 +20,16 @@ public: TMask_print_pdc::TMask_print_pdc() :TAutomask("ca1400a") { - ca_create_fields(*this, LF_PCONANA, 2, 2, F_DACONTO, F_DACONTO + 100, 0x0, "#DACONTO"); - int nfields = ca_create_fields(*this, LF_PCONANA, 2, 8, F_ACONTO, F_ACONTO + 100, 0x0, "#ACONTO"); + ca_create_fields(*this, LF_PCONANA, 3, 2, F_DACONTO, F_DACONTO + 100, 0x0, "#DACONTO"); + int nfields = ca_create_fields(*this, LF_PCONANA, 3, 8, F_ACONTO, F_ACONTO + 100, 0x0, "#ACONTO"); for (int i = 0; i < nfields; i++) { - field(F_DACONTO + i).set_group(1); - field(F_ACONTO + i).set_group(2); + TMask_field& daconto = field(F_DACONTO + i); + daconto.set_group(1); + daconto.check_type(CHECK_NORMAL); + TMask_field& aconto = field(F_ACONTO + i); + aconto.set_group(2); + aconto.check_type(CHECK_NORMAL); } } diff --git a/ca/ca1400.rep b/ca/ca1400.rep index 5b35fdb6a..b19f5684c 100755 --- a/ca/ca1400.rep +++ b/ca/ca1400.rep @@ -49,7 +49,7 @@
- USE 106 -FROM #DACONTO -TO #ACONTO + USE PCONANA +FROM CODCONTO=#DACONTO +TO CODCONTO=#ACONTO \ No newline at end of file diff --git a/ca/ca1400a.uml b/ca/ca1400a.uml index 70b9cfc43..5e2ac202e 100755 --- a/ca/ca1400a.uml +++ b/ca/ca1400a.uml @@ -2,12 +2,12 @@ PAGE "Stampa piano dei conti analitica" -1 -1 80 17 -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 1 "Da conto" END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 7 "A conto" END diff --git a/ca/ca1500.cpp b/ca/ca1500.cpp index 2ce2fcf5d..a18e5f452 100755 --- a/ca/ca1500.cpp +++ b/ca/ca1500.cpp @@ -19,10 +19,16 @@ public: TMask_print_cdc::TMask_print_cdc() :TAutomask("ca1500a") { - ca_create_fields(*this, LF_CDC, 2, 2, F_DACDC, F_DACDC + 100, 0x0, "#DACDC"); - int nfields = ca_create_fields(*this, LF_CDC, 2, 8, F_ACDC, F_ACDC + 100, 0x0, "#ACDC"); + ca_create_fields(*this, LF_CDC, 3, 2, F_DACDC, F_DACDC + 100, 0x0, "#DACDC"); + int nfields = ca_create_fields(*this, LF_CDC, 3, 8, F_ACDC, F_ACDC + 100, 0x0, "#ACDC"); for (int i = 0; i < nfields; i++) { + TMask_field& dacdc = field(F_DACDC + i); + dacdc.set_group(1); + dacdc.check_type(CHECK_NORMAL); + TMask_field& acdc = field(F_ACDC + i); + acdc.set_group(2); + acdc.check_type(CHECK_NORMAL); field(F_DACDC + i).set_group(1); field(F_ACDC + i).set_group(2); } diff --git a/ca/ca1500.rep b/ca/ca1500.rep index 6265960bb..0a2f7de19 100755 --- a/ca/ca1500.rep +++ b/ca/ca1500.rep @@ -55,7 +55,7 @@
- USE 146 -FROM #DACDC -TO #ACDC + USE CDC +FROM CODCOSTO=#DACDC +TO CODCOSTO=#ACDC \ No newline at end of file diff --git a/ca/ca1500a.uml b/ca/ca1500a.uml index b2bfd7f4e..98425faf2 100755 --- a/ca/ca1500a.uml +++ b/ca/ca1500a.uml @@ -2,12 +2,12 @@ PAGE "Stampa centri di costo" -1 -1 80 17 -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 1 "Da centro di costo" END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 7 "A centro di costo" END diff --git a/ca/ca1600.cpp b/ca/ca1600.cpp index 56f949fb4..6cef50a3c 100755 --- a/ca/ca1600.cpp +++ b/ca/ca1600.cpp @@ -19,12 +19,16 @@ public: TMask_print_cms::TMask_print_cms() :TAutomask("ca1600a") { - ca_create_fields(*this, LF_COMMESSE, 2, 2, F_DACMS, F_DACMS + 100, 0x0, "#DACMS"); - int nfields = ca_create_fields(*this, LF_COMMESSE, 2, 8, F_ACMS, F_ACMS + 100, 0x0, "#ACMS"); + ca_create_fields(*this, LF_COMMESSE, 3, 2, F_DACMS, F_DACMS + 100, 0x0, "#DACMS"); + int nfields = ca_create_fields(*this, LF_COMMESSE, 3, 8, F_ACMS, F_ACMS + 100, 0x0, "#ACMS"); for (int i = 0; i < nfields; i++) { - field(F_DACMS + i).set_group(1); - field(F_ACMS + i).set_group(2); + TMask_field& dacms = field(F_DACMS + i); + dacms.set_group(1); + dacms.check_type(CHECK_NORMAL); + TMask_field& acms = field(F_ACMS + i); + acms.set_group(2); + acms.check_type(CHECK_NORMAL); } } diff --git a/ca/ca1600.rep b/ca/ca1600.rep index 5c8062203..555ff598f 100755 --- a/ca/ca1600.rep +++ b/ca/ca1600.rep @@ -37,7 +37,7 @@
- USE 147 -FROM #DACMS -TO #ACMS + USE COMMESSE +FROM CODCMS=#DACMS +TO CODCMS=#ACMS \ No newline at end of file diff --git a/ca/ca1600a.uml b/ca/ca1600a.uml index feca65acd..2c6f5aec2 100755 --- a/ca/ca1600a.uml +++ b/ca/ca1600a.uml @@ -2,12 +2,12 @@ PAGE "Stampa commesse" -1 -1 80 17 -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 1 "Da commess" END -GROUPBOX DLG_NULL 78 6 +GROUPBOX DLG_NULL 77 6 BEGIN PROMPT 2 7 "A commessa" END diff --git a/ca/ca1700.cpp b/ca/ca1700.cpp index cb11a6493..aa9ae5b89 100755 --- a/ca/ca1700.cpp +++ b/ca/ca1700.cpp @@ -8,10 +8,12 @@ class TMask_print_fasi : public TAutomask { - + int _nfields; protected: bool on_field_event(TOperable_field& o, TField_event e, long jolly) {return true;} + public: + int nfields() { return _nfields; } TMask_print_fasi(); virtual ~TMask_print_fasi() {} }; @@ -20,10 +22,10 @@ TMask_print_fasi::TMask_print_fasi() :TAutomask("ca1700a") { ca_create_fields(*this, LF_FASI, 3, 2, F_DAFASE, F_DAFASE + 100); - int nfields = ca_create_fields(*this, LF_FASI, 3, 9, F_AFASE, F_AFASE + 100); + _nfields = ca_create_fields(*this, LF_FASI, 3, 9, F_AFASE, F_AFASE + 100); TString80 workstring; - for (int i = 0; i < nfields; i++) + for (int i = 0; i < _nfields; i++) { TEdit_field& dafase = efield(F_DAFASE + i); dafase.set_group(1); @@ -71,8 +73,29 @@ void TPrint_fasi::main_loop() if (path.empty()) path = "ca1700"; - rep.load(path); + rep.load(path); rep.mask2report(m); + const TMultilevel_code_info& main_info = ca_multilevel_code_info(LF_FASI); + + if (main_info.parent() == 0) + { + TRecordset* rset = rep.recordset(); + + if (rset != NULL) + { + TVariant var; + + var = ""; + rset->set_var("#DACODCMSFAS", var); + TString fs; + + for (int i = 0 ; fs.empty() && i < m.nfields(); i++) + fs << m.field(F_AFASE + i).get(); + if (fs.empty()) + var = "zzzzzzzzzzzz"; + rset->set_var("#ACODCMSFAS", var); + } + } book.add(rep); book.print_or_preview(); } diff --git a/ca/ca1700.rep b/ca/ca1700.rep index 2fdba2528..e254b9ed4 100755 --- a/ca/ca1700.rep +++ b/ca/ca1700.rep @@ -16,19 +16,19 @@ - + - + - + - + - + @@ -39,9 +39,9 @@
- - CODCMSFAS - MESSAGE_FORMAT_CMSCDC + + CODFASE + MESSAGE_FORMAT_FASE DESCRIZ @@ -52,9 +52,9 @@ DATAFINE - - CODFASE - MESSAGE_FORMAT_FASE + + CODCMSFAS + MESSAGE_FORMAT_CMSCDC DATAPROR