From 13e68f6cead8e64d58917f1c8320657c15aaa675 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 18 Jun 1996 11:04:45 +0000
Subject: [PATCH] Correzzione errore 004264

git-svn-id: svn://10.65.10.50/trunk@3008 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba4200.cpp  | 18 ++++++++++--------
 ba/ba4200b.uml | 10 +++++-----
 ba/ba4200c.uml |  6 ++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ba/ba4200.cpp b/ba/ba4200.cpp
index ca292bef7..226268a15 100755
--- a/ba/ba4200.cpp
+++ b/ba/ba4200.cpp
@@ -16,8 +16,9 @@
 
 class TPersone_app : public TRelation_application
 {
-  char _tip_ana ;
-  bool _reset_uff_conc;
+  char _tip_ana;
+  bool _reset_uff_conc;          
+  char _next_ana;
   bool _reset_codreg;
   TString16     _cod_ana ;
   TMask*        _msk[2] ;
@@ -33,7 +34,7 @@ protected:
   virtual void  init_query_mode(TMask& m);
   virtual void  init_insert_mode(TMask& m);
   virtual void  init_modify_mode(TMask& m);
-  virtual bool changing_mask(int mode) {return _msk[tip_msk()] == NULL;}
+  virtual bool changing_mask(int mode) {return _tip_ana != _next_ana;}
   virtual const char* get_next_key();
   virtual TMask* get_mask(int mode) ;
   virtual void write_enable(bool on = TRUE);
@@ -47,7 +48,8 @@ public:
   int tip_msk() const { return _tip_ana == TFIS ? MSKF : MSKG;}
   bool ana_fis() const { return _tip_ana == TFIS;}
   bool ana_giu() const { return _tip_ana == TGIU;}
-  void set_tip_ana(char tip) { _tip_ana = toupper(tip);}
+  void set_tip_ana(char tip) { _tip_ana = _next_ana = toupper(tip);}
+  void set_next_ana(char tip) { _next_ana = toupper(tip);}
   void set_cod_ana(const char* cod) { _cod_ana = cod;}
   const char* cod_ana() { return _cod_ana;}
   char tip_ana() { return _tip_ana;}
@@ -65,8 +67,8 @@ bool TPersone_app::ba4200_handler(TMask& m, KEY k)
 
   if (k == K_F10)
   {
-    if (app.ana_fis()) app.set_tip_ana(TGIU);
-    else app.set_tip_ana(TFIS);
+    if (app.ana_fis()) app.set_next_ana(TGIU);
+    else app.set_next_ana(TFIS);
     m.stop_run(K_ESC);
     return FALSE;
   }
@@ -480,8 +482,8 @@ bool no_dup_iva_g(TMask_field& f, KEY key)
 }
 
 TMask* TPersone_app::get_mask(int mode)
-{ 
-  if (!changing_mask(mode)) return _msk[tip_msk()];
+{  
+  set_tip_ana(_next_ana);
   if (ana_fis() && _msk[MSKF] == NULL)
   { 
     _msk[MSKF] = new TMask("ba4200b") ;
diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml
index bd4ed91f9..9fe490896 100755
--- a/ba/ba4200b.uml
+++ b/ba/ba4200b.uml
@@ -91,7 +91,7 @@ MESSAGE COPY,3@
 CHECKTYPE REQUIRED
 END
 
-RADIOBUTTON LST_AF1_SESSO 1 13
+RADIOBUTTON LST_AF1_SESSO 1 12
 BEGIN
 PROMPT 0 5 "Sesso"
 FIELD LF_ANAGFIS->SESSO
@@ -100,14 +100,14 @@ ITEM "M|Maschio"
 ITEM "F|Femmina"
 END
 
-GROUPBOX DLG_NULL 30 4
+GROUPBOX DLG_NULL 31 4
 BEGIN
-PROMPT 13 5 "Partita IVA "
+PROMPT 12 5 "Partita IVA "
 END
 
 LIST FLD_AF1_STATOPAIV 20
 BEGIN
-PROMPT 14 6 "Stato  "
+PROMPT 13 6 "Stato  "
 FIELD LF_ANAG->STATOPAIV
 HELP "Codice dello stato cui si riferisce la partita IVA"
 ITEM "  |Italia o extra CEE"
@@ -127,7 +127,7 @@ END
 
 STRING FLD_AF1_PAIV 12
 BEGIN
-PROMPT 14 7 "Codice "
+PROMPT 13 7 "Codice "
 FIELD LF_ANAG->PAIV
 HELP "Partita IVA della persona"
 VALIDATE XTZPI_FUNC FLD_AF1_STATOPAIV FLD_AF2_COMRF  FLD_AF1_COMRES
diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml
index 1f4342c05..eabe90e76 100755
--- a/ba/ba4200c.uml
+++ b/ba/ba4200c.uml
@@ -73,7 +73,7 @@ BEGIN
   KEY 2
 END
 
-GROUPBOX DLG_NULL 40 4
+GROUPBOX DLG_NULL 41 4
 BEGIN
   PROMPT 0 4 "Partita IVA "
 END
@@ -239,7 +239,8 @@ BEGIN
   DISPLAY "Stato@50" S0
   OUTPUT F_STATORES CODTAB
   HELP "Codice dello stato di residenza"
-  CHECKTYPE NORMAL
+  CHECKTYPE NORMAL 
+  MESSAGE DIRTY,FLD_AG2_COMRES|TAB,FLD_AG2_COMRES
 END
 
 STRING FLD_AG2_COMRES 4
@@ -465,6 +466,7 @@ BEGIN
   OUTPUT FLD_AG2_STATOCORR CODTAB
   HELP "Codice dello stato a cui mandare la corrispondenza"
   CHECKTYPE NORMAL
+  MESSAGE DIRTY,FLD_AG2_COMCORR|TAB,FLD_AG2_COMCORR
 END
 
 STRING FLD_AG2_COMCORR 4