Modifiche Cristina fino al 21/08/96

git-svn-id: svn://10.65.10.50/trunk@3426 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
cris 1996-08-22 14:24:07 +00:00
parent 174fb096d4
commit 14e6fd8fd8
11 changed files with 3225 additions and 3159 deletions

View File

@ -129,11 +129,14 @@
#define F_C_IDON4 106 #define F_C_IDON4 106
#define F_C_INTSI 107 #define F_C_INTSI 107
#define F_C_INTAF 108 #define F_C_INTAF 108
#define F_C_PROSSTIPO 109
#define F_C_PROSSDATA 110
#define F_C_DESC_TIPOCON 211 #define F_C_DESC_TIPOCON 211
#define F_C_DESC_IDON1 212 #define F_C_DESC_IDON1 212
#define F_C_DESC_IDON2 213 #define F_C_DESC_IDON2 213
#define F_C_DESC_IDON3 214 #define F_C_DESC_IDON3 214
#define F_C_DESC_IDON4 215 #define F_C_DESC_IDON4 215
#define F_C_DESC_PROSSTIPO 216
// pagina benemerenze // pagina benemerenze
#define F_B_TIPOBEN 101 #define F_B_TIPOBEN 101

View File

@ -1047,12 +1047,12 @@ BEGIN
GROUP 4 GROUP 4
END END
GROUPBOX DLG_NULL 77 13 GROUPBOX DLG_NULL 77 14
BEGIN BEGIN
PROMPT 1 5 "Donazioni" PROMPT 1 5 "Donazioni"
END END
SPREADSHEET F_DONAZIONI 75 11 SPREADSHEET F_DONAZIONI 75 12
BEGIN BEGIN
PROMPT 2 6 "" PROMPT 2 6 ""
ITEM "Data@10" ITEM "Data@10"
@ -1105,12 +1105,12 @@ BEGIN
GROUP 4 GROUP 4
END END
GROUPBOX DLG_NULL 77 13 GROUPBOX DLG_NULL 77 14
BEGIN BEGIN
PROMPT 1 5 "Controlli sanitari" PROMPT 1 5 "Controlli sanitari"
END END
SPREADSHEET F_CONTROLLI 75 11 SPREADSHEET F_CONTROLLI 75 12
BEGIN BEGIN
PROMPT 2 6 "" PROMPT 2 6 ""
ITEM "Data@10" ITEM "Data@10"
@ -1121,6 +1121,8 @@ BEGIN
ITEM "Id.4" ITEM "Id.4"
ITEM "Int.SI" ITEM "Int.SI"
ITEM "Int.AF" ITEM "Int.AF"
ITEM "Pr.tipo"
ITEM "Pr.data"
END END
ENDPAGE ENDPAGE
@ -1174,12 +1176,12 @@ BEGIN
ITEM "Ritirata?" ITEM "Ritirata?"
END END
GROUPBOX DLG_NULL 77 5 GROUPBOX DLG_NULL 77 6
BEGIN BEGIN
PROMPT 1 13 "Storico iscrizioni e dimissioni" PROMPT 1 13 "Storico iscrizioni e dimissioni"
END END
SPREADSHEET F_STORICO 75 3 SPREADSHEET F_STORICO 75 4
BEGIN BEGIN
PROMPT 2 14 "" PROMPT 2 14 ""
ITEM "Dal@10" ITEM "Dal@10"
@ -1321,11 +1323,16 @@ ENDPAGE
ENDMASK ENDMASK
PAGE "Controlli sanitari" -1 -1 75 14 PAGE "Controlli sanitari" -1 -1 75 18
GRUPBOX DLG_NULL 70 4
BEGIN
PROMPT 1 1 "Dati fondamentali del controllo"
END
DATE F_C_DATACON DATE F_C_DATACON
BEGIN BEGIN
PROMPT 2 1 "Data controllo " PROMPT 2 2 "Data controllo "
FIELD LF_CONTSAN->DATACON FIELD LF_CONTSAN->DATACON
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
VALIDATE NOT_EMPTY_FUNC VALIDATE NOT_EMPTY_FUNC
@ -1334,7 +1341,7 @@ END
STRING F_C_TIPOCON 2 STRING F_C_TIPOCON 2
BEGIN BEGIN
PROMPT 2 2 "Tipo controllo " PROMPT 2 3 "Tipo controllo "
FIELD LF_CONTSAN->TIPOCON FIELD LF_CONTSAN->TIPOCON
FLAGS "U" FLAGS "U"
USE TCS USE TCS
@ -1351,17 +1358,17 @@ END
GRUPBOX DLG_NULL 70 7 GRUPBOX DLG_NULL 70 7
BEGIN BEGIN
PROMPT 1 4 "Dati da compilare se si tratta di idoneita'" PROMPT 1 5 "Dati da compilare se si tratta di idoneita'"
END END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 5 "Tipi donazione ammessi" PROMPT 2 6 "Tipi donazione ammessi"
END END
STRING F_C_IDON1 2 STRING F_C_IDON1 2
BEGIN BEGIN
PROMPT 2 6 "" PROMPT 2 7 ""
FIELD LF_CONTSAN->IDON1 FIELD LF_CONTSAN->IDON1
FLAGS "U" FLAGS "U"
USE IDO USE IDO
@ -1377,7 +1384,7 @@ END
STRING F_C_IDON2 2 STRING F_C_IDON2 2
BEGIN BEGIN
PROMPT 2 7 "" PROMPT 2 8 ""
FIELD LF_CONTSAN->IDON2 FIELD LF_CONTSAN->IDON2
FLAGS "U" FLAGS "U"
USE IDO USE IDO
@ -1393,7 +1400,7 @@ END
STRING F_C_IDON3 2 STRING F_C_IDON3 2
BEGIN BEGIN
PROMPT 2 8 "" PROMPT 2 9 ""
FIELD LF_CONTSAN->IDON3 FIELD LF_CONTSAN->IDON3
FLAGS "U" FLAGS "U"
USE IDO USE IDO
@ -1409,7 +1416,7 @@ END
STRING F_C_IDON4 2 STRING F_C_IDON4 2
BEGIN BEGIN
PROMPT 2 9 "" PROMPT 2 10 ""
FIELD LF_CONTSAN->IDON4 FIELD LF_CONTSAN->IDON4
FLAGS "U" FLAGS "U"
USE IDO USE IDO
@ -1425,51 +1432,87 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 40 5 "Intervalli" PROMPT 40 6 "Intervalli"
END END
NUMBER F_C_INTSI 3 0 NUMBER F_C_INTSI 3 0
BEGIN BEGIN
PROMPT 40 6 "Sangue intero " PROMPT 40 7 "Sangue intero "
FIELD LF_CONTSAN->INTSI FIELD LF_CONTSAN->INTSI
FLAGS "U" FLAGS "U"
END END
NUMBER F_C_INTAF 3 0 NUMBER F_C_INTAF 3 0
BEGIN BEGIN
PROMPT 40 7 "Aferesi " PROMPT 40 8 "Aferesi "
FIELD LF_CONTSAN->INTAF FIELD LF_CONTSAN->INTAF
FLAGS "U" FLAGS "U"
END END
GROUPBOX DLG_NULL 70 4
BEGIN
PROMPT 1 12 "Prossimo tipo/esito"
END
STRING F_C_PROSSTIPO 2
BEGIN
PROMPT 2 13 "Tipo controllo "
FIELD LF_CONTSAN->PROSSTIPO
FLAGS "U"
USE TCS
INPUT CODTAB F_C_PROSSTIPO
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@30" S0
OUTPUT F_C_PROSSTIPO CODTAB
OUTPUT F_C_DESC_PROSSTIPO S0
CHECKTYPE REQUIRED
WARNING "Codice non presente"
HELP "Tipo/Esito controllo sanitario"
END
DATE F_C_PROSSDATA
BEGIN
PROMPT 2 14 "Data prevista "
FIELD LF_CONTSAN->PROSSDATA
HELP "Data controllo"
END
STRING F_C_DESC_TIPOCON 25 STRING F_C_DESC_TIPOCON 25
BEGIN BEGIN
PROMPT 25 2 "" PROMPT 25 3 ""
FLAGS "D" FLAGS "D"
END END
STRING F_C_DESC_IDON1 25 STRING F_C_DESC_IDON1 25
BEGIN BEGIN
PROMPT 10 6 "" PROMPT 10 7 ""
FLAGS "D" FLAGS "D"
END END
STRING F_C_DESC_IDON2 25 STRING F_C_DESC_IDON2 25
BEGIN BEGIN
PROMPT 10 7 "" PROMPT 10 8 ""
FLAGS "D" FLAGS "D"
END END
STRING F_C_DESC_IDON3 25 STRING F_C_DESC_IDON3 25
BEGIN BEGIN
PROMPT 10 8 "" PROMPT 10 9 ""
FLAGS "D" FLAGS "D"
END END
STRING F_C_DESC_IDON4 25 STRING F_C_DESC_IDON4 25
BEGIN BEGIN
PROMPT 10 9 "" PROMPT 10 10 ""
FLAGS "D"
END
STRING F_C_DESC_PROSSTIPO 25
BEGIN
PROMPT 25 13 ""
FLAGS "D" FLAGS "D"
END END

View File

@ -3,6 +3,7 @@
#include <msksheet.h> #include <msksheet.h>
#include <mailbox.h> #include <mailbox.h>
#include <applicat.h> #include <applicat.h>
#include <progind.h>
#include <relation.h> #include <relation.h>
#include <tabutil.h> #include <tabutil.h>
#include <urldefid.h> #include <urldefid.h>
@ -156,8 +157,17 @@ int TDonaz_app::write(TSheet_field& s)
const TMask& m = s.mask(); const TMask& m = s.mask();
const TDate data = m.get(F_DATADON); const TDate data = m.get(F_DATADON);
int items = s.items();
TProgind *pi;
pi = new TProgind(items,"Registrazione donazioni e controlli", FALSE, TRUE, 10);
pi->setstatus(1);
for (int r=1; r<=s.items(); r++) for (int r=1; r<=s.items(); r++)
{ {
pi->addstatus(1);
TToken_string& row = s.row(r-1); TToken_string& row = s.row(r-1);
const long codsog = row.get_long(0); const long codsog = row.get_long(0);
if (codsog != 0) if (codsog != 0)
@ -398,6 +408,9 @@ int TDonaz_app::write(TSheet_field& s)
} }
} }
} }
delete pi;
return NOERR; return NOERR;
} }
@ -418,6 +431,9 @@ bool TDonaz_app::soggetti_notify(TSheet_field& s, int r, KEY k)
bool ok = TRUE; bool ok = TRUE;
switch (k) switch (k)
{ {
case K_CTRL+K_DEL:
// avvenuta cancellazione riga
case K_TAB: case K_TAB:
// entrata riga // entrata riga
{ {

View File

@ -1,5 +1,4 @@
#include <xvt.h> #include <xvt.h>
#include <checks.h> #include <checks.h>
#include "at1.h" #include "at1.h"

View File

@ -1,5 +1,4 @@
#include <xvt.h> #include <xvt.h>
#include <checks.h> #include <checks.h>
#include "at2.h" #include "at2.h"

View File

@ -287,8 +287,9 @@ void TSospesi_application::crea_intestazione()
sep.fill('-'); sep.fill('-');
set_header(3, (const char *) sep); set_header(3, (const char *) sep);
set_header(4,"@0gCod.@7gC.@10gCognome e nome@36gNato il@47gSospensione@61gUltima id.@75gIntervalli@86gUltima donaz.@100gUlt. controllo"); set_header(4,"@0gCod.@7gC.@10gCognome e nome@36gNato il@47gSospensione@61gUltima idon.@75gIntervalli@86gUltima donaz.@100gUlt.controllo@114gPross.contr.");
set_header(6,"@0g------@7g--@10g-------------------------@36g----------@47g-------------@61g-------------@75g----------@86g-------------@100g-------------"); set_header(5,"@76gSI AF");
set_header(6,"@0g------@7g--@10g-------------------------@36g----------@47g-------------@61g-------------@75g----------@86g-------------@100g-------------@114g-------------");
} }
} }

View File

@ -112,9 +112,9 @@ void TEsclusi_application::set_page(int file, int cnt)
set_row(1,"@7g@S", FLD(LF_SOGGETTI,SOG_CATDON)); set_row(1,"@7g@S", FLD(LF_SOGGETTI,SOG_CATDON));
set_row(1,"@10g#a", &_cognome_nome); set_row(1,"@10g#a", &_cognome_nome);
set_row(1,"@36g@ld", FLD(LF_SOGGETTI,SOG_DATANASC)); set_row(1,"@36g@ld", FLD(LF_SOGGETTI,SOG_DATANASC));
set_row(1,"@50g@S", FLD(LF_SOGGETTI,SOG_ESCLUSO)); set_row(1,"@47g@S", FLD(LF_SOGGETTI,SOG_ESCLUSO));
set_row(1,"@58g@S", FLD(LF_SOGGETTI,SOG_MOTESCL)); set_row(1,"@50g@ld", FLD(LF_SOGGETTI,SOG_TERMESCL));
set_row(2,"@47g@ld", FLD(LF_SOGGETTI,SOG_TERMESCL)); set_row(1,"@61g@S", FLD(LF_SOGGETTI,SOG_MOTESCL));
} }
break; break;
} }
@ -287,9 +287,14 @@ void TEsclusi_application::crea_intestazione()
sep.fill('-'); sep.fill('-');
set_header(3, (const char *) sep); set_header(3, (const char *) sep);
set_header(4,"@0gCod.@7gC.@10gCognome e nome@36gNato il@47gTipo escl.@58gMotivo"); set_header(4,"@0gCod.@7gC.@10gCognome e nome@36gNato il@47gEsclusione@61gMotivo");
set_header(5,"47gTermine"); set_header(5,"@47gTipo Termine");
set_header(6,"@0g------@7g--@10g-------------------------@36g----------@47g----------@58g------------------------------"); set_header(6,"@0g------@7g--@10g-------------------------@36g----------@47g-------------@61g------------------------------");
//set_header(4,"@0gCod.@7gC.@10gCognome e nome@36gNato il@47gSospensione@61gUltima idon.@75gIntervalli@86gUltima donaz.@100gUlt.controllo@114gPross.contr.");
//set_header(5,"@76gSI AF");
//set_header(6,"@0g------@7g--@10g-------------------------@36g----------@47g-------------@61g-------------@75g----------@86g-------------@100g-------------@114g-------------");
} }
} }

View File

@ -1,5 +1,4 @@
#include <xvt.h> #include <xvt.h>
#include <checks.h> #include <checks.h>
#include "at3.h" #include "at3.h"

View File

@ -1,5 +1,4 @@
#include <xvt.h> #include <xvt.h>
#include <checks.h> #include <checks.h>
#include "at4.h" #include "at4.h"

View File

@ -10,3 +10,5 @@
#define CON_IDON4 "IDON4" #define CON_IDON4 "IDON4"
#define CON_INTSI "INTSI" #define CON_INTSI "INTSI"
#define CON_INTAF "INTAF" #define CON_INTAF "INTAF"
#define CON_PROSSTIPO "PROSSTIPO"
#define CON_PROSSDATA "PROSSDATA"