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

MARX#53152 bugfix: plandatum tijdvelden worden nu correct opvolgend geforceerd, maar niet ingevuld indien leeg

Browse Source 
svn path=/Website/trunk/; revision=38028
This commit is contained in:
Koen Reefman
2018-05-31 12:18:14 +00:00
parent a286fee927
commit 21799fb4b0
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/MLD/mld_edit_opdr.asp
View File

@@ -667,6 +667,7 @@ oRs.Close();
<% // TODO: deze invulbaar maken (FSN#30171) [nog overwegen: afhankelijk van de typeopdr-vinkje doen?]
// Indien de volgende plandata required worden gemaakt ooit; dan ook checkSequence() aanpassen
FCLTcalendar("date_plan",
{ label: L("lcl_opdr_plandate"),
datum: mld_opdr.mld_opdr_plandatum,

21
APPL/MLD/mld_edit_opdr.js
View File

@@ -541,12 +541,31 @@ function checkSequence(id)
{
var pld = $("#date_plan").val();
var pl2 = $("#date_plan2").val();
if (pld != null && pl2 != null && pld > pl2) // Not consecutive
var pld_date = $("#show_date_plan").val();
var pl2_date = $("#show_date_plan2").val();
var pld_time = $("#time_from_date_plan").val();
var pl2_time = $("#time_from_date_plan2").val();
if (pld_date && pld_time && pld &&
pl2_date && pl2_time && pl2 &&
pld > pl2) // Not consecutive
{
$("#show_"+thatID).val($("#show_"+thisID).val());
$("#time_from_"+thatID).val($("#time_from_"+thisID).val());
$("#"+thatID).val($("#"+thisID).val());
}
else if (pld_date && pld && pl2_date && pl2 &&
(!pld_time || !pl2_time) && // minstens 1 timefield is niet ingevuld
pld > pl2) // Not consecutive
{
if (pld_date < pl2_date)
{
$("#show_"+thatID).val($("#show_"+thisID).val());
$("#time_from_"+thatID).val("00:00");
$("#"+thatID).val($("#"+thisID).val());
}
else // (pld_date == pl2_date) want pld > pl2
$("#"+thisID).val($("#"+thatID).val());
}
}
}