diff --git a/lv/f164.dir b/lv/f164.dir index 82efdefc4..a3b963b33 100755 --- a/lv/f164.dir +++ b/lv/f164.dir @@ -1,3 +1,3 @@ 164 0 -$lvpasplan|||89|0|Tabella passaggi planning per contratto||| +$lvpasplan|||97|0|Tabella passaggi planning per contratto||| diff --git a/lv/f164.trr b/lv/f164.trr index b6eff9f65..5d91a3a55 100755 --- a/lv/f164.trr +++ b/lv/f164.trr @@ -1,13 +1,15 @@ 164 -16 +18 IDCONTR|1|3|0|Codice identificativo di un contratto CODCF|3|6|0|Codice identificativo di un cliente GGCONS|2|1|0|Giorno di consegna CODITI|1|3|0|Codice dell'itinerario USERINS|1|16|0|Utente d'inserimento DATAINS|5|8|0|Data d'inserimento +ORAINS|1|4|0|Ora d'inserimento USERAGG|1|16|0|Utente ultimo aggiornamento DATAAGG|5|8|0|Data ultimo aggiornamento +ORAAGG|1|4|0|Ora ultimo aggiornamento TIPOCF|1|1|0|Tipo liente ornitore (C) CODCF|3|6|0|Codice Cliente/Fornitore ORDFERM|2|3|0|Indica l'ordine di fermata dell'autista diff --git a/lv/lv0500a.h b/lv/lv0500a.h index 05e1f4e1a..05e3dc55f 100755 --- a/lv/lv0500a.h +++ b/lv/lv0500a.h @@ -7,15 +7,17 @@ #define F_GGCONS 107 #define F_CODITI 108 #define F_DES_ITI 109 -#define F_USERINS 110 -#define F_DATAINS 111 -#define F_USERAGG 112 -#define F_DATAAGG 113 +#define F_CODFRQCONS 110 +#define F_DES_FRQCONS 111 +#define F_MODPASS 112 +#define F_DES_MODPASS 113 #define F_ORDFERM 114 -#define F_CODFRQCONS 115 -#define F_DES_FRQCONS 116 -#define F_MODPASS 117 -#define F_FLAGSTAG 118 -#define F_ORAARR 119 -#define F_NOTE 120 +#define F_FLAGSTAG 115 +#define F_ORAARR 116 +#define F_DATAAGG 117 +#define F_ORAAGG 118 +#define F_USERAGG 119 +#define F_USERINS 120 +#define F_DATAINS 121 +#define F_NOTE 122 diff --git a/lv/lv0500a.uml b/lv/lv0500a.uml index 7218e1231..f431fd685 100755 --- a/lv/lv0500a.uml +++ b/lv/lv0500a.uml @@ -29,7 +29,7 @@ END GROUPBOX DLG_NULL 80 7 BEGIN - PROMPT 1 4 "" + PROMPT 1 4 "@b Planning per Contratto" END @@ -37,7 +37,7 @@ NUMBER F_CODCF 6 BEGIN PROMPT 2 5 "Codice " FIELD CODCF - FLAGS "B" + FLAGS "BU" KEY 1 USE LF_CLIFO SELECT TIPOCF = "C" INPUT CODCF F_CODCF @@ -57,9 +57,11 @@ END STRING F_IDCONTR 3 BEGIN PROMPT 2 7 "Contratto N." - FLAGS "B" + FLAGS "BU" FIELD IDCONTR KEY 1 + + CHECKTYPE REQUIRED END STRING F_DES_IDCONTR 50 @@ -83,7 +85,7 @@ BEGIN FIELD CODITI FLAGS "U" KEY 1 - USE ITI + USE &ITI SELECT COD="ITI" INPUT CODTAB F_CODITI DISPLAY "Codice" CODTAB DISPLAY "Descrizione@35" S0 @@ -98,23 +100,17 @@ BEGIN FLAGS "D" END -GROUPBOX DLG_NULL 80 5 +GROUPBOX DLG_NULL 80 6 BEGIN - PROMPT 1 12 "" -END - -NUMBER F_ORDFERM 3 -BEGIN - PROMPT 2 14 "Ordine Fermata" - FIELD ORDFERM + PROMPT 1 12 "@b Dettaglio" END STRING F_CODFRQCONS 2 BEGIN - PROMPT 21 14 "Frequenza Consegne" + PROMPT 2 14 "Frequenza Consegne" FIELD CODFRQCONS FLAGS "U" - USE FRQ + USE &FRQ SELECT COD="FRQ" INPUT CODTAB F_CODFRQCONS DISPLAY "Codice" CODTAB DISPLAY "Descrizione@35" S0 @@ -124,35 +120,55 @@ END STRING F_DES_FRQCONS 35 BEGIN - PROMPT 44 14 "" + PROMPT 26 14 "" FLAGS "D" END -LIST F_MODPASS 1 20 + +STRING F_MODPASS 1 BEGIN PROMPT 2 15 "Modalità Passaggio" - ITEM "C|Consegna" - ITEM "R|Ritiro" - ITEM "T|Consegna + Ritiro" + FLAGS "U" FIELD MODPASS + + USE &MPS SELECT COD="MPS" + INPUT CODTAB F_MODPASS + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione @35" S0 + + OUTPUT F_MODPASS CODTAB + OUTPUT F_DES_MODPASS S0 + +END + +STRING F_DES_MODPASS 35 +BEGIN + PROMPT 26 15 "" + FLAGS "D" +END + +NUMBER F_ORDFERM 3 +BEGIN + PROMPT 2 16 "Ordine Fermata " + FIELD ORDFERM END BOOLEAN F_FLAGSTAG BEGIN - PROMPT 45 15 "Stagionalità" + PROMPT 30 16 "Stagionalità" FIELD FLAGSTAG END NUMBER F_ORAARR 4 BEGIN - PROMPT 56 15 "Ora di arrivo" + PROMPT 47 16 "Ora di arrivo" FIELD ORAARR END GROUPBOX DLG_NULL 80 3 BEGIN - PROMPT 1 19 "" + PROMPT 1 19 "@b Dati Aggiornamento" END DATE F_DATAAGG @@ -162,6 +178,13 @@ BEGIN FIELD DATAAGG END +NUMBER F_ORAAGG 4 +BEGIN + PROMPT 25 20 "Ora Agg." + FIELD ORAARR + FLAGS "D" +END + STRING F_USERAGG 16 BEGIN PROMPT 40 20 "Utente Agg."