Patch level : at 1.7 702

Files correlati     : at8.exe
Ricompilazione Demo : [ ]
Commento            : varie sull'aggiornamento da appoggio


git-svn-id: svn://10.65.10.50/trunk@12145 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
cris 2004-06-03 11:02:18 +00:00
parent c7769f18f1
commit 185562c39b

View File

@ -119,6 +119,8 @@ static int compare_date(const TObject** o1, const TObject** o2)
bool TReconstruction::menu(MENU_TAG m) bool TReconstruction::menu(MENU_TAG m)
{ {
bool _calcolacat = FALSE;
KEY tasto = _msk->run(); KEY tasto = _msk->run();
if (tasto == K_ENTER) if (tasto == K_ENTER)
{ {
@ -145,15 +147,22 @@ bool TReconstruction::menu(MENU_TAG m)
TRectype* keyd = new TRectype(LF_DONAZ); TRectype* keyd = new TRectype(LF_DONAZ);
keyd->put(DON_CODICE, codsog); keyd->put(DON_CODICE, codsog);
int err = _sdonazioni->read(keyd); int err = _sdonazioni->read(keyd);
//if (err == NOERR)
//{
if (_sdonazioni->rows()>0) if (_sdonazioni->rows()>0)
{ {
calcola_donazioni_lib(recsog, _sdonazioni); calcola_donazioni_lib(recsog, _sdonazioni);
_sdonazioni->rewrite(); _sdonazioni->rewrite();
recsog.rewrite(_rel->lfile()); recsog.rewrite(_rel->lfile());
} }
//}
//else
// return error_box("Errore in donazioni, codice %ld", codsog);
TRectype* key = new TRectype(LF_IDONEITA); TRectype* key = new TRectype(LF_IDONEITA);
key->put(IDO_CODICE, recsog.get(SOG_CODICE)); key->put(IDO_CODICE, recsog.get(SOG_CODICE));
_sidoneita->read(key); err = _sidoneita->read(key);
//if (err == NOERR)
//{
_sidoneita->sort(compare_date); _sidoneita->sort(compare_date);
_sidoneita->rewrite(); _sidoneita->rewrite();
TRectype* keyc = new TRectype(LF_CONTSAN); TRectype* keyc = new TRectype(LF_CONTSAN);
@ -164,6 +173,11 @@ bool TReconstruction::menu(MENU_TAG m)
con_reord(recsog,_scontrolli,_sidoneita); con_reord(recsog,_scontrolli,_sidoneita);
recsog.rewrite(_rel->lfile()); recsog.rewrite(_rel->lfile());
} }
//}
//else
// return error_box("Errore in idoneita, codice %ld", codsog);
if (_calcolacat)
{
TTable ctd("CTD"); TTable ctd("CTD");
TString16 catdon = recsog.get(SOG_CATDON); TString16 catdon = recsog.get(SOG_CATDON);
const int totdon = recsog.get_int(SOG_TOTDON); const int totdon = recsog.get_int(SOG_TOTDON);
@ -189,6 +203,7 @@ bool TReconstruction::menu(MENU_TAG m)
catdon = _catfin2; catdon = _catfin2;
} }
} }
}
TDate dataiscsog = recsog.get_date(SOG_DATAISC); TDate dataiscsog = recsog.get_date(SOG_DATAISC);
if (!dataiscsog.ok() && _dataisc) if (!dataiscsog.ok() && _dataisc)
{ {