Tentativi di far funzionare ba3700

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

ba/ba3.cpp

@@ -7,14 +7,16 @@
 
 int main(int argc, char** argv)
 {
+  if (argc < 2) fatal_box(usage, argv[0]);
+  
   const TFixed_string s(argv[1]);
 
   if (s == "-0") ba3100(argc,argv) ; else
     if (s == "-1") ba3200(argc,argv) ; else
-		if (s == "-2") ba3300(argc,argv);
+      if (s == "-2") ba3300(argc,argv) ; else
-		if (s == "-3") ba3400(argc,argv);
+        if (s == "-3") ba3400(argc,argv) ; else
-		if (s == "-4") ba3500(argc,argv); 
+          if (s == "-4") ba3500(argc,argv) ; else
-		if (s == "-5") ba3600(argc,argv); 
+            if (s == "-5") ba3600(argc,argv) ; else
               if (s == "-6") ba3700(argc,argv);
               else fatal_box(usage, argv[0]) ;
 

ba/ba3700.cpp

@@ -57,8 +57,6 @@ class BA3700_application : public TRelation_application
    
   TRelation           * _rel;
   TMask               * _msk;
-  TTable              * _tab_cpg;
-  TTable              * _tab_rpg;
   TBit_array          _righe_gia_presenti;
   
   int                 _mode;              // Modo maschera corrente
@@ -76,6 +74,7 @@ class BA3700_application : public TRelation_application
   void   ulteriore_riclass       (TMask_field& f, KEY k);
 
 protected:
+
   virtual bool user_create();
   virtual bool user_destroy();
   
@@ -84,21 +83,22 @@ protected:
   virtual bool         changing_mask(int mode) {return FALSE; }
   virtual bool         remove();
   
-  void    init_mask(TMask&);
-  virtual void init_query_mode(TMask&);
   virtual void init_modify_mode(TMask&);
   virtual void init_insert_mode(TMask&);
   virtual int  rewrite(const TMask& m);
   virtual int  write(const TMask& m);
   virtual int  read(TMask& m);
+
   int          cancella(long items);
 
 public:
-  TMask * main_mask() { return _msk; }
 
-  BA3700_application() {}
+  TMask * main_mask() { return _msk; }
+  BA3700_application() : TRelation_application() {} 
+  virtual ~BA3700_application() {}
 };
                                                  
+                                                 
 HIDDEN BA3700_application * app() { return (BA3700_application*) MainApp(); }
 
 TMask*  BA3700_application::get_mask(int mode)
@@ -203,11 +203,6 @@ bool BA3700_application::fill_sheet(TMask& m)
   return TRUE;
 }
 
-void BA3700_application::init_query_mode(TMask& m)
-{
-
-}
-
 void BA3700_application::init_insert_mode(TMask& m)
 {
   _interv_rate = 0;
@@ -223,11 +218,6 @@ void BA3700_application::init_modify_mode(TMask& m)
   _interv_rate = 0;
 }
 
-void BA3700_application::init_mask(TMask& m)
-{
-
-}
-
 bool BA3700_application::rate_differenziate(TMask_field& f, KEY k)
 {
   long items;
@@ -426,13 +416,13 @@ bool BA3700_application::numero_rate(TMask_field& f, KEY k)
     {
       if (items < numero_rate)
       {
-	TToken_string& riga_app = cs.row(items - 1); //Mi posiziono sull'ultima rata
+	TToken_string& riga_app = cs.row((int)items - 1); //Mi posiziono sull'ultima rata
 
 	num_giorni = atol(riga_app.get(0));
 
-	for (int i = items; i < numero_rate; i++)
+	for (long i = items; i < numero_rate; i++)
 	{
-	  TToken_string& riga = cs.row(i);
+	  TToken_string& riga = cs.row((int)i);
 
 	  riga.cut(0);
 	  riga = riga_app;
@@ -441,11 +431,11 @@ bool BA3700_application::numero_rate(TMask_field& f, KEY k)
 	  riga.add(ng, 0);
 	  num_giorni = atol(riga.get(0));
 
-	  if (i == 1)
+	  if (i == 1l)
-            cs.disable_cell(i,1);
+        cs.disable_cell((int)i,1);
        
-          if (i >= 2)
+      else if (i >= 2l)
-	    cs.disable_cell(i,-1);
+	    cs.disable_cell((int)i,-1);
 
 	//  cs.disable_cell(i,-1);
 	}
@@ -623,7 +613,7 @@ bool BA3700_application::ricalcolo_percentuale(TMask_field& f, KEY k)
 
 bool BA3700_application::ricalcola_numero_giorni(TMask_field& f, KEY k)
 {
-  long items, ng, giorni, ngiorni;
+  long items, ng, giorni;
 
 //  TSheet_field& cs = (TSheet_field&)f.mask().field(F_SHEET_RPG);
   TSheet_field& cs = (TSheet_field&)app()->main_mask()->field(F_SHEET_RPG);
@@ -882,7 +872,7 @@ bool BA3700_application::remove()
 int BA3700_application::cancella(long items)
 {
   TTable*   tab_rpg = (TTable*)_rel->lfile(-ALIAS);
-  TRecfield an (_rel->lfile(-ALIAS)->curr(),"CODTAB",0,3);
+  TRecfield an (tab_rpg->curr(),"CODTAB",0,3);
   TString   cod_pag,dep;
   
   cod_pag   = (const char*)(an);
@@ -917,9 +907,6 @@ bool BA3700_application::user_create()
   _rel->add(TAB_RPG, "CODTAB[1,4]=CODTAB" ,1, 0, ALIAS); //-4 = alias,perche'le
 				    //due tabelle sono entrambe in TABCOM.dta
 
-  _tab_cpg = new TTable (TAB_CPG);
-  _tab_rpg = new TTable (TAB_RPG);
-
   _interv_rate = 0;
 
   _msk = new TMask("ba3700a");
@@ -941,8 +928,6 @@ bool BA3700_application::user_create()
 bool BA3700_application::user_destroy()
 {
   delete _msk;
-  delete _tab_cpg;
-  delete _tab_rpg;
   delete _rel;
   return TRUE;
 }

ba/ba3700a.uml

@@ -105,7 +105,7 @@ ENDPAGE
 
 ENDMASK
 
-PAGE "" -1 -1 50 11
+PAGE "" -1 -1 78 15
 
 NUMBER 101 4
 BEGIN