admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARAI#51853: Uren kunnen registreren van poolmedewerkers.

Browse Source 
svn path=/Website/branches/v2017.2/; revision=36597
This commit is contained in:
Maykel Geerdink
2018-01-16 13:22:25 +00:00
parent b3262405f4
commit 40303d200d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/MLD/opdr_edit_uren.asp
View File

@@ -466,17 +466,19 @@ if (urole != "fe" && canWrite)
+ " 1 canonkosten,"
+ " mld_opdr_omschrijving,"
+ " mo.mld_uitvoerende_keys,"
+ " COALESCE(prs_perslid_naam_full, pb.prs_bedrijf_naam) naam,"
+ " COALESCE(pf.prs_perslid_naam_full, pf2.prs_perslid_naam_full, pb.prs_bedrijf_naam) naam,"
+ " mld_opdr_datumbegin,"
+ " mld_opdr_einddatum,"
+ " mld_typeopdr_matchtype"
+ " FROM mld_opdr mo, "
+ " mld_typeopdr mto,"
+ " prs_v_perslid_fullnames_all pf,"
+ " prs_v_perslid_fullnames_all pf2,"
+ " prs_bedrijf pb"
+ " WHERE mo.mld_typeopdr_key = mto.mld_typeopdr_key"
+ " AND mo.mld_uitvoerende_keys = pf.prs_perslid_key(+)"
+ " AND mo.mld_uitvoerende_keys = pb.prs_bedrijf_key(+)"
+ " AND mo.mld_uitvoerende_keys = pf.prs_perslid_key(+)" // Intern bedrijf (BI).
+ " AND mo.prs_perslid_key= pf2.prs_perslid_key(+)" // Intern persoon (PI) [Nieuw].
+ " AND mo.mld_uitvoerende_keys = pb.prs_bedrijf_key(+)" // Extern bedrijf (BE).
+ " AND mto.mld_typeopdr_matchtype IN (3,6,7)"; // uren per week / totaal te besteden uren / maximaal aantal uren
filter = " mo.mld_opdr_datumbegin <= " + (datefrom.endToSQL() + " + 6")
@@ -500,7 +502,7 @@ if (urole != "fe" && canWrite)
}
else
{
filter += " AND mo.mld_uitvoerende_keys = " + prs_key;
filter += " AND (mo.mld_uitvoerende_keys = " + prs_key + " OR mo.prs_perslid_key = " + prs_key + " )";
}
if (opdrkeys.length)
filter = "(("+filter+") OR mld_opdr_key IN (" + opdrkeys.join(",") + "))"; //Waar ik in de periode al op geboekt heb?