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

FCLT#66528: Objectselectie revamp

Browse Source 
svn path=/Website/trunk/; revision=50886
This commit is contained in:
Alex Tiehuis
2021-04-16 09:57:58 +00:00
parent 942d1e8bd7
commit ede5d3c48b
2 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/MLD/mld_load_obj_info.asp
View File

@@ -18,11 +18,11 @@ DOCTYPE_Disable = 1;
<!-- #include file="../Shared/get_objecten_sql.inc" -->
<%
function kenmerkTR(label, waarde)
function kenmerkTR(label, waarde, isLink)
{
var txt = '<tr>'
+ '<td class="label"><label>'+safe.html(label)+':</label></td>'
+ '<td style="word-wrap:break-word">' +safe.html(waarde)+'</td>'
+ '<td style="word-wrap:break-word">' +(isLink ? '<span class="details" OnClick="obj_info('+ins_key+')">' : '')+safe.html(waarde)+(isLink ? '</span>' : '')+'</td>'
+ '</tr>';
return txt;
}
@@ -68,7 +68,7 @@ if (!oRs.eof)
default: { var lbl = L("lcl_obj_position"); break; } // Plaats: Ruimte(R), Terrein(T) of Werkplek(W)
}
txt += kenmerkTR(lbl, oRs("alg_plaatsaanduiding").Value);
txt += kenmerkTR(L("lcl_obj_identification"), oRs("deel").Value);
txt += kenmerkTR(L("lcl_obj_identification"), oRs("deel").Value, true);
if (oRs("ins_deel_opmerking").Value)
txt += kenmerkTR(L("lcl_ins_opmerking"), oRs("ins_deel_opmerking").value);
txt += kenmerkTR(L("lcl_amount"), oRs("ins_deel_aantal").Value + (oRs("ins_srtdeel_eenheid").Value ? " " + oRs("ins_srtdeel_eenheid").Value : ""));

80
APPL/MLD/mld_object.asp
View File

@@ -118,7 +118,7 @@ var inst_type = '';
FcltMgr.resized(window);
}
function moveRight(obj)
function moveUp(obj)
{
var object_key_str = new Array();
var object_text_str = new Array();
@@ -158,15 +158,11 @@ var inst_type = '';
$('#fldobjExist option:selected').remove();
}
function obj_info()
function obj_info(ins_key)
{
var sel = $('#fldobjPossible :selected');
if (sel.length > 0)
{
var ins_key = sel[0].value;
var url = "appl/ins/ins_deel.asp?urole=bo&ins_key=" + ins_key;
FcltMgr.openDetail(url, "");
}
ins_key = ins_key || sel[0].value;
var url = "appl/ins/ins_deel.asp?urole=bo&ins_key=" + ins_key;
FcltMgr.openDetail(url, "");
}
</script>
@@ -175,34 +171,46 @@ var inst_type = '';
<% MODAL_START(); %>
<form name="u2" action="mld_object.asp?submit=1&mld_key=<%=mld_key%>" method="post" onsubmit="return false;">
<% MODAL_BLOCK_START("mld_selobj", L("lcl_mld_objects_select"), {icon: "fa-plus-hexagon"}) %>
<tr>
<td width="45%">
<span title='<%=L("lcl_mld_deel_details")%>' OnClick='obj_info()'><%=I("fa-info-circle fa-2x", {fastyle: "far"})%></span>&nbsp;
<label class="details"><%=L("lcl_mld_objects_available") + ':'%></label><br>
<input id='autofilter' type='text' placeholder='<%=L("lcl_autofilter")%>'>
<%
if (!isNaN(alg_key))
{
var sql = get_objecten_sql(alg_key, alg_niveau, prs_key, null, stdmld_key);
FCLTselector("fldobjPossible", sql, {startmulti: true, size: 10, extraParamValue: "uitvoertijd"} );
%>
</td>
<td class="fldobjmidcolumn nowrap">
<div class="mv r" onclick="moveRight()"><%=I("fa-chevron-right")%><%=L("lcl_mld_object_add")%></div>
<div class="mv l" onclick="removeObj()"><%=L("lcl_mld_object_remove")%><%=I("fa-chevron-left")%></div>
</td>
<td width="45%"><label><%=L("lcl_mld_objects_selected") + ':'%></label><br>
<% sql = "SELECT 1 FROM DUAL WHERE 1=0"; // We krijgen ze clientside door via dialogArguments
<div class="row">
<div id="obj-info-div" class="col">
<label><%=L("lcl_mld_objects_selected") + ':'%></label><br>
<% if (!isNaN(alg_key))
{
sql = "SELECT 1 FROM DUAL WHERE 1=0"; // We krijgen ze clientside door via dialogArguments
FCLTselector("fldobjExist", sql, {startmulti: true, size: 12});
}
%>
</td>
</tr>
<tr>
<td colspan='3'>
<div id="obj_info"><br><br><br><br><br></div>
</td>
</tr>
</div>
<div id="obj_info" class="col"><br><br><br><br><br></div>
</div>
<div class="row">
<div id="obj-midcolumn-div" class="col-6">
<%
var buttons = [{title: L("lcl_mld_object_remove"), icon: "fa-arrow-alt-down", action: "removeObj()", importance: 1},
{title: L("lcl_mld_object_add"), icon: "fa-arrow-alt-up", action: "moveUp()", importance: 3}];
CreateButtons(buttons);
%>
</div>
</div>
<div class="row">
<div id="obj-sel-div" class="col-12">
<span><%=I("fa-ballot-check fa-2x", {fastyle: "far"})%></span>
<label><%=L("lcl_mld_objects_available") + ':'%></label>
<input id='autofilter' type='text' placeholder='<%=L("lcl_autofilter")%>'>
<%
var sql = get_objecten_sql(alg_key, alg_niveau, prs_key, null, stdmld_key);
FCLTselector("fldobjPossible", sql, {startmulti: true, size: 10, extraParamValue: "uitvoertijd"} );
}
%>
</div>
<% if (isNaN(alg_key))
{
%>
<div id="obj_info" class="col"><br><br><br><br><br></div>
<%
}
%>
</div>
<% MODAL_BLOCK_END()
var buttons = [{title: L("lcl_submit"), icon: "fa-check-square", action: "FcltMgr.closeDetail(window, { obj_html: $('#fldobjExist').html() })", importance: 1},
@@ -216,4 +224,4 @@ IFACE.FORM_END();
<% MODAL_END(); %>
</body>
</html>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>