From 06996b445cfbbd645557a831d08dad5f0af85ff1 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 8 Nov 1994 14:44:19 +0000
Subject: [PATCH] Corretto comportamento della relapp in write e rewrite
 Aggiunta nota integrativa ridotta

git-svn-id: svn://10.65.10.50/trunk@568 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba1400.cpp  | 16 +++++++---------
 ba/ba1400a.uml |  9 ++++++++-
 ba/ba1500a.h   | 12 ++++++------
 ba/ba1500a.uml |  5 +++++
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ba/ba1400.cpp b/ba/ba1400.cpp
index 3203cf97b..eaec10eb9 100755
--- a/ba/ba1400.cpp
+++ b/ba/ba1400.cpp
@@ -73,8 +73,9 @@ bool set_users::user_create()
 int set_users::read(TMask& m) 
 
 {
+  TRelation_application::read(m);
   const TRelation *r = get_relation();
-  m.autoload(r);
+
   m.set(F_PASSWORD, decode(r->lfile().get("PASSWORD")));
   return NOERR;
 }
@@ -83,23 +84,20 @@ int set_users::write(const TMask& m)
 
 {
   TRelation *r = get_relation();
-  r->zero();
-  m.autosave(r);
   TString16 s(encode(m.get(F_PASSWORD)));
+  
   r->lfile().put("PASSWORD", (const char *) s);
-  return r->write();
+  return TRelation_application::write(m);
 }
 
 int set_users::rewrite(const TMask& m) 
 
 {
   TRelation *r = get_relation();
-
-  r->zero();
-  m.autosave(r);
   TString16 s(encode(m.get(F_PASSWORD)));
-  r->lfile().put("PASSWORD", (const char *) s);
-  return r->rewrite();
+
+  r->lfile().put("PASSWORD",  s);
+  return TRelation_application::rewrite(m);
 }
 
 bool set_users::user_destroy()
diff --git a/ba/ba1400a.uml b/ba/ba1400a.uml
index ea5dcc714..2f7df75c0 100755
--- a/ba/ba1400a.uml
+++ b/ba/ba1400a.uml
@@ -101,9 +101,16 @@ END
 BOOLEAN F_NI 
 BEGIN
   PROMPT 1 11 "Nota integrativa"
-	FIELD AUTSTR[22,22]
+  FIELD AUTSTR[22,22]
+END
+
+BOOLEAN F_NR
+BEGIN
+   PROMPT 31 11 "Nota integrativa ridotta"
+  FIELD AUTSTR[23,23]
 END
 
 ENDPAGE
 
 ENDMASK
+
diff --git a/ba/ba1500a.h b/ba/ba1500a.h
index 66cdb1100..aba3f0c92 100755
--- a/ba/ba1500a.h
+++ b/ba/ba1500a.h
@@ -1,6 +1,6 @@
-#define F_K1	101
-#define F_K2	102
-#define F_K3	103
-#define F_K4	104
-#define F_SN	105
-#define F_DT	106
+#define F_K1    101
+#define F_K2    102
+#define F_K3    103
+#define F_K4    104
+#define F_SN    105
+#define F_DT    106
diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml
index 898d91f53..0bbf1c943 100755
--- a/ba/ba1500a.uml
+++ b/ba/ba1500a.uml
@@ -97,6 +97,11 @@ BEGIN
   PROMPT 1 9 "Nota integrativa"
 END
 
+BOOLEAN F_NR
+BEGIN
+  PROMPT 31 9 "Nota integrativa ridotta"
+END
+
 BUTTON DLG_OK 9 2
 BEGIN
   PROMPT -12 -1 ""