From 53ec9e52b5263c9d0b0b9175c779164dc0250744 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 1 Apr 2005 12:49:25 +0000
Subject: [PATCH] Patch level         :2.2 66 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :evoluzione stampe archivi di
 base CA

git-svn-id: svn://10.65.10.50/trunk@12892 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca0700a.uml |  2 +-
 ca/ca1700.cpp  | 25 +++++++++++++++++++------
 ca/ca1700.rep  |  6 +++---
 ca/ca1700a.uml | 10 +++++-----
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ca/ca0700a.uml b/ca/ca0700a.uml
index fcb6641ae..1252e0f58 100755
--- a/ca/ca0700a.uml
+++ b/ca/ca0700a.uml
@@ -6,7 +6,7 @@ ENDPAGE
 
 PAGE "Fasi" -1 -1 64 6
 
-GROUPBOX DLG_NULL 78 6
+GROUPBOX DLG_NULL 77 7
 BEGIN
   PROMPT 1 0 "@bCodici"
 END
diff --git a/ca/ca1700.cpp b/ca/ca1700.cpp
index c93f689f9..cb11a6493 100755
--- a/ca/ca1700.cpp
+++ b/ca/ca1700.cpp
@@ -19,12 +19,25 @@ public:
 TMask_print_fasi::TMask_print_fasi()
 								:TAutomask("ca1700a")
 {
-	ca_create_fields(*this, LF_FASI, 2, 2, F_DAFASE, F_DAFASE + 100, 0x0, "#DAFASE");
-	int nfields = ca_create_fields(*this, LF_FASI, 2, 8, F_AFASE, F_AFASE + 100, 0x0, "#AFASE");
+	ca_create_fields(*this, LF_FASI, 3, 2, F_DAFASE, F_DAFASE + 100);
+	int nfields = ca_create_fields(*this, LF_FASI, 3, 9, F_AFASE, F_AFASE + 100);
+  TString80 workstring;
+
 	for (int i = 0; i < nfields; i++)
 	{
-		field(F_DAFASE + i).set_group(1);
-		field(F_AFASE + i).set_group(2);
+		TEdit_field& dafase = efield(F_DAFASE + i);
+    dafase.set_group(1);
+    dafase.check_type(CHECK_NORMAL);
+    const TFieldref& dafr = *dafase.field();
+    workstring.format("DA%s[%d,%d]", (const char*)dafr.name(), dafr.from()+1, dafr.to());
+    dafase.set_field(workstring);
+
+		TEdit_field& afase = efield(F_AFASE + i);
+    afase.set_group(2);
+    afase.check_type(CHECK_NORMAL);
+    const TFieldref& afr = *afase.field();
+    workstring.format("A%s[%d,%d]", (const char*)afr.name(), afr.from()+1, afr.to());
+    afase.set_field(workstring);
 	}
 }
 
@@ -39,8 +52,8 @@ public:
 bool TPrint_fasi::create()
 {
   const TMultilevel_code_info& mci = ca_multilevel_code_info(LF_FASI);
-//  if (mci.levels() <= 0)
-//    return error_box(TR("Le fasi non sono state configurate"));
+  if (mci.levels() <= 0)
+    return error_box(TR("Le fasi non sono state configurate"));
 
   return TSkeleton_application::create();
 }
diff --git a/ca/ca1700.rep b/ca/ca1700.rep
index 0b8043d4e..2fdba2528 100755
--- a/ca/ca1700.rep
+++ b/ca/ca1700.rep
@@ -62,7 +62,7 @@
  </section>
  <section type="Foot" />
  <section type="Foot" level="1" />
- <sql>USE 148
-FROM #DAFASE
-TO #AFASE</sql>
+ <sql>USE FASI
+FROM CODCMSFAS=#DACODCMSFAS CODFASE=#DACODFASE
+TO CODCMSFAS=#ACODCMSFAS CODFASE=#ACODFASE</sql>
 </report>
\ No newline at end of file
diff --git a/ca/ca1700a.uml b/ca/ca1700a.uml
index 38520b5a7..c0692efc7 100755
--- a/ca/ca1700a.uml
+++ b/ca/ca1700a.uml
@@ -1,20 +1,20 @@
 #include "ca1700a.h"
 
-PAGE "Stampa fasi" -1 -1 80 17
+PAGE "Stampa fasi" -1 -1 80 19
 
-GROUPBOX DLG_NULL 78 6
+GROUPBOX DLG_NULL 77 7
 BEGIN
 	PROMPT 2 1 "Da fase"
 END
 
-GROUPBOX DLG_NULL 78 6
+GROUPBOX DLG_NULL 77 7
 BEGIN
-	PROMPT 2 7 "A fase"
+	PROMPT 2 8 "A fase"
 END
 
 STRING F_REPORT 20
 BEGIN
-  PROMPT 2 14 "Tipo di stampa  "
+  PROMPT 2 16 "Tipo di stampa  "
 	RSELECT "ca1700"
 	CHECKTYPE NORMAL
 END