Personalizzazione Realplast

git-svn-id: svn://10.65.10.50/branches/R_10_00@22926 c028cbd2-c16b-5b4b-a496-9718f37d4682

ps/ps0872.cpp

@@ -7,10 +7,8 @@ int main(int argc, char** argv)
   int n = argc > 1 ? atoi(argv[1]+1) : 0;
   switch(n)
   {
-	case 1:
+	case 1 : ps0872200(argc, argv); break;	//Stampa Produzione RealPlast
-		ps0872200(argc, argv); break;	//Stampa Produzione RealPlast
+  default: ps0872100(argc, argv); break;	//Stampa Listini RealPlast
-  default:
-    ps0872100(argc, argv); break;	//Stampa Listini RealPlast
   }
   return 0;
 }

ps/ps0872100.cpp

@@ -12,20 +12,18 @@ protected:
 
 public:
   TMaskPs08721() : TAutomask("ps0872100a") { }
-  virtual ~TMaskPs08721() { }
 };
 
 bool TMaskPs08721::on_field_event(TOperable_field& o, TField_event e, long jolly)
 { 
-  return TRUE;
+  return true; 
 }
 
 class TStampaStampaListinoPs0872 : public TSkeleton_application  
 {
-	virtual bool check_autorization() const {return false;}
-  virtual const char * extra_modules() const {return "ve";}
-
 protected:
+	virtual bool check_autorization() const    { return false; }
+  virtual const char * extra_modules() const { return "ve"; }
   virtual void main_loop();
 
 public:
@@ -65,6 +63,6 @@ void TStampaStampaListinoPs0872::main_loop()
 int ps0872100(int argc, char* argv[])
 {
   TStampaStampaListinoPs0872 a;
-  a.run(argc, argv, "Stampa Listini RealPlast");
+  a.run(argc, argv, TR("Stampa Listini RealPlast"));
   return 0;
 }

ps/ps0872100a.uml

@@ -1,10 +1,10 @@
 #include "ps0872100a.h"
 
-PAGE "Stampa Listini RealPlast" -1 -1 78 9
+PAGE "Stampa Listini RealPlast" -1 -1 48 5
 
 STRING F_DAART 20
 BEGIN
-   PROMPT 2 2 "Da Articolo         "
+   PROMPT 1 1 "Da Articolo        "
    USE 47
    INPUT CODART F_DAART 
    DISPLAY "Codice@20" CODART
@@ -16,33 +16,35 @@ END
 
 STRING F_AART 20
 BEGIN
-   PROMPT 2 4 "A Articolo         "
+   PROMPT 1 2 "A Articolo         "
-   USE 47
+   COPY USE F_DAART
    INPUT CODART F_AART 
-   DISPLAY "Codice@20" CODART
+   COPY DISPLAY F_DAART
-   DISPLAY "Descrizione50" DESCR
    OUTPUT F_AART CODART
    FLAGS "U"
-   GROUP 1
+   GROUP 2
 END
 
 STRING F_REPORT 20
 BEGIN
-   PROMPT 2 6 "Tipo di stampa      "
+   PROMPT 1 3 "Tipo di stampa     "
 	 RSELECT "ps08721"
 	 CHECKTYPE REQUIRED
 END
 
-BUTTON DLG_OK 10 2
+ENDPAGE
+
+TOOLBAR "bar" 0 0 0 2
+
+BUTTON DLG_OK 2 2
 BEGIN
-  PROMPT -12 -1 ""
+  PROMPT 1 1 "Stampa"
+  PICTURE TOOL_PRINT
 END
 
-BUTTON DLG_QUIT 10 2
+#include <helpbar.h>
-BEGIN 
-  PROMPT -22 -1 ""
-END  
 
 ENDPAGE
+
 ENDMASK
 

ps/ps0872200.cpp

@@ -35,7 +35,6 @@ TMaskPs08722::TMaskPs08722()
 {
   // crea relazioni, cursori e cursor_sheets
 	update_sheet();
-	((TButton_field&) field(DLG_SELECT)).set_exit_key(0);
 	_select_changed = false;
 }
 
@@ -92,7 +91,9 @@ bool TMaskPs08722::on_field_event(TOperable_field& o, TField_event e, long jolly
 				if (_select_changed)
 					update_sheet();
 				_select_changed = false;
+        if (_sht != NULL)
 				  _sht->run();
+        return false; // Don't exit
 			}
 			break;
 		default:
@@ -103,7 +104,6 @@ bool TMaskPs08722::on_field_event(TOperable_field& o, TField_event e, long jolly
 
 void TMaskPs08722::update_sheet()
 {
-	
 	if (_sht != NULL)
 	{
 		delete _sht;
@@ -111,8 +111,7 @@ void TMaskPs08722::update_sheet()
 	}
 	else
 	{
-		TFilename name("StampaSchedProd.rep");
+		TFilename name = "StampaSchedProd.rep";
-
 		name.custom_path();
 		_rep.load(name);
 	}
@@ -139,26 +138,26 @@ void TMaskPs08722::update_sheet()
 		r->set_var("#AL", var);
 		var = "F";
 		r->set_var("#F", var);
+
+    _sht = new TCursor_sheet(r->cursor(), " |33->DATADOC|NDOC|CODARTMAG|20->RAGSOC", TR("Selezione clienti per codice"),
+		                         HR("@1|Data@10|Numero|Articolo@20|Ragione Sociale@50"), 0, 1);
+	  _sht->check(-1);
 	}
 	_select_changed = false;
-	_sht = new TCursor_sheet(r->cursor(), " |33->DATADOC|NDOC|CODARTMAG|20->RAGSOC", "Selezione clienti per codice",
-		                                    "@1|Data@10|Numero|Articolo@20|Ragione Sociale@50",0,1);
-	_sht->check(-1);
 }
 
 class TStampaProduzionePs0872 : public TSkeleton_application  
 {
-  TMaskPs08722 * _mask;
+  TMaskPs08722* _mask;
 	virtual bool check_autorization() const {return false;}
-  virtual const char * extra_modules() const {return "ve";}
+  virtual const char* extra_modules() const {return "ve";}
-
 
 protected:
   virtual void main_loop();
   virtual bool create();
 
 public:
-  const TMaskPs08722 & mask() const {return *_mask;}
+  const TMaskPs08722& mask() const {return *_mask;}
   virtual ~TStampaProduzionePs0872();
 };
 
@@ -233,6 +232,6 @@ bool TReportPs08722::get_usr_val(const TString& name, TVariant& var) const
 int ps0872200(int argc, char* argv[])
 {
   TStampaProduzionePs0872 a;
-  a.run(argc, argv, "Stampa Produzione RealPlast");
+  a.run(argc, argv, TR("Stampa Produzione RealPlast"));
   return 0;
 }

ps/ps0872200a.uml

@@ -14,7 +14,7 @@ BEGIN
 	 CHECKTYPE REQUIRED
 END
 
-NUMBER F_DACLI 7
+NUMBER F_DACLI 6
 BEGIN
    PROMPT 2 4 "Da Cliente     "
    USE 20
@@ -23,17 +23,18 @@ BEGIN
    DISPLAY "Codice@10" CODCF
    DISPLAY "Descrizione@50" RAGSOC
    OUTPUT F_DACLI CODCF
+   CHECKTYPE SEARCH
 END
 
-NUMBER F_ACLI 7
+NUMBER F_ACLI 6
 BEGIN
    PROMPT 42 4 "A Cliente      "
-   USE 20
+   COPY USE F_DACLI
 	 INPUT TIPOCF "C"
    INPUT CODCF F_ACLI
-   DISPLAY "Codice@10" CODCF
+   COPY DISPLAY F_DACLI
-   DISPLAY "Descrizione@50" RAGSOC
    OUTPUT F_ACLI CODCF
+   CHECKTYPE SEARCH
 END
 
 DATE F_DAL
@@ -55,21 +56,24 @@ BEGIN
 	 CHECKTYPE REQUIRED
 END
 
+ENDPAGE
+
+TOOLBAR "" 0 0 58 2
+
 BUTTON DLG_OK 10 2
 BEGIN 
   PROMPT -13 -1 ""
+  PICTURE TOOL_PRINT
 END  
 
 BUTTON DLG_SELECT 10 2
 BEGIN 
-  PROMPT -23 -1 "~Seleziona"
+  PROMPT -23 -1 "~Selezione"
+  PICTURE TOOL_MULTISEL
 	FLAGS "D"
 END  
 
-BUTTON DLG_QUIT 10 2
+#include <helpbar.h>
-BEGIN 
-  PROMPT -33 -1 ""
-END  
 
 ENDPAGE
 ENDMASK