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

BLCC#39847 Contracten zijn nu ook te scopen op verdieping en ruimte, deze zijn nu ook te vinden bij mld_edit_opdr

Browse Source 
svn path=/Website/trunk/; revision=33672
This commit is contained in:
Koen Reefman
2017-05-03 11:04:29 +00:00
parent adf40c17a5
commit 4acd4bccfe
6 changed files with 267 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
APPL/CNT/cnt_edit_scope.asp
View File

@@ -61,7 +61,7 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
%>
$(document).ready(function ()
{
updateBld(<%=authparams.ALGwritelevel%>);
updateBld(<%=authparams.ALGwritelevel%>); // hieruit volgt ook updateFlr() en updateRoo()
<% if (cnt_srtcontract_type == 3)
{ // Objectensoort scope
%>
@@ -258,42 +258,69 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
<span id="locpass">
<table id="cntlocscope_list">
<% // Works only for Objects now; query columns match shared/load_robjs.asp
sql = "SELECT cp.cnt_contract_plaats_key"
+ ", cp.cnt_alg_plaats_key"
+ ", CASE cp.cnt_alg_plaats_code"
+ " WHEN 'L'"
+ " THEN lo.alg_locatie_omschrijving"
+ " WHEN 'G'"
+ " THEN gg.alg_locatie_omschrijving ||"
+ " ' (' || "
+ " gg.alg_locatie_code || "
+ " ' - ' || "
+ " g.alg_gebouw_code || "
+ " ' ' || "
+ " gg.alg_gebouw_naam || ')'"
+ " WHEN 'T'"
+ " THEN lo2.alg_locatie_omschrijving ||"
+ " ' (' ||"
+ " t.alg_terreinsector_code || ' - ' || t.alg_terreinsector_naam || ')'"
+ " END plaats"
+ ", cp.cnt_alg_plaats_code"
+ ", cp.cnt_contract_plaats_gewicht"
+ " FROM cnt_contract_plaats cp"
+ ", alg_v_aanweziglocatie lo"
+ ", alg_v_gebouw_gegevens gg"
+ ", alg_v_aanweziggebouw g"
+ ", alg_v_aanwezigterreinsector t"
+ ", alg_v_aanweziglocatie lo2"
+ " WHERE (cp.cnt_alg_plaats_code = 'L' OR cp.cnt_alg_plaats_code = 'G' OR cp.cnt_alg_plaats_code = 'T')"
+ " AND cp.cnt_alg_plaats_key = lo.alg_locatie_key(+)"
+ " AND cp.cnt_alg_plaats_key = gg.alg_gebouw_key(+)"
+ " AND gg.alg_gebouw_key = g.alg_gebouw_key(+)"
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND cp.cnt_alg_plaats_key = t.alg_terreinsector_key(+)"
+ " AND t.alg_locatie_key = lo2.alg_locatie_key(+)"
+ " AND cp.cnt_contract_plaats_verwijder IS NULL"
+ " AND cp.cnt_contract_key = " + cnt_key
+ " ORDER BY 3";
sql = "SELECT cp.cnt_contract_plaats_key, "
+ " cp.cnt_alg_plaats_key, "
+ " l.alg_locatie_code || ' (' || l.alg_locatie_omschrijving || ')' plaats, "
+ " cp.cnt_alg_plaats_code, "
+ " cp.cnt_contract_plaats_gewicht "
+ " FROM cnt_contract_plaats cp, alg_v_aanweziglocatie l "
+ " WHERE cp.cnt_alg_plaats_code = 'L' "
+ " AND cp.cnt_alg_plaats_key = l.alg_locatie_key "
+ " AND cp.cnt_contract_plaats_verwijder IS NULL "
+ " AND cp.cnt_contract_key = 13132 "
+ "UNION "
+ "SELECT cnt_contract_plaats_key, "
+ " cnt_alg_plaats_key key, "
+ " l.alg_locatie_code || '-' || g.alg_gebouw_code || ' (' || g.alg_gebouw_naam || ')', "
+ " cnt_alg_plaats_code, "
+ " cnt_contract_plaats_gewicht gewicht "
+ " FROM cnt_contract_plaats, alg_locatie l, alg_v_aanweziggebouw g "
+ " WHERE cnt_alg_plaats_code = 'G' "
+ " AND cnt_alg_plaats_key = g.alg_gebouw_key "
+ " AND g.alg_locatie_key = l.alg_locatie_key "
+ " AND cnt_contract_plaats_verwijder IS NULL "
+ " AND cnt_contract_key = 13132 "
+ "UNION "
+ "SELECT cnt_contract_plaats_key, "
+ " cnt_alg_plaats_key key, "
+ " l.alg_locatie_code || '-' || t.alg_terreinsector_code || ' (' || t.alg_terreinsector_naam || ')', "
+ " cnt_alg_plaats_code, "
+ " cnt_contract_plaats_gewicht gewicht "
+ " FROM cnt_contract_plaats, alg_locatie l, alg_v_aanwezigterreinsector t "
+ " WHERE cnt_alg_plaats_code = 'T' "
+ " AND cnt_alg_plaats_key = t.alg_terreinsector_key "
+ " AND t.alg_locatie_key = l.alg_locatie_key "
+ " AND cnt_contract_plaats_verwijder IS NULL "
+ " AND cnt_contract_key = 13132 "
+ "UNION "
+ "SELECT cnt_contract_plaats_key, "
+ " cnt_alg_plaats_key key, "
+ " l.alg_locatie_code || '-' || v.alg_plaatsaanduiding || "
+ " DECODE (v.alg_plaatsomschrijving, '', '', ' (' || v.alg_plaatsomschrijving || ')'), "
+ " cnt_alg_plaats_code, "
+ " cnt_contract_plaats_gewicht gewicht "
+ " FROM cnt_contract_plaats, alg_locatie l, alg_v_allonrgoed_gegevens v "
+ " WHERE cnt_alg_plaats_code = 'V' "
+ " AND v.alg_type = 'V' "
+ " AND cnt_alg_plaats_key = v.alg_verdieping_key "
+ " AND v.alg_locatie_key = l.alg_locatie_key "
+ " AND cnt_contract_plaats_verwijder IS NULL "
+ " AND cnt_contract_key = 13132 "
+ "UNION "
+ "SELECT cnt_contract_plaats_key, "
+ " cnt_alg_plaats_key key, "
+ " l.alg_locatie_code || '-' || r.alg_plaatsaanduiding || "
+ " DECODE (r.alg_plaatsomschrijving, '', '', ' (' || r.alg_plaatsomschrijving || ')'), "
+ " cnt_alg_plaats_code, "
+ " cnt_contract_plaats_gewicht gewicht "
+ " FROM cnt_contract_plaats, alg_locatie l, alg_v_allonrgoed_gegevens r "
+ " WHERE cnt_alg_plaats_code = 'R' "
+ " AND r.alg_type = 'R' "
+ " AND cnt_alg_plaats_key = r.alg_ruimte_key "
+ " AND r.alg_locatie_key = l.alg_locatie_key "
+ " AND cnt_contract_plaats_verwijder IS NULL "
+ " AND cnt_contract_key = 13132 "
+ "ORDER BY 3, 5 DESC";
oRs = Oracle.Execute(sql);
j = 1;
while(!oRs.eof)
@@ -349,7 +376,7 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
+ " AND ag.alg_locatie_key = al.alg_locatie_key"
+ " )";
var sql = "SELECT al.alg_locatie_key"
+ " , al.alg_locatie_omschrijving"
+ " , al.alg_locatie_code || ' (' || al.alg_locatie_omschrijving || ')'"
+ " FROM alg_locatie al"
+ " WHERE al.alg_locatie_verwijder IS NULL"
+ ((authparams.ALGwritelevel > -1) ? sql_my_loc : "")
@@ -358,7 +385,10 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
FCLTselector("locs",
sql,
{ label: L("lcl_location"),
startmulti: true,
initKey: -1,
initEmpty: true,
multi: true,
startmulti: false,
size: 10,
onChange: 'updateBld("' + authparams.ALGwritelevel + '");'
}); %>
@@ -371,7 +401,44 @@ var cnt_srtcontract_type = oRs("cnt_srtcontract_type").value;
<div id="selectblddiv">
<% FCLTselector("blds",
"", // sql: lege selectbox die onload wordt geladen
{ startmulti: true,
{ initKey: -1,
initEmpty: true,
multi: true,
startmulti: false,
size: 10,
onChange: 'updateFlr("' + authparams.ALGwritelevel + '");'
});%>
</div>
</td>
</tr>
<!-- Verdieping -->
<tr>
<td class="label"><label for="flr"><%=L("lcl_floor")%>:</label></td>
<td>
<div id="selectflrdiv">
<% FCLTselector("flrs",
"", // sql: lege selectbox die onload wordt geladen
{ initKey: -1,
initEmpty: true,
multi: true,
startmulti: false,
size: 10,
onChange: 'updateRoo("' + authparams.ALGwritelevel + '");'
}); %>
</div>
</td>
</tr>
<!-- Ruimte -->
<tr>
<td class="label"><label for="room"><%=L("lcl_room")%>:</label></td>
<td>
<div id="selectroodiv">
<% FCLTselector("rooms",
"", // sql: lege selectbox die onload wordt geladen
{ initKey: -1,
initEmpty: true,
multi: true,
startmulti: false,
size: 10
}); %>
</div>

141
APPL/CNT/cnt_edit_scope.js
View File

@@ -32,9 +32,38 @@ function updateBld(pautfunction)
$("#selectblddiv").load("../Shared/loadGebouw.asp",
{ autfunction: + pautfunction,
autlevel: PRSreadlevel,
startmulti: $('#selectblddiv select[multiple]').length,
terrein: 1,
locatie_key_arr: (locatie_key_arr.length != 0 ? locatie_key_arr : [-1]) // -1 is ook een geldige waarde
});
}, function() { $('#selectblddiv>select[fcltmulti=1]').multiSelectToggle(); updateFlr(pautfunction)});
}
function updateFlr(pautfunction)
{
var gebouw_key_arr = new Array();
$('#blds :selected').each(function(i, selected)
{
gebouw_key_arr[i] = $(selected).val();
});
$("#selectflrdiv").load("../Shared/loadVerdieping.asp",
{ autfunction: + pautfunction,
autlevel: PRSreadlevel,
startmulti: $('#selectflrdiv select[multiple]').length,
gebouw_key_arr: (gebouw_key_arr.length != 0 ? gebouw_key_arr : [-1]) // -1 is ook een geldige waarde
}, function() { $('#selectflrdiv>select[fcltmulti=1]').multiSelectToggle(); updateRoo(pautfunction)});
}
function updateRoo(pautfunction)
{
var verdieping_key_arr = new Array();
$('#flrs :selected').each(function(i, selected)
{
verdieping_key_arr[i] = $(selected).val();
});
$("#selectroodiv").load("../Shared/loadRuimte.asp",
{ autfunction: + pautfunction,
autlevel: PRSreadlevel,
startmulti: $('#selectroodiv select[multiple]').length,
verdieping_key_arr: (verdieping_key_arr.length != 0 ? verdieping_key_arr : [-1]) // -1 is ook een geldige waarde
}, function() { $('#selectroodiv>select[fcltmulti=1]').multiSelectToggle(); FcltMgr.resized(); });
}
function showObjDetail(evt)
@@ -225,12 +254,10 @@ function addObj()
{
var object_key_str = new Array();
var object_text_str = new Array();
//var gebouw_loctext_str = new Array();
$('#objs :selected').each(function(i, selected)
{
object_key_str[i] = $(selected).val();
object_text_str[i] = $(selected).text();
//gebouw_loctext_str[i] = $(selected)[0].loc_text;
});
for (var i = 0; i < object_key_str.length; i++)
@@ -262,48 +289,58 @@ function addObjSort()
function addLoc()
{
var gebouw_key_str = new Array();
var gebouw_text_str = new Array();
var gebouw_loctext_str = new Array();
var gebouw_bttype_str = new Array();
$('#blds :selected').each(function(i, selected)
{
gebouw_key_str[i] = $(selected).val();
gebouw_text_str[i] = $(selected).text();
gebouw_loctext_str[i] = $(selected)[0].getAttribute("loc_text");
gebouw_bttype_str[i] = $(selected)[0].getAttribute("bttype");
});
var gebouw_str = "" + gebouw_key_str;
var level;
var key_str_arr = new Array();
var text_arr = new Array();
var type_arr = new Array();
if (gebouw_str == "-1")
{ // Building is not selected so insert the locations
var locatie_key_str = new Array();
var locatie_text_str = new Array();
$('#locs :selected').each(function(i, selected)
{
locatie_key_str[i] = $(selected).val();
locatie_text_str[i] = $(selected).text();
});
if ($('#rooms :selected[value!=-1]').length) level = 5; // Ruimte
else if ($('#flrs :selected[value!=-1]').length) level = 4; // Verdieping
else if ($('#blds :selected[value!=-1]').length) level = 3; // Gebouw & Terrein
else if ($('#locs :selected[value!=-1]').length) level = 2; // Locatie
for (var i = 0; i < locatie_key_str.length; i++)
{
if (!itemLocExist(document.getElementById("cntlocscope_list"), locatie_key_str[i]))
{
insertLocRow(locatie_text_str[i], locatie_key_str[i], "L");
}
}
switch (level) {
case 5: // Ruimte
$('#rooms :selected[value!=-1]').each(function(i, selected)
{
key_str_arr[i] = $(selected).val();
text_arr[i] = $(selected)[0].getAttribute("text");
type_arr[i] = 'R';
});
break;
case 4: // Verdieping
$('#flrs :selected[value!=-1]').each(function(i, selected)
{
key_str_arr[i] = $(selected).val();
text_arr[i] = $(selected)[0].getAttribute("text");
type_arr[i] = 'V';
});
break;
case 3: // Gebouw & Terrein
$('#blds :selected[value!=-1]').each(function(i, selected)
{
key_str_arr[i] = $(selected).val();
text_arr[i] = $(selected)[0].getAttribute("text");
type_arr[i] = $(selected)[0].getAttribute("bttype");
});
break;
case 2: // Locatie
$('#locs :selected[value!=-1]').each(function(i, selected)
{
key_str_arr[i] = $(selected).val();
text_arr[i] = $(selected).text();
type_arr[i] = 'L';
});
break;
default: // Empty
return false; // Nothing selected
}
else
for (var i = 0; i < key_str_arr.length; i++)
{
for (var i = 0; i < gebouw_key_str.length; i++)
if (!itemExist(document.getElementById("cntlocscope_list"), key_str_arr[i], type_arr[i]))
{
if (!itemBldExist( document.getElementById("cntlocscope_list"), gebouw_loctext_str[i], gebouw_text_str[i], gebouw_bttype_str[i]) && gebouw_key_str[i] != -1)
{
insertLocRow(gebouw_loctext_str[i] + " (" + gebouw_text_str[i] + ")", gebouw_key_str[i], gebouw_bttype_str[i]);
}
insertLocRow(text_arr[i], key_str_arr[i], type_arr[i]);
}
//TODO: Wellicht zijn er nog locaties geselecteerd waarvan geen gebouwen zijn geselecteerd dan worden ze nu niet overgezet
// Moeten die wel overgezet worden? Discussie!
}
}
@@ -337,7 +374,7 @@ function itemObjSortExist(tbl, key)
return false;
}
function itemLocExist(tbl, key)
function itemExist(tbl, key, type)
{
if (!tbl.rows)
return true;
@@ -345,26 +382,10 @@ function itemLocExist(tbl, key)
for (var i = 0; i < tbl.rows.length; i++)
{
var j = tbl.rows[i].id.substr(3);
var lockey = $("#akd" + j).val();
if (lockey == key)
return true;
}
return false;
}
function itemBldExist(tbl, loc_itm, bld_itm, bttype)
{
if (!tbl.rows)
return true;
var locbld = loc_itm + " (" + bld_itm + ")";
for (var i = 0; i < tbl.rows.length; i++)
{
j = tbl.rows[i].id.substr(3);
loctxt = $("#aks" + j).val();
loctyp = $("#akt" + j).val();
if (((loctxt == loc_itm) || (loctxt == locbld)) && (loctyp == bttype))
return true;
var rowKey = $("#akd" + j).val();
var rowType = $("#akt" + j).val();
if (key == rowKey && type == rowType)
return true;
}
return false;
}

4
APPL/CNT/cnt_search.asp
View File

@@ -267,7 +267,7 @@ var authparams = user.checkAutorisation(autfunction, true) || {};
<td><input type="text" class="fld" id="descript" name="descript" value="<%=safe.htmlattr(descript)%>"></td>
</tr>
<% // <!-- Locatie en gebouw/terrein -->
<% // <!-- Locatie, gebouw/terrein, verdieping en ruimte -->
FCLTplaatsselector(authparams.ALGreadlevel, { regiokey: reg_key,
districtkey: dist_key,
locatiekey: loc_key,
@@ -276,7 +276,7 @@ var authparams = user.checkAutorisation(autfunction, true) || {};
ruimtekey: room_key,
terrein: true,
startlevel: alg_startlevel,
eindlevel: 5, // verdieping
eindlevel: 5, // Ruimte
secsearch: 2,
trclass: "noxd",
whenEmpty: L("lcl_search_generic"), // want filter

99
APPL/MLD/mld_edit_opdr.asp
View File

@@ -468,51 +468,66 @@ oRs.Close();
if (mld_opdr.typeopdr_contract & 2)
{
// <!-- CONTRACT UITVOERENDE -->
var sql_contract = " SELECT cnt.cnt_contract_key cnt_key"
+ " , '* ' || cnt.cnt_contract_nummer_intern"
+ " || CASE WHEN cnt.cnt_contract_versie IS NOT NULL THEN '.'||cnt.cnt_contract_versie END"
+ " || '-' || cnt.cnt_contract_omschrijving cnt_name"
+ " , cnt.cnt_prs_bedrijf_key bedrijf_key"
+ " , (SELECT b.prs_bedrijf_naam naam FROM prs_bedrijf b WHERE b.prs_bedrijf_key = cnt.cnt_prs_bedrijf_key) bedrijf_naam"
+ " , 1"
+ " , cnt.cnt_contract_nummer_intern"
+ " , cnt.cnt_contract_versie"
+ " FROM cnt_v_aanwezigcontract cnt"
+ " , cnt_contract_object co"
+ " , mld_melding_object mo "
+ " WHERE cnt.cnt_contract_key = co.cnt_contract_key"
+ " AND co.cnt_ins_deel_key = mo.ins_deel_key"
+ " AND mo.mld_melding_key = " + mld_key
+ " AND (cnt.cnt_contract_status IN (0, 1) OR cnt.cnt_contract_key = {0})".format(mld_opdr.contract_key||-1)
var sql_contract = "SELECT cnt.cnt_contract_key cnt_key, "
+ " '* ' || cnt.cnt_contract_nummer_intern "
+ " || CASE WHEN cnt.cnt_contract_versie IS NOT NULL THEN '.' || cnt.cnt_contract_versie END "
+ " || '-' || cnt.cnt_contract_omschrijving cnt_name, "
+ " cnt.cnt_prs_bedrijf_key bedrijf_key, "
+ " (SELECT b.prs_bedrijf_naam naam "
+ " FROM prs_bedrijf b "
+ " WHERE b.prs_bedrijf_key = cnt.cnt_prs_bedrijf_key) "
+ " bedrijf_naam, "
+ " 1, "
+ " cnt.cnt_contract_nummer_intern, "
+ " cnt.cnt_contract_versie "
+ " FROM cnt_v_aanwezigcontract cnt, "
+ " cnt_contract_object co, "
+ " mld_melding_object mo "
+ " WHERE cnt.cnt_contract_key = co.cnt_contract_key "
+ " AND co.cnt_ins_deel_key = mo.ins_deel_key "
+ " AND mo.mld_melding_key = " + mld_key
+ " AND (cnt.cnt_contract_status IN (0, 1) OR cnt.cnt_contract_key = {0})".format(mld_opdr.contract_key||-1)
+ (mld_opdr.uitvoerende_key > 0
? " AND cnt_prs_bedrijf_key = " + mld_opdr.uitvoerende_key
? " AND cnt_prs_bedrijf_key = " + mld_opdr.uitvoerende_key
: "")
+ " UNION"
+ " SELECT cnt.cnt_contract_key cnt_key"
+ " , cnt.cnt_contract_nummer_intern"
+ " || CASE WHEN cnt.cnt_contract_versie IS NOT NULL THEN '.'||cnt.cnt_contract_versie END"
+ " || '-' || cnt.cnt_contract_omschrijving cnt_name"
+ " , cnt.cnt_prs_bedrijf_key bedrijf_key"
+ " , (SELECT b.prs_bedrijf_naam naam FROM prs_bedrijf b WHERE b.prs_bedrijf_key = cnt.cnt_prs_bedrijf_key) bedrijf_naam"
+ " , 2"
+ " , cnt.cnt_contract_nummer_intern"
+ " , cnt.cnt_contract_versie"
+ " FROM cnt_v_aanwezigcontract cnt"
+ " , cnt_contract_plaats cp"
+ " , mld_melding me"
+ " , cnt_disc_params cpa "
+ " WHERE cnt.cnt_contract_key = cp.cnt_contract_key"
+ " AND cnt.ins_discipline_key = cpa.cnt_ins_discipline_key"
+ " AND (cnt_contract_status = 0 OR cnt.cnt_contract_key = {0})".format(mld_opdr.contract_key||-1) // actief
+ " AND ((cp.cnt_alg_plaats_key = me.mld_alg_locatie_key"
+ " AND cp.cnt_alg_plaats_code = 'L')"
+ " OR (cp.cnt_alg_plaats_key = (SELECT alg_gebouw_key FROM alg_v_onroerendgoed og"
+ " WHERE og.alg_onroerendgoed_keys = me.mld_alg_onroerendgoed_keys)"
+ " AND cp.cnt_alg_plaats_code = 'G'))"
+ " AND cnt.cnt_contract_status IN (0, 1)"
+ " AND me.mld_melding_key = " + mld_key
+ " UNION "
+ "SELECT cnt.cnt_contract_key cnt_key, "
+ " cnt.cnt_contract_nummer_intern "
+ " || CASE WHEN cnt.cnt_contract_versie IS NOT NULL THEN '.' || cnt.cnt_contract_versie END "
+ " || '-' || cnt.cnt_contract_omschrijving cnt_name, "
+ " cnt.cnt_prs_bedrijf_key bedrijf_key, "
+ " (SELECT b.prs_bedrijf_naam naam "
+ " FROM prs_bedrijf b "
+ " WHERE b.prs_bedrijf_key = cnt.cnt_prs_bedrijf_key) "
+ " bedrijf_naam, "
+ " 2, "
+ " cnt.cnt_contract_nummer_intern, "
+ " cnt.cnt_contract_versie "
+ " FROM cnt_v_aanwezigcontract cnt, "
+ " cnt_contract_plaats cp, "
+ " mld_melding me, "
+ " cnt_disc_params cpa "
+ " WHERE cnt.cnt_contract_key = cp.cnt_contract_key "
+ " AND cnt.ins_discipline_key = cpa.cnt_ins_discipline_key "
+ " AND (cnt_contract_status = 0 OR cnt.cnt_contract_key = {0})".format(mld_opdr.contract_key||-1) // actief
+ " AND ( (cp.cnt_alg_plaats_key = me.mld_alg_locatie_key "
+ " AND cp.cnt_alg_plaats_code = 'L') "
+ " OR (cp.cnt_alg_plaats_key = "
+ " (SELECT CASE cp.cnt_alg_plaats_code "
+ " WHEN 'G' THEN alg_gebouw_key "
+ " WHEN 'T' THEN alg_terreinsector_key "
+ " WHEN 'V' THEN alg_verdieping_key "
+ " WHEN 'R' THEN alg_ruimte_key "
+ " END "
+ " alg_plaats_key "
+ " FROM alg_v_onroerendgoed og "
+ " WHERE og.alg_onroerendgoed_keys = "
+ " me.mld_alg_onroerendgoed_keys))) "
+ " AND cnt.cnt_contract_status IN (0, 1) "
+ " AND me.mld_melding_key = " + mld_key
+ (mld_opdr.uitvoerende_key > 0
? " AND cnt_prs_bedrijf_key = " + mld_opdr.uitvoerende_key
? " AND cnt_prs_bedrijf_key = " + mld_opdr.uitvoerende_key
: "")
+ " ORDER BY 4, 6, 7 DESC";

11
APPL/Shared/default.csx
View File

@@ -2700,6 +2700,17 @@ input.materiaal
{
white-space: nowrap;
}
select.fldlocs,
select.fldblds,
select.fldflrs,
select.fldrooms
{
resize: both;
}
td.selectable#loc
{
padding-right: 4px;
}
/* ouderwetse listboxes */
select, .fldbedrijf, .fldfunc, .fldact, .fldsortout, .fldgroupby, .fldbdr_key, .fldopstel, .fldsel_activity,
select.flddienst, select.fldcontract, .fldt_opdr, .fldaltgroep, .fldaltfunctie, .fldBES_srtgroup,

17
APPL/Shared/loadGebouw.asp
View File

@@ -15,6 +15,7 @@ DOCTYPE_Disable = true;
// Build a building list
var locatie_key_arr = getFParamIntArray("locatie_key_arr", []); // Locatie: -2 als lege waarde meegegeven omdat -1 een geldige waarde is
var autlevel = getFParamInt("autlevel", -1);
var startmulti = getFParamInt("startmulti", 0);
var terrein = (getFParam("terrein", 0) == 1);
var filtClause = "";
@@ -30,7 +31,7 @@ var sql = "SELECT g.alg_gebouw_key alg_key"
//+ ", g.alg_gebouw_naam naam"
+ ", l.alg_locatie_code || ' - ' || g.alg_gebouw_code || ' ' || g.alg_gebouw_naam"
+ ", 1 niveau"
+ ", l.alg_locatie_omschrijving loc_text"
+ ", l.alg_locatie_code || '-' || g.alg_gebouw_code || ' (' || g.alg_gebouw_naam || ')' text"
+ ", 'G' bttype"
+ " FROM alg_v_aanweziggebouw g, alg_locatie l"
+ " WHERE l.alg_locatie_key = g.alg_locatie_key"
@@ -43,7 +44,7 @@ if (terrein)
+ " SELECT t.alg_terreinsector_key alg_key"
+ ", alg_terreinsector_code || ' - ' || alg_terreinsector_naam naam"
+ ", 3 niveau"
+ ", l.alg_locatie_omschrijving loc_text"
+ ", l.alg_locatie_code || '-' || t.alg_terreinsector_code || ' (' || t.alg_terreinsector_naam || ')' text"
+ ", 'T' bttype"
+ " FROM alg_v_aanwezigterreinsector t, alg_locatie l"
+ " WHERE l.alg_locatie_key = t.alg_locatie_key"
@@ -55,11 +56,11 @@ sql += " ORDER BY 3, 2";
FCLTselector("blds",
sql,
{ initKey: -1,
startmulti: true,
initEmpty: true,
multi: true,
startmulti: startmulti,
size: 10,
extraParamValue: "loc_text, bttype",
emptyOption: "",
initEmpty: true
extraParamValue: "text, bttype",
onChange: 'updateFlr("' + autlevel + '");'
});
%>
%>