Corretti errori da MI

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

sc/sc2100a.h

@@ -15,7 +15,6 @@
 #define F_DATASEND  116
 #define F_CLIFO     117
 
- 
 // basename of profile
 #define BASE_EC_PROFILE "PEC"
 

sc/sc2100a.uml

@@ -32,12 +32,13 @@ BEGIN
   INPUT TIPOPROF BASE_EC_PROFILE
   INPUT CODPROF[1,4] F_CODPROF
   INPUT CODPROF[5,5] F_LINPROF
-  DISPLAY "Codice" CODPROF
+  DISPLAY "Codice" CODPROF[1,4]
+  DISPLAY "Lingua" CODPROF[5,5]
   DISPLAY "Descrizione@50" DESC
   OUTPUT F_CODPROF CODPROF[1,4]
   OUTPUT F_LINPROF CODPROF[5,5]
   OUTPUT F_DESPROF DESC
-  CHECKTYPE REQUIRED
+//  CHECKTYPE REQUIRED
   FIELD ANTICLEAR
   WARNING "Codice profilo o lingua errato"
 END
@@ -46,13 +47,14 @@ STRING F_LINPROF 1
 BEGIN
   PROMPT 18 3 ""
   FLAGS "U"
-  USE %LNG
+ USE %LNG
   INPUT CODTAB F_LINPROF
   DISPLAY "Codice" CODTAB
   DISPLAY "Descrizione@50" S0
   OUTPUT F_LINPROF CODTAB
+  COPY ALL F_CODPROF
   CHECKTYPE NORMAL
-  WARNING "Codice profilo o lingua errato"
+  WARNING "Codice lingua errato"
 END
 
 STRING F_DESPROF 50 40

sc/sc2101.cpp

@@ -6,6 +6,25 @@
 
 #include <comuni.h>
 
+bool TEC_mask::codprof_handler(TMask_field& f, KEY k)
+{                                                             
+  if (f.to_check(k))
+  {
+    TEdit_field & e = (TEdit_field &) f;
+    
+    e.check_type(CHECK_REQUIRED);
+    
+    const bool ok = e.check();
+    
+    e.check_type(CHECK_NONE);
+    
+    if (k == K_ENTER && !ok)
+      return f.error_box(f.warning());
+  }
+  return TRUE;
+}                   
+
+
 bool TEC_mask::lingua_handler(TMask_field& f, KEY k)
 {             
   if (k == K_TAB && f.focusdirty())
@@ -20,12 +39,14 @@ bool TEC_mask::lingua_handler(TMask_field& f, KEY k)
 } 
 
 
+
 TEC_mask::TEC_mask(const char* name) : TSelection_mask(name), _ditta(LF_NDITTE)
 {
   _ditta.add(LF_ANAG,   "TIPOA==TIPOA|CODANAGR==CODANAGR");
   _ditta.add(LF_COMUNI, "COM==COMRF(COMRES)", 1, LF_ANAG, 101);
   _ditta.add(LF_COMUNI, "COM==COMRES", 1, LF_ANAG, 102);
 
+   set_handler(F_CODPROF, codprof_handler);
    set_handler(F_LINPROF, lingua_handler);
 }
 

sc/sc2101.h

@@ -14,6 +14,7 @@ protected:  // TMask
   virtual void start_run();
 
   static bool lingua_handler(TMask_field& f, KEY k);
+  static bool codprof_handler(TMask_field& f, KEY k);
 
 public:
   const char* get_prof_base() const;

sc/sc2400a.uml

@@ -32,12 +32,13 @@ BEGIN
   INPUT TIPOPROF BASE_EC_PROFILE
   INPUT CODPROF[1,4] F_CODPROF
   INPUT CODPROF[5,5] F_LINPROF
-  DISPLAY "Codice" CODPROF
+  DISPLAY "Codice" CODPROF[1,4]
+  DISPLAY "Lingua" CODPROF[5,5]
   DISPLAY "Descrizione@50" DESC
   OUTPUT F_CODPROF CODPROF[1,4]
   OUTPUT F_LINPROF CODPROF[5,5]
   OUTPUT F_DESPROF DESC
-  CHECKTYPE REQUIRED
+//  CHECKTYPE REQUIRED
   FIELD ANTICLEAR
   WARNING "Codice profilo o lingua errato"
 END
@@ -51,6 +52,7 @@ BEGIN
   DISPLAY "Descrizione@50" S0
   OUTPUT F_LINPROF CODTAB
   CHECKTYPE NORMAL
+  WARNING "Codice lingua errato"
 END
 
 STRING F_DESPROF 50 40

sc/sc2401.cpp

@@ -11,15 +11,52 @@
 #include <causali.h>
 #define DA_VUOTARE "***"
 
-TESSL_mask::TESSL_mask(const char *name) : TSelection_mask(name), _ditta(LF_NDITTE) {
+bool TESSL_mask::codprof_handler(TMask_field& f, KEY k)
+{                                                             
+  if (f.to_check(k))
+  {
+    TEdit_field & e = (TEdit_field &) f;
+    
+    e.check_type(CHECK_REQUIRED);
+    
+    const bool ok = e.check();
+    
+    e.check_type(CHECK_NONE);
+    
+    if (k == K_ENTER && !ok)
+      return f.error_box(f.warning());
+  }
+  return TRUE;
+}                   
+
+bool TESSL_mask::lingua_handler(TMask_field& f, KEY k)
+{             
+  if (k == K_TAB && f.focusdirty())
+  {
+    TCursor& cur = *(((TEdit_field&)(f.mask().field(F_CODPROF))).browse()->cursor());
+    // whew
+    TString16 lin = f.get();      
+    if (lin != cur.curr().get("CODPROF").mid(4))
+      f.mask().field(F_CODPROF).check(RUNNING_CHECK);
+  }                           
+  return TRUE;
+} 
+
+
+TESSL_mask::TESSL_mask(const char *name) : TSelection_mask(name), _ditta(LF_NDITTE)
+{
   _ditta.add(LF_ANAG, "TIPOA==TIPOA|CODANAGR==CODANAGR");
   _ditta.add(LF_COMUNI, "COM==COMRF(COMRES)", 1, LF_ANAG, 101);
   _ditta.add(LF_COMUNI, "COM==COMRES", 1, LF_ANAG, 102);
+ 
+   set_handler(F_CODPROF, codprof_handler);
+   set_handler(F_LINPROF, lingua_handler);
 }
 
 TESSL_mask::~TESSL_mask() {}             
 
-void TESSL_mask::on_firm_change() {    
+void TESSL_mask::on_firm_change()
+{    
   TMask::on_firm_change();
 
   _ditta[0].put("CODDITTA", prefix().get_codditta());
@@ -29,15 +66,18 @@ void TESSL_mask::on_firm_change() {
   }    
 }
 
-void TESSL_mask::start_run() {
+void TESSL_mask::start_run()
+{
   on_firm_change();
 }
 
-const char *TESSL_mask::get_prof_base() const {
+const char *TESSL_mask::get_prof_base() const
+{
   return BASE_EC_PROFILE;
 } 
 
-const TString &TESSL_mask::get_prof_code() const {
+const TString &TESSL_mask::get_prof_code() const
+{
   return get(F_CODPROF);
 } 
 

sc/sc2401.h

@@ -28,6 +28,9 @@ protected:
   virtual void on_firm_change();
   virtual void start_run();
 
+  static bool lingua_handler(TMask_field& f, KEY k);
+  static bool codprof_handler(TMask_field& f, KEY k);
+
 public:
   const char *get_prof_base() const;
   const TString &get_prof_code() const;

sc/sc3100.cpp

@@ -186,6 +186,10 @@ bool TForm_EC_editor::cpy_handler(TMask_field& f, KEY k)
     TMask mm("sc3100b");
     mm.set_handler(F_CCODES,ccodes_handler);
     mm.set_handler(F_CCODELS,clngs_handler); 
+    const TMask & m = f.mask();
+    mm.set(F_CCODED, m.get(F_CODE));
+    mm.set(F_CCODELD, m.get(F_CODEL));
+    mm.set(F_CDESCD, m.get(F_DESC));
     mm.set(F_CBASE,BASE_EC_PROFILE);
     while (mm.run() == K_ENTER) // Prende in input il nome del profilo sorgente
     {

sc/sc3100a.uml

@@ -7,7 +7,7 @@ PAGE "Scelta profilo" -1 -1 75 6
 STRING F_BASE 8
 BEGIN
 PROMPT 2 1 "Profilo base   "
-FLAGS "D"
+FLAGS "DP"
 END
 
 NUMBER F_CODE 4
@@ -15,9 +15,9 @@ BEGIN
 PROMPT 2 2 "Codice profilo "
 FLAGS "Z"
 HELP "Codice del profilo"
-USE LF_FORM  SELECT (TIPOPROF==BASE_EC_PROFILE) 
+USE LF_FORM
 JOIN %LNG TO LF_FORM ALIAS 200 INTO CODTAB==CODPROF[5,5]
-INPUT TIPOPROF F_BASE
+INPUT TIPOPROF F_BASE SELECT
 INPUT CODPROF[1,4] F_CODE
 INPUT CODPROF[5,5] F_CODEL
 DISPLAY "Profilo base" TIPOPROF

sc/sc3100c.uml

@@ -127,7 +127,7 @@ END
 
 BUTTON DLG_FINK 10 2
 BEGIN
-PROMPT -14 10 "~Fincatura"
+PROMPT -14 10 "F~incatura"
 MESSAGE EXIT,K_F3
 END
 

sc/sc3100s.uml

@@ -40,7 +40,7 @@ BEGIN
   ITEM   "Pr"              
   ITEM   "Y@2"              
   ITEM   "X@3"
-  ITEM   "Lun."
+  ITEM   "Larg."
   ITEM   "Col." 
   ITEM   "Intestazione colonna@40"
   ITEM   "Spazi"