root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2Patch level : 12.0 956

Browse Source 
Files correlati     : ce3.exe ce3900.msk
Commento            :

Corretto ordinamento e l'interfaccia della stampa registro cespiti sinteticoo
This commit is contained in:
Alessandro Bonazzi 2020-04-15 01:05:30 +02:00
parent 496bf39046
commit 709dc30cb1
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ce/ce3900.cpp
View File

@ -22,6 +22,9 @@
#include "movce.h" #include "movce.h"
#include "salce.h" #include "salce.h"
#define SORT_DATACOMP 0x1
#define SORT_CAT 0x2
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
// MASCHERA // MASCHERA
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
@ -133,13 +136,16 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk)
query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))"; query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))";
} }
//ordinamenti //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 "; query << "\nBY ";
if (msk.get_bool(F_SORT_BY_DTCOMP)) if (sort_type & SORT_DATACOMP)
query << "DTCOMP|"; query << "DTCOMP|CODCAT|CODIMP|CODLOC|IDCESPITE";
else
query << "CODCAT|CODIMP|CODLOC|IDCESPITE"; query << "IDCESPITE";
} }
@ -375,11 +381,12 @@ void TStampa_sintetica::main_loop()
//report e book dei report //report e book dei report
TReport_book book; TReport_book book;
TStampa_sintetica_rep rep; TStampa_sintetica_rep rep;
const int sort_type = mask.get_int(F_SORT);
if (mask.get_bool(F_SORT_BY_CESP)) if (sort_type & SORT_CAT)
rep.load("ce3900b");
else
rep.load("ce3900a"); rep.load("ce3900a");
else
rep.load("ce3900b");
rep.set_filter(mask); rep.set_filter(mask);
book.add(rep); book.add(rep);

3
src/ce/ce3900.h
View File

@ -26,5 +26,4 @@
#define F_DESCDC 125*/ #define F_DESCDC 125*/
#define F_REPORT 126 #define F_REPORT 126
#define F_SORT_BY_CESP 127 #define F_SORT 127
#define F_SORT_BY_DTCOMP 128

22
src/ce/ce3900.uml
View File

@ -156,23 +156,15 @@ BEGIN
PROMPT 42 14 "Escludere i cespiti alienati" PROMPT 42 14 "Escludere i cespiti alienati"
END END
GROUPBOX DLG_NULL 39 3 RADIOBUTTON F_SORT 78
BEGIN 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 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 ENDPAGE
ENDMASK ENDMASK