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

DJIN#55036 Vervaldatum voor locatie

Browse Source 
svn path=/Website/trunk/; revision=41173
This commit is contained in:
Alex Tiehuis
2019-02-26 14:24:38 +00:00
parent 3ed0bc2dc3
commit e455b448d0
11 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/ALG/alg_edit_locatie.asp
View File

@@ -13,6 +13,7 @@
*/ %>
<!--#include file="../Shared/common.inc" -->
<!--#include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!--#include file="../Shared/selector.inc" -->
<!--#include file="../Shared/plaatsselector.inc" -->
@@ -56,6 +57,7 @@ if (loc_key > 0)
var pst_land = oRs("alg_locatie_post_land").value;
var dienstniveau = oRs("mld_dienstniveau_key").value;
var loc_score1 = oRs("alg_locatie_mjb_score1").value;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value != null ? new Date(oRs("alg_locatie_vervaldatum").Value) : null;
oRs.Close();
}
@@ -133,6 +135,13 @@ manRWFIELD("loc_y", "fld", L("lcl_geoycoord"), loc_y, {maxlengt
BLOCK_END();
BLOCK_START("algLoc2", "&nbsp;");
FCLTcalendar("vervaldatum",
{ datum: vervaldatum,
initEmpty: vervaldatum==null,
label: L("lcl_alg_vervaldatum"),
readonly: !this_alg.writeman
});
manRWFIELD("pst_adres", "fld", L("lcl_prs_address_post_adres"), pst_adres, {maxlength: 50});
manRWFIELD("pst_postc", "fld", L("lcl_prs_address_post_postcode"), pst_postc, {maxlength: 12});
manRWFIELD("pst_plaats", "fld", L("lcl_prs_address_post_plaats"), pst_plaats, {maxlength: 30});

1
APPL/ALG/alg_edit_locatie_save.asp
View File

@@ -37,6 +37,7 @@ user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse))
{ dbs: "MLD_DIENSTNIVEAU_KEY", typ: "key", frm: "dienstniveau" },
{ dbs: "alg_locatie_x", typ: "float", frm: "loc_x" },
{ dbs: "alg_locatie_y", typ: "float", frm: "loc_y" },
{ dbs: "alg_locatie_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "alg_locatie_email", typ: "varchar", frm: "loc_mail" }];
var warning = "";

6
APPL/ALG/alg_locatie_list.inc
View File

@@ -118,6 +118,7 @@ function locatie_list(pautfunction, params)
var reg_key = params.reg_key;
var dis_key = params.dis_key;
var loc_key = params.loc_key;
var expalgincl = params.expalgincl;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
@@ -159,6 +160,7 @@ function locatie_list(pautfunction, params)
+ " , l.alg_locatie_post_land"
+ " , l.alg_locatie_verantw"
+ " , l.alg_locatie_verantw_tel"
+ " , l.alg_locatie_vervaldatum"
+ " , l.alg_locatie_x"
+ " , l.alg_locatie_y"
+ " , l.alg_locatie_mjb_score1"
@@ -197,6 +199,9 @@ function locatie_list(pautfunction, params)
sqln += " AND d.alg_regio_key = " + reg_key;
}
if (!expalgincl)
sqln += " AND (l.alg_locatie_vervaldatum IS NULL OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE)) ";
if (params.loc_code)
sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");
if (params.loc_descr)
@@ -243,6 +248,7 @@ function locatie_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_locatie_vervaldatum", datatype: "date"}));
if (ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1", datatype: "number"}));

8
APPL/ALG/alg_locatie_search.asp
View File

@@ -70,6 +70,14 @@ var authparams = alg.checkAutorisation();
<td class="label"><label><%=L("lcl_estate_locatie_man_descr")%>:</label></td>
<td><input type="text" class="wildcard" id="loc_descr" name="loc_descr" value=""></td>
</tr>
<!-- Vervallen objecten -->
<tr class="primsearch">
<td></td>
<td align=left>
<input type="checkbox" class="fldexpalgincl" name="expAlgIncl" id="expAlgIncl" value="1" >
<label for="expAlgIncl"><%=L("lcl_alg_locatie_vervallen_incl")%></label>
</td>
</tr>
</table>
</td><!-- end column 1 -->

2
APPL/ALG/alg_locatie_search_list.asp
View File

@@ -28,6 +28,7 @@ var loc_key = getQParamInt("locatiekey", -1); // Locatie
var loc_code = getQParam("loc_code", ""); // Locatiecode
var loc_descr = getQParam("loc_descr", ""); // Locatienaam
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var expalgincl = getQParamInt("expalgincl", 0) == 1;
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
@@ -40,6 +41,7 @@ locatie_list ( "*",
loc_key: (loc_key != -1? loc_key : null),
loc_code: loc_code,
loc_descr: loc_descr,
expalgincl: expalgincl,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
noref: (noref != -1? noref : null)

5
APPL/ALG/alg_show_locatie.asp
View File

@@ -48,6 +48,7 @@ var pst_adres = oRs("alg_locatie_post_adres").value;
var pst_plaats = oRs("alg_locatie_post_plaats").value;
var pst_land = oRs("alg_locatie_post_land").value;
var loc_deleted = oRs("alg_locatie_verwijder").value != null;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value;
var dienstniveau_key = oRs("mld_dienstniveau_key").value;
oRs.Close();
%>
@@ -151,6 +152,10 @@ oRs.Close();
BLOCK_END();
BLOCK_START("algLoc2", "&nbsp;");
var fldcls = "fld";
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_plaats"), pst_plaats, {suppressEmpty: true});

6
APPL/PDA/locatie.asp
View File

@@ -58,6 +58,7 @@ var pst_plaats = oRs("alg_locatie_post_plaats").value;
var pst_land = oRs("alg_locatie_post_land").value;
var loc_deleted = oRs("alg_locatie_verwijder").value != null;
var dienstniveau_key = oRs("mld_dienstniveau_key").value;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value;
oRs.Close();
%>
@@ -100,6 +101,11 @@ oRs.Close();
toRs.Close();
}
var fldcls = "fld";
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELD(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_plaats"), pst_plaats, {suppressEmpty: true});

1
APPL/PRS/prs_edit_dienstlocs.asp
View File

@@ -206,6 +206,7 @@ var immediate = getQParamInt("immediate", 0) == 1;
+ " , alg_srtgebouw sg"
+ " WHERE l.alg_locatie_key = g.alg_locatie_key"
+ " AND g.alg_srtgebouw_key = sg.alg_srtgebouw_key(+)"
+ " AND (l.alg_locatie_vervaldatum IS NULL OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC (SYSDATE))"
+ " AND sg.alg_srtgebouw_passief IS NULL";

1
APPL/Shared/Suggest/SuggestGebouwTerrein.asp
View File

@@ -112,6 +112,7 @@ sql = "SELECT g.alg_gebouw_key alg_key"
+ " OR UPPER(g.alg_gebouw_naam) LIKE " + safe.quoted_sql_wild2(chars) + ")"
+ " AND l.alg_locatie_key = g.alg_locatie_key"
+ " AND g.alg_srtgebouw_key = sg.alg_srtgebouw_key(+)"
+ " AND (l.alg_locatie_vervaldatum IS NULL OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ filtClauseGebouw.where_geb
+ filtClause;

1
APPL/Shared/Suggest/SuggestLocatie.asp
View File

@@ -108,6 +108,7 @@ if (autlevel > -1)
+ filtClause.from
+ " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild2(chars)
+ " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild2(chars) + ")"
+ " AND (l.alg_locatie_vervaldatum IS NULL OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
//+ existBuilding
+ filtClause.where
+ " ORDER BY 2"

7
APPL/Shared/Suggest/plaatsFilter.inc
View File

@@ -122,6 +122,7 @@ function getFiltClauseRegio(pfiltcode, params)
+ ", alg_v_aanweziglocatie al"
+ " WHERE al.alg_locatie_key = ag.alg_locatie_key"
+ " AND ad.alg_district_key = al.alg_district_key"
+ " AND (al.alg_locatie_vervaldatum IS NULL OR al.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND ag.alg_gebouw_bez = 1"
+ " AND ad.alg_regio_key = r.alg_regio_key)";
@@ -138,6 +139,7 @@ function getFiltClauseRegio(pfiltcode, params)
+ ", alg_v_aanweziglocatie al"
+ " WHERE al.alg_locatie_key = ag.alg_locatie_key"
+ " AND sg.alg_srtgebouw_passief IS NULL"
+ " AND (al.alg_locatie_vervaldatum IS NULL OR al.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND sg.alg_srtgebouw_key(+) = ag.alg_srtgebouw_key"
+ " AND ad.alg_district_key = al.alg_district_key"
@@ -161,6 +163,7 @@ function getFiltClauseDistrict(pfiltcode, params)
+ ", alg_v_aanweziglocatie al"
+ " WHERE al.alg_locatie_key = ag.alg_locatie_key"
+ " AND ag.alg_gebouw_bez = 1"
+ " AND (al.alg_locatie_vervaldatum IS NULL OR al.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND al.alg_district_key = d.alg_district_key)";
break;
@@ -171,7 +174,8 @@ function getFiltClauseDistrict(pfiltcode, params)
case "EXP": lfiltClause = " AND EXISTS"
+ " (SELECT ''"
+ " FROM alg_v_aanweziglocatie al"
+ " WHERE al.alg_district_key = d.alg_district_key)";
+ " WHERE al.alg_district_key = d.alg_district_key)"
+ " AND (al.alg_locatie_vervaldatum IS NULL OR al.alg_locatie_vervaldatum > TRUNC(SYSDATE))";
// Filter als gevolg van UWVA#14613
case "RES":
case "FAC": lfiltClause = " AND EXISTS"
@@ -180,6 +184,7 @@ function getFiltClauseDistrict(pfiltcode, params)
+ ", alg_v_aanweziglocatie al"
+ " WHERE al.alg_locatie_key = ag.alg_locatie_key"
+ " AND sg.alg_srtgebouw_passief IS NULL"
+ " AND (al.alg_locatie_vervaldatum IS NULL OR al.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND sg.alg_srtgebouw_key(+) = ag.alg_srtgebouw_key"
+ " AND al.alg_district_key = d.alg_district_key)";