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

NYBU#55433 Arrangementen bij reserveringen realiseren

Browse Source 
svn path=/Website/trunk/; revision=40236
This commit is contained in:
Alex Tiehuis
2018-12-14 10:04:31 +00:00
parent 69bdd9b2fe
commit b5a7fb9a26
3 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
APPL/RES/res_edit_arrangement_artikel_multi.asp
View File

@@ -13,11 +13,13 @@
*/ %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="res.inc" -->
<%
FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"] });
FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"],
js: ["jquery-ui.js"] });
var art_key_arr = getQParamIntArray("id");
var submitting = getQParamInt("submit", 0) == 1;
@@ -99,37 +101,39 @@ user.auth_required_or_abort(ingesloten.length); // We klagen niet over enkele we
{
FcltMgr.closeDetail(window, { cancel: true } );
}
function res_arr_remark()
{
$("div.readonly.opmerkingen").html($("option:selected").attr("title").replace(/\n/g, "<br>"));
FcltMgr.resized();
}
$(function()
{
res_arr_remark();
});
</script>
</head>
<body class="modal" id="mod_resmultiedit">
<form name="u2" action="res_edit_arrangement_artikel_multi.asp?submit=1&id=<%=ingesloten.join(",")%>" method="post">
<% BLOCK_START("arrgArtikelen", L("res_arrangement")); %>
<table class="fcltblocktab" width="100%">
<tr>
<td class="label"><label class="selector" for="arrangement"><%=L("res_arrangement")%>:</label></td>
<td>
<select class="fldarrangement required" name="arrangement" id="arrangement">
<option value="-1" class=" required">&nbsp;</option>
<%
// select arrangements
var oRs = Oracle.Execute(
"SELECT res_arrangement_key, res_arrangement_omschrijving "+
"FROM res_arrangement"
);
while (!oRs.eof)
{
%> <option value=<%=oRs("res_arrangement_key").Value%>>
<%=oRs("res_arrangement_omschrijving").Value%>
</option>
<% oRs.MoveNext();
}
oRs.close();
%> </select>
</td>
</tr>
</table>
<% BLOCK_END();
<% BLOCK_START("arrgArtikelen", L("res_arrangement"));
// select arrangements
var oRs = Oracle.Execute(
"SELECT res_arrangement_key, res_arrangement_omschrijving "+
"FROM res_arrangement"
);
sql = "SELECT res_arrangement_key, res_arrangement_omschrijving, res_arrangement_opmerking title "+
"FROM res_arrangement";
FCLTselector("arrangement",
sql,
{ label: L("res_arrangement"),
extraParamValue: "title",
onChange: "res_arr_remark()"
});
ROTEXTAREATR("opmerkingen", L("res_arrangement_opmerking"), "");
BLOCK_END();
var buttons = [];
buttons.push({title: L("lcl_submit"), action:"res_submit()", singlepress: true, id: "btn_edit_submit"});

14
APPL/RES/res_edit_objcat.asp
View File

@@ -235,13 +235,6 @@ var new_item_key = 0; // Globaal
});
}
function selectArrangement()
{
var subject = L("lcl_select_package");
var url = "../res/res_select_arrangement.asp?tijd=<%=res_van.getHours()%>:<%=res_van.getHours()%>";
FcltMgr.openModalDetail(url, subject, {callback: addArrangementItems});
}
</script>
</head>
@@ -580,6 +573,13 @@ var new_item_key = 0; // Globaal
}
oRs_arr.close();
%>
function selectArrangement()
{
var subject = L("lcl_select_package");
var url = "../res/res_select_arrangement.asp?tijd=<%=res_van.getHours()%>:<%=res_van.getMinutes()%>&discs=<%=discArr.join(",")%>";
FcltMgr.openModalDetail(url, subject, {callback: addArrangementItems});
}
</script>
<%

31
APPL/RES/res_select_arrangement.asp
View File

@@ -14,23 +14,24 @@
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="res.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../shared/iface.inc" -->
<!-- #include file="../Shared/discxalg3d.inc" -->
<!-- #include file="../shared/kpl_ksrt_validate.inc" -->
<!-- #include file="res_plan_obj.inc" -->
<!-- #include file="res_cat.inc" -->
<%
FCLTHeader.Requires({ plugins: ["jQuery"],
js: ["jquery-ui.js", rooturl+"/appl/res/res_plan.js"],
js: ["jquery-ui.js"],
css: [rooturl+"/appl/res/res.css"]});
%>
<html>
<head>
<% FCLTHeader.Generate(); %>
<% FCLTHeader.Generate();
var discs = getQParamIntArray("discs", [-1]).join(",");
var uren = parseInt(getQParam("tijd", "12:00").split(":")[0], 10);
var minuten = parseInt(getQParam("tijd", "12:00").split(":")[1], 10);
uren = uren.length==1 ? "0"+uren : uren;
minuten = minuten.length==1 ? "0"+minuten : minuten;
%>
<script type="text/javascript">
function res_arr_submit()
@@ -49,7 +50,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
function res_arr_remark()
{
$("div.readonly.opmerkingen").html($("option:selected").attr("res_arrangement_opmerking").replace(/\n/g, "<br>"));
$("div.readonly.opmerkingen").html($("option:selected").attr("title").replace(/\n/g, "<br>"));
FcltMgr.resized();
}
@@ -57,19 +58,21 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
{
res_arr_remark();
});
</script>
</head>
<body class="modal" id="mod_resselectarrangement">
<form name="u2" >
<% BLOCK_START("arrgArtikelen", L("res_arrangement"));
sql = "SELECT res_arrangement_key, res_arrangement_omschrijving, res_arrangement_opmerking "+
"FROM res_arrangement";
sql = "SELECT DISTINCT ar.res_arrangement_key, ar.res_arrangement_omschrijving, ar.res_arrangement_opmerking title "
+ "FROM res_arrangement ar, res_arrangement_artikel aa, res_artikel ra "
+ "WHERE ra.res_discipline_key IN ("+discs+") "
+ "AND aa.res_artikel_key = ra.res_artikel_key "
+ "AND ar.res_arrangement_key = aa.res_arrangement_key";
FCLTselector("arrangement",
sql,
{ label: L("res_arrangement"),
extraParamValue: "res_arrangement_opmerking",
extraParamValue: "title",
onChange: "res_arr_remark()"
});
@@ -80,13 +83,13 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
<td><input type='number' id='uren'
class='fld_cattime'
name='uren'
value='<%=getQParam("tijd", "12:00").split(":")[0]%>'
value='<%=uren%>'
maxlength='2' size='2'>
&nbsp;
<input type='number' id='minuten'
class='fld_cattime'
name='minuten'
value='<%=getQParam("tijd", "12:00").split(":")[1]%>'
value='<%=minuten%>'
maxlength='2' size='2'>
</td>
</tr>