From 281f048803ce08447e1d5be6ffe9ff5831928cde Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 May 2008 15:49:00 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :stampa commesse in formato
 adolfico

git-svn-id: svn://10.65.10.50/trunk@16624 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca1600.cpp  | 23 ++++++++++++++++++++++-
 ca/ca1600a.h   |  2 +-
 ca/ca1600a.uml | 23 +----------------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ca/ca1600.cpp b/ca/ca1600.cpp
index e608cfaaa..486650e6f 100755
--- a/ca/ca1600.cpp
+++ b/ca/ca1600.cpp
@@ -33,6 +33,16 @@ TMask_print_cms::TMask_print_cms()
 		acms.set_group(2);
     acms.check_type(CHECK_NORMAL);
 	}
+  //ci potrebbe essere pure il centro di costo (es. Dinamica con cdc=SEDE)
+  TConfig& ini = ca_config();
+  for (int i = 0; i < 2; i++)
+  {
+    const TString& level = ini.get("Level", NULL, i+1);  // Legge il livello 1 o 2
+    if (level == "CDC")                                  // Crea centro di costo 
+    {
+      ca_create_fields(*this, 0, LF_CDC, 3,  15, F_CDC, F_DESCDC);
+    }
+  }
 }
 
 bool TMask_print_cms::on_field_event(TOperable_field& o, TField_event e, long jolly)
@@ -98,7 +108,9 @@ void TPrint_cms::main_loop()
     const int anno = m.get_int(F_ANNO);
     const TDate dadata = m.get_date(F_DADATA);
     const TDate adata = m.get_date(F_ADATA);
-    const TString cdc = m.get(F_CDC);
+    TString cdc;
+    for (short cdc_id = F_CDC; m.id2pos(cdc_id) > 0; cdc_id++)
+      cdc << m.get(cdc_id);
     if (anno  > 0 || dadata.ok() || adata.ok() || cdc.full())
     {
       TString query;
@@ -126,6 +138,15 @@ void TPrint_cms::main_loop()
       //inserisce la USE e la SELECT all'inizio (tecnica per aggirare il problema degli && ignoti)
       query.insert("USE COMMESSE\nSELECT ");
 
+      //e se la commessa fosse strutturata?
+      TString codcms;
+      for (short codcms_id = F_DACMS; m.id2pos(codcms_id) > 0; codcms_id++)
+        codcms << m.get(codcms_id);
+      query << "/n" << "FROM CODCMS='" << codcms << "'";
+      for (short codcms_id = F_ACMS; m.id2pos(codcms_id) > 0; codcms_id++)
+        codcms << m.get(codcms_id);
+      query << "/n" << "TO CODCMS='" << codcms << "'";
+
       //cabia la query al report
       rep.set_recordset(query);
     }
diff --git a/ca/ca1600a.h b/ca/ca1600a.h
index 013025535..59da0ad84 100755
--- a/ca/ca1600a.h
+++ b/ca/ca1600a.h
@@ -4,5 +4,5 @@
 #define F_DADATA  110
 #define F_ADATA   111
 #define F_CDC     112
-#define F_DESCDC  113
+#define F_DESCDC  116
 #define F_REPORT	120
\ No newline at end of file
diff --git a/ca/ca1600a.uml b/ca/ca1600a.uml
index d04f99f37..3ce3f4d3d 100755
--- a/ca/ca1600a.uml
+++ b/ca/ca1600a.uml
@@ -26,7 +26,7 @@ BEGIN
   PROMPT 2 7 "@bA commessa"
 END
 
-GROUPBOX DLG_NULL 77 4
+GROUPBOX DLG_NULL 77 7
 BEGIN
   PROMPT 2 13 "@bParametri"
 END
@@ -59,27 +59,6 @@ BEGIN
   PROMPT 40 14 "A data "
 END
 
-STRING F_CDC 20
-BEGIN
-  PROMPT 3 15 "C. di costo "
-  USE LF_CDC
-  INPUT CODCOSTO F_CDC
-  DISPLAY "Centro di costo@20" CODCOSTO
-  DISPLAY "Descrizione@50" DESCRIZ
-  OUTPUT F_CDC CODCOSTO
-  OUTPUT F_DESCDC DESCRIZ
-END
-
-STRING F_DESCDC 50 37
-BEGIN
-  PROMPT 38 15 ""
-  USE LF_CDC KEY 2
-  INPUT DESCRIZ F_DESCDC
-  DISPLAY "Descrizione@50" DESCRIZ
-  DISPLAY "Centro di costo@20" CODCOSTO
-  COPY OUTPUT F_CDC
-END
-
 STRING F_REPORT 20
 BEGIN
   PROMPT 2 -1 "Report alternativo  "