From cfb5ec8e3a5484bc469db54fcf0b3c87115cd1a0 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Mon, 27 Nov 2017 16:19:15 +0000 Subject: [PATCH] Patch level : 12.0 476 Files correlati : ca0.exe ca0300a.msk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reso opzionale l'albero nelle immissioni degli archivi della contabilità analitica. git-svn-id: svn://10.65.10.50/branches/R_10_00@24205 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/ca/ca0300a.h | 5 +++++ src/ca/ca0300a.uml | 25 +++++++++++++++++++++++++ src/ca/ca0400.cpp | 1 + src/ca/ca0500.cpp | 2 ++ src/ca/ca0600.cpp | 1 + src/ca/ca0700.cpp | 1 + src/ca/calib01.cpp | 34 ++++++++++++++++++---------------- src/ca/calib01.h | 1 + 8 files changed, 54 insertions(+), 16 deletions(-) diff --git a/src/ca/ca0300a.h b/src/ca/ca0300a.h index 10a7324ea..60e60b58f 100755 --- a/src/ca/ca0300a.h +++ b/src/ca/ca0300a.h @@ -50,6 +50,11 @@ #define F_PDCREQ 143 #define F_SEZRIF 144 +#define F_CDCTREE 161 +#define F_CMSTREE 162 +#define F_FSCTREE 163 +#define F_PDCTREE 164 + //pagina con le regole del rendiconto #define F_RIGHE_NUM 170 #define F_RIGHE_FDR 171 diff --git a/src/ca/ca0300a.uml b/src/ca/ca0300a.uml index d29f39056..9b4864153 100755 --- a/src/ca/ca0300a.uml +++ b/src/ca/ca0300a.uml @@ -145,6 +145,12 @@ BEGIN FIELD CdcRequired END +BOOLEAN F_CDCTREE +BEGIN + PROMPT 40 7 "Albero record in immissione" + FIELD CdcTree +END + GROUPBOX DLG_NULL 78 8 BEGIN PROMPT 1 9 "@bCommessa" @@ -224,6 +230,12 @@ BEGIN FIELD CmsRequired END +BOOLEAN F_CMSTREE +BEGIN + PROMPT 40 15 "Albero record in immissione" + FIELD CmsTree +END + ENDPAGE PAGE "Configurazione campi 2" -1 -1 78 10 @@ -307,6 +319,12 @@ BEGIN FIELD FscRequired END +BOOLEAN F_FSCTREE +BEGIN + PROMPT 40 7 "Albero record in immissione" + FIELD FscTree +END + GROUPBOX DLG_NULL 78 9 BEGIN PROMPT 1 10 "@bPiano dei conti analitico" @@ -405,6 +423,13 @@ BEGIN FIELD PdciRequired END +BOOLEAN F_PDCTREE +BEGIN + PROMPT 40 17 "Albero record in immissione" + FIELD PdcTree +END + + RADIOBUTTON F_SEZRIF 60 BEGIN PROMPT 1 19 "Sezione di riferimento per le ripartizioni Costo/Ricavo" diff --git a/src/ca/ca0400.cpp b/src/ca/ca0400.cpp index 10765c186..22203ace2 100755 --- a/src/ca/ca0400.cpp +++ b/src/ca/ca0400.cpp @@ -17,6 +17,7 @@ class TPiano_conti_anal_msk : public TSimple_anal_msk protected: virtual int get_logicnum() const { return LF_PCONANA; } virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); + virtual bool create_tree() const { return ca_config().get_bool("PdcTree");} public: TPiano_conti_anal_msk() { read("ca0400a"); } diff --git a/src/ca/ca0500.cpp b/src/ca/ca0500.cpp index 75c122b33..af5fdde17 100755 --- a/src/ca/ca0500.cpp +++ b/src/ca/ca0500.cpp @@ -14,6 +14,8 @@ class TCdC_anal_msk : public TSimple_anal_msk { protected: virtual int get_logicnum() const { return LF_CDC; } + virtual bool create_tree() const { return ca_config().get_bool("CdcTree");} + public: TCdC_anal_msk(); diff --git a/src/ca/ca0600.cpp b/src/ca/ca0600.cpp index 683bf6d5b..d0eb50947 100755 --- a/src/ca/ca0600.cpp +++ b/src/ca/ca0600.cpp @@ -15,6 +15,7 @@ class TCms_anal_msk : public TSimple_anal_msk { protected: virtual int get_logicnum() const { return LF_COMMESSE; } + virtual bool create_tree() const { return ca_config().get_bool("CmsTree");} public: TCms_anal_msk(); diff --git a/src/ca/ca0700.cpp b/src/ca/ca0700.cpp index ae9eab345..12c1bf7ac 100755 --- a/src/ca/ca0700.cpp +++ b/src/ca/ca0700.cpp @@ -17,6 +17,7 @@ class TFsc_anal_msk : public TSimple_anal_msk protected: virtual int get_logicnum() const { return LF_FASI; } virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); + virtual bool create_tree() const { return ca_config().get_bool("FscTree");} public: TFsc_anal_msk(); diff --git a/src/ca/calib01.cpp b/src/ca/calib01.cpp index c01443dbd..f2e001382 100755 --- a/src/ca/calib01.cpp +++ b/src/ca/calib01.cpp @@ -1505,23 +1505,25 @@ bool TSimple_anal_msk::on_field_event(TOperable_field& o, TField_event e, long j int TSimple_anal_msk::compute_offset() const { int delta = 0; - RCT rct; xvt_vobj_get_client_rect(TASK_WIN, &rct); - if (rct.right > 720) - delta = (rct.right - 720) / 2 / CHARX; - - if (delta > 0) - { - int ln = get_logicnum(); - if (ln == LF_FASI) - { - const TString& ff = ca_config().get("FathFasi"); - if (ff.full()) - ln = (ff == "CMS") ? LF_COMMESSE : LF_CDC; - } - TLocalisamfile lif(ln); - const TRecnotype recs = lif.items(); - } + if (create_tree()) + { + RCT rct; xvt_vobj_get_client_rect(TASK_WIN, &rct); + if (rct.right > 720) + delta = (rct.right - 720) / 2 / CHARX; + if (delta > 0) + { + int ln = get_logicnum(); + if (ln == LF_FASI) + { + const TString& ff = ca_config().get("FathFasi"); + if (ff.full()) + ln = (ff == "CMS") ? LF_COMMESSE : LF_CDC; + } + TLocalisamfile lif(ln); + const TRecnotype recs = lif.items(); + } + } return delta; } diff --git a/src/ca/calib01.h b/src/ca/calib01.h index 0bf44198c..00d54accd 100755 --- a/src/ca/calib01.h +++ b/src/ca/calib01.h @@ -128,6 +128,7 @@ protected: virtual short create_tree_field(); int compute_offset() const; + virtual bool create_tree () const { return false;} protected: TSimple_anal_msk() { }