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

Patch level : 10.1036

Browse Source 
Files correlati     :   ci2.exe
Ricompilazione Demo : [ ]
Commento            :

Corretta rilevazione ore


git-svn-id: svn://10.65.10.50/branches/R_10_00@22323 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-06-24 20:18:09 +00:00
parent c957e734e4
commit 2234ff0150
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ci/ci2300.cpp
View File

@ -519,7 +519,7 @@ TImporta_rilore_rec::TImporta_rilore_rec(TFilename& filename)
class TImporta_rilore_msk : public TAutomask class TImporta_rilore_msk : public TAutomask
{ {
TAssoc_array _matricole; TAssoc_array _matricole;
TAssoc_array _ore; TArray _ore;
protected: protected:
void importa(); void importa();
@ -528,7 +528,7 @@ protected:
public: public:
TAssoc_array & matricole() {return _matricole;} TAssoc_array & matricole() {return _matricole;}
TAssoc_array & ore() {return _ore;} TArray & ore() {return _ore;}
TImporta_rilore_msk(); TImporta_rilore_msk();
}; };
@ -570,8 +570,10 @@ void TImporta_rilore_msk::importa()
{ {
key = "R"; key = "R";
tpora = "0000"; tpora = "0000";
if (ore().is_key(tpora)) const int index = atoi(tpora);
tpora = (TString &) ore()[tpora];
if (ore().objptr(index) != NULL)
tpora = (TString &) ore()[index];
msg_head = data.string(); msg_head = data.string();
msg_head << " Addetto - " << codice; msg_head << " Addetto - " << codice;
key << codice << data.string(ANSI) << tpora; // cambiare key << codice << data.string(ANSI) << tpora; // cambiare
@ -594,11 +596,14 @@ void TImporta_rilore_msk::importa()
{ {
fieldname.format("%02d_%s%1d", i, CODGIU, t); fieldname.format("%02d_%s%1d", i, CODGIU, t);
tpora = recordset.get(fieldname).as_string(); tpora = recordset.get(fieldname).as_string();
if (atoi(tpora) > 0)
const int index = atoi(tpora);
if (index > 0)
{ {
if (ore().is_key(tpora)) if (ore().objptr(index) != NULL)
{ {
tpora = (TString &) ore()[tpora]; tpora = (TString &) ore()[index];
fieldname.format("%02d_%s%1d", i, OREGIU, t); fieldname.format("%02d_%s%1d", i, OREGIU, t);
oreril = recordset.get(fieldname).as_real() / CENTO; oreril = recordset.get(fieldname).as_real() / CENTO;
@ -685,14 +690,10 @@ static bool scan_rss(const TRelation & rel, void *pJolly)
static bool scan_ore(const TRelation & rel, void *pJolly) static bool scan_ore(const TRelation & rel, void *pJolly)
{ {
TImporta_rilore_msk & mask = *((TImporta_rilore_msk *)pJolly); TImporta_rilore_msk & mask = *((TImporta_rilore_msk *)pJolly);
TString80 cod_est = rel.curr().get("S1"); const int cod_est = atoi(rel.curr().get("S1"));
const TString& codice = rel.curr().get("CODTAB");
if (cod_est.full())
{
const TString16 codice = rel.curr().get("CODTAB");
mask.ore().add(cod_est, codice); mask.ore().add(codice, cod_est);
}
return true; return true;
} }