From 397f941fa30277006a9201d975a3afb816dfa6e8 Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 13 Jul 1995 14:37:51 +0000
Subject: [PATCH] Sistemate ultime cacche visualizzazione

git-svn-id: svn://10.65.10.50/trunk@1597 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg5500.cpp  | 94 +++++++++++++++++++++++++++++++-------------------
 cg/cg5500b.uml |  4 +--
 cg/cg5500c.uml |  4 +--
 3 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/cg/cg5500.cpp b/cg/cg5500.cpp
index 4d81330fb..b6dbba522 100755
--- a/cg/cg5500.cpp
+++ b/cg/cg5500.cpp
@@ -1174,12 +1174,36 @@ void Visliq_app::write_general(TMask& m)
   {
     // this is a true bordel                            
     int row = (i/step) - 1;    
-
+    
+    bool lfrommask = sh.selected() == row && sh.sheet_mask().is_running();
+    bool vfrommask = sv.selected() == (i == 12 ? row + 1 : row) && 
+      sv.sheet_mask().is_running();
+    
     TToken_string& tt_lo = (TToken_string&)_liq_rows[row]; 
-    TToken_string& tt_ln = sh.row(row);
+    TToken_string& tt_ln = sh.row(row);  
+    
+    // risolve menata del dettaglio si'/no  
+    if (lfrommask)
+    {    
+      tt_ln.add(sh.sheet_mask().get(102),1);
+      tt_ln.add(sh.sheet_mask().get(103),2);
+      tt_ln.add(sh.sheet_mask().get(104),3);
+      tt_ln.add(sh.sheet_mask().get(105),4);
+      tt_ln.add(sh.sheet_mask().get(106),5);
+    }
+
     // saltare una riga se dicembre (riga 11 == acconto)  
     TToken_string& tt_vo = (TToken_string&)_vers_rows[i == 12 ? row + 1 : row]; 
-    TToken_string& tt_vn = sv.row(row); 
+    TToken_string& tt_vn = sv.row(i == 12 ? row + 1 : row); 
+
+    if (vfrommask)
+    { 
+      tt_vn.add(sv.sheet_mask().get(102),1);
+      tt_vn.add(sv.sheet_mask().get(103),2);
+      tt_vn.add(sv.sheet_mask().get(104),3);
+      tt_vn.add(sv.sheet_mask().get(105),4);
+      tt_vn.add(sv.sheet_mask().get(106),5);      
+    }
     
     // traduci contenuto righe in real pila
     real    orett(tt_lo.get(4));
@@ -1384,40 +1408,40 @@ void Visliq_app::write_general(TMask& m)
       
       rstart = risl;
     }
-  else 
-  {
-    // salva i valori modificati senza fare controlli
-    // e rimetti a lui i suoi debiti mettendo B0 a FALSE
-    if (orett != nrett)
-      _lim->put("R5", nrett);
-    if (orimb != nrimb)
-      _lim->put("R1", nrimb);
-    _lim->put("B0", ""); 
-    _lim->rewrite();
-  }  
-    
-    // Rimetti a posto righe sheet se serve
-    int sr0 = (_lim->get_real("R0")).sign();
-    int sr5 = (_lim->get_real("R5")).sign();
+else 
+{
+  // salva i valori modificati senza fare controlli
+  // e rimetti a lui i suoi debiti mettendo B0 a FALSE
+  if (orett != nrett)
+    _lim->put("R5", nrett);
+  if (orimb != nrimb)
+    _lim->put("R1", nrimb);
+  _lim->put("B0", ""); 
+  _lim->rewrite();
+}  
 
-    tt_ln.add(abs(_lim->get_real("R0")).string(),1);  
-    tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
-    tt_ln.add((_lim->get_real("R1")).string(),3);
-    tt_ln.add(abs(_lim->get_real("R5")).string(),4);
-    tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
-    
-    sh.force_update(row);
-    
-  } // for mese liq. (riga sheet)
+// Rimetti a posto righe sheet se serve
+int sr0 = (_lim->get_real("R0")).sign();
+int sr5 = (_lim->get_real("R5")).sign();
 
-  // Rileggi array righe vecchie
-  _vers_rows = sv.rows_array();  
-  _liq_rows  = sh.rows_array(); 
-  
-  // m.dirty() deve ritornare FALSE  
-  m.field(F_CREDPREC).set_dirty(FALSE);
-  m.field(F_VISLIQ1).set_dirty(FALSE);
-  m.field(F_VISLIQ2).set_dirty(FALSE);
+tt_ln.add(abs(_lim->get_real("R0")).string(),1);  
+tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
+tt_ln.add((_lim->get_real("R1")).string(),3);
+tt_ln.add(abs(_lim->get_real("R5")).string(),4);
+tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
+
+sh.force_update(row);
+
+} // for mese liq. (riga sheet)
+
+// Rileggi array righe vecchie
+_vers_rows = sv.rows_array();  
+_liq_rows  = sh.rows_array(); 
+
+// m.dirty() deve ritornare FALSE  
+m.field(F_CREDPREC).set_dirty(FALSE);
+m.field(F_VISLIQ1).set_dirty(FALSE);
+m.field(F_VISLIQ2).set_dirty(FALSE);
 }
 
 
diff --git a/cg/cg5500b.uml b/cg/cg5500b.uml
index dcb7b4c60..733a000b2 100755
--- a/cg/cg5500b.uml
+++ b/cg/cg5500b.uml
@@ -160,7 +160,7 @@ END
 BUTTON 100 10 2
 BEGIN
 	PROMPT -33 -1 "Dettaglio"   
-	FLAGS "H"
+//	FLAGS "H"
 END
 
 ENDPAGE
@@ -249,7 +249,7 @@ END
 BUTTON 100 10 2
 BEGIN
 	PROMPT -33 -1 "Dettaglio"
-	FLAGS "H"
+//	FLAGS "H"
 END
 
 ENDPAGE
diff --git a/cg/cg5500c.uml b/cg/cg5500c.uml
index 41a71a439..5c6296357 100755
--- a/cg/cg5500c.uml
+++ b/cg/cg5500c.uml
@@ -138,7 +138,7 @@ END
 BUTTON 100 10 2
 BEGIN
 	PROMPT -33 -1 "Dettaglio"
-	FLAGS "H"
+// 	FLAGS "H"
 END
 
 ENDPAGE
@@ -226,7 +226,7 @@ END
 BUTTON 100 10 2
 BEGIN
 	PROMPT -33 -1 "Dettaglio"
-	FLAGS "H"
+//	FLAGS "H"
 END
 
 ENDPAGE