Patch level : 10.1016

Files correlati : ci2.exe Ricompilazione Demo : [ ] Commento : Corretta rilevazione ore git-svn-id: svn://10.65.10.50/branches/R_10_00@22236 c028cbd2-c16b-5b4b-a496-9718f37d4682
2011-06-08 09:38:45 +00:00 · 2011-06-08 09:38:45 +00:00 · 3b392516fa
commit 3b392516fa
parent 1d5b4c0a42
7 changed files with 68 additions and 38 deletions
--- a/ci/ci1300a.rep
+++ b/ci/ci1300a.rep
@ -322,13 +322,18 @@
  </field>
 </section>
 <section type="Foot" pattern="1" />
- <section type="Foot" level="1" pattern="1">
+ <section type="Foot" level="1" height="6" pattern="1">
  <font face="Arial Narrow" bold="1" size="7" />
-  <field border="1" x="14" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="29" pattern="2" text="Totali">
+  <field border="1" x="13.5" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="29" pattern="2" text="Totali">
   <font face="Arial" bold="1" size="8" />
  </field>
-  <field border="1" x="43.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2" text="##@,@@" />
-  <field border="1" x="50" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="100" pattern="2" text="##@,@@" />
+  <field x="128" y="3" type="Testo" width="4" pattern="1" text="Data" />
+  <field x="133" y="3" type="Data" width="10" pattern="1">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="150" y="3" type="Testo" width="7" pattern="1" text="Firma" />
+  <field border="1" x="42.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="7" id="99" pattern="2" text="###@,@@" />
+  <field border="1" x="49.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="100" pattern="2" text="###@,@@" />
  <field border="1" x="57" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="3.5" id="101" pattern="2" hide_zero="1" text="#@,@@" />
  <field border="1" x="60.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="3.5" id="102" pattern="2" hide_zero="1" text="#@,@@" />
  <field border="1" x="64" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="3.5" id="103" pattern="2" hide_zero="1" text="#@,@@" />
--- a/ci/ci1300b.rep
+++ b/ci/ci1300b.rep
@ -32,12 +32,8 @@
    <li Value="Commessa" Code="8" />
   </list>
  </field>
-  <field x="49.5" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale PREV">
-   <font face="Arial Narrow" bold="1" size="8" />
-  </field>
-  <field x="56" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale CONS">
-   <font face="Arial Narrow" bold="1" size="8" />
-  </field>
+  <field x="49.5" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale PREV" />
+  <field x="56" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale CONS" />
  <field x="1" y="2" type="Array" width="18" pattern="1">
   <font face="Arial" bold="1" size="8" />
   <source>#ORDINAMENTO</source>
@ -52,9 +48,7 @@
    <li Value="Fase" Code="8" />
   </list>
  </field>
-  <field border="1" x="63" y="1" type="Testo" valign="center" align="center" width="4.5" height="2" id="101" pattern="2" text="Gen">
-   <font face="Arial Narrow" bold="1" size="8" />
-  </field>
+  <field border="1" x="63" y="1" type="Testo" valign="center" align="center" width="4.5" height="2" id="101" pattern="2" text="Gen" />
  <field border="1" x="67.5" y="1" type="Testo" valign="center" align="center" width="4.5" height="2" id="102" pattern="2" text="Feb" />
  <field border="1" x="72" y="1" type="Testo" valign="center" align="center" width="4.5" height="2" id="103" pattern="2" text="Mar" />
  <field border="1" x="76.5" y="1" type="Testo" valign="center" align="center" width="4.5" height="2" id="104" pattern="2" text="Apr" />
@ -208,11 +202,16 @@
  </field>
 </section>
 <section type="Foot" pattern="1" />
- <section type="Foot" level="1" pattern="1">
+ <section type="Foot" level="1" height="6" pattern="1">
  <font face="Arial Narrow" bold="1" size="7" />
  <field border="1" x="13.5" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="35" pattern="2" text="Totali">
   <font face="Arial" bold="1" size="8" />
  </field>
+  <field x="88" y="3" type="Testo" width="4" pattern="1" text="Data" />
+  <field x="93" y="3" type="Data" width="10" pattern="1">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="110" y="3" type="Testo" width="7" pattern="1" text="Firma" />
  <field border="1" x="49.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2" text="###@,@@" />
  <field border="1" x="56" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="100" pattern="2" text="###@,@@" />
  <field border="1" x="63" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="4.5" id="101" pattern="2" hide_zero="1" text="##@,@@" />
--- a/ci/ci1400a.rep
+++ b/ci/ci1400a.rep
@ -257,11 +257,16 @@
  </field>
 </section>
 <section type="Foot" pattern="1" />
- <section type="Foot" level="1" pattern="1">
+ <section type="Foot" level="1" height="6" pattern="1">
  <font face="Arial Narrow" bold="1" size="7" />
  <field border="1" x="14" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="29" pattern="2" text="Totali">
   <font face="Arial" bold="1" size="8" />
  </field>
+  <field x="136" y="3" type="Testo" width="4" pattern="1" text="Data" />
+  <field x="141" y="3" type="Data" width="10" pattern="1">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="158" y="3" type="Testo" width="7" pattern="1" text="Firma" />
  <field border="1" x="43.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2" text="##@,@@" />
  <field border="1" x="50" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="100" pattern="2" text="##@,@@" />
  <field border="1" x="57" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="3.5" id="101" pattern="2" hide_zero="1" text="#@,@@" />
--- a/ci/ci1400b.rep
+++ b/ci/ci1400b.rep
@ -4,12 +4,8 @@
 <font face="Arial" size="8" />
 <section type="Head" pattern="1">
  <font face="Arial Narrow" bold="1" size="8" />
-  <field x="50" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale PREV">
-   <font face="Arial Narrow" bold="1" size="8" />
-  </field>
-  <field x="56" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale CONS">
-   <font face="Arial Narrow" bold="1" size="8" />
-  </field>
+  <field x="50" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale PREV" />
+  <field x="56" y="1" type="Testo" align="center" width="6" height="2" pattern="1" text="Totale CONS" />
  <field x="1" y="2" type="Stringa" width="18" pattern="1">
   <font face="Arial" bold="1" size="8" />
   <source>Des1</source>
@ -140,11 +136,16 @@
  </field>
 </section>
 <section type="Foot" pattern="1" />
- <section type="Foot" level="1" pattern="1">
+ <section type="Foot" level="1" height="6" pattern="1">
  <font face="Arial Narrow" bold="1" size="7" />
  <field border="1" x="14" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="35" pattern="2" text="Totali">
   <font face="Arial" bold="1" size="8" />
  </field>
+  <field x="88" y="3" type="Testo" width="4" pattern="1" text="Data" />
+  <field x="93" y="3" type="Data" width="10" pattern="1">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="110" y="3" type="Testo" width="7" pattern="1" text="Firma" />
  <field border="1" x="49.5" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2" text="##@,@@" />
  <field border="1" x="56" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="100" pattern="2" text="##@,@@" />
  <field border="1" x="63" y="0.5" type="Numero" align="right" bg_color="#C0C0C0" width="4.5" id="101" pattern="2" hide_zero="1" text="#@,@@" />
--- a/ci/ci2100a.uml
+++ b/ci/ci2100a.uml
@ -89,10 +89,15 @@ BEGIN
  CHECKTYPE NORMAL
 END

-STRING F_DESRIS 50 27
+STRING F_DESRIS 50 24
 BEGIN
  PROMPT 50 2 ""
-  FLAGS "D"
+  USE RSS KEY 2
+  INPUT S0 F_DESRIS
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@16" CODTAB
+  COPY OUTPUT F_CODRIS
+  CHECKTYPE SEARCH
  GROUP 2
 END

@ -110,10 +115,15 @@ BEGIN
  CHECKTYPE NORMAL
 END

-STRING F_DESATT 50 27
+STRING F_DESATT 50 24
 BEGIN
-  PROMPT 50 27 ""
-  FLAGS "D"
+  PROMPT 50 2 ""
+  USE ATR KEY 2
+  INPUT S0 F_DESRIS
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@16" CODTAB
+  COPY OUTPUT F_CODATT
+  CHECKTYPE SEARCH
  GROUP 3
 END

--- a/ci/ci2200.cpp
+++ b/ci/ci2200.cpp
@ -763,7 +763,7 @@ void TRilevamento_cons_msk::update_disp()
 			if (codice == row.get(sf.cid2index(S_CODRIS)))
 				orecons += real(row.get(sf.cid2index(S_QTAORE)));
 	}
-	if (orecons > get_int(F_OREDIS))
+	if (orecons > get_real(F_OREDIS))
 		field(F_ORECONS).set_prompt("$[r]Cons.  ");
 	else
 		field(F_ORECONS).set_prompt("Cons.  ");
--- a/ci/ci2200a.uml
+++ b/ci/ci2200a.uml
@ -32,7 +32,7 @@ ENDPAGE

 PAGE "Rilevazione consuntivi" 0 2 0 0

-GROUPBOX DLG_NULL 78 7
+GROUPBOX DLG_NULL 78 10
 BEGIN
  PROMPT  1 0 "@bSelezione"
 END
@ -94,10 +94,15 @@ BEGIN
  CHECKTYPE NORMAL
 END

-STRING F_DESRIS 50 27
+STRING F_DESRIS 50 24
 BEGIN
  PROMPT 50 3 ""
-  FLAGS "D"
+  USE RSS KEY 2
+  INPUT S0 F_DESRIS
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@16" CODTAB
+  COPY OUTPUT F_CODRIS
+  CHECKTYPE SEARCH
  GROUP 2
 END

@ -115,33 +120,38 @@ BEGIN
  CHECKTYPE NORMAL
 END

-STRING F_DESATT 50 27
+STRING F_DESATT 50 24
 BEGIN
  PROMPT 50 3 ""
-  FLAGS "D"
+  USE ATR KEY 2
+  INPUT S0 F_DESRIS
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@16" CODTAB
+  COPY OUTPUT F_CODATT
+  CHECKTYPE SEARCH
  GROUP 3
 END

 NUMBER F_OREDIS 6 2
 BEGIN
-  PROMPT 60 1 "Dispon."
+  PROMPT 35 10 "Disponibiltà "
  FLAG "D"
 END

 NUMBER F_ORECONS 6 2
 BEGIN
-  PROMPT 60 2 "Cons.  "
+  PROMPT 60 10 "Consuntivo "
  FLAG "D"
 END

-TREE F_CALENDARIO 10 14
+TREE F_CALENDARIO 10 12
 BEGIN
-  PROMPT 1 8 ""
+  PROMPT 1 11 ""
 END

 SPREADSHEET F_SHEET 65 0
 BEGIN
-  PROMPT 15 8 ""
+  PROMPT 15 11 ""
  ITEM "Canc"
  ITEM "Tipo"
  ITEM "Codice@16"