Corretti metodi virtuali read derivati da relapp

git-svn-id: svn://10.65.10.50/trunk@931 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba2200.uml

@@ -0,0 +1,75 @@
+#include "ba2200.h"
+
+PAGE "Salvataggio / Ripristino archivi" -1 -1 72 7
+
+LIST F_FLOPPY 1 5
+BEGIN
+  PROMPT 1 1 "Disco "
+  ITEM "A|A:"
+  ITEM "B|B:"
+END
+
+LIST F_DATA 1 14
+BEGIN
+  PROMPT 17 1 "Dati "
+  ITEM " |Ditta"       MESSAGE ENABLE,1@
+  ITEM "C|Dati comuni" MESSAGE CLEAR,1@
+END
+     
+NUMBER F_CODDITTA 5       
+BEGIN       
+  PROMPT 56 1 "Ditta "
+  USE LF_NDITTE
+  INPUT CODDITTA F_CODDITTA
+  DISPLAY "Codice" CODDITTA
+  DISPLAY "Ragione Sociale" RAGSOC
+  OUTPUT F_CODDITTA CODDITTA
+  OUTPUT F_RAGSOC RAGSOC
+  CHECKTYPE REQUIRED
+  WARNING "Specificare la ditta su cui lavorare"
+  GROUP 1
+END       
+
+STRING F_RAGSOC 50
+BEGIN
+  PROMPT 1 2 "Ragione Sociale "
+  USE LF_NDITTE KEY 2
+  INPUT RAGSOC F_RAGSOC
+  DISPLAY "Ragione Sociale" RAGSOC
+  DISPLAY "Codice" CODDITTA
+  COPY OUTPUT F_CODDITTA
+  CHECKTYPE REQUIRED
+  GROUP 1
+END
+
+STRING F_DESCR 50
+BEGIN
+  PROMPT 1 3 "Descrizione     "
+END
+
+BOOLEAN F_TEMP
+BEGIN
+  PROMPT 1 4 "Usare direttorio temporaneo durante il ripristino"
+END
+
+BUTTON DLG_NULL 15 2
+BEGIN
+  PROMPT -13 -1 "~Salvataggio"
+  MESSAGE EXIT,K_SAVE
+END
+
+BUTTON DLG_NULL 15 2
+BEGIN
+  PROMPT -23 -1 "~Riprisitino"
+  MESSAGE EXIT,K_INS
+END
+
+
+BUTTON DLG_QUIT 15 2
+BEGIN
+  PROMPT -33 -1 ""
+END
+       
+ENDPAGE
+
+ENDMASK

ba/ba3400.cpp

@@ -18,7 +18,6 @@ protected:
   virtual TMask* get_mask(int mode) { return _msk; }
   virtual bool changing_mask(int mode) { return FALSE;}
   virtual TRelation* get_relation() const { return _rel; }
-  virtual int read(TMask& m) { m.autoload(); return NOERR; }
 
 public:
   TTestrel_application(const char* name, const char* num);

ba/ba4300.cpp

@@ -239,7 +239,7 @@ void TDitte_application::set_att_prev(const TMask& m)
 
 int TDitte_application::write(const TMask& m)
 {
-  const int err = TRelation_application::write();
+  const int err = TRelation_application::write(m);
   if (err == NOERR)
   {
     TRectype& ditte=_rel->curr();
@@ -284,7 +284,7 @@ int TDitte_application::write(const TMask& m)
 
 int TDitte_application::rewrite(const TMask& m)
 {
-  const int err = TRelation_application::rewrite();
+  const int err = TRelation_application::rewrite(m);
   if (err == NOERR)
     set_att_prev(m);
   return err;

ba/ba4500.cpp

@@ -141,17 +141,18 @@ bool TAttivita_application::user_destroy()
 }
 
 int TAttivita_application::read(TMask& m) 
-
 {
-  m.autoload();
+  const int err = TRelation_application::read(m);
+  if (err == NOERR)
+  {
     m.field(FLD_AT2_CODANGRDS).set_focusdirty();
     gest_res(m.field(FLD_AT2_CODANGRDS), K_TAB);
-  return NOERR;
+  }
+  return err;
 }
 
 int ba4500(int argc, char* argv[])
 {
-  
   TAttivita_application a;
   a.run(argc, argv, "Anagrafica Attivita'");
   return 0;