Modifiche e aggiunte (in corso d'opera) al form editor

Correzione formato date e chiamate a string()


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

ba/ba1100.cpp

@@ -57,7 +57,6 @@ public:
 };
 
 HIDDEN void build_filelist(const char *path, TArray & list)
-
 {
 #if XVT_OS==XVT_OS_SCOUNIX
   struct directx
@@ -195,7 +194,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
 void TManutenzione_app::print()
 
 {
-  TPrinter & p = printer();
+  TPrinter& p = printer();
 
   p.open();
   p.headerlen(6);

ba/ba1100.h

@@ -14,8 +14,6 @@
 ///////////////////////////////////////////////////////////
 // TDir_sheet  
 ///////////////////////////////////////////////////////////
-#define DESCPAR "FieldDescr"
-#define DESCDIR "recdesc"
 
 class TDir_sheet : public TSheet
 {

ba/ba2100.h

@@ -36,10 +36,18 @@
 #define F_GROUP22   152
 #define F_GROUP23   153
 #define F_GROUP24   154
-
+#define F_DFORMAT   155
+#define F_DDAY      156
+#define F_DMONTH    157
+#define F_DYEAR     158
+#define F_DSEP      159
+#define F_DEXAMPLE  160
+#define F_FILE      161
+#define F_BUT_FILE  162
+#define F_BUT_FIELD 163
 
 
 #define F_ITEMS     200
 #define F_DECIMALS  206
-
+#define F_CAPTION   301
 

ba/ba2100f.uml

@@ -20,13 +20,13 @@ LIST F_CLASS 10
 BEGIN
   PROMPT 1 1 "Tipo    "
   FLAGS "DG"
-  ITEM "STRINGA|Testo" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "STRINGA|Testo" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS|HIDE,8@
-  ITEM "NUMERO|Numero" MESSAGE SHOW,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "NUMERO|Numero" MESSAGE SHOW,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS|HIDE,8@
-  ITEM "DATA|Data"     MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "DATA|Data"     MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS|SHOW,8@
-  ITEM "LISTA|Lista"   MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|SHOW,F_ITEMS
+  ITEM "LISTA|Lista"   MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|SHOW,F_ITEMS|HIDE,8@
-  ITEM "GRUPPO|Gruppo" MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "GRUPPO|Gruppo" MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS|HIDE,8@
-  ITEM "LINEA|Linea"   MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "LINEA|Linea"   MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS|HIDE,8@
-  ITEM "FIGURA|Figura" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "FIGURA|Figura" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS|HIDE,8@
 END
 
 STRING F_KEY 80 60
@@ -90,193 +90,284 @@ BEGIN
   HELP "Formato di stampa (# = ' ', @ = '0', ~ = '')"
 END
 
+STRING F_FILE 40
+BEGIN
+  PROMPT 1 7 "Archivio      "
+  HELP "Nome dell'archivio relativo al campo"
+  GROUP 7   
+  FLAGS "D"
+END
+           
+BUTTON F_BUT_FILE 2 1
+BEGIN          
+	PROMPT  56 7 "*"
+	PICTURE 109         
+	MESSAGE EXIT,F_BUT_FILE
+END
+           
 STRING F_FIELD 40
 BEGIN
-  PROMPT 1 7 "Campo su file "
+  PROMPT 1 8 "Campo su file "
   HELP "Nome del campo su file"
-  GROUP 7
+  GROUP 7  
+  FLAGS "D"
+END
+
+BUTTON F_BUT_FIELD 2 1
+BEGIN          
+	PROMPT  56 8 "*"
+	PICTURE 109                            
+	MESSAGE EXIT,F_BUT_FIELD
 END
 
 STRING F_FIELD2 40
 BEGIN
-  PROMPT 1 8 "II campo      "
+  PROMPT 1 9 "II campo      "
   HELP "Nome del campo su file da utilizzare se il primo e' vuoto"
   GROUP 7
 END
 
 BOOLEAN F_DISABLED
 BEGIN
-  PROMPT 60 7 "Disabilitato"
+  PROMPT 62 8 "Disabilitato"
   HELP "Il campo viene completamente ignorato e quindi nemmeno stampato"
   GROUP 7
 END
 
 BOOLEAN F_AUTOMAGIC
 BEGIN
-  PROMPT 60 8 "Automatico"
+  PROMPT 62 9 "Automatico"
   HELP "Il campo viene calcolato automaticamente"
   GROUP 7
 END
 
 GROUPBOX F_GROUP 78 4
 BEGIN
-  PROMPT 1 9 "Gruppi di stampa"
+  PROMPT 1 10 "Gruppi di stampa"
   GROUP 7
 END
 
 BOOLEAN F_GROUP1
 BEGIN
-  PROMPT 4 10 "1"
+  PROMPT 4 11 "1"
   GROUP 7
 END
 
 BOOLEAN F_GROUP2
 BEGIN
-  PROMPT 10 10 "2"
+  PROMPT 10 11 "2"
   GROUP 7
 END
 
 BOOLEAN F_GROUP3
 BEGIN
-  PROMPT 16 10 "3"
+  PROMPT 16 11 "3"
   GROUP 7
 END
 
 BOOLEAN F_GROUP4
 BEGIN
-  PROMPT 22 10 "4"
+  PROMPT 22 11 "4"
   GROUP 7
 END
 
 BOOLEAN F_GROUP5
 BEGIN
-  PROMPT 28 10 "5"
+  PROMPT 28 11 "5"
   GROUP 7
 END
 
 BOOLEAN F_GROUP6
 BEGIN
-  PROMPT 34 10 "6"
+  PROMPT 34 11 "6"
   GROUP 7
 END
 
 BOOLEAN F_GROUP7
 BEGIN
-  PROMPT 40 10 "7"
+  PROMPT 40 11 "7"
   GROUP 7
 END
 
 BOOLEAN F_GROUP8
 BEGIN
-  PROMPT 46 10 "8"
+  PROMPT 46 11 "8"
   GROUP 7
 END
 
 BOOLEAN F_GROUP9
 BEGIN
-  PROMPT 52 10 "9"
+  PROMPT 52 11 "9"
   GROUP 7
 END
 
 BOOLEAN F_GROUP10
 BEGIN
-  PROMPT 58 10 "10"
+  PROMPT 58 11 "10"
   GROUP 7
 END
 
 BOOLEAN F_GROUP11
 BEGIN
-  PROMPT 64 10 "11"
+  PROMPT 64 11 "11"
   GROUP 7
 END
 
 BOOLEAN F_GROUP12
 BEGIN
-  PROMPT 70 10 "12"
+  PROMPT 70 11 "12"
   GROUP 7
 END
 
 BOOLEAN F_GROUP13
 BEGIN
-  PROMPT 4 11 "13"
+  PROMPT 4 12 "13"
   GROUP 7
 END
 
 BOOLEAN F_GROUP14
 BEGIN
-  PROMPT 10 11 "14"
+  PROMPT 10 12 "14"
   GROUP 7
 END
 
 BOOLEAN F_GROUP15
 BEGIN
-  PROMPT 16 11 "15"
+  PROMPT 16 12 "15"
   GROUP 7
 END
 
 BOOLEAN F_GROUP16
 BEGIN
-  PROMPT 22 11 "16"
+  PROMPT 22 12 "16"
   GROUP 7
 END
 
 BOOLEAN F_GROUP17
 BEGIN
-  PROMPT 28 11 "17"
+  PROMPT 28 12 "17"
   GROUP 7
 END
 
 BOOLEAN F_GROUP18
 BEGIN
-  PROMPT 34 11 "18"
+  PROMPT 34 12 "18"
   GROUP 7
 END
 
 BOOLEAN F_GROUP19
 BEGIN
-  PROMPT 40 11 "19"
+  PROMPT 40 12 "19"
   GROUP 7
 END
 
 BOOLEAN F_GROUP20
 BEGIN
-  PROMPT 46 11 "20"
+  PROMPT 46 12 "20"
   GROUP 7
 END
 
 BOOLEAN F_GROUP21
 BEGIN
-  PROMPT 52 11 "21"
+  PROMPT 52 12 "21"
   GROUP 7
 END
 
 BOOLEAN F_GROUP22
 BEGIN
-  PROMPT 58 11 "22"
+  PROMPT 58 12 "22"
   GROUP 7
 END
 
 BOOLEAN F_GROUP23
 BEGIN
-  PROMPT 64 11 "23"
+  PROMPT 64 12 "23"
   GROUP 7
 END
 
 BOOLEAN F_GROUP24
 BEGIN
-  PROMPT 70 11 "24"
+  PROMPT 70 12 "24"
   GROUP 7
 END
 
 SPREADSHEET F_ITEMS
 BEGIN
-  PROMPT 0 13 "Spreadsheet"
+  PROMPT 0 14 "Spreadsheet"
   ITEM "Codice@8"
   ITEM "Testo@32"
   ITEM "Messaggio@80"
   GROUP 7
 END
 
+// Gruppo 8 per edit formato data
+GROUPBOX DLG_NULL 78 5
+BEGIN
+	PROMPT 1 14 "Formato data"
+    GROUP 8
+END
+
+LIST F_DFORMAT 16
+BEGIN
+   PROMPT 3 15  "Tipo data      "   
+   ITEM "1|Giorno Mese Anno"
+   ITEM "2|Mese Anno Giorno"
+   ITEM "3|Anno Giorno Mese"
+   ITEM "7|Mese Anno"
+   ITEM "4|Anno"
+   ITEM "5|Mese"
+   ITEM "6|Giorno"
+   GROUP 8
+END           
+	   
+LIST F_DDAY 16
+BEGIN
+   PROMPT 42 15 "Formato giorno " 
+   ITEM "4|Con zeri(es. 02)"
+   ITEM "2|Normale (es. 2)"
+   ITEM "5|In lettere"
+   ITEM "6|Giorno settimana"
+   GROUP 8
+END           
+	   
+LIST F_DMONTH 16
+BEGIN
+   PROMPT 3 16  "Formato mese   " 
+   ITEM "4|Con zeri(es. 02)"
+   ITEM "2|Normale (es. 2)"
+   ITEM "5|In lettere"
+   ITEM "7|Trimestre"
+   GROUP 8
+END           
+	   
+LIST F_DYEAR 16
+BEGIN
+   PROMPT 42 16 "Formato anno   "  
+   ITEM "2|Breve (2 cifre)"
+   ITEM "4|Lungo (4 cifre)"
+   GROUP 8
+END           
+	   
+LIST F_DSEP 5
+BEGIN
+   PROMPT 3 17 "Separatore     "     
+   ITEM "-|-"
+   ITEM "/|/"
+   ITEM ".|."
+   ITEM ",|,"
+   ITEM "S|Spazio"
+   GROUP 8
+END           
+	   
+STRING F_DEXAMPLE 40
+BEGIN
+   PROMPT 28 17 "Esempio  "  
+   FLAGS "D"
+   GROUP 8
+END           
+	   
+// fine gruppo 8
+
 ENDPAGE
 
 ENDMASK

ba/ba2100u.uml

@@ -0,0 +1,37 @@
+#include "ba2100.h"
+
+PAGE "Modifica sottosezione" -1 -1 52 5
+
+
+STRING F_CAPTION 40
+BEGIN
+	PROMPT 2 1 "Titolo "
+	HELP "Specificare il titolo della sottosezione"
+END
+
+
+BUTTON DLG_OK 10 2
+BEGIN
+	PROMPT -14 -1 ""
+END
+
+BUTTON DLG_EDIT 10 2
+BEGIN
+	PROMPT -24 -1 ""
+	MESSAGE EXIT,K_INS
+END
+
+BUTTON DLG_DELREC 10 2
+BEGIN   
+	PROMPT -34 -1 ""
+	MESSAGE EXIT,K_DEL
+END
+
+
+BUTTON DLG_CANCEL 10 2
+BEGIN
+	PROMPT -44 -1 ""
+END
+
+ENDPAGE
+ENDMASK

ba/ba6101.cpp

@@ -547,7 +547,7 @@ void TAnaprint_app::set_scheda_socio()
             FLD(LF_ANAG,"COFI"));
     set_row(3,"");
 
-    b1 = anaf->get_date("DATANASC").string(4);
+    b1 = anaf->get_date("DATANASC").string(full);
     b2 = anaf->get("SESSO");
     b3 = anaf->get("STATONASC").empty() ? 
       "Italiana" : anaf->get("STATONASC");