root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cg3600.cpp Corretta lettura che ignorava sempre le causali

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@4026 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1996-12-20 12:06:42 +00:00
parent eb563e23fe
commit e99622f927
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cg/cg3600.cpp
View File

@ -677,7 +677,7 @@ void TMastrino::read(const TBill& conto,
_da_data = dd.ok() ? dd : inizio_esercizio; _da_data = dd.ok() ? dd : inizio_esercizio;
_a_data = ad.ok() ? ad : esercizi[ae].fine(); _a_data = ad.ok() ? ad : esercizi[ae].fine();
const bool test_caus = !(_da_caus.blank() && _a_caus.blank()); const bool test_caus = !(dc.blank() && ac.blank());
_da_caus = dc; _da_caus = dc;
_a_caus = ac.blank() ? "zzz" : ac; // Se vuota sceglie la massima causale _a_caus = ac.blank() ? "zzz" : ac; // Se vuota sceglie la massima causale
@ -2570,19 +2570,10 @@ void TGrid_mask::handler(WINDOW win, EVENT* ep)
if (ep->type == E_MOUSE_DOWN && ep->v.mouse.button == 1) if (ep->type == E_MOUSE_DOWN && ep->v.mouse.button == 1)
{ {
_last_grid = NULL; _last_grid = NULL;
for (int f = fields()-1; f >= 0; f--)
{ RCT rct; _grid->get_rect(rct);
TMask_field& cur_fld = fld(f); if (xvt_rect_has_point(&rct, ep->v.mouse.where))
if (cur_fld.parent() == win) _last_grid = _grid;
{
RCT rct; cur_fld.get_rect(rct);
if (xvt_rect_has_point(&rct, ep->v.mouse.where))
{
if (cur_fld.class_id() == CLASS_GRID_FIELD)
_last_grid = (TGrid_field*)&cur_fld;
}
}
}
if (_last_grid) if (_last_grid)
{ {
@ -2611,8 +2602,8 @@ void TGrid_mask::handler(WINDOW win, EVENT* ep)
if (r == RESP_2 || r == RESP_3) if (r == RESP_2 || r == RESP_3)
sht.save_columns_order(); sht.save_columns_order();
#endif #endif
return;
} }
return;
} }
if (ep->type == E_COMMAND) if (ep->type == E_COMMAND)
{ {
@ -2801,13 +2792,14 @@ void TMastrini_video::open_files(int logicnum, ...)
else else
_file.add(new TLocalisamfile(logicnum), logicnum); _file.add(new TLocalisamfile(logicnum), logicnum);
logicnum = va_arg(marker, int); logicnum = va_arg(marker, int);
} }
va_end(marker);
} }
bool TMastrini_video::create() bool TMastrini_video::create()
{ {
open_files(LF_RMOV, LF_MOV,0); open_files(LF_RMOV, LF_MOV, LF_CAUSALI, 0);
open_files(LF_SALDI, LF_PCON,0); open_files(LF_SALDI, LF_PCON, 0);
_qm = new TQuery_mask; _qm = new TQuery_mask;
_gm = new TGrid_mask; _gm = new TGrid_mask;