From f588e0149885b1feeaae190cdf62ded05a4f54de Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Thu, 2 Dec 2021 00:11:33 +0100 Subject: [PATCH] Patch level : 12.0 1098 Files correlati : ci1300ab.rep ci1300bb.rep ci1300a.rep ci1.exe Commento : Corretti report per beneficiario nella stampa ore per risorsa/attrezzatura --- src/ci/ci1300.cpp | 12 ++++---- src/ci/ci1300a.rep | 64 ++++++++++++++++++++-------------------- src/ci/ci1300ab.rep | 71 +++++++++++++++++++++++++-------------------- src/ci/ci1300bb.rep | 66 +++++++++++++++++++++-------------------- src/ci/ci1350.cpp | 6 ++++ 5 files changed, 119 insertions(+), 100 deletions(-) diff --git a/src/ci/ci1300.cpp b/src/ci/ci1300.cpp index dface6300..933d17e80 100755 --- a/src/ci/ci1300.cpp +++ b/src/ci/ci1300.cpp @@ -367,9 +367,11 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c } totcosto += ore_al_giorno * costo; record->add(totcosto.string(), 34); + record->add(costo.string(), 35); int i = data - inizio_periodo + 1; - if (tpassenza.full()) + + if (tpassenza.full()) { TString8 tp = tpass.objptr(i) == NULL ? EMPTY_STRING : tpass.row(i); @@ -398,9 +400,9 @@ 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 (tpass.objptr(d) != NULL) + // if (val.blank()) + // { + if (tpass.objptr(d) != nullptr) { const TString8 tp = tpass.row(d); @@ -409,7 +411,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 diff --git a/src/ci/ci1300a.rep b/src/ci/ci1300a.rep index 99fff3c51..20121edf0 100755 --- a/src/ci/ci1300a.rep +++ b/src/ci/ci1300a.rep @@ -1,6 +1,6 @@ - Rilevazione ore mensili per Risorsa - Attrezzatura mensile + Rilevazione ore mensili per Risorsa - Attrezzatura