From 24233ed38ec9817e78faaa1e89535d0811f7dcbd Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 27 Apr 2011 14:28:42 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/branches/R_10_00@22032 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ha/ha0100.cpp | 32 +++++++++++++++++ ha/hatbatt.h | 33 +++++++++-------- ha/hatbatt.uml | 96 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 128 insertions(+), 33 deletions(-) diff --git a/ha/ha0100.cpp b/ha/ha0100.cpp index 4411506eb..8b26b6562 100755 --- a/ha/ha0100.cpp +++ b/ha/ha0100.cpp @@ -40,6 +40,8 @@ protected: // TRelation_application virtual bool protected_record(TRectype& record); virtual void init_query_mode(TMask& m); virtual void init_query_insert_mode(TMask& m); + virtual void init_insert_mode(TMask& m); + virtual void init_modify_mode(TMask& m); virtual bool get_next_key(TToken_string& key); }; @@ -93,6 +95,26 @@ bool THA_table_app::protected_record(TRectype& record) return true; } +void THA_table_app::init_insert_mode(TMask& m) +{ + const TString4 name = get_relation()->file(0).name(); + if (name == "ATT") + { + m.hide(-2); + m.show(-1); + } +} + +void THA_table_app::init_modify_mode(TMask& m) +{ + const TString4 name = get_relation()->file(0).name(); + if (name == "ATT") + { + m.hide(-2); + m.show(-1); + } +} + void THA_table_app::init_query_mode(TMask& m) { const TString4 name = get_relation()->file(0).name(); @@ -101,6 +123,11 @@ void THA_table_app::init_query_mode(TMask& m) m.hide(F_CODCLI1); m.show(F_CODCLI); } + if (name == "ATT") //inizialmente vedo il gruppo 2 di SEARCH e non quello 1 di NEW + { + m.hide(-1); + m.show(-2); + } } void THA_table_app::init_query_insert_mode(TMask& m) @@ -111,6 +138,11 @@ void THA_table_app::init_query_insert_mode(TMask& m) m.hide(F_CODCLI); m.show(F_CODCLI1); } + if (name == "ATT") + { + m.hide(-2); //in caso di 'nuovo' vedo il gruppo di NEW + m.show(-1); + } } int ha0100(int argc, char* argv[]) diff --git a/ha/hatbatt.h b/ha/hatbatt.h index f49df8fb8..17daa699e 100755 --- a/ha/hatbatt.h +++ b/ha/hatbatt.h @@ -1,15 +1,20 @@ -#define F_CODART 201 -#define F_DESCRART 202 -#define F_PROGRESSIVO 203 -#define F_CODART_X_MATR 204 -#define F_MATRICOLA 205 -#define F_DATA_FABBR 206 -#define F_CESPITE 207 -#define F_DESC_CES 208 +#define F_CODART 201 +#define F_DESCRART 202 -#define F_CODCF 210 -#define F_DESCF 211 -#define F_DATA_CONSEGNA 212 -#define F_CODINDSP 213 -#define F_INDSP 214 -#define F_RAGSOCINDSP 215 \ No newline at end of file +#define F_PROGRESSIVO 205 +#define F_CODART_X_MATR 206 +#define F_MATRICOLA 207 +#define F_DATA_FABBR 208 + +#define F_CESPITE_NEW 210 +#define F_CESPITE_SEARCH 211 +#define F_DESC_CES_NEW 212 +#define F_DESC_CES_SEARCH 213 +#define F_NOTE 214 + +#define F_CODCF 215 +#define F_DESCF 216 +#define F_DATA_CONSEGNA 217 +#define F_CODINDSP 218 +#define F_INDSP 219 +#define F_RAGSOCINDSP 220 \ No newline at end of file diff --git a/ha/hatbatt.uml b/ha/hatbatt.uml index 53de6e50f..660ec34d7 100755 --- a/ha/hatbatt.uml +++ b/ha/hatbatt.uml @@ -45,17 +45,18 @@ BEGIN FLAGS "UZ" USE &ATT JOIN LF_ANAMAG INTO CODART=CODTAB[1,5] + JOIN LF_CESPI INTO IDCESPITE=S1 INPUT CODTAB[1,5] F_CODART INPUT CODTAB[6,12] F_PROGRESSIVO DISPLAY "Progressivo" CODTAB[6,12] DISPLAY "Articolo" CODTAB[1,5] DISPLAY "Matricola@15" S0[6,20] - DISPLAY "Descrizione@50" LF_ANAMAG->DESCR - DISPLAY "Cespite@10" S1[1,10] + DISPLAY "Cespite@10" S1 + DISPLAY "Descrizione cespite@35" LF_CESPI->DESC + DISPLAY "Note@35" S3 + DISPLAY "Descrizione articolo@50" LF_ANAMAG->DESCR OUTPUT F_CODART CODTAB[1,5] OUTPUT F_PROGRESSIVO CODTAB[6,12] - OUTPUT F_MATRICOLA S0[6,20] - OUTPUT F_CESPITE S1[1,10] FIELD CODTAB[6,12] CHECKTYPE REQUIRED KEY 1 @@ -75,52 +76,104 @@ BEGIN FLAGS "U" USE &ATT KEY 2 JOIN LF_ANAMAG INTO CODART=CODTAB[1,5] + JOIN LF_CESPI INTO IDCESPITE=S1 INPUT S0[1,5] F_CODART INPUT S0[6,20] F_MATRICOLA - DISPLAY "Codice@5" S0[1,5] + DISPLAY "Articolo@5" S0[1,5] DISPLAY "Matricola@15" S0[6,20] DISPLAY "Progressivo" CODTAB[6,12] - DISPLAY "Descrizione@50" LF_ANAMAG->DESCR - DISPLAY "Cespite@10" S1[1,10] + DISPLAY "Cespite@10" S1 + DISPLAY "Descrizione cespite@35" LF_CESPI->DESC + DISPLAY "Note@35" S3 + DISPLAY "Descrizione articolo@50" LF_ANAMAG->DESCR COPY OUTPUT F_PROGRESSIVO + OUTPUT F_MATRICOLA S0[6,20] CHECKTYPE NORMAL FIELD S0[6,20] KEY 2 END -STRING F_CESPITE 10 +STRING F_CESPITE_NEW 10 BEGIN PROMPT 2 4 "Cespite " - FLAGS "UZ" + FLAGS "HUZ" USE LF_CESPI - INPUT IDCESPITE F_CESPITE + INPUT IDCESPITE F_CESPITE_NEW DISPLAY "Cespite@10" IDCESPITE DISPLAY "Desc@50" DESC DISPLAY "Cat." CODCAT - OUTPUT F_CESPITE IDCESPITE - OUTPUT F_DESC_CES DESC + OUTPUT F_CESPITE_NEW IDCESPITE + OUTPUT F_DESC_CES_NEW DESC CHECKTYPE NORMAL FIELD S1 + GROUP 1 END -STRING F_DESC_CES 50 46 +STRING F_DESC_CES_NEW 50 46 BEGIN PROMPT 26 4 "" + FLAGS "H" USE LF_CESPI KEY 3 - INPUT DESC F_DESC_CES + INPUT DESC F_DESC_CES_NEW DISPLAY "Desc@50" DESC DISPLAY "Codice@10" IDCESPITE DISPLAY "Cat." CODCAT - COPY OUTPUT F_CESPITE + COPY OUTPUT F_CESPITE_NEW + GROUP 1 +END + +STRING F_CESPITE_SEARCH 10 +BEGIN + PROMPT 2 4 "Cespite " + FLAGS "UZ" + USE &ATT + JOIN LF_CESPI INTO IDCESPITE=S1 + JOIN LF_ANAMAG INTO CODART=CODTAB[1,5] + INPUT S1[1,10] F_CESPITE_SEARCH + DISPLAY "Cespite@10" S1 + DISPLAY "Descrizione cespite@50" LF_CESPI->DESC + DISPLAY "Note@35" S3 + DISPLAY "Articolo" CODTAB[1,5] + DISPLAY "Progressivo" CODTAB[6,12] + DISPLAY "Matricola@15" S0[6,20] + COPY OUTPUT F_PROGRESSIVO + OUTPUT F_CESPITE_SEARCH S1 + OUTPUT F_DESC_CES_SEARCH LF_CESPI->DESC CHECKTYPE NORMAL + FIELD S1 + GROUP 2 + KEY 3 +END + +STRING F_DESC_CES_SEARCH 50 46 +BEGIN + PROMPT 26 4 "" + FLAGS "DU" + /*USE &ATT + JOIN LF_CESPI INTO IDCESPITE=S1 + INPUT S1 F_CESPITE_SEARCH + DISPLAY "Descrizione cespite@50" LF_CESPI->DESC + DISPLAY "Cespite@10" S1 + DISPLAY "Note@35" S3 + DISPLAY "Articolo" CODTAB[1,5] + DISPLAY "Progressivo" CODTAB[6,12] + DISPLAY "Matricola@15" S0[6,20] + COPY OUTPUT F_CESPITE_SEARCH*/ + GROUP 2 END DATE F_DATA_FABBR BEGIN - PROMPT 2 5 "Data fabbricazione " + PROMPT 2 5 "Data fab. " FIELD D1 END +STRING F_NOTE 50 46 +BEGIN + PROMPT 26 5 "" + FIELD S3 +END + GROUPBOX DLG_NULL 76 8 BEGIN PROMPT 1 7 "@bCliente" @@ -135,10 +188,12 @@ BEGIN INPUT CODCF F_CODCF DISPLAY "Codice" CODCF DISPLAY "Descrizione@50" RAGSOC + DISPLAY "Indirizzo@30" INDCF OUTPUT F_CODCF CODCF OUTPUT F_DESCF RAGSOC CHECKTYPE NORMAL FIELD I0 + ADD RUN cg0 -1 C END STRING F_DESCF 50 @@ -148,14 +203,16 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_DESCF DISPLAY "Descrizione@50" RAGSOC + DISPLAY "Indirizzo@30" INDCF DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF CHECKTYPE NORMAL + ADD RUN cg0 -1 C END DATE F_DATA_CONSEGNA BEGIN - PROMPT 2 10 "Data presa in consegna " + PROMPT 2 10 "Data presa in consegna " CHECKTYPE REQUIRED FIELD D0 END @@ -205,9 +262,10 @@ Mappa campi sul file TABMOD (tabella &ATT): ------------------------------------------- CODTAB[1,5] = codart (A) CODTAB[6,12] = progressivo (N z) -S0[1,5] = codart per matricola (A) +S0[1,5] = codart per matricola (A) S0[6,20] = matricola (A) -S1[1,10] = codice cespite (A) +S1[1,10] = codice cespite (A) +S3 = descrizione aggiuntiva cespite (da importazione iniziale dati Hardy) I0 = codice cliente I1 = codice indirizzo spedizione D0 = data assegnamento