From b59ecc61967c64d876c50f5b4be9c13c8a4ab93d Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 29 Sep 2009 09:12:17 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento :aggiunta maschera di copia/crea listino (senza programma x ora!) git-svn-id: svn://10.65.10.50/trunk@19348 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/ve2500.cpp | 80 +++++++++++----- ve/ve2500a.h | 1 - ve/ve2500a.uml | 9 +- ve/ve2500b.h | 21 +++++ ve/ve2500b.uml | 250 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 331 insertions(+), 30 deletions(-) create mode 100755 ve/ve2500b.h create mode 100755 ve/ve2500b.uml diff --git a/ve/ve2500.cpp b/ve/ve2500.cpp index 6215d2aeb..7f5a82120 100755 --- a/ve/ve2500.cpp +++ b/ve/ve2500.cpp @@ -7,17 +7,47 @@ #include "rcondv.h" #include "ve2500a.h" +#include "ve2500b.h" -/////////////////////////////////////////////////////////////// -// MASCHERA -/////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////// +// MASCHERA SECONDARIA DI GENERAZIONE LISTINO +//////////////////////////////////////////////////////////////////// +class TGestione_listini_semplice_mask_genera: public TAutomask +{ +protected: + +public: + void crea_listino(); + virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); + TGestione_listini_semplice_mask_genera(TSheet_field& sf_righe); +}; + + +bool TGestione_listini_semplice_mask_genera::on_field_event(TOperable_field& o, TField_event e, long jolly) +{ + return true; +} + +TGestione_listini_semplice_mask_genera::TGestione_listini_semplice_mask_genera(TSheet_field& sf_righe) : TAutomask("ve2500b") +{ + const bool gesliscv = ini_get_bool(CONFIG_DITTA, "ve", "GESLISCV"); + enable(F_CATVEN, gesliscv); + enable(F_DESVEN, gesliscv); +} + +void TGestione_listini_semplice_mask_genera::crea_listino() +{ + +} + +//////////////////////////////////////////////////////////////////// +// MASCHERA PRINCIPALE DI GESTIONE LISTINO (quella con lo sheet) +//////////////////////////////////////////////////////////////////// class TGestione_listini_semplice_mask: public TAutomask { protected: virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); - void crea_listino_da_anagrafica(); - void copia_listino(); public: int find_art(TSheet_field& s, const char tipo, const TString& art, const int tranne = -1) const; @@ -78,14 +108,6 @@ int TGestione_listini_semplice_mask::find_art(TSheet_field& s, const char tipo, return r; } -void TGestione_listini_semplice_mask::crea_listino_da_anagrafica() -{ - -} - -void TGestione_listini_semplice_mask::copia_listino() -{ -} bool TGestione_listini_semplice_mask::on_field_event(TOperable_field &o, TField_event e, long jolly) { @@ -185,12 +207,10 @@ bool TGestione_listini_semplice_mask::on_field_event(TOperable_field &o, TField_ case DLG_CREA: if (e == fe_button) { - crea_listino_da_anagrafica(); - } - break; - case DLG_COPIA: - { - copia_listino(); + TSheet_field& sf_righe = sfield(F_L_RIGHE); + TGestione_listini_semplice_mask_genera mask_gen(sf_righe); + if (mask_gen.run()) + mask_gen.crea_listino(); } break; default: @@ -216,14 +236,13 @@ protected: virtual bool user_destroy(); virtual TMask *get_mask(int) { return _mask; } virtual bool changing_mask(int) { return false; } -// virtual void init_query_mode(TMask& m); -// virtual void init_insert_mode(TMask& m); -// virtual void init_modify_mode(TMask& m); + virtual void init_query_mode(TMask& m); + virtual void init_insert_mode(TMask& m); + virtual void init_modify_mode(TMask& m); virtual bool protected_record(TRectype& rec); virtual int read(TMask& m); -// virtual bool remove(); virtual int write(const TMask& m); virtual int rewrite(const TMask& m); @@ -391,6 +410,21 @@ int TGestione_listini_semplice::write(const TMask& m) return err; } +void TGestione_listini_semplice::init_query_mode(TMask& m) +{ + m.disable(DLG_CREA); +} + +void TGestione_listini_semplice::init_insert_mode(TMask& m) +{ + m.enable(DLG_CREA); +} + +void TGestione_listini_semplice::init_modify_mode(TMask& m) +{ + m.enable(DLG_CREA); +} + bool TGestione_listini_semplice::user_create() { //controlla che solo il producer AGA possa usare questo programma diff --git a/ve/ve2500a.h b/ve/ve2500a.h index fead542ec..fbcdff7d8 100755 --- a/ve/ve2500a.h +++ b/ve/ve2500a.h @@ -67,7 +67,6 @@ //bottoni #define DLG_CREA 501 -#define DLG_COPIA 502 diff --git a/ve/ve2500a.uml b/ve/ve2500a.uml index c4c6081bb..2cd14ccd2 100755 --- a/ve/ve2500a.uml +++ b/ve/ve2500a.uml @@ -1,7 +1,8 @@ #include "ve2500a.h" TOOLBAR "Toolbar" 0 0 0 2 -#include + +#include BUTTON DLG_CREA 2 2 BEGIN @@ -9,11 +10,7 @@ BEGIN PICTURE TOOL_IMPORT END -BUTTON DLG_COPIA 2 2 -BEGIN - PROMPT 11 -1 "Co~pia" - PICTURE TOOL_COPY -END +#include ENDPAGE diff --git a/ve/ve2500b.h b/ve/ve2500b.h new file mode 100755 index 000000000..d1ed7920e --- /dev/null +++ b/ve/ve2500b.h @@ -0,0 +1,21 @@ +//campi maschera ve2500b.uml (parametri di creazione nuovi listini) + +#define F_SELECT 101 + +#define F_CATVEN 102 +#define F_DESVEN 103 +#define F_COD 104 +#define F_DESCR 105 +#define F_RICARICO 106 + +#define F_DACODART 107 +#define F_DADESART 108 +#define F_ACODART 109 +#define F_ADESART 110 +#define F_GRMERC 111 +#define F_SOTGRMERC 112 +#define F_DESGRMERC 113 +#define F_RAGFIS 114 +#define F_DESRAGFIS 115 +#define F_COPIATESTA 116 + diff --git a/ve/ve2500b.uml b/ve/ve2500b.uml new file mode 100755 index 000000000..93581920e --- /dev/null +++ b/ve/ve2500b.uml @@ -0,0 +1,250 @@ +#include "ve2500b.h" + +TOOLBAR "Toolbar" 0 0 0 2 + +#include + +ENDPAGE + +PAGE "Creazione nuovo listino" 0 2 0 0 + +RADIOBUTTON F_SELECT 76 +BEGIN + PROMPT 1 1 "@bTipologia di generazione" + ITEM "1|Copia da listino esistente" + MESSAGE HIDE,2@|HIDE,3@|HIDE,4@|SHOW,1@ + ITEM "2|Anagrafica articoli" + MESSAGE HIDE,1@|HIDE,3@|HIDE,4@|SHOW,2@ + ITEM "3|Gruppo merceologico" + MESSAGE HIDE,1@|HIDE,2@|HIDE,4@|SHOW,3@ + ITEM "4|Raggruppamento fiscale" + MESSAGE HIDE,1@|HIDE,2@|HIDE,3@|SHOW,4@ +END + +//Copia listino esistente +//----------------------------------------------- +GROUPBOX DLG_NULL 76 5 +BEGIN + PROMPT 1 7 "@bDati listino origine" + GROUP 1 +END + +STRING F_CATVEN 2 +BEGIN + PROMPT 2 8 "Cat. vend. " + FIELD CATVEN + FLAGS "U" + KEY 1 + USE CVE + INPUT CODTAB F_CATVEN + DISPLAY "Cat." CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CATVEN CODTAB + OUTPUT F_DESVEN S0 + CHECKTYPE FORCED + GROUP 1 +END + +STRING F_DESVEN 50 +BEGIN + PROMPT 21 8 "" + USE CVE KEY 2 + INPUT S0 F_DESVEN + DISPLAY "Descrizione@50" S0 + DISPLAY "Cat." CODTAB + COPY OUTPUT F_CATVEN + CHECKTYPE NORMAL + GROUP 1 +END + +STRING F_COD 3 +BEGIN + PROMPT 2 9 "Listino " + FLAGS "U" + KEY 1 + USE LF_CONDV + INPUT TIPO "L" + INPUT CATVEN F_CATVEN SELECT + INPUT COD F_COD + DISPLAY "C.V." CATVEN + DISPLAY "Codice" COD + DISPLAY "Descrizione@50" DESCR + DISPLAY "Valuta" CODVAL + DISPLAY "Fine validita'" VALFIN + OUTPUT F_CATVEN CATVEN + OUTPUT F_COD COD + OUTPUT F_DESCR DESCR + CHECKTYPE REQUIRED + GROUP 1 +END + +STRING F_DESCR 50 +BEGIN + PROMPT 21 9 "" + GROUP 1 +END + +NUMBER F_RICARICO 5 2 +BEGIN + PROMPT 2 10 "Ricarico " + NUM_EXPR (#F_RICARICO>=-100)&&(#F_RICARICO<=100) + WARNING "La percentuale di ricarico deve essere compresa tra -100 e 100" + GROUP 1 +END + +BOOLEAN F_COPIATESTA +BEGIN + PROMPT 21 10 "Copia tutti i dati di testata" + GROUP 1 +END + +//Generazione da anagrafica articoli +//----------------------------------------------- +GROUPBOX DLG_NULL 76 6 +BEGIN + PROMPT 1 7 "@bAnagrafica articoli" + GROUP 2 +END + +STRING F_DACODART 20 +BEGIN + PROMPT 2 8 "Da articolo " + FLAGS "U" + USE LF_ANAMAG + INPUT CODART F_DACODART + DISPLAY "Articolo@20" CODART + DISPLAY "Descrizione@50" DESCR + OUTPUT F_DACODART CODART + OUTPUT F_DADESART DESCR + CHECKTYPE NORMAL + ADD RUN ve2 -3 + GROUP 2 +END + +STRING F_DADESART 50 35 +BEGIN + PROMPT 38 8 "" + USE LF_ANAMAG KEY 2 + INPUT DESCR F_DADESART + DISPLAY "Descrizione@50" DESCR + DISPLAY "Articolo@20" CODART + COPY OUTPUT F_DACODART + CHECKTYPE NORMAL + ADD RUN ve2 -3 + GROUP 2 +END + +STRING F_ACODART 20 +BEGIN + PROMPT 2 9 "A articolo " + FLAGS "U" + USE LF_ANAMAG + INPUT CODART F_ACODART + COPY DISPLAY F_DACODART + OUTPUT F_ACODART CODART + OUTPUT F_ADESART DESCR + CHECKTYPE NORMAL + ADD RUN ve2 -3 + GROUP 2 +END + +STRING F_ADESART 50 35 +BEGIN + PROMPT 38 9 "" + USE LF_ANAMAG KEY 2 + INPUT DESCR F_ADESART + COPY DISPLAY F_DADESART + COPY OUTPUT F_ACODART + CHECKTYPE NORMAL + ADD RUN ve2 -3 + GROUP 2 +END + +STRING F_GRMERC 3 +BEGIN + PROMPT 2 10 "Gr. merc. " + FLAGS "U" + USE GMC SELECT CODTAB[4,5] == "" + INPUT CODTAB[1,3] F_GRMERC + DISPLAY "Gruppo" CODTAB[1,3] + DISPLAY "Descrizione@50" S0 + OUTPUT F_GRMERC CODTAB[1,3] + OUTPUT F_DESGRMERC S0 + CHECKTYPE NORMAL + GROUP 2 3 +END + +STRING F_SOTGRMERC 5 +BEGIN + PROMPT 20 10 "" + FLAGS "U" + USE GMC SELECT CODTAB[4,5] != "" + COPY INPUT F_GRMERC + INPUT CODTAB[4,5] F_SOTGRMERC + DISPLAY "Gruppo" CODTAB[1,3] + DISPLAY "Sottogruppo" CODTAB[4,5] + DISPLAY "Descrizione@50" S0 + COPY OUTPUT F_GRMERC + OUTPUT F_SOTGRMERC CODTAB[4,5] + CHECKTYPE NORMAL + GROUP 2 3 +END + +STRING F_DESGRMERC 50 45 +BEGIN + PROMPT 28 10 "" + USE GMC KEY 2 + INPUT S0 F_DESGRMERC + DISPLAY "Descrizione@50" S0 + DISPLAY "Gruppo" CODTAB[1,3] + DISPLAY "Sottogruppo" CODTAB[4,5] + COPY OUTPUT F_SOTGRMERC + CHECKTYPE NORMAL + GROUP 2 3 +END + +STRING F_RAGFIS 5 +BEGIN + PROMPT 2 11 "Raggr. fis. " + FLAGS "U" + USE RFA + INPUT CODTAB F_RAGFIS + DISPLAY "Ragg. fisc." CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_RAGFIS CODTAB + OUTPUT F_DESRAGFIS S0 + CHECKTYPE NORMAL + GROUP 2 4 +END + +STRING F_DESRAGFIS 50 +BEGIN + PROMPT 23 11 "" + USE RFA KEY 2 + INPUT S0 F_DESRAGFIS + DISPLAY "Descrizione@50" S0 + DISPLAY "Ragg. fisc." CODTAB + COPY OUTPUT F_RAGFIS + CHECKTYPE NORMAL + GROUP 2 4 +END + +//Generazione da gruppo merceologico +//----------------------------------------------- +GROUPBOX DLG_NULL 76 3 +BEGIN + PROMPT 1 9 "@bGruppo merceologico" + GROUP 3 +END + +//Generazione da raggruppamento fiscale +//----------------------------------------------- +GROUPBOX DLG_NULL 76 3 +BEGIN + PROMPT 1 10 "@bRaggruppamento fiscale" + GROUP 4 +END + +ENDPAGE + +ENDMASK \ No newline at end of file