Inserito il campo F_INTEST in ba2100f.uml.

Corretta la sequenza dei tab stops in ba21fn.uml


git-svn-id: svn://10.65.10.50/trunk@2398 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba2100f.uml

@@ -94,21 +94,6 @@ MESSAGE COPY,F_HEIGHT
 GROUP 7
 END
 
-BOOLEAN F_FINKL
-BEGIN 
-  PROMPT 40 18 "Fincatura prima"
-END
-
-BOOLEAN F_FINKR
-BEGIN 
-  PROMPT 63 18 "Fincatura dopo"
-END
-
-NUMBER F_SPACES 2
-BEGIN
-   PROMPT 1 18 "N. spazi davanti al campo " 
-END
-
 STRING F_PICTURE 80 40
 BEGIN
 PROMPT 1 4 "Formato       "
@@ -140,16 +125,37 @@ PROMPT 1 5 "Testo fisso   "
 HELP "Eventuale testo fisso da stampare"
 END
 
+NUMBER F_SPACES 2
+BEGIN
+   PROMPT 1 6 "N. spazi davanti al campo " 
+END
+
+BOOLEAN F_FINKL
+BEGIN 
+  PROMPT 40 6 "Fincatura prima"
+END
+
+BOOLEAN F_FINKR
+BEGIN 
+  PROMPT 63 6 "Fincatura dopo"
+END
+
+STRING F_INTEST 80 60
+BEGIN
+PROMPT 1 7 "Intestazione  "
+HELP "Eventuale intestazione da stampare per sezioni COLUMNWISE"
+END
+
 // Gruppo 8 per edit formato data
 GROUPBOX DLG_NULL 78 5
 BEGIN
-PROMPT 1 6 "Formato data"
+PROMPT 1 8 "Formato data"
 GROUP 8
 END
 
 LIST F_DFORMAT 16
 BEGIN
-PROMPT 3 7  "Tipo data      "   
+PROMPT 3 9  "Tipo data      "   
 ITEM "1|Giorno Mese Anno"
 ITEM "2|Mese Anno Giorno"
 ITEM "3|Anno Giorno Mese"
@@ -162,7 +168,7 @@ END
 
 LIST F_DDAY 16
 BEGIN
-PROMPT 42 7 "Formato giorno " 
+PROMPT 42 9 "Formato giorno " 
 ITEM "4|Con zeri(es. 02)"
 ITEM "2|Normale (es. 2)"
 ITEM "5|In lettere"
@@ -172,7 +178,7 @@ END
 
 LIST F_DMONTH 16
 BEGIN
-PROMPT 3 8 "Formato mese   " 
+PROMPT 3 10 "Formato mese   " 
 ITEM "4|Con zeri(es. 02)"
 ITEM "2|Normale (es. 2)"
 ITEM "5|In lettere"
@@ -182,7 +188,7 @@ END
 
 LIST F_DYEAR 16
 BEGIN
-PROMPT 42 8 "Formato anno   "  
+PROMPT 42 10 "Formato anno   "  
 ITEM "2|Breve (2 cifre)"
 ITEM "4|Lungo (4 cifre)"
 GROUP 8
@@ -190,7 +196,7 @@ END
 
 LIST F_DSEP 5
 BEGIN
-PROMPT 3 9 "Separatore     "     
+PROMPT 3 11 "Separatore     "     
 ITEM "-|-"
 ITEM "/|/"
 ITEM ".|."
@@ -201,7 +207,7 @@ END
 
 STRING F_DEXAMPLE 40
 BEGIN
-PROMPT 28 9 "Esempio  "  
+PROMPT 28 11 "Esempio  "  
 FLAGS "D"
 GROUP 8
 END           
@@ -211,48 +217,48 @@ END
 
 STRING F_FILE1 80 60
 BEGIN
-PROMPT 2 11 "Archivio "
+PROMPT 2 13 "Archivio "
 HELP "Nome dell'archivio relativo al campo"
 FLAGS "D"
 END
 
 BUTTON F_BUT_FILE1 2 1
 BEGIN          
-PROMPT 73 11 "*"
+PROMPT 73 13 "*"
 PICTURE 109         
 GROUP 7  
 END
 
 STRING F_FIELD1 80 60
 BEGIN
-PROMPT 2 12 "Campo 1  "
+PROMPT 2 14 "Campo 1  "
 HELP "Nome del campo su file"
 FLAGS "D"
 END
 
 BUTTON F_BUT_FIELD1 2 1
 BEGIN          
-PROMPT 73 12 "*"
+PROMPT 73 14 "*"
 PICTURE 109                            
 GROUP 7  
 END
 
 STRING F_FIELDREF1 20 16
 BEGIN
-PROMPT 60 13 ""
+PROMPT 60 15 ""
 FLAGS "D"
 END
 
 NUMBER F_FROM1 2
 BEGIN
-PROMPT 2 13 "Da       "
+PROMPT 2 15 "Da       "
 FLAGS "U"
 GROUP 7  
 END
 
 NUMBER F_TO1 2
 BEGIN
-PROMPT 22 13 "A "
+PROMPT 22 15 "A "
 FLAGS "U"
 GROUP 7  
 END
@@ -260,48 +266,48 @@ END
 
 STRING F_FILE2 60
 BEGIN
-PROMPT 2 14 "Archivio "
+PROMPT 2 16 "Archivio "
 HELP "Nome dell'archivio relativo al campo"
 FLAGS "D"
 END
 
 BUTTON F_BUT_FILE2 2 1
 BEGIN          
-PROMPT 73 14 "*"
+PROMPT 73 16 "*"
 PICTURE 109         
 GROUP 7  
 END
 
 STRING F_FIELD2 60
 BEGIN
-PROMPT 2 15 "Campo 2  "
+PROMPT 2 17 "Campo 2  "
 HELP "Nome del campo su file"
 FLAGS "D"
 END
 
 BUTTON F_BUT_FIELD2 2 1
 BEGIN          
-PROMPT 73 15 "*"
+PROMPT 73 17 "*"
 PICTURE 109                            
 GROUP 7  
 END
 
 STRING F_FIELDREF2 16
 BEGIN
-PROMPT 60 16 ""
+PROMPT 60 18 ""
 FLAGS "D"
 END
 
 NUMBER F_FROM2 2
 BEGIN
-PROMPT 2 16 "Da       "
+PROMPT 2 18 "Da       "
 FLAGS "U"
 GROUP 7  
 END
 
 NUMBER F_TO2 2
 BEGIN
-PROMPT 22 16 "A "
+PROMPT 22 18 "A "
 FLAGS "U"
 GROUP 7  
 END

ba/ba21fn.uml

@@ -8,6 +8,12 @@ BEGIN
   HELP  ""
 END
 
+STRING C_HR 1
+BEGIN
+  PROMPT 8 1 ""
+  HELP  ""
+END
+
 STRING C_TM 1
 BEGIN
   PROMPT  15 1 ""
@@ -20,21 +26,9 @@ BEGIN
   HELP  ""
 END
 
-STRING C_BL 1
+STRING C_VR 1                                         
 BEGIN
-  PROMPT 1 9 ""
-  HELP  ""
-END
-
-STRING C_BM 1
-BEGIN
-  PROMPT 15 9 ""
-  HELP  ""
-END
-
-STRING C_BR 1 
-BEGIN
-  PROMPT 29 9 ""
+  PROMPT 1 3 ""
   HELP  ""
 END
 
@@ -56,15 +50,21 @@ BEGIN
   HELP  ""
 END
 
-STRING C_HR 1
+STRING C_BL 1
 BEGIN
-  PROMPT 8 1 ""
+  PROMPT 1 9 ""
   HELP  ""
 END
 
-STRING C_VR 1                                         
+STRING C_BM 1
 BEGIN
-  PROMPT 1 3 ""
+  PROMPT 15 9 ""
+  HELP  ""
+END
+
+STRING C_BR 1 
+BEGIN
+  PROMPT 29 9 ""
   HELP  ""
 END
 
@@ -79,4 +79,4 @@ BEGIN
 END
                                           
 ENDPAGE
-ENDMASK
+ENDMASK

ba/bafrm.h

@@ -15,6 +15,7 @@
 #define F_MEMO      113
 #define F_NUMCOL    114
 #define F_LENFMT    115
+#define F_INTEST    116
 
 // defines per ba2100s e sc3100s
 #define F_FONT      113