From 992b4beb1507eaa2cdcbae7dcc3a9515deb9f959 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 10 Apr 2012 07:42:50 +0000
Subject: [PATCH] Estratta query da programma ed inserita nel report

git-svn-id: svn://10.65.10.50/branches/R_10_00@22623 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ha/ha3700.cpp   | 40 ++--------------------------------------
 ha/ha3700a.rep  | 10 ++++++++++
 ha/verigH01.ini |  3 +++
 ha/verigH02.ini |  3 +++
 4 files changed, 18 insertions(+), 38 deletions(-)
 create mode 100644 ha/verigH01.ini
 create mode 100644 ha/verigH02.ini

diff --git a/ha/ha3700.cpp b/ha/ha3700.cpp
index 7e41c1651..f73bbd76a 100755
--- a/ha/ha3700.cpp
+++ b/ha/ha3700.cpp
@@ -4,7 +4,7 @@
 #include <recarray.h>
 #include <relation.h>
 #include <report.h>
-#include <textset.h>
+
 
 #include "../ba/ba8500.h"
 
@@ -48,50 +48,14 @@ public:
 
 void TPrint_storico_mask::elabora()
 {
-  //prende un tot di dati dalla maschera per stabilire la query
-  const TString& codag = get(F_CODAG);
-  const long codcf = get_long(F_CODCF);
-  const int codindsp = get_int(F_CODINDSP);
-
-  const TString& codart = get(F_CODART);
-  const long progressivo = get_long(F_PROGRESSIVO);
-  TString16 codtab;
-  codtab.format("%-5s%07d", (const char*)codart, progressivo);
-  const TString& matricola = get(F_MATRICOLA);
-  const TString& tipo = get(F_TIPO);
-
-  //genera la query parametrica
-  TString query;
-  query << "USE &HAHIS";
-  query << "\nSELECT (BETWEEN(S7[1,1];#TIPO;#TIPO))&&(BETWEEN(TRIM(401@->S0[6,20]);#MATRICOLA;#MATRICOLA))&&(BETWEEN(122->CODAGE,#CODAG,#CODAG))&&(BETWEEN(I0,#CODCF,#CODCF))&&(BETWEEN(I1,#INDSPED,#INDSPED))";
-  query << "\nBY 122->CODAGE I0 I1 CODTAB[1,12]";
-  query << "\nJOIN &HAATT ALIAS 401 INTO CODTAB=CODTAB[1,12]";
-  query << "\nJOIN CFVEN INTO TIPOCF=\"C\" CODCF==I0";
-  query << "\nJOIN AGENTI TO CFVEN INTO CODAGE==CODAG";
-  query << "\nFROM CODTAB=#CODART";
-  query << "\nTO CODTAB=#CODART";
-
-  /*TISAM_recordset recset(query);
-  recset.set_var("#MATRICOLA", matricola);
-  recset.set_var("#CODAG", codag);
-  recset.set_var("#CODCF", codcf);
-  recset.set_var("#CODTAB", codtab);*/
-
-  //const long recset_items = recset.items();
-
-  //appiccia il recordset al report
   TPrint_storico_report rep;
-  rep.set_recordset(query);
   rep.mask2report(*this);
-  rep.preview();
+  rep.print_or_preview();
 }
 
 
 bool TPrint_storico_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
 {
-  /*switch (o.dlg())
-  {
-  }*/
   return true;
 }
 
diff --git a/ha/ha3700a.rep b/ha/ha3700a.rep
index 3fd97d989..e13ee233d 100755
--- a/ha/ha3700a.rep
+++ b/ha/ha3700a.rep
@@ -173,4 +173,14 @@ MESSAGE ADD,F1.110</prescript>
   </field>
   <field x="97" type="Valuta" align="right" width="11" id="110" pattern="1" text="#########,@@" />
  </section>
+ <sql>
+   USE &#26;HAHIS
+   SELECT (BETWEEN(S7[1,1];#TIPO;#TIPO))&#26;&#26;(BETWEEN(TRIM(401@->S0[1,20]);#CODART;#CODART))&#26;&#26;(BETWEEN(122->CODAGE,#CODAG,#CODAG))&#26;&#26;(BETWEEN(I0,#CODCF,#CODCF))&#26;&#26;(BETWEEN(I1,#INDSPED,#INDSPED))
+   BY 122->CODAGE I0 I1 CODTAB
+   JOIN &#26;HAATT ALIAS 401 INTO CODTAB==CODTAB
+   JOIN CFVEN INTO TIPOCF="C" CODCF==I0
+   JOIN AGENTI TO CFVEN INTO CODAGE==CODAG
+   FROM CODTAB=#MATRICOLA
+   TO CODTAB=#MATRICOLA
+ </sql>
 </report>
\ No newline at end of file
diff --git a/ha/verigH01.ini b/ha/verigH01.ini
new file mode 100644
index 000000000..5d8964337
--- /dev/null
+++ b/ha/verigH01.ini
@@ -0,0 +1,3 @@
+[MAIN]
+SELCLIFO = X
+
diff --git a/ha/verigH02.ini b/ha/verigH02.ini
new file mode 100644
index 000000000..5d8964337
--- /dev/null
+++ b/ha/verigH02.ini
@@ -0,0 +1,3 @@
+[MAIN]
+SELCLIFO = X
+