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

HSLE#39086

Browse Source 
svn path=/Website/branches/v2016.3/; revision=32471
This commit is contained in:
Koen Reefman
2017-01-20 13:44:55 +00:00
parent 39aaee151f
commit 8f6f09261a
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/res_cat.inc
View File

@@ -277,7 +277,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
minimum="<%=minimum%>"
size="4"
<%=(cstatus_reado? "readonly style='background-color: #dddddd;' " : "")%>
onblur='showTotPriceArt_ex(this);checkResTime(this, "<%=art_str%>");'>
onblur='showTotPriceArt_ex(this)'>
<% if (existing && aantal == 0)
{ /* Cursor in het aantal veld van meegegeven artikel (res_artikel_key) */
%> <script type="text/javascript">

45
APPL/RES/res_edit_objcat.asp
View File

@@ -200,31 +200,28 @@ var new_item_key = 0; // Globaal
function checkResTime(elm, art_str)
{
if (parseFloat($("#inpb_c_" + art_str).val()) > 0)
{
var lbeginart = parseFloat($("#inpbb1_c_" + art_str).val());
var leindart = parseFloat($("#inpbe1_c_" + art_str).val());
// if (parseFloat($("#inpb_c_" + art_str).val()) > 0) HSLE#39086, onnodig, als tijd verkeerd is, dan foutmelding geven dat tijd verkeerd is, ongeacht aantal
var hourhasfocus = $("#inpbh1_c_" + art_str).is(":focus");
var minhasfocus = $("#inpbm1_c_" + art_str).is(":focus");
var articlehasfocus = hourhasfocus || minhasfocus;
var lhour = parseInt($("#inpbh1_c_" + art_str).val(), 10);
var lmin = parseInt($("#inpbm1_c_" + art_str).val(), 10);
var lrestime = lhour + lmin/60;
var hourhasfocus = $("#inpbh1_c_" + art_str).is(":focus");
var minhasfocus = $("#inpbm1_c_" + art_str).is(":focus");
var articlehasfocus = hourhasfocus || minhasfocus;
if (!articlehasfocus && (lrestime < lbeginart || lrestime > leindart))
{
elm.select();
// begintijd en eindtijd van float naar (HH:MM - HH:MM)
var lhours = Math.floor(lbeginart).toString();
var lminutes = ((lbeginart - Math.floor(lbeginart)) * 60);
var lbegin = lhours.toString() + ":" + (lminutes < 10 ? "0" + lminutes : lminutes).toString();
lhours = Math.floor(leindart).toString();
lminutes = ((leindart - Math.floor(leindart)) * 60);
var leind = Math.floor(leindart).toString() + ":" + (lminutes < 10 ? "0" + lminutes : lminutes).toString();
// PCHD#39096 Tijdelijke oplossing voor IE11 alert-loop
// FcltMgr.alert(L("lcl_res_between_startend").format(lbegin, leind));
alert(L("lcl_res_between_startend").format(lbegin, leind));
}
var lbeginart = parseFloat($("#inpbb1_c_" + art_str).val());
var leindart = parseFloat($("#inpbe1_c_" + art_str).val());
var lhour = parseInt($("#inpbh1_c_" + art_str).val(), 10);
var lmin = parseInt($("#inpbm1_c_" + art_str).val(), 10);
var lrestime = lhour + lmin/60;
if (!articlehasfocus && (lrestime < lbeginart || lrestime > leindart))
{
// begintijd en eindtijd van float naar (HH:MM - HH:MM)
var lhours = Math.floor(lbeginart).toString();
var lminutes = ((lbeginart - Math.floor(lbeginart)) * 60);
var lbegin = lhours.toString() + ":" + (lminutes < 10 ? "0" + lminutes : lminutes).toString();
lhours = Math.floor(leindart).toString();
lminutes = ((leindart - Math.floor(leindart)) * 60);
var leind = Math.floor(leindart).toString() + ":" + (lminutes < 10 ? "0" + lminutes : lminutes).toString();
FcltMgr.alert(L("lcl_res_between_startend").format(lbegin, leind), { fnafterclose: function() { elm.select(); } });
}
}
</script>