From e4b38035694bd396add1111469bedb41c0c443ef Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 12 Apr 1996 08:23:03 +0000 Subject: [PATCH] Corretti errori da MI git-svn-id: svn://10.65.10.50/trunk@2720 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- sc/sc2100a.h | 7 ++-- sc/sc2100a.uml | 96 ++++++++++++++++++++++++++------------------------ sc/sc2101.cpp | 23 +++++++++++- sc/sc2101.h | 1 + sc/sc2400a.uml | 8 +++-- sc/sc2401.cpp | 50 +++++++++++++++++++++++--- sc/sc2401.h | 3 ++ sc/sc3100.cpp | 6 +++- sc/sc3100a.uml | 36 +++++++++---------- sc/sc3100c.uml | 10 +++--- sc/sc3100s.uml | 2 +- 11 files changed, 157 insertions(+), 85 deletions(-) diff --git a/sc/sc2100a.h b/sc/sc2100a.h index ee6dded03..14e1a34be 100755 --- a/sc/sc2100a.h +++ b/sc/sc2100a.h @@ -15,8 +15,7 @@ #define F_DATASEND 116 #define F_CLIFO 117 - -// basename of profile +// basename of profile #define BASE_EC_PROFILE "PEC" - -#endif \ No newline at end of file + +#endif diff --git a/sc/sc2100a.uml b/sc/sc2100a.uml index 72da6517a..74656de24 100755 --- a/sc/sc2100a.uml +++ b/sc/sc2100a.uml @@ -4,17 +4,17 @@ PAGE "Stampa estratti conto" -1 -1 68 18 NUMBER F_CODDITTA 5 -BEGIN +BEGIN PROMPT 1 1 "Cod. " - FLAGS "DFR" - USE LF_NDITTE - INPUT CODDITTA F_CODDITTA - OUTPUT F_RAGSOC RAGSOC - CHECKTYPE REQUIRED + FLAGS "DFR" + USE LF_NDITTE + INPUT CODDITTA F_CODDITTA + OUTPUT F_RAGSOC RAGSOC + CHECKTYPE REQUIRED END STRING F_RAGSOC 50 46 -BEGIN +BEGIN PROMPT 13 1 "R.S. " FLAGS "D" END @@ -25,147 +25,149 @@ BEGIN END NUMBER F_CODPROF 4 -BEGIN - PROMPT 1 3 "Profilo " +BEGIN + PROMPT 1 3 "Profilo " FLAGS "Z" USE LF_FORM INPUT TIPOPROF BASE_EC_PROFILE - INPUT CODPROF[1,4] F_CODPROF + 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 + OUTPUT F_DESPROF DESC +// CHECKTYPE REQUIRED FIELD ANTICLEAR WARNING "Codice profilo o lingua errato" END STRING F_LINPROF 1 -BEGIN - PROMPT 18 3 "" +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 -BEGIN +BEGIN PROMPT 25 3 "" FLAGS "D" END DATE F_DATALIMOP -BEGIN +BEGIN PROMPT 1 4 "Data limite operazione " -// FLAGS "A" +// FLAGS "A" // CHECKTYPE REQUIRED END DATE F_DATALIMSC -BEGIN +BEGIN PROMPT 1 5 "Data limite scaduto " FLAGS "A" CHECKTYPE REQUIRED END NUMBER F_GIORISCH 3 -BEGIN +BEGIN PROMPT 1 6 "Giorni calcolo rischio " GROUP 1 END BOOLEAN F_STAMPCHIU -BEGIN - PROMPT 1 7 "Stampa partite chiuse" +BEGIN + PROMPT 1 7 "Stampa partite chiuse" MESSAGE FALSE DISABLE,F_DATACHIU MESSAGE TRUE ENABLE,F_DATACHIU END DATE F_DATACHIU -BEGIN +BEGIN PROMPT 25 7 "dal " FLAGS "D" END STRING F_LUOGOSEND 50 32 -BEGIN +BEGIN PROMPT 1 8 "Luogo d'invio " END DATE F_DATASEND -BEGIN +BEGIN PROMPT 50 8 "data " - FLAGS "A" + FLAGS "A" CHECKTYPE REQUIRED END RADIOBUTTON SC_CLIFO 20 -BEGIN - PROMPT 0 10 "Selezione" +BEGIN + PROMPT 0 10 "Selezione" ITEM "C|Clienti" MESSAGE ENABLE,1@ ITEM "F|Fornitori" MESSAGE CLEAR,1@ END RADIOBUTTON SC_SORTCF 20 -BEGIN - PROMPT 25 10 "Ordinamento" +BEGIN + PROMPT 25 10 "Ordinamento" ITEM "1|Per codice" MESSAGE HIDE,2@|SHOW,3@ ITEM "2|Per ragione sociale" MESSAGE HIDE,3@|SHOW,2@ END BUTTON SC_SELECT 10 1 -BEGIN +BEGIN PROMPT 51 11 "~Selezione" END BUTTON SC_RESET 10 1 -BEGIN +BEGIN PROMPT 51 12 "~Azzera" END NUMBER SC_CFCODFR 5 -BEGIN +BEGIN PROMPT 1 14 "Da codice " GROUP 3 END BUTTON SC_CFBUTFR 2 1 -BEGIN +BEGIN PROMPT 31 14 "" PICTURE 109 GROUP 3 END NUMBER SC_CFCODTO 5 -BEGIN +BEGIN PROMPT 36 14 "a codice " GROUP 3 END - + BUTTON SC_CFBUTTO 2 1 -BEGIN +BEGIN PROMPT 51 14 "" PICTURE 109 GROUP 3 END STRING SC_CFDESFR 50 30 -BEGIN +BEGIN PROMPT 1 14 "Da ragione sociale " GROUP 2 FLAGS "H" END BUTTON SC_CFDESBUTFR 2 1 -BEGIN +BEGIN PROMPT 51 14 "" PICTURE 109 GROUP 2 @@ -173,17 +175,17 @@ BEGIN END STRING SC_CFDESTO 50 30 -BEGIN +BEGIN PROMPT 1 15 "A ragione sociale " GROUP 2 FLAGS "H" END - + BUTTON SC_CFDESBUTTO 2 1 -BEGIN +BEGIN PROMPT 51 15 "" PICTURE 109 - GROUP 2 + GROUP 2 FLAGS "H" END @@ -191,8 +193,8 @@ NUMBER SC_NSEL 3 BEGIN PROMPT 56 14 "N. " FLAGS "D" -END - +END + BUTTON DLG_PRINT 10 2 BEGIN PROMPT -12 -1 "" diff --git a/sc/sc2101.cpp b/sc/sc2101.cpp index df2cce879..0e68ea8fd 100755 --- a/sc/sc2101.cpp +++ b/sc/sc2101.cpp @@ -6,6 +6,25 @@ #include +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()) @@ -17,7 +36,8 @@ bool TEC_mask::lingua_handler(TMask_field& f, KEY k) f.mask().field(F_CODPROF).check(RUNNING_CHECK); } return TRUE; -} +} + TEC_mask::TEC_mask(const char* name) : TSelection_mask(name), _ditta(LF_NDITTE) @@ -26,6 +46,7 @@ TEC_mask::TEC_mask(const char* name) : TSelection_mask(name), _ditta(LF_NDITTE) _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); } diff --git a/sc/sc2101.h b/sc/sc2101.h index 19593b451..637264990 100755 --- a/sc/sc2101.h +++ b/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; diff --git a/sc/sc2400a.uml b/sc/sc2400a.uml index c242d4a19..f5bfb67af 100755 --- a/sc/sc2400a.uml +++ b/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 @@ -60,7 +62,7 @@ BEGIN END DATE F_DATALIMOP -BEGIN +BEGIN PROMPT 30 4 "Data limite operazione " END diff --git a/sc/sc2401.cpp b/sc/sc2401.cpp index 2b877514a..000f36960 100755 --- a/sc/sc2401.cpp +++ b/sc/sc2401.cpp @@ -11,15 +11,52 @@ #include #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); } diff --git a/sc/sc2401.h b/sc/sc2401.h index 4c57389f0..dadf14e13 100755 --- a/sc/sc2401.h +++ b/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; diff --git a/sc/sc3100.cpp b/sc/sc3100.cpp index 6fbdaca83..f9c49cc5a 100755 --- a/sc/sc3100.cpp +++ b/sc/sc3100.cpp @@ -185,7 +185,11 @@ bool TForm_EC_editor::cpy_handler(TMask_field& f, KEY k) TLocalisamfile frm(LF_FORM),rfr(LF_RFORM); TMask mm("sc3100b"); mm.set_handler(F_CCODES,ccodes_handler); - mm.set_handler(F_CCODELS,clngs_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 { diff --git a/sc/sc3100a.uml b/sc/sc3100a.uml index 2aab1dc38..3f8fcec16 100755 --- a/sc/sc3100a.uml +++ b/sc/sc3100a.uml @@ -7,51 +7,51 @@ 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 -BEGIN +BEGIN PROMPT 2 2 "Codice profilo " FLAGS "Z" -HELP "Codice del profilo" -USE LF_FORM SELECT (TIPOPROF==BASE_EC_PROFILE) +HELP "Codice del profilo" +USE LF_FORM JOIN %LNG TO LF_FORM ALIAS 200 INTO CODTAB==CODPROF[5,5] -INPUT TIPOPROF F_BASE -INPUT CODPROF[1,4] F_CODE +INPUT TIPOPROF F_BASE SELECT +INPUT CODPROF[1,4] F_CODE INPUT CODPROF[5,5] F_CODEL -DISPLAY "Profilo base" TIPOPROF +DISPLAY "Profilo base" TIPOPROF DISPLAY "Codice" CODPROF[1,4] DISPLAY "Lingua" CODPROF[5,5] -DISPLAY "Descrizione@50" DESC -DISPLAY "Desc. Lingua@50" -200->S0 +DISPLAY "Descrizione@50" DESC +DISPLAY "Desc. Lingua@50" -200->S0 OUTPUT F_BASE TIPOPROF OUTPUT F_CODE CODPROF[1,4] OUTPUT F_CODEL CODPROF[5,5] OUTPUT F_DESC DESC -END +END STRING F_CODEL 1 -BEGIN +BEGIN PROMPT 40 2 "Codice lingua " FLAGS "U" -HELP "Codice lingua del profilo" +HELP "Codice lingua del profilo" USE %LNG INPUT CODTAB F_CODEL DISPLAY "Codice lingua" CODTAB DISPLAY "Decrizione@50" S0 OUTPUT F_CODEL CODTAB CHECKTYPE NORMAL -END +END STRING F_DESC 50 -BEGIN +BEGIN PROMPT 2 3 "Descrizione " -HELP "Descrizione profilo utente" +HELP "Descrizione profilo utente" COPY ALL F_CODE -VALIDATE NOT_EMPTY_FUNC +VALIDATE NOT_EMPTY_FUNC WARNING "La descrizione e' obbligatoria" -END +END BUTTON DLG_OK 9 2 BEGIN @@ -59,7 +59,7 @@ PROMPT -14 -1 "" END BUTTON DLG_DELREC 9 2 -BEGIN +BEGIN PROMPT -24 -1 "" MESSAGE EXIT,K_DEL END diff --git a/sc/sc3100c.uml b/sc/sc3100c.uml index db999f8d5..119c47ebf 100755 --- a/sc/sc3100c.uml +++ b/sc/sc3100c.uml @@ -3,15 +3,15 @@ PAGE "Dati generali" -1 -1 78 14 LIST F_SFONT 2 16 -BEGIN +BEGIN PROMPT 1 1 "Font " ITEM "Courier New|Courier New" HELP "Font di stampa su video o stampante" -END +END LIST F_SSIZE 3 BEGIN -PROMPT 1 2 "Dimensione " +PROMPT 1 2 "Dimensione " ITEM "12|12" HELP "Dimensioni del carattere di stampa" END @@ -54,7 +54,7 @@ PROMPT 72 3 "" HELP "Coordinata Y di posizionamento" END -BOOLEAN F_SVALUTA +BOOLEAN F_SVALUTA BEGIN PROMPT 1 5 " E.C. in valuta" END @@ -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 diff --git a/sc/sc3100s.uml b/sc/sc3100s.uml index 90a3ec954..eaedc97d3 100755 --- a/sc/sc3100s.uml +++ b/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"