Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            : Giornaliero controlli: e' possibile inserire anche le idoneita e gli intervalli


git-svn-id: svn://10.65.10.50/trunk@7135 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
cris 1998-09-25 07:50:43 +00:00
parent e071d68bee
commit f9275c5f59
3 changed files with 131 additions and 109 deletions

View File

@ -203,8 +203,14 @@ int TGiornalieroC::write(TSheet_field& s)
if (err == NOERR) if (err == NOERR)
{ {
TString16 tipocon = row.get(3); TString16 tipocon = row.get(3);
TString16 prosstipo = row.get(4); TString16 idon1 = row.get(4);
TDate prossdata = row.get(5); TString16 idon2 = row.get(5);
TString16 idon3 = row.get(6);
TString16 idon4 = row.get(7);
int intsi = row.get_int(8);
int intaf = row.get_int(9);
TString16 prosstipo = row.get(10);
TDate prossdata = row.get(11);
if (tipocon.blank()) if (tipocon.blank())
tipocon = tipogen; tipocon = tipogen;
if (prosstipo.blank()) if (prosstipo.blank())
@ -217,16 +223,25 @@ int TGiornalieroC::write(TSheet_field& s)
recc->put(CON_CODICE, row.get(0)); recc->put(CON_CODICE, row.get(0));
recc->put(CON_DATACON, datagen); recc->put(CON_DATACON, datagen);
recc->put(CON_TIPOCON, tipocon); recc->put(CON_TIPOCON, tipocon);
recc->put(CON_IDON1, idon1);
recc->put(CON_IDON1, idon2);
recc->put(CON_IDON1, idon3);
recc->put(CON_IDON1, idon4);
recc->put(CON_INTSI, intsi);
recc->put(CON_INTAF, intaf);
recc->put(CON_PROSSTIPO, prosstipo); recc->put(CON_PROSSTIPO, prosstipo);
recc->put(CON_PROSSDATA, prossdata); recc->put(CON_PROSSDATA, prossdata);
if (modstato_tcs(tipocon) == 'I') if (modstato_tcs(tipocon) == 'I')
{ {
recc->put(CON_IDON1, sog.get(SOG_IDON1)); if (idon1.empty() && idon2.empty() && idon3.empty() && idon4.empty() && intsi == 0 && intaf == 0)
recc->put(CON_IDON2, sog.get(SOG_IDON2)); {
recc->put(CON_IDON3, sog.get(SOG_IDON3)); recc->put(CON_IDON1, sog.get(SOG_IDON1));
recc->put(CON_IDON4, sog.get(SOG_IDON4)); recc->put(CON_IDON2, sog.get(SOG_IDON2));
recc->put(CON_INTSI, sog.get(SOG_INTSI)); recc->put(CON_IDON3, sog.get(SOG_IDON3));
recc->put(CON_INTAF, sog.get(SOG_INTAF)); recc->put(CON_IDON4, sog.get(SOG_IDON4));
recc->put(CON_INTSI, sog.get(SOG_INTSI));
recc->put(CON_INTAF, sog.get(SOG_INTAF));
}
} }
bool insert = FALSE; bool insert = FALSE;
bool exist = FALSE; bool exist = FALSE;
@ -275,6 +290,7 @@ int TGiornalieroC::write(TSheet_field& s)
const TDate oggi(TODAY); const TDate oggi(TODAY);
sog.put(SOG_DATAULTAGG,oggi); sog.put(SOG_DATAULTAGG,oggi);
sog.put(SOG_UTENULTAGG,user()); sog.put(SOG_UTENULTAGG,user());
sog.rewrite();
const TDate dataprossi = sog.get_date(SOG_DATAPROSSI); const TDate dataprossi = sog.get_date(SOG_DATAPROSSI);
const TDate dataconv = sog.get_date(SOG_DATACONV); const TDate dataconv = sog.get_date(SOG_DATACONV);
const char stato = modstato_tcs(sog.get(SOG_STATO)); const char stato = modstato_tcs(sog.get(SOG_STATO));
@ -287,8 +303,8 @@ int TGiornalieroC::write(TSheet_field& s)
sog.put(SOG_DATACONV, datanulla); sog.put(SOG_DATACONV, datanulla);
const int numzero = 0; const int numzero = 0;
sog.put(SOG_NUMCONV,numzero); sog.put(SOG_NUMCONV,numzero);
sog.rewrite();
} }
sog.rewrite();
} }
} }
} }

View File

@ -20,16 +20,22 @@
#define F_S_COGNOME 102 #define F_S_COGNOME 102
#define F_S_NOME 103 #define F_S_NOME 103
#define F_S_TIPOCON 104 #define F_S_TIPOCON 104
#define F_S_PROSSTIPO 105 #define F_S_IDON1 105
#define F_S_PROSSDATA 106 #define F_S_IDON2 106
#define F_S_MOTIVO 107 #define F_S_IDON3 107
#define F_S_RESPONSAB 108 #define F_S_IDON4 108
#define F_S_DATANASC 109 #define F_S_INTSI 109
#define F_S_TOTDON 110 #define F_S_INTAF 110
#define F_S_CODSEZ 111 #define F_S_PROSSTIPO 111
#define F_S_CODSOT 112 #define F_S_PROSSDATA 112
#define F_S_CATDON 113 #define F_S_MOTIVO 113
#define F_S_TESSAVIS 114 #define F_S_RESPONSAB 114
#define F_S_DATANASC 115
#define F_S_TOTDON 116
#define F_S_CODSEZ 117
#define F_S_CODSOT 118
#define F_S_CATDON 119
#define F_S_TESSAVIS 120
#define F_S_DENSEZ 151 #define F_S_DENSEZ 151
#define F_S_DENSOT 152 #define F_S_DENSOT 152
@ -37,14 +43,8 @@
#define F_S_DESC_CATDON 154 #define F_S_DESC_CATDON 154
#define F_S_DESC_MOTIVO 155 #define F_S_DESC_MOTIVO 155
#define F_S_IDON1 156 #define F_S_DESC_IDON1 156
#define F_S_IDON2 157 #define F_S_DESC_IDON2 157
#define F_S_IDON3 158 #define F_S_DESC_IDON3 158
#define F_S_IDON4 159 #define F_S_DESC_IDON4 159
#define F_S_INTSI 160 #define F_S_DESC_PROSSTIPO 160
#define F_S_INTAF 161
#define F_S_DESC_IDON1 162
#define F_S_DESC_IDON2 163
#define F_S_DESC_IDON3 164
#define F_S_DESC_IDON4 165
#define F_S_DESC_PROSSTIPO 166

View File

@ -133,6 +133,12 @@ BEGIN
ITEM "Cognome@25" ITEM "Cognome@25"
ITEM "Nome@25" ITEM "Nome@25"
ITEM "Tipo" ITEM "Tipo"
ITEM "Id.1@F"
ITEM "Id.2@F"
ITEM "Id.3@F"
ITEM "Id.4@F"
ITEM "Int.SI"
ITEM "Int.AF"
ITEM "Pr.tipo" ITEM "Pr.tipo"
ITEM "Pr.data" ITEM "Pr.data"
ITEM "Mot." ITEM "Mot."
@ -231,7 +237,7 @@ STRING F_S_TIPOCON 2
BEGIN BEGIN
PROMPT 2 10 "Tipo/Esito " PROMPT 2 10 "Tipo/Esito "
FLAGS "U" FLAGS "U"
USE TCS SELECT S6 # "I" USE TCS
INPUT CODTAB F_S_TIPOCON INPUT CODTAB F_S_TIPOCON
DISPLAY "Codice" CODTAB DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@30" S0 DISPLAY "Descrizione@30" S0
@ -241,6 +247,83 @@ BEGIN
HELP "Tipo/Esito controllo sanitario" HELP "Tipo/Esito controllo sanitario"
END END
STRING F_S_IDON1 2
BEGIN
PROMPT 16 14 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON1
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON1 CODTAB
OUTPUT F_S_DESC_IDON1 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON2 2
BEGIN
PROMPT 16 15 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON2
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON2 CODTAB
OUTPUT F_S_DESC_IDON2 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON3 2
BEGIN
PROMPT 16 16 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON3
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON3 CODTAB
OUTPUT F_S_DESC_IDON3 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON4 2
BEGIN
PROMPT 16 17 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON4
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON4 CODTAB
OUTPUT F_S_DESC_IDON4 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
TEXT DLG_NULL
BEGIN
PROMPT 50 14 "Intervalli: "
END
NUMBER F_S_INTSI 3 0
BEGIN
PROMPT 50 15 "Sangue intero "
FLAGS "U"
END
NUMBER F_S_INTAF 3 0
BEGIN
PROMPT 50 16 "Aferesi "
FLAGS "U"
END
STRING F_S_PROSSTIPO 2 STRING F_S_PROSSTIPO 2
BEGIN BEGIN
PROMPT 2 11 "Prossimo tipo " PROMPT 2 11 "Prossimo tipo "
@ -374,83 +457,6 @@ BEGIN
PROMPT 2 14 "Se idoneita': " PROMPT 2 14 "Se idoneita': "
END END
STRING F_S_IDON1 2
BEGIN
PROMPT 16 14 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON1
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON1 CODTAB
OUTPUT F_S_DESC_IDON1 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON2 2
BEGIN
PROMPT 16 15 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON2
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON2 CODTAB
OUTPUT F_S_DESC_IDON2 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON3 2
BEGIN
PROMPT 16 16 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON3
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON3 CODTAB
OUTPUT F_S_DESC_IDON3 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
STRING F_S_IDON4 2
BEGIN
PROMPT 16 17 ""
FLAGS "U"
USE IDO
INPUT CODTAB F_S_IDON4
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@40" S0
OUTPUT F_S_IDON4 CODTAB
OUTPUT F_S_DESC_IDON4 S0
CHECKTYPE NORMAL
WARNING "Codice non presente"
HELP "Idoneita' alla donazione"
END
TEXT DLG_NULL
BEGIN
PROMPT 50 14 "Intervalli: "
END
NUMBER F_S_INTSI 3 0
BEGIN
PROMPT 50 15 "Sangue intero "
FLAGS "U"
END
NUMBER F_S_INTAF 3 0
BEGIN
PROMPT 50 16 "Aferesi "
FLAGS "U"
END
STRING F_S_DESC_IDON1 25 STRING F_S_DESC_IDON1 25
BEGIN BEGIN
PROMPT 22 14 "" PROMPT 22 14 ""