diff --git a/lv/lv2300a.h b/lv/lv2300a.h index 5109ee4a5..a858fb868 100755 --- a/lv/lv2300a.h +++ b/lv/lv2300a.h @@ -1,6 +1,14 @@ -#define F_COD_ITI_FROM 201 -#define F_DES_ITI_FROM 202 -#define F_COD_ITI_TO 203 -#define F_DES_ITI_TO 204 -#define F_DATA_DAL 205 -#define F_DATA_AL 206 \ No newline at end of file +#define F_DATA_FROM 201 +#define F_DATA_TO 202 +#define F_COD_ITI_FROM 203 +#define F_DES_ITI_FROM 204 +#define F_COD_ITI_TO 205 +#define F_DES_ITI_TO 206 +#define F_COD_AUT_FROM 207 +#define F_DES_AUT_FROM 208 +#define F_COD_AUT_TO 209 +#define F_DES_AUT_TO 210 +#define F_CODCF_FROM 211 +#define F_RAGSOCCF_FROM 212 +#define F_CODCF_TO 213 +#define F_RAGSOCCF_TO 214 diff --git a/lv/lv2300a.rep b/lv/lv2300a.rep index dde0c41e3..fe06aea4f 100755 --- a/lv/lv2300a.rep +++ b/lv/lv2300a.rep @@ -22,39 +22,9 @@
-
- CODITI - - - 167.CODITI - - - - 300@.S0 - -
-
- CODAUT - - - 167.CODAUT - - - - 301@.S0 - -
-
- DTCONS - - - 302@.S0 - - - - - - +
+ DTCONS+CODITI + 167.GGCONS @@ -67,35 +37,59 @@
  • - - - 167.CODMEZ + + + 167.CODITI - - - + + + 300@.S0 + + + + 167.CODAUT + + + + 301@.S0 + + DTCONS - - - - - - - - - - - - - - - - - - - + + + + + + + 302@.S0 + + + + 167.CODMEZ + + + + + + + + + + + + + + + + + + + + + +
    • @@ -103,31 +97,31 @@
    - - - - - - - - - - + + + + + + + + + + 167.CODNUM - + 167.ORDFER - + 167.CODCF - + 303@.RAGSOC - + IF(304@.CODINDSP= "0" ;303@.LOCALITACF;305@.LOCALITA) - + 167.MODPASS
  • @@ -136,24 +130,22 @@
  • - + #NEXTCONS - + 167.NDOC - + IF(304@.CODINDSP= "0";303@.INDCF;305@.INDIR) - +
    • -
    -
    USE 167 KEY 2 -SELECT BETWEEN (CODITI, #FROM_COD_ITI, #TO_COD_ITI) +SELECT BETWEEN (CODITI, #FROM_COD_ITI, #TO_COD_ITI)  BETWEEN (CODAUT, #FROM_COD_AUT,#TO_COD_AUT)  BETWEEN(CODCF,#FROM_CODCF,#TO_CODCF) JOIN ITI ALIAS 300 INTO CODTAB==CODITI JOIN AUT TO 167 ALIAS 301 INTO CODTAB==CODAUT JOIN MEZ TO 167 ALIAS 302 INTO CODTAB==CODMEZ diff --git a/lv/lv2300a.uml b/lv/lv2300a.uml index 96166b06b..957fa7bdb 100755 --- a/lv/lv2300a.uml +++ b/lv/lv2300a.uml @@ -6,14 +6,39 @@ ENDPAGE PAGE "Stampa Planning per Itinerario" -1 -1 40 5 -GROUPBOX DLG_NULL 76 5 +GROUPBOX DLG_NULL 76 3 BEGIN - PROMPT 1 1 "@bParametri di Stampa" + PROMPT 1 1 "@bParametri Data" +END + +DATE F_DATA_FROM +BEGIN + PROMPT 2 2 "Dal " + FIELD #FROM_DATA + GROUP 1 + CHECKTYPE REQUIRED + FLAGS "A" +END + +DATE F_DATA_TO +BEGIN + PROMPT 25 2 "Al " + FIELD #TO_DATA + FLAGS "A" + GROUP 2 + CHECKTYPE REQUIRED + VALITATE DATE_CMP_FUNC >= F_DATA_FROM + WARNING "La data finale deve essere successiva a quella iniziale" +END + +GROUPBOX DLG_NULL 76 4 +BEGIN + PROMPT 1 4 "@bParametri Itinerario" END NUMBER F_COD_ITI_FROM 3 BEGIN - PROMPT 2 2 "Da Itinerario" + PROMPT 2 5 "Da Itinerario" FLAGS "UZ" USE &ITI INPUT CODTAB F_COD_ITI_FROM @@ -21,19 +46,19 @@ BEGIN DISPLAY "Descrizione@50" S0 OUTPUT F_COD_ITI_FROM CODTAB OUTPUT F_DES_ITI_FROM S0 - CHECKTYPE REQUIRED + CHECKTYPE SEARCH FIELD #FROM_COD_ITI END STRING F_DES_ITI_FROM 50 BEGIN - PROMPT 25 2 "" + PROMPT 25 5 "" FLAGS "D" END NUMBER F_COD_ITI_TO 3 BEGIN - PROMPT 2 3 "A Itinerario " + PROMPT 2 6 "A Itinerario " FLAGS "UZ" USE &ITI INPUT CODTAB F_COD_ITI_TO @@ -41,35 +66,108 @@ BEGIN DISPLAY "Descrizione@50" S0 OUTPUT F_COD_ITI_TO CODTAB OUTPUT F_DES_ITI_TO S0 - CHECKTYPE REQUIRED + CHECKTYPE SEARCH FIELD #TO_COD_ITI END STRING F_DES_ITI_TO 50 BEGIN - PROMPT 25 3 "" + PROMPT 25 6 "" FLAGS "D" END -DATE F_DATA_DAL +GROUPBOX DLG_NULL 76 4 BEGIN - PROMPT 2 4 "Dal " - FIELD #FROM_DATA - GROUP 1 - CHECKTYPE REQUIRED - FLAGS "A" + PROMPT 1 8 "@bParametri Autista" END -DATE F_DATA_AL +STRING F_COD_AUT_FROM 6 BEGIN - PROMPT 25 4 "Al " - FIELD #TO_DATA - FLAGS "A" - GROUP 2 - CHECKTYPE REQUIRED - VALITATE DATE_CMP_FUNC >= F_DATA_DAL - WARNING "La data finale deve essere successiva a quella iniziale" + PROMPT 2 9 "Da Autista " + FLAGS "U" + USE &AUT + INPUT CODTAB F_COD_AUT_FROM + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_COD_AUT_FROM CODTAB + OUTPUT F_DES_AUT_FROM S0 + CHECKTYPE SEARCH + FIELD #FROM_COD_AUT +END + +STRING F_DES_AUT_FROM 50 +BEGIN + PROMPT 25 9 "" + FLAGS "D" +END + +STRING F_COD_AUT_TO 6 +BEGIN + PROMPT 2 10 "Ad Autista " + FLAGS "U" + USE &AUT + INPUT CODTAB F_COD_AUT_TO + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_COD_AUT_TO CODTAB + OUTPUT F_DES_AUT_TO S0 + CHECKTYPE SEARCH + FIELD #TO_COD_AUT +END + +STRING F_DES_AUT_TO 50 +BEGIN + PROMPT 25 10 "" + FLAGS "D" +END + +GROUPBOX DLG_NULL 76 4 +BEGIN + PROMPT 1 12 "@bParametri Cliente" +END + +NUMBER F_CODCF_FROM 6 +BEGIN + PROMPT 2 13 "Da Cliente " + FLAGS "U" + USE LF_CLIFO KEY 1 + INPUT TIPOCF "C" + INPUT CODCF F_CODCF_FROM + DISPLAY "Codice " CODCF + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_CODCF_FROM CODCF + OUTPUT F_RAGSOCCF_FROM RAGSOC + CHECKTYPE NORMAL + FIELD #FROM_CODCF +END + +STRING F_RAGSOCCF_FROM 50 +BEGIN + PROMPT 25 13 "" + FLAGS "D" +END + +NUMBER F_CODCF_TO 6 +BEGIN + PROMPT 2 14 "A Cliente " + FLAGS "U" + USE LF_CLIFO KEY 1 + INPUT TIPOCF "C" + INPUT CODCF F_CODCF_TO + DISPLAY "Codice " CODCF + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_CODCF_TO CODCF + OUTPUT F_RAGSOCCF_TO RAGSOC + CHECKTYPE NORMAL + FIELD #TO_CODCF +END + +STRING F_RAGSOCCF_TO 50 +BEGIN + PROMPT 25 14 "" + FLAGS "D" END ENDPAGE + ENDMASK