From 8e77cebeaf885600a3d84b7a14a899df2a6ef627 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 1 Mar 2010 14:50:07 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            : stampa delle convocazioni per
 intervallo: adesso stampa qualcosa (cambiato anche sort in agalib)

git-svn-id: svn://10.65.10.50/trunk@20172 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 at/at4100.cpp  |  9 +++------
 at/at4100a.uml | 39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/at/at4100.cpp b/at/at4100.cpp
index 6177685b8..8a4187047 100755
--- a/at/at4100.cpp
+++ b/at/at4100.cpp
@@ -812,8 +812,8 @@ bool TStampaScadenze::set_print(int m)
     _procdon 		= _msk->get(F_PROCDON1);
     _usodisp    = _msk->get_bool(F_USODISP);
     _proc_esclusivo = _msk->get_bool(F_PROC_ESCLUSIVO);
-    _usomodo 		= _msk->get_bool(F_USOMODO);
     _modo 	 		= _msk->get(F_MODO);
+    _usomodo 		= _modo.full() && _msk->get_bool(F_USOMODO);
     _perfamiglie = _msk->get_bool(F_PERFAMIGLIE);
     _percap = _msk->get_bool(F_PERCAP);
     _ab01		 		= _msk->get(F_AB01);
@@ -864,9 +864,6 @@ bool TStampaScadenze::set_print(int m)
 			((TSorted_cursor*)current_cursor())->change_order("90->DOM_CAP|90->DOM_CODCOM|90->COGNOME|90->NOME");
 
 		// filtro per idoneo e non escluso                                     
-		//if (_usomodo)
-    	//current_cursor()->setfilter(format("(TCS->S6 == \"I\" || TCS->S6 == \"F\") && (ESCLUSO == \"\") && (MODCONV == \"%s\")",(const char*)_modo), TRUE);
-		//else
     	current_cursor()->setfilter("((TCS->S6 == \"I\" ) || (TCS->S6 == \"F\")) && (ESCLUSO == \"\")", TRUE);
 		// filtro per categorie e altro
 		current_cursor()->set_filterfunction(filter_func_scadenze);
@@ -994,8 +991,8 @@ bool TStampaScadenze::user_create()
   _rel->add(LF_SEZIONI, "CODSEZ==CODSEZ|CODSOT==CODSOT");
 	_donaz 		= new TLocalisamfile(LF_DONAZ);
 	_famiglie =	new TLocalisamfile(LF_FAMIGLIE);
-	_sfamiglia = new TRecord_array(LF_FAMIGLIE,FAM_PROGFAM);	
-  add_cursor(new TSorted_cursor(_rel,"","",3));
+	_sfamiglia = new TRecord_array(LF_FAMIGLIE,FAM_PROGFAM); 
+  add_cursor(new TSorted_cursor(_rel, "CODSEZ|CODSOT|COGNOME|NOME|DATANASC", "", 3));
   _msk = new TMask("at4100a");
   TConfig config(CONFIG_STUDIO);
 
diff --git a/at/at4100a.uml b/at/at4100a.uml
index 8265203af..b215768f9 100755
--- a/at/at4100a.uml
+++ b/at/at4100a.uml
@@ -336,7 +336,42 @@ END
 
 TEXT DLG_NULL
 BEGIN
-  PROMPT 2 13 "Giorni:   Lu  Ma  Me  Gi  Ve  Sa  Do"
+  PROMPT 2 13 "Giorni:"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 12 13 "Lu"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 16 13 "Ma"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 20 13 "Me"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 24 13 "Gi"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 28 13 "Ve"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 32 13 "Sa"
+END
+
+TEXT DLG_NULL
+BEGIN
+  PROMPT 36 13 "Do"
 END
 
 BOOLEAN F_GPD_LUN
@@ -391,7 +426,7 @@ BEGIN
    MESSAGE FALSE RESET,F_MODO|DISABLE,F_MODO
 END
 
-LISTBOX F_MODO 13
+LISTBOX F_MODO 2 13
 BEGIN
    PROMPT 20 15 ""
    #include "modalita.h"