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

Merge branch 'R12.00.1136' of http://10.65.20.33/sirio/CAMPO/campo into R12.00.1136

Browse Source
This commit is contained in:
Macchina_Compilatrice 2022-05-02 17:55:24 +02:00
commit d6efe5405c
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/lv_maskrighe.vcxproj
View File

@ -46,8 +46,8 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\exed\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

4
build/lv_profiles.vcxproj
View File

@ -47,8 +47,8 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\exed\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

14
build/lv_profiles.vcxproj.filters
View File

@ -6,18 +6,4 @@
<Extensions>src</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<SrcReleaseCompiler Include="..\lv\lvbolaca.src">
<Filter>Sources</Filter>
</SrcReleaseCompiler>
<SrcReleaseCompiler Include="..\lv\lvbolacp.src">
<Filter>Sources</Filter>
</SrcReleaseCompiler>
<SrcReleaseCompiler Include="..\lv\lvbolacr.src">
<Filter>Sources</Filter>
</SrcReleaseCompiler>
<SrcReleaseCompiler Include="..\lv\lvbollac.src">
<Filter>Sources</Filter>
</SrcReleaseCompiler>
</ItemGroup>
</Project>

11
src/ci/ci1300.cpp
View File

@ -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