diff --git a/lv/f164.trr b/lv/f164.trr index dde2f1cc3..80d30aec9 100755 --- a/lv/f164.trr +++ b/lv/f164.trr @@ -16,8 +16,6 @@ UTULAGG|1|16|0|Utente che ha fatto l'ultimo aggiornamento DTULAGG|5|8|0|Data dell'ultimo aggiornamento ORULAGG|10|6|Ora dell'ultimo aggiornamento NOTE|11|10|0|Note -3 -CODCF+CODCONT+CODITI+GGCONS| -GGCONS+CODITI+CODCF+CONCONT| -GGCONS+CODCF+CONDCON+CODITI| +1 +CODCF+CODCONT+CODITI+GGCONS| diff --git a/lv/lv0500a.h b/lv/lv0500a.h index a15ebe385..6cd693e8a 100755 --- a/lv/lv0500a.h +++ b/lv/lv0500a.h @@ -2,11 +2,11 @@ #define F_RAGSOCDITTA 102 #define F_CODCF 103 #define F_RAGSOC_CLI 104 -#define F_IDCONTR 105 -#define F_DES_IDCONTR 106 -#define F_GGCONS 107 -#define F_CODITI 108 -#define F_DES_ITI 109 +#define F_CODCONT 105 +#define F_DES_CODCONT 106 +#define F_CODITI 107 +#define F_DES_ITI 108 +#define F_GGCONS 109 #define F_CODFRQCONS 110 #define F_DES_FRQCONS 111 #define F_MODPASS 112 diff --git a/lv/lv0500a.uml b/lv/lv0500a.uml index 7c9a1a3c2..a171fd33a 100755 --- a/lv/lv0500a.uml +++ b/lv/lv0500a.uml @@ -54,38 +54,29 @@ BEGIN FLAGS "D" END -STRING F_IDCONTR 3 +STRING F_CODCONT 3 BEGIN PROMPT 2 7 "Contratto N." FLAGS "BU" - FIELD IDCONTR + FIELD CODCONT KEY 1 CHECKTYPE REQUIRED END -STRING F_DES_IDCONTR 50 +STRING F_DES_CODCONT 50 BEGIN PROMPT 20 7 "" FLAGS "D" END -NUMBER F_GGCONS 1 -BEGIN - PROMPT 2 9 "Giorno Consegna" - FIELD GGCONS - KEY 1 - CHECKTYPE REQUIRED -END - - STRING F_CODITI 3 BEGIN - PROMPT 22 9 "Cod.Itinerario" + PROMPT 2 9 "Itinerario " FIELD CODITI FLAGS "U" KEY 1 - USE &ITI SELECT COD="ITI" + USE &ITI INPUT CODTAB F_CODITI DISPLAY "Codice" CODTAB DISPLAY "Descrizione@35" S0 @@ -96,21 +87,49 @@ END STRING F_DES_ITI 35 BEGIN - PROMPT 42 9 "" + PROMPT 20 9 "" FLAGS "D" END -GROUPBOX DLG_NULL 80 6 +NUMBER F_GGCONS 1 BEGIN - PROMPT 1 12 "@b Dettaglio" + PROMPT 57 9 "Giorno Consegna" + FIELD GGCONS + KEY 1 + + USE LF_LVPASPLAN KEY 1 + INPUT CODCF F_CODCF + INPUT CODCONT F_CODCONT + INPUT CODITI F_CODITI + INPUT GGCONS F_GGCONS + DISPLAY "Cliente" CODCF + DISPLAY "Contratto" CODCONT + DISPLAY "Itinerario" CODITI + DISPLAY "Giorno" GGCONS + DISPLAY "Ord.Fermata" ORDFERM + DISPLAY "Frequenza" FREQ + DISPLAY "Mod.Pass." MODPASS + DISPLAY "Stagionalità" FLSTAG + DISPLAY "Ora Arrivo" ORARPRV + OUTPUT F_CODCF CODCF + OUTPUT F_CODCONT CODCONT + OUTPUT F_CODITI CODITI + OUTPUT F_GGCONS GGCONS + + CHECKTYPE REQUIRED +END + +GROUPBOX DLG_NULL 80 5 +BEGIN + PROMPT 1 11 "@b Dettaglio" END STRING F_CODFRQCONS 2 BEGIN - PROMPT 2 14 "Frequenza Consegne" - FIELD CODFRQCONS + PROMPT 2 12 "Frequenza Consegne" + FIELD FREQ FLAGS "U" - USE &FRQ SELECT COD="FRQ" + USE &FRQ INPUT CODTAB F_CODFRQCONS DISPLAY "Codice" CODTAB DISPLAY "Descrizione@35" S0 @@ -120,18 +139,18 @@ END STRING F_DES_FRQCONS 35 BEGIN - PROMPT 26 14 "" + PROMPT 26 12 "" FLAGS "D" END STRING F_MODPASS 1 BEGIN - PROMPT 2 15 "Modalità Passaggio" + PROMPT 2 13 "Modalità Passaggio" FLAGS "U" FIELD MODPASS - USE &MPS SELECT COD="MPS" + USE &MPS INPUT CODTAB F_MODPASS DISPLAY "Codice" CODTAB DISPLAY "Descrizione @35" S0 @@ -143,74 +162,74 @@ END STRING F_DES_MODPASS 35 BEGIN - PROMPT 26 15 "" + PROMPT 26 13 "" FLAGS "D" END NUMBER F_ORDFERM 3 BEGIN - PROMPT 2 16 "Ordine Fermata " + PROMPT 2 14 "Ordine Fermata " FIELD ORDFERM END BOOLEAN F_FLAGSTAG BEGIN - PROMPT 30 16 "Stagionalità" - FIELD FLAGSTAG + PROMPT 30 14 "Stagionalità" + FIELD FLSTAG END -NUMBER F_ORAARR 4 +NUMBER F_ORAARR 6 BEGIN - PROMPT 47 16 "Ora di arrivo" - FIELD ORAARR + PROMPT 47 14 "Ora di arrivo" + FIELD ORARPRV END GROUPBOX DLG_NULL 80 5 BEGIN - PROMPT 1 18 "@b Gestione Dati Ins.\Agg." + PROMPT 1 16 "@b Gestione Dati Ins.\Agg." END DATE F_DATAINS BEGIN - PROMPT 2 20 "Data Ins." + PROMPT 2 18 "Data Ins." FLAGS "DP" - FIELD DATAINS + FIELD DTCREAZ END -NUMBER F_ORAINS 4 +NUMBER F_ORAINS 6 BEGIN - PROMPT 25 20 "Ora Ins." - FIELD ORAINS + PROMPT 25 18 "Ora Ins." + FIELD ORCREAZ FLAGS "D" END STRING F_USERINS 16 BEGIN - PROMPT 40 20 "Utente Ins." + PROMPT 44 18 "Utente Ins." FLAGS "D" - FIELD USERINS + FIELD UTCREAZ END DATE F_DATAAGG BEGIN - PROMPT 2 21 "Data Agg." + PROMPT 2 19 "Data Agg." FLAGS "ADP" - FIELD DATAAGG + FIELD DTULAGG END -NUMBER F_ORAAGG 4 +NUMBER F_ORAAGG 6 BEGIN - PROMPT 25 21 "Ora Agg." - FIELD ORAAGG + PROMPT 25 19 "Ora Agg." + FIELD ORULAGG FLAGS "D" END STRING F_USERAGG 16 BEGIN - PROMPT 40 21 "Utente Agg." + PROMPT 44 19 "Utente Agg." FLAGS "D" - FIELD USERAGG + FIELD UTULAGG END ENDPAGE