Giornaliero controlli: corretta la maschera di inserimento

Patch level         :
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


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

at/at0300a.h

@@ -6,11 +6,14 @@
 #define F_TIPOCON             202
 #define F_PROSSTIPO           203
 #define F_PROSSDATA           204
-#define F_DESC_TIPOCON        205
+#define F_MOTIVO              205
-#define F_DESC_PROSSTIPO      206
+#define F_RESPONSAB           206
+#define F_DESC_TIPOCON        207
+#define F_DESC_PROSSTIPO      208
+#define F_DESC_MOTIVO         209
 
 // spreadsheet
-#define F_SOGGETTI            207
+#define F_SOGGETTI            210
 
 // pagina soggetti
 #define F_S_CODICE                101
@@ -19,16 +22,20 @@
 #define F_S_TIPOCON               104
 #define F_S_PROSSTIPO             105
 #define F_S_PROSSDATA             106
-#define F_S_DATANASC              107
+#define F_S_MOTIVO                107
-#define F_S_CODSEZ                108
+#define F_S_RESPONSAB             108
-#define F_S_CODSOT                109
+#define F_S_DATANASC              109
-#define F_S_CATDON                110
+#define F_S_TOTDON                110
-#define F_S_TESSAVIS              111
+#define F_S_CODSEZ                111
+#define F_S_CODSOT                112
+#define F_S_CATDON                113
+#define F_S_TESSAVIS              114
 
 #define F_S_DENSEZ                151
 #define F_S_DENSOT                152
 #define F_S_DESC_TIPOCON          153
-#define F_S_DESC_CATDON           155
+#define F_S_DESC_CATDON           154
+#define F_S_DESC_MOTIVO           155
 
 #define F_S_IDON1               156
 #define F_S_IDON2               157

at/at0300a.uml

@@ -54,7 +54,7 @@ END
 
 STRING F_TIPOCON 2
 BEGIN
-   PROMPT 2 2 "Tipo/Esito     "
+   PROMPT 30 1 "Tipo/Esito    "
    FLAGS "U"
    USE TCS
    INPUT CODTAB F_TIPOCON
@@ -67,9 +67,15 @@ BEGIN
    HELP "Tipo/Esito controllo sanitario"
 END
 
+DATE F_PROSSDATA
+BEGIN
+   PROMPT 2 2 "Data prossimo  "
+   HELP "Data prevista per il prossimo controllo"
+END
+
 STRING F_PROSSTIPO 2
 BEGIN
-   PROMPT 2 3 "Prossimo tipo  "
+   PROMPT 30 2 "Prossimo tipo "
    FLAGS "U"
    USE TCS
    INPUT CODTAB F_PROSSTIPO
@@ -82,21 +88,41 @@ BEGIN
    HELP "Tipo/Esito del prossimo controllo previsto"
 END
 
-DATE F_PROSSDATA
+STRING F_MOTIVO 4
 BEGIN
-   PROMPT 2 4 "Data prevista  "
+   PROMPT 2 3 "Motivo         "
-   HELP "Data prevista per il prossimo controllo"
+   FLAGS "U"
+   USE MTC
+   INPUT CODTAB F_MOTIVO
+   DISPLAY "Codice" CODTAB
+   DISPLAY "Descrizione@50" S0
+   OUTPUT F_MOTIVO CODTAB
+   OUTPUT F_DESC_MOTIVO S0
+   CHECKTYPE NORMAL
+   WARNING "Codice motivo non presente"
+   HELP "Motivo del controllo sanitario"
+END
+
+STRING F_RESPONSAB 50
+BEGIN
+   PROMPT 2 4 "Responsabile   "
 END
 
 STRING F_DESC_TIPOCON 25
 BEGIN
-  PROMPT 30 2 ""
+  PROMPT 50 1 ""
   FLAGS "D"
 END
 
 STRING F_DESC_PROSSTIPO 25
 BEGIN
-  PROMPT 30 3 ""
+  PROMPT 50 2 ""
+  FLAGS "D"
+END
+
+STRING F_DESC_MOTIVO 25
+BEGIN
+  PROMPT 25 3 ""
   FLAGS "D"
 END
 
@@ -106,10 +132,13 @@ BEGIN
    ITEM "Codice@8"
    ITEM "Cognome@25"
    ITEM "Nome@25"
-   ITEM "Contr."
+   ITEM "Tipo"
-   ITEM "Pross."
+   ITEM "Pr.tipo"
-   ITEM "Data pross."
+   ITEM "Pr.data"
+   ITEM "Mot."
+   ITEM "Responsabile@15"
    ITEM "Nato il@10"
+   ITEM "Don."
    ITEM "Sez."
    ITEM "Sot."
    ITEM "Cat."
@@ -138,6 +167,7 @@ BEGIN
   DISPLAY "Cognome@25" COGNOME
   DISPLAY "Nome@25" NOME
   DISPLAY "Nato il@10" DATANASC
+  DISPLAY "Don." TOTDON
   DISPLAY "Sez." CODSEZ
   DISPLAY "Sot." CODSOT
   DISPLAY "C." CATDON
@@ -150,8 +180,8 @@ BEGIN
   OUTPUT F_S_CODSOT CODSOT
   OUTPUT F_S_CATDON CATDON
   OUTPUT F_S_TESSAVIS TESSAVIS
-  //CHECKTYPE NORMAL
+  OUTPUT F_S_TOTDON TOTDON
-  //ADD RUN at0 -0
+  ADD RUN at0 -0
 END
 
 STRING F_S_COGNOME 25
@@ -164,15 +194,23 @@ BEGIN
   DISPLAY "Cognome@25" COGNOME
   DISPLAY "Nome@25" NOME
   DISPLAY "Nato il@10" DATANASC
+  DISPLAY "Don." TOTDON
   DISPLAY "Codice@8" CODICE
   DISPLAY "Sez." CODSEZ
   DISPLAY "Sot." CODSOT
   DISPLAY "C." CATDON
   DISPLAY "Tessera" TESSAVIS
-  COPY OUTPUT F_S_CODICE
+  OUTPUT F_S_CODICE CODICE
+  OUTPUT F_S_COGNOME COGNOME
+  OUTPUT F_S_NOME NOME
+  OUTPUT F_S_DATANASC DATANASC
+  OUTPUT F_S_CODSEZ CODSEZ
+  OUTPUT F_S_CODSOT CODSOT
+  OUTPUT F_S_CATDON CATDON
+  OUTPUT F_S_TESSAVIS TESSAVIS
+  OUTPUT F_S_TOTDON TOTDON
   HELP "Cognome del soggetto"
-  //CHECKTYPE SEARCH
+  ADD RUN at0 -0
-  //ADD RUN at0 -0
 END
 
 STRING F_S_NOME 25
@@ -181,19 +219,19 @@ BEGIN
   COPY ALL F_S_COGNOME
   HELP "Nome del soggetto"
   //CHECKTYPE SEARCH
-  //ADD RUN at0 -0
+  ADD RUN at0 -0
 END
 
-GROUPBOX DLG_NULL 77 9
+GROUPBOX DLG_NULL 77 10
 BEGIN
   PROMPT 1 9 "Dati del controllo sanitario effettuato"
 END
 
 STRING F_S_TIPOCON 2
 BEGIN
-   PROMPT 2 10 "Tipo controllo "
+   PROMPT 2 10 "Tipo/Esito    "
    FLAGS "U"
-   USE TCS SELECT S6=="N"
+   USE TCS SELECT S6 # "I"
    INPUT CODTAB F_S_TIPOCON
    DISPLAY "Codice" CODTAB
    DISPLAY "Descrizione@30" S0
@@ -205,7 +243,7 @@ END
 
 STRING F_S_PROSSTIPO 2
 BEGIN
-   PROMPT 2 16 "Prossimo contr.: Tipo "
+   PROMPT 2 11 "Prossimo tipo "
    FLAGS "U"
    USE TCS
    INPUT CODTAB F_S_PROSSTIPO
@@ -220,10 +258,36 @@ END
 
 DATE F_S_PROSSDATA
 BEGIN
-   PROMPT 56 16 "Data "
+   PROMPT 51 11 "Data "
    HELP "Data controllo"
 END
 
+STRING F_S_MOTIVO 4
+BEGIN
+   PROMPT 2 12 "Motivo        "
+   FLAGS "U"
+   USE MTC
+   INPUT CODTAB F_S_MOTIVO
+   DISPLAY "Codice" CODTAB
+   DISPLAY "Descrizione@50" S0
+   OUTPUT F_S_MOTIVO CODTAB
+   OUTPUT F_S_DESC_MOTIVO S0
+   CHECKTYPE NORMAL
+   WARNING "Codice motivo non presente"
+   HELP "Motivo del controllo sanitario"
+END
+
+STRING F_S_RESPONSAB 50
+BEGIN
+   PROMPT 2 13 "Responsabile  "
+END
+
+NUMERO F_S_TOTDON 3
+BEGIN
+   PROMPT 40 7 "Totale donazioni "
+   FLAGS "D"
+END
+
 DATE F_S_DATANASC
 BEGIN
   PROMPT 2 3 "Nato il        "
@@ -277,16 +341,28 @@ END
 
 STRING F_S_TESSAVIS 10
 BEGIN
-  PROMPT 52 7 "Tessera AVIS "
+  PROMPT 38 3 "Tessera "
   FLAGS "D"
 END
 
 STRING F_S_DESC_TIPOCON 25
 BEGIN
-  PROMPT 23 10 ""
+  PROMPT 22 10 ""
   FLAGS "D"
 END
 
+STRING F_S_DESC_PROSSTIPO 25
+BEGIN
+  PROMPT 22 11 ""
+  FLAGS "D"
+END
+
+STRING F_S_DESC_MOTIVO 25
+BEGIN
+   PROMPT 24 12 ""
+   FLAGS "D"
+END
+
 STRING F_S_DESC_CATDON 25
 BEGIN
   PROMPT 12 7 ""
@@ -295,12 +371,12 @@ END
 
 TEXT DLG_NULL
 BEGIN
-   PROMPT 2 11 "Se idoneita': Tipi donazione ammessi"
+   PROMPT 2 14 "Se idoneita': "
 END
 
 STRING F_S_IDON1 2
 BEGIN
-  PROMPT 40 11 ""
+  PROMPT 16 14 ""
   FLAGS "U"
   USE IDO
   INPUT CODTAB F_S_IDON1
@@ -315,7 +391,7 @@ END
 
 STRING F_S_IDON2 2
 BEGIN
-  PROMPT 40 12 ""
+  PROMPT 16 15 ""
   FLAGS "U"
   USE IDO
   INPUT CODTAB F_S_IDON2
@@ -330,7 +406,7 @@ END
 
 STRING F_S_IDON3 2
 BEGIN
-   PROMPT 40 13 ""
+   PROMPT 16 16 ""
    FLAGS "U"
   USE IDO
   INPUT CODTAB F_S_IDON3
@@ -345,7 +421,7 @@ END
 
 STRING F_S_IDON4 2
 BEGIN
-   PROMPT 40 14 ""
+   PROMPT 16 17 ""
    FLAGS "U"
   USE IDO
   INPUT CODTAB F_S_IDON4
@@ -360,48 +436,42 @@ END
 
 TEXT DLG_NULL
 BEGIN
-   PROMPT 2 15 "                          Intervalli"
+   PROMPT 50 14 "Intervalli: "
 END
 
 NUMBER F_S_INTSI 3 0
 BEGIN
-   PROMPT 40 15 "Sangue intero "
+   PROMPT 50 15 "Sangue intero "
    FLAGS "U"
 END
 
 NUMBER F_S_INTAF 3 0
 BEGIN
-   PROMPT 60 15 "Aferesi "
+   PROMPT 50 16 "Aferesi       "
    FLAGS "U"
 END
 
 STRING F_S_DESC_IDON1 25
 BEGIN
-  PROMPT 46 11 ""
+  PROMPT 22 14 ""
   FLAGS "D"
 END
 
 STRING F_S_DESC_IDON2 25
 BEGIN
-  PROMPT 46 12 ""
+  PROMPT 22 15 ""
   FLAGS "D"
 END
 
 STRING F_S_DESC_IDON3 25
 BEGIN
-  PROMPT 46 13 ""
+  PROMPT 22 16 ""
   FLAGS "D"
 END
 
 STRING F_S_DESC_IDON4 25
 BEGIN
-  PROMPT 46 14 ""
+  PROMPT 22 17 ""
-  FLAGS "D"
-END
-
-STRING F_S_DESC_PROSSTIPO 25
-BEGIN
-  PROMPT 29 16 ""
   FLAGS "D"
 END