diff --git a/build/lv_maskrighe.vcxproj b/build/lv_maskrighe.vcxproj index 5c3393ecf..72e96c0b2 100644 --- a/build/lv_maskrighe.vcxproj +++ b/build/lv_maskrighe.vcxproj @@ -46,8 +46,8 @@ $(Configuration)\$(ProjectName)\ false false - .\..\exed\ - .\..\debug\ + ..\exe\ + ..\debug\ false diff --git a/build/lv_profiles.vcxproj b/build/lv_profiles.vcxproj index d89938adb..f5f9b159d 100644 --- a/build/lv_profiles.vcxproj +++ b/build/lv_profiles.vcxproj @@ -47,8 +47,8 @@ $(Configuration)\$(ProjectName)\ false false - .\..\exed\ - .\..\debug\ + ..\exe\ + ..\debug\ false diff --git a/build/lv_profiles.vcxproj.filters b/build/lv_profiles.vcxproj.filters index 20922e6fe..6fbc05d15 100644 --- a/build/lv_profiles.vcxproj.filters +++ b/build/lv_profiles.vcxproj.filters @@ -6,18 +6,4 @@ src - - - Sources - - - Sources - - - Sources - - - Sources - - \ No newline at end of file diff --git a/src/ci/ci1300.cpp b/src/ci/ci1300.cpp index 933d17e80..1724a8c60 100755 --- a/src/ci/ci1300.cpp +++ b/src/ci/ci1300.cpp @@ -281,6 +281,9 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c const real tot_ore_uso_risorsa_nel_periodo = tot_ore * giorni_lavorativi / giorni_lavorativi_rilore; const TString8 tpora = rilore_recset.get_string(RILORE_TPORA); const TString8 tpassenza = cache().get("&ORE", tpora, "S2"); + + if (tpassenza == "OA") + int i = 1; //crea la chiave per l'assoc_array TToken_string key; @@ -373,7 +376,7 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c if (tpassenza.full()) { - TString8 tp = tpass.objptr(i) == NULL ? EMPTY_STRING : tpass.row(i); + TString8 tp = tpass.objptr(i) == nullptr ? EMPTY_STRING : tpass.row(i); if (tp.blank()) tpass.add(tpassenza, i); @@ -400,8 +403,8 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c TString8 fld = "H0."; fld << 200 + d; TString val = rep.field(fld)->get().as_string(); - // if (val.blank()) - // { + if (val.blank()) + { if (tpass.objptr(d) != nullptr) { const TString8 tp = tpass.row(d); @@ -411,7 +414,7 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c else rep.field(fld)->set(""); } - // } + } } //prende il recordset in opera dal report per fargli le set_var