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

FSN#40512 nog ietsjes meer opruimen

Browse Source 
svn path=/Website/trunk/; revision=33858
This commit is contained in:
Peter Feij
2017-05-15 15:20:29 +00:00
parent b67ef9f60f
commit 6058d6aff3
4 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/CNT/cnt.inc
View File

@@ -1155,11 +1155,7 @@ cnt = { setcontractstatus:
+ " FROM cnt_v_aanwezigcontract_object co"
+ " , ins_v_aanwezigdeel ad"
+ " WHERE cnt_ins_deel_key = ad.ins_deel_key"
+ " AND ad.ins_alg_locatie_key IN (" + select_loc_keys + ")"
+ " UNION"
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_contract_locatie_geg cl"
+ " WHERE alg_locatie_key IN (" + select_loc_keys + "))";
+ " AND ad.ins_alg_locatie_key IN (" + select_loc_keys + "))";
return sql;
}

35
APPL/CNT/loadContracten.asp
View File

@@ -1,35 +0,0 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
*/ %>
<%
DOCTYPE_Disable = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<%
// Maak een contracten lijst
//var autfunction = getQParam("autfunction", ""); // Check of user rechten heeft op meegegeven artikelen
var loc_key = getQParamInt("loc_key", "-1"); // Locatie key
var srttype_key = getQParamInt("srttype", "-1"); // Contractsoort
var cnt_key = getQParamInt("cnt_key", "-1"); // Initiele waarde contract key
sql = "SELECT cnt_contract_key"
+ ", cnt_contract_omschrijving"
+ " FROM cnt_v_contract_locatie_geg"
+ " WHERE" + (loc_key == -1 && srttype_key == -1? " 1 = 2" : " 1 = 1")
+ (loc_key != -1? " AND alg_locatie_key = " + loc_key : "")
+ (srttype_key != -1? " AND ins_discipline_key = " + srttype_key : "")
+ " ORDER BY 2"
FCLTselectorOptions(sql,
{ initKey: cnt_key,
moreinfo: true,
emptyOption: ""
});
%>

6
APPL/FAC/fac_fiattering_list.inc
View File

@@ -936,11 +936,7 @@ function getSqlFiatFin(fiatstatus, prsKeys, params)
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_aanwezigcontract_object co"
+ " , ins_v_aanwezigdeel ad"
+ " WHERE cnt_ins_deel_key = ad.ins_deel_key AND ad.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")"
+ " UNION"
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_contract_locatie_geg cl"
+ " WHERE alg_locatie_key IN (" + loc_key_arr.join(",") + ")))";
+ " WHERE cnt_ins_deel_key = ad.ins_deel_key AND ad.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")))";
sql += "AND (" + sql1 + " OR " + sql2 + " OR " + sql3 + ")";
}

15
APPL/FIN/fin_list.inc
View File

@@ -427,11 +427,7 @@ function fin_list (params)
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_aanwezigcontract_object co"
+ " , ins_v_aanwezigdeel ad"
+ " WHERE cnt_ins_deel_key = ad.ins_deel_key AND ad.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")"
+ " UNION"
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_contract_locatie_geg cl"
+ " WHERE alg_locatie_key IN (" + loc_key_arr.join(",") + ")))";
+ " WHERE cnt_ins_deel_key = ad.ins_deel_key AND ad.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")))";
sql += "AND (" + sql1 + " OR " + sql2 + " OR " + sql3 + ")";
}
@@ -482,14 +478,7 @@ function fin_list (params)
+ " AND ad.ins_alg_ruimte_type IN ('T', 'R', 'W')"
+ " AND aaor.alg_gebouw_key = g.alg_gebouw_key"
+ " AND (g.prs_perslid_key_verantw = " + verantw_key
+ " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")"
+ " UNION"
+ " SELECT cnt_contract_key"
+ " FROM cnt_v_contract_locatie_geg cl"
+ " , alg_v_aanweziggebouw g"
+ " WHERE cl.alg_locatie_key = g.alg_locatie_key"
+ " AND (g.prs_perslid_key_verantw = " + verantw_key
+ " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")))"
+ " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")))";
sql += " AND (" + sql1 + " OR " + sql2 + " OR " + sql3 + ")";
}