diff --git a/mg/mgtbfsa.h b/mg/mgtbfsa.h index 36ac22d6d..25712efd1 100755 --- a/mg/mgtbfsa.h +++ b/mg/mgtbfsa.h @@ -2,5 +2,5 @@ #define F_ROOT 102 #define F_DESLIV 103 #define F_FORMLIV 104 -#define F_SEPDESC 105 + diff --git a/mg/mgtbfsa.uml b/mg/mgtbfsa.uml index 5d30af3d4..dabd3f993 100755 --- a/mg/mgtbfsa.uml +++ b/mg/mgtbfsa.uml @@ -41,13 +41,6 @@ BEGIN MESSAGE TRUE CLEAR,F_SEPDESC END -STRING F_SEPDESC 3 -BEGIN - PROMPT 2 6 "Sep.Descriz." - FIELD S11 - HELP "Separatore per la descrizione (_= spazio)" -END - // descrizione parte del formato codice STRING F_DESLIV 50 BEGIN diff --git a/mg/mgtbgsa.h b/mg/mgtbgsa.h index 80ba52d98..e93170369 100755 --- a/mg/mgtbgsa.h +++ b/mg/mgtbgsa.h @@ -12,31 +12,40 @@ #define F_CHILD1 201 #define F_FORMAT1 301 #define F_DESCR1 401 +#define F_SEPDES1 501 #define F_CHILD2 202 #define F_FORMAT2 302 #define F_DESCR2 402 +#define F_SEPDES2 502 #define F_CHILD3 203 #define F_FORMAT3 303 #define F_DESCR3 403 +#define F_SEPDES3 503 #define F_CHILD4 204 #define F_FORMAT4 304 #define F_DESCR4 404 +#define F_SEPDES4 504 + #define F_CHILD5 205 #define F_FORMAT5 305 #define F_DESCR5 405 +#define F_SEPDES5 505 #define F_CHILD6 206 #define F_FORMAT6 306 #define F_DESCR6 406 +#define F_SEPDES6 506 #define F_CHILD7 207 #define F_FORMAT7 307 #define F_DESCR7 407 +#define F_SEPDES7 507 #define F_CHILD8 208 #define F_FORMAT8 308 #define F_DESCR8 408 +#define F_SEPDES8 508 diff --git a/mg/mgtbgsa.uml b/mg/mgtbgsa.uml index f990e768d..8beb587c7 100755 --- a/mg/mgtbgsa.uml +++ b/mg/mgtbgsa.uml @@ -122,13 +122,20 @@ BEGIN FLAGS "D" END -STRING F_DESCR1 50 45 +STRING F_DESCR1 50 35 BEGIN PROMPT 28 7 "" GROUP 3 FLAGS "D" END +STRING F_SEPDES1 6 +BEGIN + PROMPT 64 7 "Sep." + GROUP 3 + FIELD S2[1,6] +END + STRING F_CHILD2 3 BEGIN PROMPT 2 8 "Parte 3 " @@ -142,8 +149,8 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD3 - MESSAGE ENABLE,F_CHILD3 + MESSAGE EMPTY CLEAR,F_CHILD3|CLEAR,F_SEPDES2 + MESSAGE ENABLE,F_CHILD3|ENABLE,F_SEPDES2 END STRING F_FORMAT2 20 10 @@ -153,13 +160,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR2 50 45 +STRING F_DESCR2 50 35 BEGIN PROMPT 28 8 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES2 6 +BEGIN + PROMPT 64 8 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[7,12] +END + STRING F_CHILD3 3 BEGIN PROMPT 2 9 "Parte 4 " @@ -173,8 +188,8 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD4 - MESSAGE ENABLE,F_CHILD4 + MESSAGE EMPTY CLEAR,F_CHILD4|CLEAR,F_SEPDES3 + MESSAGE ENABLE,F_CHILD4|ENABLE,F_SEPDES3 END STRING F_FORMAT3 20 10 @@ -184,13 +199,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR3 50 45 +STRING F_DESCR3 50 35 BEGIN PROMPT 28 9 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES3 6 +BEGIN + PROMPT 64 9 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[13,18] +END + STRING F_CHILD4 3 BEGIN PROMPT 2 10 "Parte 5 " @@ -204,24 +227,33 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD5 - MESSAGE ENABLE,F_CHILD5 + MESSAGE EMPTY CLEAR,F_CHILD5|CLEAR,F_SEPDES4 + MESSAGE ENABLE,F_CHILD5|ENABLE,F_SEPDES4 END STRING F_FORMAT4 20 10 BEGIN PROMPT 16 10 "" - GROUP 3 + GROUP 319,2 + FLAGS "D" END -STRING F_DESCR4 50 45 +STRING F_DESCR4 50 35 BEGIN PROMPT 28 10 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES4 6 +BEGIN + PROMPT 64 10 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[19,24] +END + STRING F_CHILD5 3 BEGIN PROMPT 2 11 "Parte 6 " @@ -235,8 +267,8 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD6 - MESSAGE ENABLE,F_CHILD6 + MESSAGE EMPTY CLEAR,F_CHILD6|CLEAR,F_SEPDES5 + MESSAGE ENABLE,F_CHILD6|ENABLE,F_SEPDES5 END STRING F_FORMAT5 20 10 @@ -246,13 +278,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR5 50 45 +STRING F_DESCR5 50 35 BEGIN PROMPT 28 11 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES5 6 +BEGIN + PROMPT 64 11 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[25,30] +END + STRING F_CHILD6 3 BEGIN PROMPT 2 12 "Parte 7 " @@ -266,8 +306,8 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD7 - MESSAGE ENABLE,F_CHILD7 + MESSAGE EMPTY CLEAR,F_CHILD7|CLEAR,F_SEPDES6 + MESSAGE ENABLE,F_CHILD7|ENABLE,F_SEPDES6 END STRING F_FORMAT6 20 10 @@ -277,13 +317,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR6 50 45 +STRING F_DESCR6 50 35 BEGIN PROMPT 28 12 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES6 6 +BEGIN + PROMPT 64 12 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[31,36] +END + STRING F_CHILD7 3 BEGIN PROMPT 2 13 "Parte 8 " @@ -297,8 +345,8 @@ BEGIN CHECKTYPE NORMAL GROUP 3 FLAGS "G" - MESSAGE EMPTY CLEAR,F_CHILD8 - MESSAGE ENABLE,F_CHILD8 + MESSAGE EMPTY CLEAR,F_CHILD8|CLEAR,F_SEPDES7 + MESSAGE ENABLE,F_CHILD8|ENABLE,F_SEPDES7 END STRING F_FORMAT7 20 10 @@ -308,13 +356,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR7 50 45 +STRING F_DESCR7 50 35 BEGIN PROMPT 28 13 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES7 6 +BEGIN + PROMPT 64 13 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[37,42] +END + STRING F_CHILD8 3 BEGIN PROMPT 2 14 "Parte 9 " @@ -327,6 +383,8 @@ BEGIN FIELD S1[22,24] CHECKTYPE NORMAL GROUP 3 + MESSAGE EMPTY CLEAR,F_SEPDES8 + MESSAGE ENABLE,F_SEPDES8 FLAGS "G" END @@ -337,13 +395,21 @@ BEGIN FLAGS "D" END -STRING F_DESCR8 50 45 +STRING F_DESCR8 50 35 BEGIN PROMPT 28 14 "" FLAGS "D" GROUP 3 END +STRING F_SEPDES8 6 +BEGIN + PROMPT 64 14 "Sep." + GROUP 3 + FLAGS "D" + FIELD S2[43,48] +END + STRING F_FORMAT 90 30 BEGIN PROMPT 1 16 "Formato complessivo "