Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


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

ba/bainst.cpp

@@ -36,6 +36,8 @@ int main(int argc,char** argv)
     r = bainst38(argc, argv);// pre/post installazione statistiche:
   else if (mod == "mr")
     r = bainst39(argc, argv);// pre/post installazione MRP
+  else if (mod == "lv")
+    r = bainst41(argc, argv);// pre/post installazione lavanderie
   else
     r = bainst00(argc, argv);// pre/post installazione base
   return 0;

ba/bainst.h

@@ -12,5 +12,6 @@ int bainst35(int argc, char** argv);
 int bainst34(int argc, char** argv);
 int bainst38(int argc, char** argv);
 int bainst39(int argc, char** argv);
+int bainst41(int argc, char** argv);
 
 

ba/bainst32.uml

@@ -1,4 +1,4 @@
-#include "bainst32.h"
+#include "bainsta.h"
 
 PAGE "Installazione MG" -1 -1 78 8
 

ba/bainst38.uml

@@ -1,4 +1,4 @@
-#include "bainst38.h"
+#include "bainsta.h"
 
 PAGE "Installazione SV" -1 -1 78 8
 

ba/bainst41.cpp

@@ -0,0 +1,20 @@
+#include <modaut.h>
+
+#include "bainstlib.h"
+
+class TInstall_LV : public TInstallmodule_app
+{
+
+protected:
+  virtual int module_number() const { return LVAUT; }
+
+public:
+  virtual ~TInstall_LV () {}
+};
+
+int bainst41(int argc, char** argv)
+{ 
+  TInstall_LV app;
+  app.run(argc, argv);
+  return 0;
+}

ba/bainst41.uml

@@ -0,0 +1,18 @@
+#include "bainsta.h"
+
+PAGE "Installazione LV" -1 -1 78 8
+
+BOOL F_DEFAULTSDATA
+BEGIN
+  PROMPT 2 2 "Carica le tabelle del modulo Lavanderie"
+END
+
+BUTTON DLG_OK 10 2
+BEGIN
+  PROMPT -11 -1 "~Conferma"
+  MESSAGE EXIT,K_ENTER
+  PICTURE BMP_OK
+END
+
+ENDPAGE
+ENDMASK

ba/bainstlib.cpp

@@ -401,17 +401,24 @@ bool TInstallmodule_app::destroy()
 bool TInstallmodule_app::something_to_load() const
 { 
 	bool yes = false;
-	
+	//dati comuni
 	TFilename file_to_load = module_code();
-	file_to_load << "tabcom.txt";		//dati comuni
+	file_to_load << "tabcom.txt";		
 	yes = ci_sono_novita(file_to_load, LF_TABCOM);
-
+  //dati ditta
 	if (!yes)
 	{
 	  file_to_load = module_code();
-	  file_to_load << "tab.txt";		//dati ditta
+	  file_to_load << "tab.txt";		
 		yes =	ci_sono_novita(file_to_load, LF_TAB);
 	}
+  //dati di modulo
+	if (!yes)
+	{
+	  file_to_load = module_code();
+	  file_to_load << "tabmod.txt";		
+		yes =	ci_sono_novita(file_to_load, LF_TABMOD);
+	}
 	return yes;
 }
 
@@ -432,7 +439,7 @@ bool TInstallmodule_app::preload_mask()
 
 bool TInstallmodule_app::ci_sono_novita(const TFilename& filesource, const int filedest) const
 {
-	bool ok = (filedest == LF_TAB || filedest == LF_TABCOM) && filesource.exist();
+	bool ok = (filedest == LF_TAB || filedest == LF_TABCOM || filedest == LF_TABMOD) && filesource.exist();
 	if (ok)
 	{
 		TScanner scan(filesource);
@@ -450,8 +457,18 @@ bool TInstallmodule_app::ci_sono_novita(const TFilename& filesource, const int f
 					tok = scan.line();
 					if (tok.blank())
 						break;
-					ifile.put("COD", tok.get(0));
+          if (filedest == LF_TABMOD)
-					ifile.put("CODTAB", tok.get(1));
+          {
+            ifile.put("MOD", tok.get(0));
+            ifile.put("CUST", tok.get(1));
+					  ifile.put("COD", tok.get(2));
+					  ifile.put("CODTAB", tok.get(3));
+          }
+          else
+          {
+					  ifile.put("COD", tok.get(0));
+					  ifile.put("CODTAB", tok.get(1));
+          }
 					ok = ifile.read() != NOERR;
 				}
 				ifile.close();