From 709dc30cb13d2d7cbd0b0f5707b624689776bd06 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Wed, 15 Apr 2020 01:05:30 +0200
Subject: [PATCH] 2Patch level        : 12.0 956 Files correlati     : ce3.exe
 ce3900.msk Commento            :

Corretto ordinamento e l'interfaccia della stampa registro cespiti sinteticoo
---
 src/ce/ce3900.cpp | 23 +++++++++++++++--------
 src/ce/ce3900.h   |  3 +--
 src/ce/ce3900.uml | 22 +++++++---------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp
index 6bce065bb..8b6eabbc0 100755
--- a/src/ce/ce3900.cpp
+++ b/src/ce/ce3900.cpp
@@ -22,6 +22,9 @@
 #include "movce.h"
 #include "salce.h"
 
+#define SORT_DATACOMP  0x1
+#define SORT_CAT       0x2
+
 ////////////////////////////////////////////////////////
 //	MASCHERA
 ////////////////////////////////////////////////////////
@@ -133,13 +136,16 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk)
       query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))";
 	}
   //ordinamenti
-	if (!msk.get_bool(F_SORT_BY_CESP))
+
+	const int sort_type = msk.get_int(F_SORT);
+
+	if (!(sort_type & SORT_CAT))
 	{
 		query << "\nBY ";
-		if (msk.get_bool(F_SORT_BY_DTCOMP))
-			query << "DTCOMP|";
-
-		query << "CODCAT|CODIMP|CODLOC|IDCESPITE";
+		if (sort_type & SORT_DATACOMP)
+			query << "DTCOMP|CODCAT|CODIMP|CODLOC|IDCESPITE";
+		else
+			query << "IDCESPITE";
 	}
 
 
@@ -375,11 +381,12 @@ 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 (mask.get_bool(F_SORT_BY_CESP))
-      rep.load("ce3900b");
-    else
+		if (sort_type & SORT_CAT)
       rep.load("ce3900a");
+    else
+      rep.load("ce3900b");
 
 		rep.set_filter(mask);
 		book.add(rep);
diff --git a/src/ce/ce3900.h b/src/ce/ce3900.h
index 8a4ca8d4d..42a2c0954 100755
--- a/src/ce/ce3900.h
+++ b/src/ce/ce3900.h
@@ -26,5 +26,4 @@
 #define F_DESCDC          125*/
 
 #define F_REPORT					126
-#define F_SORT_BY_CESP    127
-#define F_SORT_BY_DTCOMP  128
+#define F_SORT						127
diff --git a/src/ce/ce3900.uml b/src/ce/ce3900.uml
index 4add6f8c0..30bede67f 100755
--- a/src/ce/ce3900.uml
+++ b/src/ce/ce3900.uml
@@ -156,23 +156,15 @@ BEGIN
   PROMPT 42 14 "Escludere i cespiti alienati"
 END
 
-GROUPBOX DLG_NULL 39 3
+RADIOBUTTON F_SORT 78
 BEGIN
-  PROMPT 1 16 "@bOrdinamenti"
+  PROMPT 1 16 "@bOrdinamento"
+  ITEM "2|Categoria+Cespite"
+  ITEM "0|Cespite"
+  ITEM "3|Categoria+Completamento"
+  ITEM "1|Completamento"
+  FLAGS "Z"
 END
-
-BOOLEAN F_SORT_BY_CESP
-BEGIN
-  PROMPT 2 17 "Per cespite"
-	MESSAGE TRUE "",F_SORT_BY_DTCOMP
-END
-
-BOOLEAN F_SORT_BY_DTCOMP
-BEGIN
-  PROMPT 20 17 "Per data completamento"
-	MESSAGE TRUE "",F_SORT_BY_CESP
-END
-
 ENDPAGE
 
 ENDMASK