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

AKZA#41075 Wijzigingen in Outletbeheer kunnen niet meer worden opgeslagen

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34583
This commit is contained in:
Erik Groener
2017-07-11 06:42:35 +00:00
parent 06ae7377b5
commit 5d2349e00f
2 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
APPL/INS/load_ports.asp
View File

@@ -8,19 +8,6 @@
<% /* Dynamic upload of Uitvoerende persons list */ %> <% /* Dynamic upload of Uitvoerende persons list */ %>
<html>
<head>
<script type="text/javascript">
var opt_ports = new Array();
function port(value, text, parent_key, ex_value)
{
this.value = value;
this.text = text;
this.parent_key = parent_key;
this.ex_value = ex_value;
}
</script>
<% <%
var sql = ''; var sql = '';
module = getQParamInt("module"); module = getQParamInt("module");
@@ -28,50 +15,62 @@
port = getQParam("port"); port = getQParam("port");
outlet_key = getQParamInt("outlet"); outlet_key = getQParamInt("outlet");
Response.Write("// {{ module = " + module); // Response.Write("// {{ module = " + module);
Response.Write("// {{ name = " + name); // Response.Write("// {{ name = " + name);
Response.Write("// {{ port = " + port); // Response.Write("// {{ port = " + port);
Response.Write("// {{ outlet_key = " + outlet_key); // Response.Write("// {{ outlet_key = " + outlet_key);
%> %>
<html>
<head>
<script type="text/javascript"> <script type="text/javascript">
opt_ports[opt_ports.length] = new port( '', " ", -1, "-1"); var opt_ports = new Array();
opt_ports.push(add_port('', ' ', -1, '-1'));
function add_port(value, text, parent_key, ex_value)
{
return {value: value, text: text, parent_key: parent_key, ex_value: ex_value};
}
</script> </script>
<% <%
if (module>0)
{ // Note: de poortnummer worden numeriek gesorteerd (1,2 ipv 1,10,2), wetende dat het nummers zijn.
// voor ongeldige nummers wordt 0 gepresenteerd(!)
// indien poort is text dan sortering op ins_deel_omschrijving
sql = "SELECT d.ins_deel_key" // 0
+ ", COALESCE(d.ins_deel_omschrijving,'0')" // 1
+ ", COALESCE((SELECT MIN(kd.ins_deel_key)"
+ " FROM ins_kenmerkdeel kd"
+ " WHERE kd.ins_kenmerkdeel_waarde = TO_CHAR(d.ins_deel_key)"
+ " AND kd.ins_kenmerkdeel_verwijder IS NULL"
+ " AND kd.ins_deel_key != " + outlet_key + "), -1)"
+ " FROM ins_deel d"
+ ", ins_srtdeel sd"
+ " WHERE d.ins_deel_parent_key = " + module
+ " AND d.ins_srtdeel_key = sd.ins_srtdeel_key"
+ " AND ins_deel_verwijder IS NULL"
+ " ORDER BY fac.safe_to_number(d.ins_deel_omschrijving), d.ins_deel_omschrijving";
oRs = Oracle.Execute( sql ); if (module>0)
c0=oRs(0); { // Note: de poortnummer worden numeriek gesorteerd (1,2 ipv 1,10,2), wetende dat het nummers zijn.
c1=oRs(1); // voor ongeldige nummers wordt 0 gepresenteerd(!)
c2=oRs(2); // indien poort is text dan sortering op ins_deel_omschrijving
sql = "SELECT d.ins_deel_key" // c0
+ " , COALESCE(d.ins_deel_omschrijving,'0')" // c1
+ " , COALESCE( (SELECT MIN(kd.ins_deel_key)"
+ " FROM ins_kenmerkdeel kd"
+ " WHERE kd.ins_kenmerkdeel_waarde = TO_CHAR(d.ins_deel_key)"
+ " AND kd.ins_kenmerkdeel_verwijder IS NULL"
+ " AND kd.ins_deel_key != " + outlet_key
+ "), -1)" // c2
+ " FROM ins_deel d"
+ " , ins_srtdeel sd"
+ " WHERE d.ins_deel_parent_key = " + module
+ " AND d.ins_srtdeel_key = sd.ins_srtdeel_key"
+ " AND ins_deel_verwijder IS NULL"
+ " ORDER BY fac.safe_to_number(d.ins_deel_omschrijving), d.ins_deel_omschrijving";
oRs = Oracle.Execute( sql );
c0=oRs(0);
c1=oRs(1);
c2=oRs(2);
while (!oRs.eof)
{
if (c2.Value == -1) // only load the free ports
{
%> %>
<script type="text/javascript"> <script type="text/javascript">
<% while (!oRs.eof) opt_ports.push( add_port(<%=c0.value%>, "<%=safe.jsstring(c1.value)%>", <%=module%>, "<%=c2.value%>"));
{ %> </script>
if (<%=c2.value%> == -1) // only load the free ports <%
opt_ports[opt_ports.length] = }
new port(<%=c0.value%>, "<%=safe.jsstring(c1.value)%>", <%=module%>, "<%=c2.value%>"); oRs.MoveNext();
<% oRs.MoveNext();
} }
oRs.close(); oRs.close();
%>
</script>
<%
} }
%> %>
</head> </head>

16
APPL/INS/outlet.asp
View File

@@ -55,9 +55,10 @@ var srtdeel_key_wallplate = oRs(0).value;
function PortsUploaded(name, port) function PortsUploaded(name, port)
{ {
new_ports = window.frames.hidFrame.opt_ports; new_ports = window.frames[0].window.opt_ports;
connect = $("[name='" + name + "con']")[0]; connect = $("[name='" + name + "con']")[0];
sel = $("[name='" + name + "']")[0]; sel = $("[name='" + name + "']")[0];
sel.options.length = new_ports.length; sel.options.length = new_ports.length;
for (i in new_ports) for (i in new_ports)
{ {
@@ -204,9 +205,8 @@ var srtdeel_key_wallplate = oRs(0).value;
function doSubmit() function doSubmit()
{ {
var o_txt = document.getElementById("sgOutlet").value; var o_txt = document.getElementById("sgOutlet").value;
var portidvalue = '' + document.forms.u2.portid.value;
var portpart = document.forms.u2[portidvalue + "part"].options; var port = $("#"+portidvalue + "part option:selected").text();
var port = portpart(portpart.selectedIndex).text;
var label = "placeholder"; var label = "placeholder";
if (CheckPort()) if (CheckPort())
@@ -217,9 +217,11 @@ var srtdeel_key_wallplate = oRs(0).value;
label = L("lcl_out_port") + " " + port + L("lcl_out_same_building") + o_txt + ". " + L("lcl_out_proceed"); label = L("lcl_out_port") + " " + port + L("lcl_out_same_building") + o_txt + ". " + L("lcl_out_proceed");
// autoConf must be true so execute confirm with placeholder label // autoConf must be true so execute confirm with placeholder label
FcltMgr.confirm(label, { autoconfirm: autoConf }, function() { FcltMgr.confirm( label
document.forms.u2.submit(); , { autoconfirm: autoConf }
}); , function() {
document.forms.u2.submit();
});
} }
} }