From 93679c43001a90fe726e131e63bda1d96afd1826 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Tue, 3 Mar 2020 01:30:57 +0100 Subject: [PATCH] Patch level : 12.0 no patch Files correlati : Commento : MIgliorata la generazione dei campi utente sulle righe documento --- src/ve/verig.uml | 763 +++++++++++++++++++++++++++++++++++++-------- src/ve/verig01.uml | 26 +- src/ve/verigdef.h | 15 +- 3 files changed, 674 insertions(+), 130 deletions(-) diff --git a/src/ve/verig.uml b/src/ve/verig.uml index f42803137..33a5d192b 100755 --- a/src/ve/verig.uml +++ b/src/ve/verig.uml @@ -1649,11 +1649,16 @@ ELSEIF NUMBER FR_QTAGG1 13 5 ENDIF BEGIN -IFDEF(X_QTAGG1) - PROMPT X_QTAGG1 Y_QTAGG1 PR_QTAGG1 -ELSEIF - PROMPT 2 6 "Qta' agg.1 " +IFNDEF(X_QTAGG1) +!!define X_QTAGG1 2 ENDIF +IFNDEF(Y_QTAGG1) +!!define Y_QTAGG1 6 +ENDIF +IFNDEF(PR_QTAGG1) +!!define PR_QTAGG1 "Quantità 1 " +ENDIF +PROMPT X_QTAGG1 Y_QTAGG1 PR_QTAGG1 IFDEF(FL_QTAGG1) FLAGS FL_QTAGG1 ENDIF @@ -1663,7 +1668,11 @@ ENDIF IFDEF(NC_QTAGG1) NUM_CALC NC_QTAGG1 ENDIF - FIELD QTAGG1 +IFDEF(FI_QTAGG1) + FIELD FI_QTAGG1 +ELSEIF + FIELD QTAGG1 +ENDIF END ENDIF @@ -1678,11 +1687,16 @@ ELSEIF NUMBER FR_QTAGG2 13 5 ENDIF BEGIN -IFDEF(X_QTAGG2) - PROMPT X_QTAGG2 Y_QTAGG2 PR_QTAGG2 -ELSEIF - PROMPT 28 6 "2 " +IFNDEF(X_QTAGG2) +!!define X_QTAGG2 28 ENDIF +IFNDEF(Y_QTAGG5) +!!define Y_QTAGG2 6 +ENDIF +IFNDEF(PR_QTAGG2) +!!define PR_QTAGG2 "Quantità 2 " +ENDIF +PROMPT X_QTAGG2 Y_QTAGG2 PR_QTAGG2 IFDEF(FL_QTAGG2) FLAGS FL_QTAGG2 ENDIF @@ -1692,7 +1706,11 @@ ENDIF IFDEF(NC_QTAGG2) NUM_CALC NC_QTAGG2 ENDIF - FIELD QTAGG2 +IFDEF(FI_QTAGG2) + FIELD FI_QTAGG2 +ELSEIF + FIELD QTAGG2 +ENDIF END ENDIF @@ -1707,11 +1725,16 @@ ELSEIF NUMBER FR_QTAGG3 13 5 ENDIF BEGIN -IFDEF(X_QTAGG3) - PROMPT X_QTAGG3 Y_QTAGG3 PR_QTAGG3 -ELSEIF - PROMPT 44 6 "3 " +IFNDEF(X_QTAGG3) +!!define X_QTAGG3 55 ENDIF +IFNDEF(Y_QTAGG3) +!!define Y_QTAGG3 6 +ENDIF +IFNDEF(PR_QTAGG3) +!!define PR_QTAGG3 "Quantità 3 " +ENDIF +PROMPT X_QTAGG3 Y_QTAGG3 PR_QTAGG3 IFDEF(FL_QTAGG3) FLAGS FL_QTAGG3 ENDIF @@ -1721,7 +1744,11 @@ ENDIF IFDEF(NC_QTAGG3) NUM_CALC NC_QTAGG3 ENDIF - FIELD QTAGG3 +IFDEF(FI_QTAGG3) + FIELD FI_QTAGG3 +ELSEIF + FIELD QTAGG3 +ENDIF END ENDIF @@ -1736,11 +1763,16 @@ ELSEIF NUMBER FR_QTAGG4 13 5 ENDIF BEGIN -IFDEF(X_QTAGG4) - PROMPT X_QTAGG4 Y_QTAGG4 PR_QTAGG4 -ELSEIF - PROMPT 12 7 "4 " +IFNDEF(X_QTAGG4) +!!define X_QTAGG4 2 ENDIF +IFNDEF(Y_QTAGG4) +!!define Y_QTAGG4 7 +ENDIF +IFNDEF(PR_QTAGG4) +!!define PR_QTAGG4 "Quantità 4 " +ENDIF +PROMPT 2 7 "4 " IFDEF(FL_QTAGG4) FLAGS FL_QTAGG4 ENDIF @@ -1750,13 +1782,17 @@ ENDIF IFDEF(NC_QTAGG1) NUM_CALC NC_QTAGG4 ENDIF - FIELD QTAGG4 +IFDEF(FI_QTAGG4) + FIELD FI_QTAGG4 +ELSEIF + FIELD QTAGG4 +ENDIF END ENDIF IFDEF(FLD_QTAGG5) IFDEF(TY_QTAGG5) -IF(TY_QTAGG1==CURRENCY) +IF(TY_QTAGG5==CURRENCY) TY_QTAGG5 FR_QTAGG5 13 ELSEIF TY_QTAGG5 FR_QTAGG5 13 5 @@ -1765,11 +1801,16 @@ ELSEIF NUMBER FR_QTAGG5 13 5 ENDIF BEGIN -IFDEF(X_QTAGG5) - PROMPT X_QTAGG5 Y_QTAGG5 PR_QTAGG5 -ELSEIF - PROMPT 28 7 "5 " +IFNDEF(X_QTAGG5) +!!define X_QTAGG5 28 ENDIF +IFNDEF(Y_QTAGG5) +!!define Y_QTAGG5 7 +ENDIF +IFNDEF(PR_QTAGG5) +!!define PR_QTAGG5 "Quantità 5 " +ENDIF +PROMPT X_QTAGG5 Y_QTAGG5 PR_QTAGG5 IFDEF(FL_QTAGG5) FLAGS FL_QTAGG5 ENDIF @@ -1779,7 +1820,11 @@ ENDIF IFDEF(NC_QTAGG5) NUM_CALC NC_QTAGG5 ENDIF - FIELD QTAGG5 +IFDEF(FI_QTAGG5) + FIELD FI_QTAGG5 +ELSEIF + FIELD QTAGG5 +ENDIF END ENDIF @@ -1861,58 +1906,577 @@ ENDIF END ENDIF -IFDEF(FLD_JOLLY) -STRING FR_JOLLY1 20 -BEGIN - PROMPT 2 12 "Jolly " -END +IFDEF(FLD_JOLLY1) +IFNDEF(TY_JOLLY1) +F_TYPE(JOLLY1, STRING) +ENDIF +IFNDEF(LN_JOLLY1) +F_LEN(JOLLY1, 20) +ENDIF +IFNDEF(DE_JOLLY1) +F_DEC(JOLLY1, ) +ENDIF +IFNDEF (X_JOLLY1) +F_X(JOLLY1, 2) +ENDIF +IFNDEF (Y_JOLLY1) +F_Y(JOLLY1, 11) +ENDIF +IFNDEF(PR_JOLLY1) +F_PROMPT(JOLLY1, "Jolly 1 ") +ENDIF +IFNDEF(FI_JOLLY1) +F_FIELD(JOLLY1, 0) +ENDIF +IFNDEF(FL_JOLLY1) +F_FLG(JOLLY1, 0) +ENDIF +IFNDEF(CH_JOLLY1) +F_CHK(JOLLY1, 0) +ENDIF +IFNDEF(MS_JOLLY1) +!!define MS_JOLLY1 0 +ENDIF -STRING FR_JOLLY2 20 +TY_JOLLY1 FR_JOLLY1 LN_JOLLY1 DE_JOLLY1 BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY3 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY4 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY5 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY6 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY7 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY8 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY9 20 -BEGIN - PROMPT 2 12 "Jolly " -END - -STRING FR_JOLLY10 20 -BEGIN - PROMPT 2 12 "Jolly " + PROMPT X_JOLLY1 Y_JOLLY1 PR_JOLLY1 +IF(FL_JOLLY1 != 0) + FLAGS FL_JOLLY1 +ENDIF +IF(CH_JOLLY1 != 0) + CHECKTYPE CH_JOLLY1 +ENDIF +IF(MS_JOLLY1 != 0) + MESSAGE MS_JOLLY1,MF_JOLLY1 +ENDIF +IF(FI_JOLLY1 != 0) + FIELD FI_JOLLY1 +ENDIF END ENDIF +IFDEF(FLD_JOLLY2) +IFNDEF(TY_JOLLY2) +F_TYPE(JOLLY2, STRING) +ENDIF +IFNDEF(LN_JOLLY2) +F_LEN(JOLLY2, 20) +ENDIF +IFNDEF(DE_JOLLY2) +F_DEC(JOLLY2, ) +ENDIF +IFNDEF (X_JOLLY2) +F_X(JOLLY2, 2) +ENDIF +IFNDEF (Y_JOLLY2) +F_Y(JOLLY2, 12) +ENDIF +IFNDEF(PR_JOLLY2) +F_PROMPT(JOLLY2, "Jolly 2 ") +ENDIF +IFNDEF(FI_JOLLY2) +F_FIELD(JOLLY2, 0) +ENDIF +IFNDEF(FL_JOLLY2) +F_FLG(JOLLY2, 0) +ENDIF +IFNDEF(CH_JOLLY2) +F_CHK(JOLLY2, 0) +ENDIF +IFNDEF(MS_JOLLY2) +!!define MS_JOLLY2 0 +ENDIF + +TY_JOLLY2 FR_JOLLY2 LN_JOLLY2 DE_JOLLY2 +BEGIN + PROMPT X_JOLLY2 Y_JOLLY2 PR_JOLLY2 +IF(FL_JOLLY2 != 0) + FLAGS FL_JOLLY2 +ENDIF +IF(CH_JOLLY2 != 0) + CHECKTYPE CH_JOLLY2 +ENDIF +IF(MS_JOLLY2 != 0) + MESSAGE MS_JOLLY2,MF_JOLLY2 +ENDIF +IF(FI_JOLLY2 != 0) + FIELD FI_JOLLY2 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY3) +IFNDEF(TY_JOLLY3) +F_TYPE(JOLLY3, STRING) +ENDIF +IFNDEF(LN_JOLLY3) +F_LEN(JOLLY3, 20) +ENDIF +IFNDEF(DE_JOLLY3) +F_DEC(JOLLY3, ) +ENDIF +IFNDEF (X_JOLLY3) +F_X(JOLLY3, 2) +ENDIF +IFNDEF (Y_JOLLY3) +F_Y(JOLLY3, 13) +ENDIF +IFNDEF(PR_JOLLY3) +F_PROMPT(JOLLY3, "Jolly 3 ") +ENDIF +IFNDEF(FI_JOLLY3) +F_FIELD(JOLLY3, 0) +ENDIF +IFNDEF(FL_JOLLY3) +F_FLG(JOLLY3, 0) +ENDIF +IFNDEF(CH_JOLLY3) +F_CHK(JOLLY3, 0) +ENDIF +IFNDEF(MS_JOLLY3) +!!define MS_JOLLY3 0 +ENDIF + +TY_JOLLY3 FR_JOLLY3 LN_JOLLY3 DE_JOLLY3 +BEGIN + PROMPT X_JOLLY3 Y_JOLLY3 PR_JOLLY3 +IF(FL_JOLLY3 != 0) + FLAGS FL_JOLLY3 +ENDIF +IF(CH_JOLLY3 != 0) + CHECKTYPE CH_JOLLY3 +ENDIF +IF(MS_JOLLY3 != 0) + MESSAGE MS_JOLLY3,MF_JOLLY3 +ENDIF +IF(FI_JOLLY3 != 0) + FIELD FI_JOLLY3 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY4) +IFNDEF(TY_JOLLY4) +F_TYPE(JOLLY4, STRING) +ENDIF +IFNDEF(LN_JOLLY4) +F_LEN(JOLLY4, 20) +ENDIF +IFNDEF(DE_JOLLY4) +F_DEC(JOLLY4, ) +ENDIF +IFNDEF (X_JOLLY4) +F_X(JOLLY4, 2) +ENDIF +IFNDEF (Y_JOLLY4) +F_Y(JOLLY4, 14) +ENDIF +IFNDEF(PR_JOLLY4) +F_PROMPT(JOLLY4, "Jolly 4 ") +ENDIF +IFNDEF(FI_JOLLY4) +F_FIELD(JOLLY4, 0) +ENDIF +IFNDEF(FL_JOLLY4) +F_FLG(JOLLY4, 0) +ENDIF +IFNDEF(CH_JOLLY4) +F_CHK(JOLLY4, 0) +ENDIF +IFNDEF(MS_JOLLY4) +!!define MS_JOLLY4 0 +ENDIF + +TY_JOLLY4 FR_JOLLY4 LN_JOLLY4 DE_JOLLY4 +BEGIN + PROMPT X_JOLLY4 Y_JOLLY4 PR_JOLLY4 +IF(FL_JOLLY4 != 0) + FLAGS FL_JOLLY4 +ENDIF +IF(CH_JOLLY4 != 0) + CHECKTYPE CH_JOLLY4 +ENDIF +IF(MS_JOLLY4 != 0) + MESSAGE MS_JOLLY4,MF_JOLLY4 +ENDIF +IF(FI_JOLLY4 != 0) + FIELD FI_JOLLY4 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY5) +IFNDEF(TY_JOLLY5) +F_TYPE(JOLLY5, STRING) +ENDIF +IFNDEF(LN_JOLLY5) +F_LEN(JOLLY5, 20) +ENDIF +IFNDEF(DE_JOLLY5) +F_DEC(JOLLY5, ) +ENDIF +IFNDEF (X_JOLLY5) +F_X(JOLLY5, 2) +ENDIF +IFNDEF (Y_JOLLY5) +F_Y(JOLLY5, 15) +ENDIF +IFNDEF(PR_JOLLY5) +F_PROMPT(JOLLY5, "Jolly 5 ") +ENDIF +IFNDEF(FI_JOLLY5) +F_FIELD(JOLLY5, 0) +ENDIF +IFNDEF(FL_JOLLY5) +F_FLG(JOLLY5, 0) +ENDIF +IFNDEF(CH_JOLLY5) +F_CHK(JOLLY5, 0) +ENDIF +IFNDEF(MS_JOLLY5) +!!define MS_JOLLY5 0 +ENDIF + +TY_JOLLY5 FR_JOLLY5 LN_JOLLY5 DE_JOLLY5 +BEGIN + PROMPT X_JOLLY5 Y_JOLLY5 PR_JOLLY5 +IF(FL_JOLLY5 != 0) + FLAGS FL_JOLLY5 +ENDIF +IF(CH_JOLLY5 != 0) + CHECKTYPE CH_JOLLY5 +ENDIF +IF(MS_JOLLY5 != 0) + MESSAGE MS_JOLLY5,MF_JOLLY5 +ENDIF +IF(FI_JOLLY5 != 0) + FIELD FI_JOLLY5 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY6) +IFNDEF(TY_JOLLY6) +F_TYPE(JOLLY6, STRING) +ENDIF +IFNDEF(LN_JOLLY6) +F_LEN(JOLLY6, 20) +ENDIF +IFNDEF(DE_JOLLY6) +F_DEC(JOLLY6, ) +ENDIF +IFNDEF (X_JOLLY6) +F_X(JOLLY6, 2) +ENDIF +IFNDEF (Y_JOLLY6) +F_Y(JOLLY6, 16) +ENDIF +IFNDEF(PR_JOLLY6) +F_PROMPT(JOLLY6, "Jolly 6 ") +ENDIF +IFNDEF(FI_JOLLY6) +F_FIELD(JOLLY6, 0) +ENDIF +IFNDEF(FL_JOLLY6) +F_FLG(JOLLY6, 0) +ENDIF +IFNDEF(CH_JOLLY6) +F_CHK(JOLLY6, 0) +ENDIF +IFNDEF(MS_JOLLY6) +!!define MS_JOLLY6 0 +ENDIF + +TY_JOLLY6 FR_JOLLY6 LN_JOLLY6 DE_JOLLY6 +BEGIN + PROMPT X_JOLLY6 Y_JOLLY6 PR_JOLLY6 +IF(FL_JOLLY6 != 0) + FLAGS FL_JOLLY6 +ENDIF +IF(CH_JOLLY6 != 0) + CHECKTYPE CH_JOLLY6 +ENDIF +IF(MS_JOLLY6 != 0) + MESSAGE MS_JOLLY6,MF_JOLLY6 +ENDIF +IF(FI_JOLLY6 != 0) + FIELD FI_JOLLY6 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY7) +IFNDEF(TY_JOLLY7) +F_TYPE(JOLLY7, STRING) +ENDIF +IFNDEF(LN_JOLLY7) +F_LEN(JOLLY7, 20) +ENDIF +IFNDEF(DE_JOLLY7) +F_DEC(JOLLY7, ) +ENDIF +IFNDEF (X_JOLLY7) +F_X(JOLLY7, 2) +ENDIF +IFNDEF (Y_JOLLY7) +F_Y(JOLLY7, 17) +ENDIF +IFNDEF(PR_JOLLY7) +F_PROMPT(JOLLY7, "Jolly 7 ") +ENDIF +IFNDEF(FI_JOLLY7) +F_FIELD(JOLLY7, 0) +ENDIF +IFNDEF(FL_JOLLY7) +F_FLG(JOLLY7, 0) +ENDIF +IFNDEF(CH_JOLLY7) +F_CHK(JOLLY7, 0) +ENDIF +IFNDEF(MS_JOLLY7) +!!define MS_JOLLY7 0 +ENDIF + +TY_JOLLY7 FR_JOLLY7 LN_JOLLY7 DE_JOLLY7 +BEGIN + PROMPT X_JOLLY7 Y_JOLLY7 PR_JOLLY7 +IF(FL_JOLLY7 != 0) + FLAGS FL_JOLLY7 +ENDIF +IF(CH_JOLLY7 != 0) + CHECKTYPE CH_JOLLY7 +ENDIF +IF(MS_JOLLY7 != 0) + MESSAGE MS_JOLLY7,MF_JOLLY7 +ENDIF +IF(FI_JOLLY7 != 0) + FIELD FI_JOLLY7 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY8) +IFNDEF(TY_JOLLY8) +F_TYPE(JOLLY8, STRING) +ENDIF +IFNDEF(LN_JOLLY8) +F_LEN(JOLLY8, 20) +ENDIF +IFNDEF(DE_JOLLY8) +F_DEC(JOLLY8, ) +ENDIF +IFNDEF (X_JOLLY8) +F_X(JOLLY8, 2) +ENDIF +IFNDEF (Y_JOLLY8) +F_Y(JOLLY8, 18) +ENDIF +IFNDEF(PR_JOLLY8) +F_PROMPT(JOLLY8, "Jolly 8 ") +ENDIF +IFNDEF(FI_JOLLY8) +F_FIELD(JOLLY8, 0) +ENDIF +IFNDEF(FL_JOLLY8) +F_FLG(JOLLY8, 0) +ENDIF +IFNDEF(CH_JOLLY8) +F_CHK(JOLLY8, 0) +ENDIF +IFNDEF(MS_JOLLY8) +!!define MS_JOLLY8 0 +ENDIF + +TY_JOLLY8 FR_JOLLY8 LN_JOLLY8 DE_JOLLY8 +BEGIN + PROMPT X_JOLLY8 Y_JOLLY8 PR_JOLLY8 +IF(FL_JOLLY8 != 0) + FLAGS FL_JOLLY8 +ENDIF +IF(CH_JOLLY8 != 0) + CHECKTYPE CH_JOLLY8 +ENDIF +IF(MS_JOLLY8 != 0) + MESSAGE MS_JOLLY8,MF_JOLLY8 +ENDIF +IF(FI_JOLLY8 != 0) + FIELD FI_JOLLY8 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY9) +IFNDEF(TY_JOLLY9) +F_TYPE(JOLLY9, STRING) +ENDIF +IFNDEF(LN_JOLLY9) +F_LEN(JOLLY9, 20) +ENDIF +IFNDEF(DE_JOLLY9) +F_DEC(JOLLY9, ) +ENDIF +IFNDEF (X_JOLLY9) +F_X(JOLLY9, 2) +ENDIF +IFNDEF (Y_JOLLY9) +F_Y(JOLLY9, 19) +ENDIF +IFNDEF(PR_JOLLY9) +F_PROMPT(JOLLY9, "Jolly 9 ") +ENDIF +IFNDEF(FI_JOLLY9) +F_FIELD(JOLLY9, 0) +ENDIF +IFNDEF(FL_JOLLY9) +F_FLG(JOLLY9, 0) +ENDIF +IFNDEF(CH_JOLLY9) +F_CHK(JOLLY9, 0) +ENDIF +IFNDEF(MS_JOLLY9) +!!define MS_JOLLY9 0 +ENDIF + +TY_JOLLY9 FR_JOLLY9 LN_JOLLY9 DE_JOLLY9 +BEGIN + PROMPT X_JOLLY9 Y_JOLLY9 PR_JOLLY9 +IF(FL_JOLLY9 != 0) + FLAGS FL_JOLLY9 +ENDIF +IF(CH_JOLLY9 != 0) + CHECKTYPE CH_JOLLY9 +ENDIF +IF(MS_JOLLY9 != 0) + MESSAGE MS_JOLLY9,MF_JOLLY9 +ENDIF +IF(FI_JOLLY9 != 0) + FIELD FI_JOLLY9 +ENDIF +END +ENDIF + +IFDEF(FLD_JOLLY10) +IFNDEF(TY_JOLLY10) +F_TYPE(JOLLY10, STRING) +ENDIF +IFNDEF(LN_JOLLY10) +F_LEN(JOLLY10, 20) +ENDIF +IFNDEF(DE_JOLLY10) +F_DEC(JOLLY10, ) +ENDIF +IFNDEF (X_JOLLY10) +F_X(JOLLY10, 2) +ENDIF +IFNDEF (Y_JOLLY10) +F_Y(JOLLY10, 20) +ENDIF +IFNDEF (PR_JOLLY10) +F_PROMPT(JOLLY10, "Jolly 10 ") +ENDIF +IFNDEF (FI_JOLLY10) +F_FIELD(JOLLY10, 0) +ENDIF +IFNDEF (FL_JOLLY10) +F_FLG(JOLLY10, 0) +ENDIF +IFNDEF (CH_JOLLY10) +F_CHK(JOLLY10, 0) +ENDIF +IFNDEF (MS_JOLLY10) +!!define MS_JOLLY10 0 +ENDIF + +TY_JOLLY10 FR_JOLLY10 LN_JOLLY10 DE_JOLLY10 +BEGIN + PROMPT X_JOLLY10 Y_JOLLY10 PR_JOLLY10 +IF(FL_JOLLY10 != 0) + FLAGS FL_JOLLY10 +ENDIF +IF(CH_JOLLY10 != 0) + CHECKTYPE CH_JOLLY10 +ENDIF +IF(MS_JOLLY10 != 0) + MESSAGE MS_JOLLY10 +ENDIF +IF(FI_JOLLY10 != 0) + FIELD FI_JOLLY10 +ENDIF +END +ENDIF + +IFDEF(FLD_CODAGG1) +IFDEF(TY_CODAGG1) +TY_CODAGG1 FR_CODAGG1 20 +ELSEIF +STRING FR_CODAGG1 20 +ENDIF +BEGIN +IFNDEF(X_CODAGG1) +!!define X_CODAGG1 2 +ENDIF +IFNDEF(Y_CODAGG1) +!!define Y_CODAGG1 21 +ENDIF +IFNDEF(PR_CODAGG1) +!!define PR_CODAGG1 "Stringa 1 " +ENDIF +PROMPT X_CODAGG1 Y_CODAGG1 PR_CODAGG1 +IFDEF(FL_CODAGG1) + FLAGS FL_CODAGG1 +ENDIF +IFDEF(MS_CODAGG1) + MESSAGE MS_CODAGG1 +ENDIF +IFDEF(NC_CODAGG1) + NUM_CALC NC_CODAGG1 +ENDIF +IFDEF(FI_CODAGG1) + FIELD FI_CODAGG1 +ELSEIF + FIELD CODAGG1 +ENDIF +END +ENDIF + +IFDEF(FLD_CODAGG2) +IFDEF(TY_CODAGG2) +TY_CODAGG2 FR_CODAGG2 20 +ELSEIF +STRING FR_CODAGG2 13 5 +ENDIF +BEGIN +IFNDEF(X_CODAGG2) +!!define X_CODAGG2 2 +ENDIF +IFNDEF(Y_CODAGG2) +!!define Y_CODAGG2 22 +ENDIF +IFNDEF(PR_CODAGG2) +!!define PR_CODAGG2 "Stringa 2 " +ENDIF +IFDEF(X_CODAGG2) + PROMPT X_CODAGG2 Y_CODAGG2 PR_CODAGG2 +ELSEIF + PROMPT 2 12 "Stringa 2 " +ENDIF +IFDEF(FL_CODAGG2) + FLAGS FL_CODAGG2 +ENDIF +IFDEF(MS_CODAGG2) + MESSAGE MS_CODAGG2 +ENDIF +IFDEF(NC_CODAGG2) + NUM_CALC NC_CODAGG2 +ENDIF +IFDEF(FI_CODAGG2) + FIELD FI_CODAGG2 +ELSEIF + FIELD CODAGG2 +ENDIF +END + IFDEF(FLD_RIDPREZZO) CURRENCY FR_RIDPREZZO 18 BEGIN @@ -2124,6 +2688,8 @@ BEGIN FIELD PCON(10) END +ENDIF + ENDPAGE #endif @@ -2245,55 +2811,4 @@ END ENDIF // Campi analitici - -IFDEF(FLD_CODAGG1) -IFDEF(TY_CODAGG1) -TY_CODAGG1 FR_CODAGG1 20 -ELSEIF -STRING FR_CODAGG1 20 -ENDIF -BEGIN -IFDEF(X_CODAGG1) -PROMPT X_CODAGG1 Y_CODAGG1 PR_CODAGG1 -ELSEIF - PROMPT 2 15 "Stringa 1 " -ENDIF -IFDEF(FL_CODAGG1) - FLAGS FL_CODAGG1 -ENDIF -IFDEF(MS_CODAGG1) - MESSAGE MS_CODAGG1 -ENDIF -IFDEF(NC_CODAGG1) - NUM_CALC NC_CODAGG1 -ENDIF - FIELD CODAGG1 -END -ENDIF - -IFDEF(FLD_CODAGG2) -IFDEF(TY_CODAGG2) -TY_CODAGG2 FR_CODAGG2 20 -ELSEIF -STRING FR_CODAGG2 13 5 -ENDIF -BEGIN -IFDEF(X_CODAGG2) - PROMPT X_CODAGG2 Y_CODAGG2 PR_CODAGG2 -ELSEIF - PROMPT 42 15 "Stringa 2 " -ENDIF -IFDEF(FL_CODAGG2) - FLAGS FL_CODAGG2 -ENDIF -IFDEF(MS_CODAGG2) - MESSAGE MS_CODAGG2 -ENDIF -IFDEF(NC_CODAGG2) - NUM_CALC NC_CODAGG2 -ENDIF - FIELD CODAGG2 -END -ENDIF - ENDMASK diff --git a/src/ve/verig01.uml b/src/ve/verig01.uml index 26e058ecf..040a68b8d 100755 --- a/src/ve/verig01.uml +++ b/src/ve/verig01.uml @@ -17,7 +17,31 @@ DEFINE_FIELD(DESMAG) DEFINE_FIELD(CODDEP) DEFINE_FIELD(DESDEP) DEFINE_FIELD(CODART) -// F_OUT(CODART, FR_CODAGG1, USER1) +// DEFINE_FIELD(JOLLY1) +// DEFINE_FIELD(JOLLY2) +// DEFINE_FIELD(JOLLY3) +// DEFINE_FIELD(JOLLY4) +// DEFINE_FIELD(JOLLY5) +// DEFINE_FIELD(JOLLY6) +// DEFINE_FIELD(JOLLY7) +// DEFINE_FIELD(JOLLY8) +// DEFINE_FIELD(JOLLY9) +// DEFINE_FIELD(JOLLY10) +// DEFINE_FIELD(QTAGG1) +// F_POS(QTAGG1, 25, 2, "Q 1") +// DEFINE_FIELD(QTAGG2) +// F_X(QTAGG2, 26) +// DEFINE_FIELD(QTAGG3) +// F_Y(QTAGG3, 15) +// DEFINE_FIELD(QTAGG4) +// F_PROMPT(QTAGG4, "Q 4") +// DEFINE_FIELD(QTAGG5) +// DEFINE_FIELD(CODAGG1) +// F_X(CODAGG1, 20) +// F_Y(CODAGG1, 15) +// F_PROMPT(CODAGG1, "Cod.Importazione ") +// DEFINE_FIELD(CODAGG2) +// F_FIELD(CODAGG1, CODIMP) DEFINE_FIELD(DESCRART) DEFINE_FIELD(UMQTA) DEFINE_FIELD(QTA) diff --git a/src/ve/verigdef.h b/src/ve/verigdef.h index f4132f73d..5900c795a 100755 --- a/src/ve/verigdef.h +++ b/src/ve/verigdef.h @@ -1,15 +1,20 @@ -#define INCLDEF(file) !!include file +#define INCLDEF(file) !!include file; #define IFDEF(name) !!ifdef name -#define IF(cond) !!if cond +#define IFNDEF(name) !!ifndef name +#define IF(cond) !!if (cond) #define ENDIF !!endif #define ELSEIF !!else #define DEFINE_FIELD(name) !!define FLD_##name ; -#define F_POS(name, row, col, prompt) !!define X_##name row ;\ -!!define Y_##name col ;\ -!!define PR_##name prompt ; +#define F_X(name, row) !!define X_##name row ; +#define F_Y(name, col) !!define Y_##name col ; +#define F_PROMPT(name, prompt) !!define PR_##name prompt ; // da implementare +#define F_POS(name, row, col, prompt) F_X(name, row);\ +F_Y(name, col);\ +F_PROMPT(name, prompt); +#define F_FIELD(name, field) !!define FI_##name field ; #define F_TYPE(name, type) !!define TY_##name type ; #define F_LEN(name, len) !!define LN_##name len ; #define F_DEC(name, dec) !!define DE_##name dec ;