From 9aa6cf6e91df5392356cd5737ea9334452653c28 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 31 Jan 2011 12:38:58 +0000
Subject: [PATCH] Patch level         : 10.0 902 Files correlati     : ci0.exe
 ci2.exe Ricompilazione Demo : [ ] Commento            :

Aggiunta matricola e Qualifica alla tabella risorse


git-svn-id: svn://10.65.10.50/branches/R_10_00@21544 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ci/ci2200.cpp | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/ci/ci2200.cpp b/ci/ci2200.cpp
index 48ef40eef..cc0c319d1 100755
--- a/ci/ci2200.cpp
+++ b/ci/ci2200.cpp
@@ -389,7 +389,7 @@ void TRilevamento_cons_msk::update_column(short sid, bool full, int len)
 void TRilevamento_cons_msk::riempi_risoatt(char tipo)
 {
   TSheet_field& sheet = sfield(F_SHEET);
-
+	TMask & sm = sheet.sheet_mask();
 	if (sheet.items() > 0 && sheet.dirty() && yesno_box("Vuoi salvare le modifiche"))
 		registra();
   sheet.destroy();
@@ -419,6 +419,24 @@ void TRilevamento_cons_msk::riempi_risoatt(char tipo)
 	update_column(S_CODATT, codice.full());
 	update_column(S_DESATT, codice.full());
 	update_column(S_TPORA, tpora.full(), 4);
+	if (_scdc_sid >= 0)
+		for ( short id = _scdc_sid; id <= _scdc_lid; id++)
+		{
+			update_column(id, codcosto.full());
+			sm.enable(id + 50, codcosto.blank());
+		}
+	if (_scms_sid >= 0)
+		for ( short id = _scms_sid; id <= _scms_lid; id++)
+		{
+			update_column(id, codcms.full());
+			sm.enable(id + 50, codcms.blank());
+		}
+	if (_sfase_sid >= 0)
+		for ( short id = _sfase_sid; id <= _sfase_lid; id++)
+		{
+			update_column(id, codfase.full());
+			sm.enable(id + 50, codfase.blank());
+		}
   //preparo la query
   
 	query << "USE " << LF_RILORE  << " KEY 2\n" ;
@@ -683,7 +701,7 @@ void TRilevamento_cons_msk::nuova_riga()
     msk.enable(S_CODRIS);
 	if (tutti || tipo == "A") 
     msk.enable(S_CODATT);
-  msk.enable(S_TPORA, tpora.empty()); */
+  msk.enable(S_TPORA, tpora.empty()); 
 	if (_scdc_sid >= 0)
 		for ( short id = _scdc_sid; id <= _scdc_lid; id++)
 			msk.enable(id, codcosto.blank());
@@ -692,7 +710,7 @@ void TRilevamento_cons_msk::nuova_riga()
 			msk.enable(id, codcms.blank());
 	if (_sfase_sid >= 0)
 		for ( short id = _sfase_sid; id <= _sfase_lid; id++)
-			msk.enable(id, codfase.blank());
+			msk.enable(id, codfase.blank()); */
 
 	riga.add(tipo, sheet.cid2index(S_RISOATT));
 	if (!tutti)
@@ -908,8 +926,10 @@ void TRilevamento_cons_msk::update_day()
 //ON_FIELD_EVENT: metodo che gestisce gli eventi sui vari campi della maschera
 bool TRilevamento_cons_msk::on_field_event(TOperable_field& f, TField_event e, long jolly)
 {
- 	if (e == fe_modify && f.dlg() >= F_ANAL && f.dlg() < F_ANAL+12)
-	  riempi_sheet();
+	if ((f.dlg() == _cdc_lid ||
+			f.dlg() == _cms_lid ||
+			f.dlg() == _fase_lid) && e == fe_modify)
+      riempi_sheet();
 	if (f.dlg() == _scms_lid)
 	{
 		if (e == fe_init || e == fe_modify)