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

UWVA#38222 Locatie met louter vervallen gebouwen toch te selecteren

Browse Source 
svn path=/Website/branches/v2016.2/; revision=31366
This commit is contained in:
Erik Groener
2016-11-04 13:14:57 +00:00
parent 7d1c520dbc
commit f66452d965
17 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
APPL/BES/bes_edit_bestelling.asp
View File

@@ -27,6 +27,7 @@
<!-- #include file="../Shared/bedrijfselector.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/rater.inc" -->
<!-- #include file="../Shared/Suggest/plaatsFilter.inc"-->
<!-- #include file="../prs/prs.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="bes_flexkenmerk.inc" -->
@@ -668,21 +669,11 @@ else // nieuwe bestelling. Defaults bepalen
if (getQParamInt("adres_key", -1) > 0)
aflever_readonly = true;
var sql_filter = " AND EXISTS"
+ " ( SELECT ''"
+ " FROM alg_v_aanweziggebouw ag"
+ " , alg_srtgebouw sg"
+ " WHERE ag.alg_srtgebouw_key = sg.alg_srtgebouw_key(+)"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC (SYSDATE))"
+ " AND sg.alg_srtgebouw_passief IS NULL"
+ " AND ag.alg_locatie_key = m.alg_locatie_key"
+ " )";
sql = "SELECT m.mld_adres_key"
+ ", m.mld_adres_naam, m.mld_adres_upper"
+ (aflever_readonly? " FROM mld_adres m" : " FROM mld_v_afleveradres m")
+ " WHERE 1=1"
+ sql_filter
+ getFiltClauseLocatie("EXP");
+ (ALGreadlevel >= 0
? " AND m.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations "
+ " WHERE prs_perslid_key = " + user_key

2
APPL/CAD/EvictionPlan.asp
View File

@@ -111,7 +111,7 @@ function onOtherDrawing()
startlevel: 2, // Locatie
eindlevel: 4, // Verdieping
onVerChange: "OnFloorChanged()",
filtercode: "FAC"
filtercode: "EXP"
});
%>
<tr>

2
APPL/CAD/contour_search.asp
View File

@@ -85,7 +85,7 @@ if (verdieping_key > 0 || (gebouw_key > 0 && bttype == "T"))
startlevel: 2, // locatie
eindlevel: 4, // verdieping
whenEmpty: L("lcl_search_generic"), // want filter bttype?
filtercode: "FAC"
filtercode: "EXP"
});
%>
</table>

2
APPL/CAD/tekening_search.asp
View File

@@ -43,7 +43,7 @@ var authparams = user.checkAutorisation(autfunction);
startlevel: 2, // locatie
eindlevel: 3, // Gebouw
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
%>
<tr>

2
APPL/CNT/cnt_edit_scope.asp
View File

@@ -104,7 +104,7 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
onVerChange: "onPlaatsChange()",
onRuiChange: "onPlaatsChange()",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
}); %>
</table>
</td>

2
APPL/CNT/cnt_search.asp
View File

@@ -276,7 +276,7 @@ var authparams = user.checkAutorisation(autfunction, true) || {};
secsearch: 2,
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
RWFIELDTR("loc_omschr", "fld wildcardr", L("lcl_location"), safe.htmlattr(loc_omschr), { trclass: "primsearch onlyxd hidden", datatype: "text" });

2
APPL/FAC/fac_fiattering_search.asp
View File

@@ -104,7 +104,7 @@ var betreft = getQParamArray("betreft", []); // Betreft module BES, CNT, FIN, ML
terrein: true,
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
%>
</table>

2
APPL/FIN/fin_search.asp
View File

@@ -318,7 +318,7 @@ var isContactpersoon = user.isContactpersoon();
terrein: true,
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
}
%>

2
APPL/INS/ins_move_deel_multi.asp
View File

@@ -189,7 +189,7 @@ user.anything_todo_or_abort(tobemoved > 0); // We klagen niet over enkele wel en
, eindlevel: maxlevel
, terrein: true
, requiredlevel: 2
, filtercode: "FAC"
, filtercode: "EXP"
}
);

4
APPL/INS/ins_search.asp
View File

@@ -440,7 +440,7 @@ var authparams = user.checkAutorisation(autfunction);
eindlevel: 2, // locatie
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
}
else //fronto
@@ -450,7 +450,7 @@ var authparams = user.checkAutorisation(autfunction);
eindlevel: 3, // gebouw
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
}
}

2
APPL/INS/ins_verbruik_search.asp
View File

@@ -30,7 +30,7 @@ var authparams = user.checkAutorisation(autfunction);
FCLTplaatsselector(authparams.ALGreadlevel, { startlevel: 2, // locatie
eindlevel: 2, // Locatie
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
sql = " SELECT DISTINCT s.ins_srtdeel_key"

2
APPL/PRJ/prj_search.asp
View File

@@ -95,7 +95,7 @@ var authparams = user.checkAutorisation(autfunction);
startlevel: 2, // locatie
eindlevel: 3, // gebouw
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
}); %>
</table>
</td><!-- end column 2-->

2
APPL/PRS/prs_bedrijf_search.asp
View File

@@ -148,7 +148,7 @@ toRs.close();
eindlevel: 3, // gebouw
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
%>

20
APPL/PRS/prs_edit_dienstlocs.asp
View File

@@ -16,6 +16,7 @@
<!--#include file="../Shared/common.inc"-->
<!--#include file="../Shared/selector.inc"-->
<!--#include file="../Shared/iface.inc"-->
<!--#include file="../Shared/Suggest/plaatsFilter.inc"-->
<%
FCLTHeader.Requires({ plugins: ["jQuery"] })
@@ -135,16 +136,6 @@ var dienst_key = getQParamInt("dienst_key"); // bedrijf key
<td>
<label><%=L("lcl_location")%>:</label><br>
<%
var sql_filter = " AND EXISTS"
+ " ( SELECT ''"
+ " FROM alg_v_aanweziggebouw ag"
+ " , alg_srtgebouw sg"
+ " WHERE ag.alg_srtgebouw_key = sg.alg_srtgebouw_key(+)"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC (SYSDATE))"
+ " AND sg.alg_srtgebouw_passief IS NULL"
+ " AND ag.alg_locatie_key = al.alg_locatie_key"
+ " )";
var existing_loc_sql =
"SELECT dl.alg_locatie_key"
+ " , al.alg_locatie_omschrijving"
@@ -155,15 +146,14 @@ var dienst_key = getQParamInt("dienst_key"); // bedrijf key
+ " AND dl.prs_dienst_key = " + dienst_key
+ " AND dl.prs_bedrijf_key = " + bedrijf_key
+ " AND dl.alg_locatie_key IS NOT NULL";
//+ sql_filter;
var loc_sql =
"SELECT al.alg_locatie_key"
+ " , al.alg_locatie_omschrijving"
"SELECT l.alg_locatie_key"
+ " , l.alg_locatie_omschrijving"
+ " , 'L' locorgeb"
+ " FROM alg_v_aanweziglocatie al"
+ " FROM alg_v_aanweziglocatie l"
+ " WHERE 1=1"
+ sql_filter;
+ getFiltClauseLocatie("EXP");
FCLTselector("locPossible", loc_sql + " MINUS " + existing_loc_sql + " ORDER BY 2",
{ startmulti: true,

2
APPL/RES/res_search_ppi.asp
View File

@@ -110,7 +110,7 @@ var authparams = user.checkAutorisation(autfunction);
eindlevel: 5, // Ruimte
secsearch: 3, // gebouw en hoger
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
}); %>
</table>
<!-- end column 1 -->

2
APPL/SLE/sle_edit_srtdeel.asp
View File

@@ -147,7 +147,7 @@ if (!oRs.eof) uitleen_flex_present = true;
FCLTplaatsselector(authparamsSLEBOF.ALGwritelevel, { startlevel: 2, // Locatie
eindlevel: 5, // Ruimte
autoselect: true,
filtercode: "FAC"
filtercode: "EXP"
});
%>
<tr>

2
APPL/SLE/sleutel_search.asp
View File

@@ -199,7 +199,7 @@ var authparamsSLEFOF = user.checkAutorisation("WEB_SLEFOF", true);
startlevel: 2, // locatie
eindlevel: 5, // ruimte/werkplek
whenEmpty: L("lcl_search_generic"), // want filter
filtercode: "FAC"
filtercode: "EXP"
});
//<!-- Afdeling/Organisatie -->