From 361168d5e48e0171968e9ed851a4fd98d5e74f18 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 7 Sep 2012 14:54:09 +0000
Subject: [PATCH] Corretta stampa giri

git-svn-id: svn://10.65.10.50/branches/R_10_00@22723 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv0500.cpp  |  8 ++++----
 lv/lv1300.cpp  |  7 +++----
 lv/lv2200z.rep | 23 +++++++++++++----------
 lv/lv2300.cpp  | 27 +++++++++++++--------------
 lv/lv2300a.rep |  1 -
 lv/lv2300a.uml |  2 +-
 lv/lvlib.cpp   |  8 ++++++--
 lv/lvlib.h     | 20 --------------------
 8 files changed, 40 insertions(+), 56 deletions(-)

diff --git a/lv/lv0500.cpp b/lv/lv0500.cpp
index 18a49121e..ba3679b14 100755
--- a/lv/lv0500.cpp
+++ b/lv/lv0500.cpp
@@ -119,17 +119,17 @@ int TPass_plan_contr::read(TMask& m)
   if (err == NOERR)
   {
     TSheet_field& pc = m.sfield(F_PASPLAN);
-   
-    if (pc.items() == 0)
+
+    if (pc.empty())
     {
       //questo ciclo crea le sette righe vuote
-      TString ora = "00:00";
+      const char* const ora = "00:00";
       for (int i = 1; i<=7; ++i)
       {
         TToken_string& row = pc.row(-1);     //crea una nuova riga dello sheet
         row.add(i,pc.cid2index(F_S_GGCONS)); //aggiunge al posto giusto il numero del giorno della settimana
         row.add(ora,pc.cid2index(F_S_ORA));  //propone l'ora di arrivo in automatico
-        pc.check_row(pc.items()-1);       //forza la maschera a fare la decodifica dei codici
+        pc.check_row(pc.items()-1);          //forza la maschera a fare la decodifica dei codici
       }
       pc.force_update();  //forza l'update dello sheet, in modo da rendere visibili i cambiamenti fatti
     }
diff --git a/lv/lv1300.cpp b/lv/lv1300.cpp
index 23a0f2327..70ab82ce4 100755
--- a/lv/lv1300.cpp
+++ b/lv/lv1300.cpp
@@ -1,12 +1,11 @@
 #include <applicat.h>
 #include <automask.h>
 #include <execp.h>
-#include <relation.h>
-#include <reprint.h>
+
+#include "lvlib.h"
 
 #include "lv1300a.h"
-#include "lvlib.h"
-#include "../ve/velib.h"
+#include "../ve/pacchi.h"
 
 ///////////////////////////////////////////////////////////
 // TStampa_inv_msk
diff --git a/lv/lv2200z.rep b/lv/lv2200z.rep
index 7dc7aa77f..86f15f507 100755
--- a/lv/lv2200z.rep
+++ b/lv/lv2200z.rep
@@ -95,7 +95,7 @@
   </field>
  </section>
  <section type="Body" level="1" pattern="1">
-  <field border="1" x="92.9" y="-0.07" type="Linea" height="4" pattern="1" />
+  <field border="1" x="92.75" y="-0.07" type="Linea" height="4" pattern="1" />
   <field border="1" x="0.5" type="Linea" height="4" pattern="1" />
   <field x="1" type="Numero" align="right" width="5" pattern="1" hide_zero="1">
    <source>167.ORDFER</source>
@@ -108,9 +108,10 @@
   <field x="14" type="Stringa" width="17" height="3" pattern="1">
    <source>IF(#F_CHECK_MNEM=="X";303@.RICALT;303@.RAGSOC)</source>
   </field>
-  <field border="1" x="31.37" type="Linea" height="4" pattern="1" />
+  <field border="1" x="31.25" type="Linea" height="4" pattern="1" />
   <field x="31.5" type="Stringa" width="25" height="2" pattern="1">
    <source>IF(304@.CODINDSP= "0" ;303@.LOCALITACF;305@.LOCALITA)</source>
+   <alt_source>IF(304@.CODINDSP= "0" ;307@.DENCOM;308@.DENCOM)</alt_source>
   </field>
   <field border="1" x="56.75" type="Linea" height="4" pattern="1" />
   <field x="57" type="Array" align="center" width="9" pattern="1">
@@ -131,12 +132,12 @@
    <source>#NEXTCONS</source>
   </field>
   <field x="31.5" y="2" type="Stringa" width="25" height="2" pattern="1">
-   <source>IF(304@.CODINDSP= "0";303@.CIVCF+','+303@.INDCF;305@.CIV+','+305@.INDIR)</source>
+   <source>IF(304@.CODINDSP="0";303@.CIVCF+','+303@.INDCF;305@.CIV+','+305@.INDIR)</source>
   </field>
   <field x="66.5" y="2" type="Numero" align="right" width="13" pattern="1" hide_zero="1">
    <source>167.NDOC</source>
   </field>
-  <field border="1" x="0.5" y="4" type="Linea" width="92.4" height="0" pattern="1" />
+  <field border="1" x="0.5" y="4" type="Linea" width="92.5" height="0" pattern="1" />
  </section>
  <section type="Foot" pattern="1" />
  <section type="Foot" level="1" pattern="1" />
@@ -146,10 +147,12 @@
     JOIN &#26;ITI ALIAS 300 INTO CODTAB==CODITI
     JOIN &#26;AUT TO 167 ALIAS 301 INTO CODTAB==CODAUT
     JOIN &#26;MEZ TO 167 ALIAS 302 INTO CODTAB==CODMEZ
-    JOIN 20 TO 167 ALIAS 303 INTO TIPOCF=="C" CODCF==CODCF
-    JOIN 168 TO 167 ALIAS 304 INTO CODCONT==CODCONT CODCF==CODCF
-    JOIN 16 TO 168 ALIAS 305 INTO TIPOCF=="C" CODCF==CODCF CODIND==CODINDSP
-    FROM DTCONS=#FROM_DATA
-    TO DTCONS=#TO_DATA
-  </sql>
+   JOIN 20 TO 167 ALIAS 303 INTO TIPOCF=="C" CODCF==CODCF
+   JOIN 17 TO 20 ALIAS 304 INTO TIPOCF=="C" CODCF==CODCF
+   JOIN 16 TO 17 ALIAS 305 INTO TIPOCF=="C" CODCF==CODCF CODIND==CODINDSP
+   JOIN 13 TO 20 ALIAS 307 INTO STATO=STATOCF COM==COMCF
+   JOIN 13 TO 16 ALIAS 308 INTO STATO=STATO COM==COM
+   FROM DTCONS=#FROM_DATA
+   TO DTCONS=#TO_DATA
+ </sql>
 </report>
\ No newline at end of file
diff --git a/lv/lv2300.cpp b/lv/lv2300.cpp
index f17d5d50b..df46b94af 100755
--- a/lv/lv2300.cpp
+++ b/lv/lv2300.cpp
@@ -36,7 +36,7 @@ public:
   TPassaggio& passaggio(int p);
 };
 
-TPassaggio& TPassaggi:: passaggio(int p)
+TPassaggio& TPassaggi::passaggio(int p)
 {
   TPassaggio* h = (TPassaggio*)objptr(p);
 
@@ -83,7 +83,7 @@ class TSettimana: public TArray
 {
 public:
   void add(int g, TPassaggio* p);
-  TPassaggio& passaggio(int g, int p);//giorno, fermata
+  const TPassaggio& passaggio(int g, int p);//giorno, fermata
   int passaggi(int g) const;
   int passaggi() const;
   TSettimana():TArray(7){}//7 gg = settimana
@@ -124,13 +124,13 @@ void TSettimana::add(int g,TPassaggio* p)
   
 }
 
-TPassaggio& TSettimana ::passaggio(int g,int p)
+const TPassaggio& TSettimana::passaggio(int g,int p)
 {
-  TPassaggi* a= (TPassaggi*) objptr(g);
-  if(a==NULL)
+  TPassaggi* a= (TPassaggi*)objptr(g);
+  if (a==NULL)
   {
-    a=new TPassaggi();
-    TArray::add(a,g);
+    a = new TPassaggi();
+    TArray::add(a, g);
   }
   return a->passaggio(p);
 }
@@ -250,21 +250,20 @@ void TGiri_app::elabora(const TMask& mask) const
   {
     TSettimana& s = *(TSettimana*) obj;
     const int max = s.passaggi();
+    TString4 str_iti;
 
-    for(int j=0; j<max; j++)
+    for (int j=0; j<max; j++)
     {
       giri_set->new_rec();
-
-      TString4 str_iti;
       str_iti.format("%03d", i);
-      giri_set->set(0,TVariant(str_iti));
+      giri_set->set(0, str_iti);
       
-      for(int g = 1; g <= 7; g++)
+      for (int g = 1; g <= 7; g++)
       {
         const TPassaggio& pass = s.passaggio(g,j);
         const int column = (g-1) * 3 + 1;
         
-        giri_set->set(column,pass._ragsoc);
+        giri_set->set(column, pass._ragsoc);
         giri_set->set(column + 1, TVariant(long (pass._ordfer)));
         giri_set->set(column + 2, TVariant(long (pass._ora)));
       }
@@ -281,7 +280,7 @@ void TGiri_app::elabora(const TMask& mask) const
 
  #ifdef DBG
   const long cazzoni = giri_set->items();
-  giri_set->save_as("C:/tmp/cazzone.xls", fmt_html);
+  giri_set->save_as("C:/temp/cazzone.xls", fmt_html);
 #endif
 
   TReport_book b;
diff --git a/lv/lv2300a.rep b/lv/lv2300a.rep
index 16588e534..b023c8912 100755
--- a/lv/lv2300a.rep
+++ b/lv/lv2300a.rep
@@ -109,7 +109,6 @@
   </field>
   <field x="58" y="0.5" type="Stringa" width="15" pattern="1">
    <source>K</source>
-   <prescript description="B1.0 PRESCRIPT">MESSAGE _ISAMREAD,CLIFO,TIPOCF='C'!CODCF=#THIS,RAGSOC</prescript>
   </field>
   <field x="73.5" y="0.5" type="Numero" align="right" width="2" pattern="1" hide_zero="1">
    <source>L</source>
diff --git a/lv/lv2300a.uml b/lv/lv2300a.uml
index f41398de4..18163b849 100755
--- a/lv/lv2300a.uml
+++ b/lv/lv2300a.uml
@@ -178,7 +178,7 @@ END
 
 BOOLEAN F_CHECK_MNEM_TO
 BEGIN
-  PROMPT 2 18 "Utilizza Mnemorico (Ricerca Alt.)"
+  PROMPT 2 18 "Utilizza Mnemonico (Ricerca Alt.)"
   FIELD #F_CHECK_MNEM
 END
 
diff --git a/lv/lvlib.cpp b/lv/lvlib.cpp
index 7da6eaf37..763ffb085 100755
--- a/lv/lvlib.cpp
+++ b/lv/lvlib.cpp
@@ -1,16 +1,20 @@
 #include "lvlib.h"
-#include "lvrcondv.h"
-#include "lvcondv.h"
 
 #include "../cg/cglib01.h"
 #include "../mg/clifogiac.h"
 
+#include "lvrcondv.h"
+#include "lvcondv.h"
+#include "../ve/pacchi.h"
+
 #include <applicat.h>
 #include <config.h>
 #include <modaut.h>
 #include <recset.h>
 #include <utility.h>
 
+
+
 ///////////////////////////////////////////////////////////
 // Utilities
 ///////////////////////////////////////////////////////////
diff --git a/lv/lvlib.h b/lv/lvlib.h
index c2bd4a2d9..4509a5df8 100755
--- a/lv/lvlib.h
+++ b/lv/lvlib.h
@@ -1,26 +1,6 @@
 #ifndef __LVLIB_H
 #define __LVLIB_H
 
-#ifndef __RECSET_H
-#include <recset.h>
-#endif
-
-#ifndef __REPORT_H
-#include <report.h>
-#endif
-
-#ifndef __MGLIB_H 
-#include "../mg/mglib.h"
-#endif
-
-#ifndef __PACCHI_H 
-#include "../ve/pacchi.h"
-#endif
-
-#ifndef __VELIB_H 
-#include "../ve/velib.h"
-#endif
-
 #ifndef __VELIB07_H 
 #include "../ve/velib07.h"
 #endif