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

FSN#34748: Mobile contracten waar je rechten op hebt.

Browse Source 
svn path=/Website/branches/v2016.1/; revision=29349
This commit is contained in:
Maykel Geerdink
2016-05-10 13:37:31 +00:00
parent c74a9a0f9f
commit 6d090040ef
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/CNT/cnt.inc
View File

@@ -246,6 +246,7 @@ cnt = { setcontractstatus:
var cntFOpz = params.cntFOpz;
var cntFVerl = params.cntFVerl;
var grp_sel = params.grp_sel;
var mobile = params.mobile == 1;
var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
var print = (outputmode == 1 || outputmode == 5);
@@ -286,7 +287,7 @@ cnt = { setcontractstatus:
+ " , alg_locatie_code"
+ " , alg_locatie_count"
+ " , c.ins_discipline_key"
+ " , " + lcl.xsqla('cd.ins_discipline_omschrijving','cd.ins_discipline_key')
+ " , " + lcl.xsqla('cd.ins_discipline_omschrijving', 'cd.ins_discipline_key')
+ " , c.cnt_contract_kosten"
+ " , di.prs_dienst_omschrijving"
+ " , (SELECT " + S("prs_kpn_string")
@@ -639,15 +640,18 @@ cnt = { setcontractstatus:
// En de contracten waarvan ik eigenaar of beheerder ben, ook al zouden die verder buiten de scope vallen
sql_mine = "SELECT cnt_contract_key FROM cnt_contract WHERE c.prs_perslid_key_beh = " + user_key + " OR c.prs_perslid_key_eig = " + user_key;
sql = sql + " AND c.cnt_contract_key IN (" + sql_scope + " UNION ALL " + sql_scopeloos + " UNION ALL " + sql_mine + ")";
sql = sql + " AND c.cnt_contract_key IN (" + sql_scope + " UNION ALL " + sql_scopeloos + " UNION ALL " + sql_mine + ")"
+ (grp_sel == ""
? ""
: " AND ins_discipline_omschrijving = " + safe.quoted_sql(grp_sel))
: " AND ins_discipline_omschrijving = " + safe.quoted_sql(grp_sel));
// Op datum (c.cnt_contract_looptijd_tot) sorteren: UWVA#13274 en daarbinnen op c.cnt_contract_nummer en c.cnt_contract_nummer_intern: UWVA#14609
sql += " ORDER BY" + (excel? " UPPER("+ lcl.xsql('cd.ins_discipline_omschrijving','cd.ins_discipline_key') +")," : "")
+ " c.cnt_contract_looptijd_tot"
+ " , c.cnt_contract_nummer"
sql += " ORDER BY" + (excel || mobile? " UPPER("+ lcl.xsql('cd.ins_discipline_omschrijving','cd.ins_discipline_key') +")," : "")
+ (mobile
? " uitvoerder"
+ " , cnt_contract_omschrijving"
: " c.cnt_contract_looptijd_tot"
+ " , c.cnt_contract_nummer")
+ " , c.cnt_contract_nummer_intern";
return sql;

7
APPL/PDA/cnt_list.asp
View File

@@ -50,12 +50,12 @@ var autfunction = (urole == "fe" ? "WEB_CNTUSE" : "WEB_CNTMAN");
function fnHeader (oRs)
{
return oRs("cnt_contract_nummer_intern").value + (oRs("cnt_contract_versie").value == null ? "" : "."+oRs("cnt_contract_versie").value);
return oRs("cnt_contract_nummer_intern").value + (oRs("cnt_contract_versie").value == null? "" : "." + oRs("cnt_contract_versie").value);
}
function fnBedrag (oRs)
{
return oRs("cnt_contract_kosten").value ? S("currency_pref")+safe.curr(oRs("cnt_contract_kosten").value) : "";
return oRs("cnt_contract_kosten").value? S("currency_pref") + safe.curr(oRs("cnt_contract_kosten").value) : "";
}
function fncolSubHeader(oRs)
@@ -72,7 +72,8 @@ var autfunction = (urole == "fe" ? "WEB_CNTUSE" : "WEB_CNTMAN");
var params = {urole: urole,
grp_sel: grp_sel,
cntAct: true, // Alleen actieve contracten tonen.
cntFAct: true // Alleen actuele contracten tonen.
cntFAct: true, // Alleen actuele contracten tonen.
mobile: 1 // Mobile lijst.
};
var sql = cnt.getfromwherelist_sql(autfunction, params);