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

git-svn-id: svn://10.65.10.50/branches/R_10_00@23088 c028cbd2-c16b-5b4b-a496-9718f37d4682

Browse Source
This commit is contained in:
guy 2015-05-15 08:45:29 +00:00
parent 46c3bbba19
commit 89281098ee
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fe/fe0100.cpp
View File

@ -497,13 +497,11 @@ bool TSpesometro_msk::azzera_alleg(TAssoc_array& manuali) const
TRectype& mrec = fmov.curr();
TString msg; msg << TR("Azzeramento ") << falleg.description() << ' ' << anno;
TProgind pi(alleg.items(), msg, false);
TProgress_monitor pi(alleg.items(), msg, false);
manuali.destroy();
for (bool ok = alleg.move_first(); ok; ok = alleg.move_next())
{
pi.addstatus(1);
const long progr = arec.get_long(ALL_PROGR);
const long numreg = mrec.get_long(MOV_NUMREG);
const TDate datareg = mrec.get_long(MOV_DATAREG);
@ -520,6 +518,7 @@ bool TSpesometro_msk::azzera_alleg(TAssoc_array& manuali) const
}
if (kill)
falleg.remove(); // Riga generata dalla vecchia versione
pi.add_status();
}
return !manuali.empty();
}
@ -602,11 +601,9 @@ TRecnotype TSpesometro_msk::genera_alleg()
TRectype& mov_rec = mov.cursor()->curr();
const TRecnotype items = mov.items();
TProgind pi(items, str_pi);
TProgress_monitor pi(items, str_pi);
for (bool ok = mov.move_first(); ok; ok = mov.move_next())
{
if (!pi.addstatus(1))
break;
_why = em_normale;
const TDate datafe = mov_rec.get(MOV_INVIOFE);
@ -623,6 +620,9 @@ TRecnotype TSpesometro_msk::genera_alleg()
continue;
}
elabora_movimento(mov_rec, falleg);
if (!pi.add_status())
break;
}
}
@ -815,16 +815,17 @@ bool TSpesometro_msk::recall_alleg() const
TString msg;
msg << TR("Aggiornamento movimenti di prima nota dal ")
<< dal.stringa() << TR(" al ") << al.stringa();
TProgind pi(recset.items(), msg);
TProgress_monitor pi(recset.items(), msg);
for (bool ok = recset.move_first(); ok; ok = recset.move_next())
{
if (!pi.addstatus(1))
break;
if (file.get_date(MOV_INVIOFE).ok())
{
file.zero(MOV_INVIOFE);
file.rewrite();
}
if (!pi.add_status())
break;
}
return true;
@ -895,15 +896,14 @@ bool TSpesometro_msk::send_alleg()
TFilename temp; build_outname(temp);
_log = new TLog_report(temp);
TProgind pi(tot_alleg, temp);
TProgress_monitor pi(tot_alleg, temp);
for (bool ok = alleg.move_first(); ok; ok = alleg.move_next())
{
if (!pi.addstatus(1))
break;
const int ignora = alleg.get(ALL_IGNORA).as_int(); // Non mi fido di "", " " e "0" per questo campo
if (ignora == 0)
send_rec(rec, recset);
if (!pi.add_status())
break;
}
recset.add_footer(*this);
done = recset.save_as(temp);
@ -932,8 +932,6 @@ bool TSpesometro_msk::send_alleg()
TProgress_monitor pi(tot_alleg, TR("Aggiornamento movimenti di prima nota"), false);
for (bool ok = alleg.move_first(); ok; ok = alleg.move_next())
{
if (!pi.add_status())
break;
const int ignora = rec.get_int(ALL_IGNORA);
if (ignora)
continue;
@ -965,6 +963,8 @@ bool TSpesometro_msk::send_alleg()
fall.put(ALL_IGNORA, em_inviato);
fall.rewrite();
}
if (!pi.add_status())
break;
}
}
@ -1055,7 +1055,7 @@ void TSpesometro_msk::load_sheet()
}
pi_str << anno;
TProgind pi(items, pi_str);
TProgress_monitor pi(items, pi_str);
TRectype& curr = alleg.cursor()->curr();
int rec = 0;
for (bool ok = alleg.move_first(); ok; ok = alleg.move_next())
@ -1110,13 +1110,10 @@ bool TSpesometro_msk::save_sheet()
{
TFast_isamfile alleg(LF_ALLEG);
TRectype& rec = alleg.curr();
TProgind pi(items, TR("Registrazione righe"), false);
TProgress_monitor pi(items, TR("Registrazione righe"), false);
FOR_EACH_SHEET_ROW(s, r, row)
{
if (!pi.addstatus(1))
break;
alleg.zero();
rec.put(ALL_ANNO, anno);
s.autosave_line(r+1, rec);
@ -1126,6 +1123,7 @@ bool TSpesometro_msk::save_sheet()
done = cantwrite_box(alleg.name());
break;
}
pi.add_status();
}
}
@ -1280,11 +1278,7 @@ bool TSpesometro_msk::on_field_event(TOperable_field& o, TField_event e, long jo
{
const TString& tipo = get(F_TIPO);
if (tipo != "FE" && tipo != "BL")
return error_box("Non è possibile inviare i record che verrebbero scartati");
TDate dal, al;
get_date_range(dal, al);
if (tipo == "BL" && (al-dal) > 93)
return error_box("E' necessario specificare il mese o il trimestre per la Black List");
return error_box("Non è possibile inviare record scartati");
send_alleg();
enable_buttons(); // Disabilita bottone se definitivo
}