UWVA#36747 Vervaldatum bij gebouw - daarna bestaat-ie niet meer ook voor grote stappen in vastgoedbrowser
svn path=/Website/trunk/; revision=30176
This commit is contained in:
@@ -40,6 +40,7 @@ function ruimte_list(pautfunction, params)
|
||||
var area_descr = params.area_descr;
|
||||
var area_use = params.area_use
|
||||
var dept = params.dept;
|
||||
var chkgeb = params.chkgeb;
|
||||
%>
|
||||
|
||||
<html>
|
||||
@@ -190,6 +191,9 @@ function ruimte_list(pautfunction, params)
|
||||
+ " WHERE prs_ruimteafdeling_verwijder IS NULL "
|
||||
+ " AND prs_afdeling_key = " + dept + ")";
|
||||
}
|
||||
|
||||
if (chkgeb)
|
||||
sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
|
||||
|
||||
sqln += " ORDER BY l.alg_locatie_upper ASC"
|
||||
+ ", g.alg_gebouw_upper ASC"
|
||||
|
||||
@@ -32,6 +32,7 @@ var area_nr = getQParam("nr", null); // Ruimte nr
|
||||
var area_descr = getQParam("descr", null); // Ruimte omschrijving
|
||||
var area_use = getQParamInt("srt", null); // Ruimtefunctie
|
||||
var dept = getQParamInt("dept", -1); // Afdeling
|
||||
var chkgeb = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw lvl_key/geb_key niet)
|
||||
|
||||
ruimte_list ( "*",
|
||||
{ outputmode: outputmode,
|
||||
@@ -46,7 +47,8 @@ ruimte_list ( "*",
|
||||
area_descr: (area_descr != ""? area_descr : null),
|
||||
area_use: (area_use != -1? area_use : null),
|
||||
dept: (dept !=-1? dept : null),
|
||||
noref: (noref != -1? noref : null)
|
||||
noref: (noref != -1? noref : null),
|
||||
chkgeb: chkgeb
|
||||
}
|
||||
);
|
||||
%>
|
||||
@@ -68,8 +68,8 @@ var authparams = alg.checkAutorisation();
|
||||
%>
|
||||
</table>
|
||||
</td><!-- end column 1 -->
|
||||
<td class="searchkolom2"><input type="hidden" name="noref" value="1">
|
||||
</td><!-- end column 1 -->
|
||||
<td class="searchkolom2"><input type="hidden" name="noref" value="1"><input type="hidden" name="chkgeb" value="1">
|
||||
</td><!-- end column 1 -->
|
||||
</tr>
|
||||
</form>
|
||||
<% BLOCK_END();
|
||||
|
||||
@@ -89,6 +89,7 @@ function verdiepingen_list(pautfunction, params)
|
||||
var loc_key = params.loc_key;
|
||||
var bld_key = params.bld_key;
|
||||
var lvl_key = params.lvl_key;
|
||||
var chkgeb = params.chkgeb;
|
||||
|
||||
function fnrowActionEnabler(oRs)
|
||||
{
|
||||
@@ -156,7 +157,9 @@ function verdiepingen_list(pautfunction, params)
|
||||
sqln += " AND l.alg_district_key = " + dis_key;
|
||||
else if (reg_key)
|
||||
sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
|
||||
|
||||
|
||||
if (chkgeb)
|
||||
sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
|
||||
|
||||
sqln += " ORDER BY l.alg_locatie_upper ASC, "
|
||||
+ " g.alg_gebouw_upper ASC, "
|
||||
|
||||
@@ -27,6 +27,8 @@ var dis_key = getQParamInt("districtkey", -1); // District
|
||||
var loc_key = getQParamInt("locatiekey", -1); // Locatie
|
||||
var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
|
||||
var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
|
||||
var chkgeb = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw geb_key niet)
|
||||
|
||||
|
||||
verdiepingen_list ( "*",
|
||||
{ outputmode: outputmode,
|
||||
@@ -36,7 +38,8 @@ verdiepingen_list ( "*",
|
||||
loc_key: (loc_key != -1? loc_key : null),
|
||||
bld_key: (bld_key != -1? bld_key : null),
|
||||
lvl_key: (lvl_key != -1? lvl_key : null),
|
||||
noref: (noref != -1? noref : null)
|
||||
noref: (noref != -1? noref : null),
|
||||
chkgeb: chkgeb
|
||||
}
|
||||
);
|
||||
%>
|
||||
Reference in New Issue
Block a user