Patch level : 12.0 1106

Files correlati     : li0.exe li0200a.rep li0200a.msk li0500a.rep li0500a.msk

Commento :

Corretta la stampa degli elenchi delle lettere d'intento

src/li/li0200.cpp

@@ -14,7 +14,6 @@
 
 #define CONFIG_DICINT "DICINT.ini"
 
-
 class TLista_dichiarazioni : public TSkeleton_application
 {
 	void elab(TSimpleAutomask& m);
@@ -24,7 +23,8 @@ public:
 
 void TLista_dichiarazioni::elab(TSimpleAutomask& m)
 {
-  TProgram_report rep("li0200a");
+	TFilename repname(m.get(DLG_REPORT));
+  TProgram_report rep(repname);
   TReport_book book;
 
   rep.mask2report(m);

src/li/li0200a.rep

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report libraries="" page_merge="" save_printer="" name="li0200a" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="">
+<report libraries="" page_merge="" save_printer="" name="li0200a" use_printer_font="" orientation="2" page_split="" lpi="6" command="" class="li0200a">
  <description>registro dichiarazioni d'intento</description>
  <font face="Arial" size="8" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">

src/li/li0200a.uml

@@ -6,8 +6,6 @@ ENDPAGE
 
 PAGE "Riepilogo dichiarazioni di intento" 0 2 0 0
 
-
-
 NUMBER F_ANNO 4
 BEGIN
   PROMPT 1 2 "Anno       : "
@@ -44,6 +42,15 @@ BEGIN
   GROUP 2
 END
 
+STRING DLG_REPORT 256 66
+BEGIN
+PROMPT 1 -2 "Report  "
+FLAGS "B"
+RSELECT "li0200a"
+CHECKTYPE REQUIRED
+WARNING "Impossibile trovare un report compatibile"
+END
+
 ENDPAGE
 
 ENDMASK

src/li/li0500.cpp

@@ -26,7 +26,7 @@ protected:
 
 public:
   TPrint_letint_mask();
-  virtual ~TPrint_letint_mask() {}
+  virtual ~TPrint_letint_mask() { }
 };
 
 TPrint_letint_mask::TPrint_letint_mask()
@@ -181,7 +181,7 @@ protected:
 	virtual word last_printed_page() const { return _last_printed_page; }
 
 public:
-	TLetint_report(int last_printed_page) : TProgram_report("li0500a") , _last_printed_page(last_printed_page) {}
+	TLetint_report(const TString & repname, int last_printed_page) : TProgram_report(repname) , _last_printed_page(last_printed_page) {}
 	~TLetint_report() {}
 };
 
@@ -256,12 +256,12 @@ bool TPrint_letint::create()
 
 void TPrint_letint::main_loop()
 {
-  TFilename path;
   TPrint_letint_mask m;
 
   while (m.run() == K_ENTER)
   {
     TReport_book book;
+
 		word last_page = 0;
 		const int anno = m.get_int(F_ANNO);
 		
@@ -272,17 +272,11 @@ void TPrint_letint::main_loop()
 		if (!_a_data.ok())
 			_a_data = TDate(31, 12, anno);
 
-    TLetint_report rep(last_page);
+    TLetint_report rep(m.get(DLG_REPORT), last_page);
 		
-		path = m.get(F_REPORT);
-		if (path.empty())
-			path = "li0500a";
 		rep.mask2report(m);
-
-
 		rep.recordset()->set_var("#DADATA", TVariant(_da_data));
 		rep.recordset()->set_var("#ADATA", TVariant(_a_data));
-
 		book.add(rep);
     book.print_or_preview();
   }

src/li/li0500a.rep

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report name="li0500a" orientation="2" lpi="6">
+<report name="li0500a" orientation="2" lpi="6" class="li0500a">
  <description>registro dichiarazioni d'intento</description>
  <font face="Arial" size="8" />
  <section type="Head" pattern="1">

src/li/li0500a.uml

@@ -18,23 +18,25 @@ END
 
 DATE F_DAL
 BEGIN
-  PROMPT 15 3 "Dal         "
+  PROMPT 1 5 "Dal  "
   GROUP 1
 END
 
 DATE F_AL
 BEGIN
-  PROMPT 47 3 "Al   "
+  PROMPT 1 7 "Al   "
   GROUP 1
   VALIDATE DATE_CMP_FUNC >= F_DAL
   WARNING "Specificare una 'Data fine periodo' non inferiore alla 'Data inizio perodo'"
 END
 
-STRING F_REPORT 70 60
+STRING DLG_REPORT 256 66
 BEGIN
-  PROMPT 1 5 "Report "
+PROMPT 1 -2 "Report  "
-  RSELECT "li0500"
+FLAGS "B"
-  CHECKTYPE NORMAL
+RSELECT "li0500a"
+CHECKTYPE REQUIRED
+WARNING "Impossibile trovare un report compatibile"
 END
 
 ENDPAGE