Patch level : 12.0 1066

Files correlati     : ce3.exe ce3900.msk rimosso ce3900b.rep
Commento        :

Modificato i flag di ordinamento e di totale nella stampa registro sintetico.

Interno :

Controllare i totali visto che ho dovuto modicae il modo di calcolarlo.

src/ce/ce3900.cpp

@@ -151,26 +151,20 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk)
 	}
   //ordinamenti
 
-	const int sort_type = msk.get_int(F_SORT);
-
-	if (sort_type & SORT_CAT)
-	{
-		query << "\nBY ";
-		if (sort_type & SORT_DATACOMP)
-			query << "CODCAT|CODIMP|CODLOC|DTCOMP|IDCESPITE";
-		else
-			query << "CODCAT|CODIMP|CODLOC|IDCESPITE";
-	}
-	else
-	{
-    query << "\nBY ";
-		if (sort_type & SORT_DATACOMP)
-			query << "CODIMP|CODLOC|DTCOMP|IDCESPITE";
-    else
-      query << "CODIMP|CODLOC|IDCESPITE";
-	}
 
+  TToken_string order("", '|');
 
+  query << "\nBY ";
+  if (msk.get_bool(F_SORTCAT))
+    order.add("CODCAT");
+  if (msk.get_bool(F_SORTIMP))
+    order.add("CODIMP");
+  if (msk.get_bool(F_SORTLOC))
+    order.add("CODLOC");
+  if (msk.get_bool(F_SORTCOMP))
+    order.add("DTCOMP");
+  order.add("IDCESPITE");
+  query << order;
   //setta la nuova complicata query nel report (che avrebbe solo USE CESPI)
 	set(query);
 
@@ -191,7 +185,6 @@ class TStampa_sintetica_rep : public TReport
 {
 	int _anno;
 	int _tpamm;
-	int _group_codimp, _group_codloc;
 	TCespite _cespite;
 
 protected:
@@ -204,13 +197,28 @@ public:
 
 void TStampa_sintetica_rep::set_filter(const TStampa_sintetica_mask& msk)
 {
-  _anno = msk.get_int(F_ESERCIZIO);
+  const bool shcat = (!msk.excel()) && msk.get_bool(F_TOTCAT);
-	_tpamm = msk.get_int(F_SITUAZIONE);
+  const bool shimp = (!msk.excel()) && msk.get_bool(F_TOTIMP);
+  const bool shloc = (!msk.excel()) && msk.get_bool(F_TOTLOC);
 
-	_group_codimp = msk.get_bool(F_GROUP_CODIMP);
+  section('H', 2).show(shcat);
-	_group_codloc = msk.get_bool(F_GROUP_CODLOC);
+  section('H', 3).show(shimp);
+  section('H', 4).show(shloc);
+  section('F', 2).show(shcat);
+  section('F', 3).show(shimp);
+  section('F', 4).show(shloc);
+
+  section('H', 2).group_by(shcat ? section('H', 2).grouped_by() : "");
+  section('H', 3).group_by(shimp ? section('H', 3).grouped_by() : "");
+  section('H', 4).group_by(shloc ? section('H', 4).grouped_by() : "");
+
+  
+  section('H', 2).force_page_break(msk.get_bool(F_BREAK));
+  _anno = msk.get_int(F_ESERCIZIO);
+  _tpamm = msk.get_int(F_SITUAZIONE);
 
   TStampa_sintetica_recordset* rs = new TStampa_sintetica_recordset(EMPTY_STRING);
+
   set_recordset(rs);
 	rs->set_filter(msk);
 }
@@ -278,16 +286,6 @@ bool TStampa_sintetica_rep::get_usr_val(const TString& name, TVariant& var) cons
 		}
 		return true;
 	}
-	if (name == "#GROUP_CODIMP")
-	{
-		var.set(_group_codimp);
-		return true;
-	}
-  if (name == "#GROUP_CODLOC")
-	{
-		var.set(_group_codloc);
-		return true;
-	}
 	if (name == "#QAMMMV")	//quote ammortamento su movimento esercizio corrente
 	{
 		real quote_ammmv;
@@ -415,26 +413,9 @@ void TStampa_sintetica::main_loop()
 		//report e book dei report
 		TReport_book book;
 		TStampa_sintetica_rep rep;
-		const int sort_type = mask.get_int(F_SORT);
-
-		if (sort_type & SORT_CAT)
-		{
-			rep.load("ce3900a");
-			rep.section('H', 2).force_page_break(mask.get_bool(F_BREAK));
-		}
-    else
-      rep.load("ce3900b");
 
+		rep.load("ce3900a");
 		rep.set_filter(mask);
-    if (mask.excel())
-    {
-      rep.section('H', 2).hide();
-      rep.section('H', 3).hide();
-      rep.section('H', 4).hide();
-      rep.section('F', 2).hide();
-      rep.section('F', 3).hide();
-      rep.section('F', 4).hide();
-    }
 		book.add(rep);
 
     //stampa il book dei report

src/ce/ce3900.h

@@ -14,18 +14,16 @@
 #define F_D_TO_CAT        115
 #define F_SITUAZIONE			116
 
-#define F_GROUP_CODIMP		117
-#define F_GROUP_CODLOC		118
 #define F_EXCLUDE_ALIENS  119
 #define F_CALCOLO         120
 
-/*#define F_CODCMS          120
+#define F_TOTCAT          121
-#define F_DESCMS          121
+#define F_TOTIMP          122
-#define F_CODFASE         122
+#define F_TOTLOC          123
-#define F_DESFASE         123
-#define F_CODCDC          124
-#define F_DESCDC          125*/
 
 #define F_REPORT					126
-#define F_SORT						127
+#define F_SORTCAT         127
-#define F_BREAK           128
+#define F_SORTIMP         128
+#define F_SORTLOC         129
+#define F_SORTCOMP        130
+#define F_BREAK           131

src/ce/ce3900.uml

@@ -132,46 +132,70 @@ BEGIN
   FLAGS "Z"
 END
 
-GROUPBOX DLG_NULL 39 3
+GROUPBOX DLG_NULL 78 3
 BEGIN 
-  PROMPT 1 13 "@bRaggruppamenti"
+  PROMPT 0 13 "@bOrdinamento per"
 END
 
-BOOLEAN F_GROUP_CODIMP
+BOOLEAN F_SORTCAT
 BEGIN
-  PROMPT 2 14 "Per impianto "
+ PROMPT 1 14 "Categoria"
-  MESSAGE FALSE CLEAR,F_GROUP_CODLOC
+ MESSAGE TRUE ENABLE,F_TOTCAT|"X",F_TOTCAT
-  MESSAGE TRUE ENABLE,F_GROUP_CODLOC
+ MESSAGE FALSE CLEAR,F_TOTCAT
 END
 
-BOOLEAN F_GROUP_CODLOC
+BOOLEAN F_SORTIMP
 BEGIN
-  PROMPT 20 14 "Per localita' "
+ PROMPT 14 14 "Impianto"
+ MESSAGE TRUE ENABLE,F_TOTIMP|"X",F_TOTIMP
+ MESSAGE FALSE CLEAR,F_TOTIMP
+ END
+
+BOOLEAN F_SORTLOC
+BEGIN
+ PROMPT 28 14 "Località"
+ MESSAGE TRUE ENABLE,F_TOTLOC|"X",F_TOTLOC
+ MESSAGE FALSE CLEAR,F_TOTLOC
+END
+
+BOOLEAN F_SORTCOMP
+BEGIN
+ PROMPT 42 14 "Completamento"
+END
+
+GROUPBOX DLG_NULL 40 3
+BEGIN
+  PROMPT 0 16 "@bTotali per"
+END
+
+BOOLEAN F_TOTCAT
+BEGIN
+  PROMPT 1 17 "Categoria"
+END
+
+BOOLEAN F_TOTIMP
+BEGIN
+  PROMPT 14 17 "Impianto"
+END
+
+BOOLEAN F_TOTLOC
+BEGIN
+  PROMPT 28 17 "Località"
 END
 
 GROUPBOX DLG_NULL 38 3
 BEGIN
-  PROMPT 41 13 "@bEsclusioni"
+  PROMPT 41 16 "@bEsclusioni"
 END
 
 BOOLEAN F_EXCLUDE_ALIENS
 BEGIN
-  PROMPT 42 14 "Escludere i cespiti alienati"
+  PROMPT 42 17 "Cespiti alienati"
 END
 
 BOOLEAN F_CALCOLO
 BEGIN
-  PROMPT 2 16 "Esegui calcolo ammortamenti prima di stampare"
+  PROMPT 2 19 "Esegui calcolo ammortamenti prima di stampare"
-END
-
-RADIOBUTTON F_SORT 78
-BEGIN
-  PROMPT 1 17 "@bOrdinamento"
-  ITEM "2|Categoria+Cespite" MESSAGE ENABLE,F_BREAK
-  ITEM "0|Cespite" MESSAGE CLEAR,F_BREAK
-  ITEM "3|Categoria+Completamento" MESSAGE ENABLE,F_BREAK
-  ITEM "1|Completamento" MESSAGE CLEAR,F_BREAK
-  FLAGS "Z"
 END
 
 BOOLEAN F_BREAK
@@ -180,7 +204,5 @@ BEGIN
   FLAGS "Z"
 END
 
-
 ENDPAGE
-
 ENDMASK

src/ce/ce3900a.rep

@@ -27,8 +27,6 @@
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
   <font face="Arial" size="8" />
-  <prescript description="H1 PRESCRIPT">MESSAGE RESET,F1
-</prescript>
   <field border="1" radius="100" x="18" y="0.5" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="148" codval="" height="2.5" id="" pattern="2" hide_zero="" text="REGISTRO CESPITI SINTETICO">
    <font face="Times New Roman" bold="1" size="16" />
   </field>
@@ -79,15 +77,6 @@
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODIMP</groupby>
   <font face="Arial" size="7" />
-  <prescript description="H3 PRESCRIPT">#GROUP_CODIMP @
-IF
-"H3" SHOW
-"F3" SHOW
-ELSE
-"H3" HIDE
-"F3" HIDE
-THEN
-</prescript>
   <postscript description="H3 POSTSCRIPT">MESSAGE RESET,F3
 </postscript>
   <field x="4" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Impianto:">
@@ -107,15 +96,6 @@ THEN
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="4" hidden="1" bg_color="#C0C0C0" sh_color="#FFFFFF" page_break="" can_break="" pattern="10" sh_angle="270">
   <groupby>CODLOC</groupby>
   <font face="Arial" bold="1" size="7" />
-  <prescript description="H4 PRESCRIPT">#GROUP_CODLOC @
-IF
-"H4" SHOW
-"F4" SHOW
-ELSE
-"H4" HIDE
-"F4" HIDE
-THEN
-</prescript>
   <postscript description="H4 POSTSCRIPT">MESSAGE RESET,F4
 </postscript>
   <field x="7" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="" pattern="1" hide_zero="" text="Localita':" />
@@ -150,55 +130,64 @@ THEN
   </field>
   <field x="66" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="101" pattern="1" hide_zero="" text="#########,@@">
    <source>#COSTOINI</source>
-   <postscript description="B1.101 POSTSCRIPT">MESSAGE ADD,F2.101
+   <postscript description="B1.101 POSTSCRIPT">MESSAGE ADD,F1.101
+MESSAGE ADD,F2.101
 MESSAGE ADD,F3.101
 MESSAGE ADD,F4.101</postscript>
   </field>
   <field x="90" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="102" pattern="1" hide_zero="" text="#########,@@">
    <source>#COSTOFIN</source>
-   <postscript description="B1.102 POSTSCRIPT">MESSAGE ADD,F2.102
+   <postscript description="B1.102 POSTSCRIPT">MESSAGE ADD,F1.102
+MESSAGE ADD,F2.102
 MESSAGE ADD,F3.102
 MESSAGE ADD,F4.102</postscript>
   </field>
   <field x="78" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="103" pattern="1" hide_zero="" text="#########,@@">
    <source>#102-#101</source>
-   <postscript description="B1.103 POSTSCRIPT">MESSAGE ADD,F2.103
+   <postscript description="B1.103 POSTSCRIPT">MESSAGE ADD,F1.103
+MESSAGE ADD,F2.103
 MESSAGE ADD,F3.103
 MESSAGE ADD,F4.103</postscript>
   </field>
   <field x="109" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="104" pattern="1" hide_zero="" text="#########,@@">
    <source>#QAMM+#QAMMMV</source>
-   <postscript description="B1.104 POSTSCRIPT">MESSAGE ADD,F2.104
+   <postscript description="B1.104 POSTSCRIPT">MESSAGE ADD,F1.104
+MESSAGE ADD,F2.104
 MESSAGE ADD,F3.104
 MESSAGE ADD,F4.104</postscript>
   </field>
   <field x="121" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="105" pattern="1" hide_zero="" text="#########,@@">
    <source>#FAMM</source>
-   <postscript description="B1.105 POSTSCRIPT">MESSAGE ADD,F2.105
+   <postscript description="B1.105 POSTSCRIPT">MESSAGE ADD,F1.105
+MESSAGE ADD,F2.105
 MESSAGE ADD,F3.105
 MESSAGE ADD,F4.105</postscript>
   </field>
   <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@">
    <source>#CESSELIM+#QAMMMV</source>
-   <postscript description="B1.106 POSTSCRIPT">MESSAGE ADD,F2.106
+   <postscript description="B1.106 POSTSCRIPT">MESSAGE ADD,F1.106
+MESSAGE ADD,F2.106
 MESSAGE ADD,F3.106
 MESSAGE ADD,F4.106</postscript>
   </field>
   <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@">
    <source>#QAMM_FPRIVATO</source>
-   <postscript description="B1.107 POSTSCRIPT">MESSAGE ADD,F2.107
+   <postscript description="B1.107 POSTSCRIPT">MESSAGE ADD,F1.107
+MESSAGE ADD,F2.107
 MESSAGE ADD,F3.107
 MESSAGE ADD,F4.107</postscript>
   </field>
   <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
    <source>#104+#105-#106+#107</source>
-   <postscript description="B1.108 POSTSCRIPT">MESSAGE ADD,F2.108
+   <postscript description="B1.108 POSTSCRIPT">MESSAGE ADD,F1.108
+MESSAGE ADD,F2.108
 MESSAGE ADD,F3.108
 MESSAGE ADD,F4.108</postscript>
   </field>
   <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
    <source>#COSTOFIN-#108</source>
-   <postscript description="B1.109 POSTSCRIPT">MESSAGE ADD,F2.109
+   <postscript description="B1.109 POSTSCRIPT">MESSAGE ADD,F1.109
+MESSAGE ADD,F2.109
 MESSAGE ADD,F3.109
 MESSAGE ADD,F4.109</postscript>
   </field>
@@ -234,33 +223,15 @@ MESSAGE ADD,F4.109</postscript>
   <field x="20" deactivated="" type="Stringa" hidden="" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="30" codval="" id="98" pattern="1" hide_zero="" text="">
    <font italic="1" face="Arial Narrow" bold="1" size="9" />
   </field>
-  <field x="66" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="101" pattern="1" hide_zero="" text="#########,@@">
+  <field x="66" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="101" pattern="1" hide_zero="" text="#########,@@" />
-   <postscript description="F2.101 POSTSCRIPT">MESSAGE ADD,F1.101</postscript>
+  <field x="90" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="102" pattern="1" hide_zero="" text="#########,@@" />
-  </field>
+  <field x="78" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="103" pattern="1" hide_zero="" text="#########,@@" />
-  <field x="90" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="102" pattern="1" hide_zero="" text="#########,@@">
+  <field x="109" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="104" pattern="1" hide_zero="" text="#########,@@" />
-   <postscript description="F2.102 POSTSCRIPT">MESSAGE ADD,F1.102</postscript>
+  <field x="121" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="105" pattern="1" hide_zero="" text="#########,@@" />
-  </field>
+  <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@" />
-  <field x="78" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="103" pattern="1" hide_zero="" text="#########,@@">
+  <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@" />
-   <postscript description="F2.103 POSTSCRIPT">MESSAGE ADD,F1.103</postscript>
+  <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@" />
-  </field>
+  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@" />
-  <field x="109" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="104" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.104 POSTSCRIPT">MESSAGE ADD,F1.104</postscript>
-  </field>
-  <field x="121" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="105" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.105 POSTSCRIPT">MESSAGE ADD,F1.105</postscript>
-  </field>
-  <field x="133" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="106" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.106 POSTSCRIPT">MESSAGE ADD,F1.106</postscript>
-  </field>
-  <field x="145" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="107" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.107 POSTSCRIPT">MESSAGE ADD,F1.107</postscript>
-  </field>
-  <field x="157" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="108" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.108 POSTSCRIPT">MESSAGE ADD,F1.108</postscript>
-  </field>
-  <field x="169" deactivated="" type="Valuta" hidden="" align="right" link="" txt_color="#FFFFFF" dynamic_height="" shade_offset="" width="12" codval="" id="109" pattern="1" hide_zero="" text="#########,@@">
-   <postscript description="F2.109 POSTSCRIPT">MESSAGE ADD,F1.109</postscript>
-  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="3" hidden="1" bg_color="#808080" sh_color="#C0C0C0" page_break="" can_break="" pattern="10" sh_angle="90">
   <font italic="1" face="Arial" bold="1" size="7" />