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

HCAS#41319 in normale mode: iniDate wordt nu weer consistent met branch weergegeven (niet meer YYYY-MM-DD)

Browse Source 
svn path=/Website/trunk/; revision=38117
This commit is contained in:
Koen Reefman
2018-06-07 11:33:15 +00:00
parent 25955185b7
commit 08aa370a2a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
APPL/Shared/calendar.inc
View File

@@ -146,7 +146,8 @@ function _FCLTcalendar (fieldID, params)
var initDate = params.datum || new Date();
if (params.initEmpty == 1)
{
var iniDate = "";
var iniTextDate = "";
var iniDateDate = "";
var iniDateVal = null;
if (params.initTimeEmpty == 1)
var iniTime = "";
@@ -155,21 +156,20 @@ function _FCLTcalendar (fieldID, params)
}
else
{
// Deze is verkeerd omdat input type=date het formaat [YYYY-MM-DD] verwacht
// var iniDate = toDateString(initDate, false, false, params.noConvert);
var iniDate = new Date(initDate.getTime()-(initDate.getTimezoneOffset()*60000)).toISOString().substr(0,10);
var iniTextDate = toDateString(initDate, false, false, params.noConvert);
// Input type=date verwacht het formaat [YYYY-MM-DD]
var iniDateDate = new Date(initDate.getTime()-(initDate.getTimezoneOffset()*60000)).toISOString().substr(0,10);
var iniDateVal = initDate.valueOf();
if (params.initTimeEmpty == 1)
var iniTime = "";
else
var iniTime = toTimeString(initDate, false, params.noConvert);
}
var readotag = params.readonly? " readonly" : "";
var hiddentag = params.hidden? " style='display:none'" : ""; // Alleen op de calender, niet de tijd
%>
<input class="flddate<%=!params.readonly&&params.required?" required":""%><%=params.addClass? " " + params.addClass : ""%>" type="<%=params.hidden?"hidden":"text"%>" <%=readotag%> <%=hiddentag%> id="show_<%=fieldID%>" value="<%=iniDate%>" nofollow="<%=params.nofollow? 1 : 0%>">
<input class="flddate<%=!params.readonly&&params.required?" required":""%><%=params.addClass? " " + params.addClass : ""%>" type="<%=params.hidden?"hidden":"text"%>" <%=readotag%> <%=hiddentag%> id="show_<%=fieldID%>" nofollow="<%=params.nofollow? 1 : 0%>">
<% if (!params.hidden && !params.readonly) { %>
<i class='fa fa-calendar fa-fw dateklikker' onclick='$("#show_<%=fieldID%>").click().focus()'></i>
<% } %>
@@ -270,7 +270,8 @@ function _FCLTcalendar (fieldID, params)
numberOfMonths: <%=(device.test(device.isMobile)?1:params.calendars) || 1%>,
<%= params.hidden? "showOn:'focus'," : ""%>
onSelect: $("#show_<%=fieldID%>")[0].onSelect
}).change(cal_show_onChange);
}).change(cal_show_onChange)
.val("<%=iniTextDate%>");
$("#show_<%=fieldID%>").on('focus', function() { $("#show_<%=fieldID%>").datepicker('show') });
<% if (params.autoopen){ %>
@@ -280,7 +281,7 @@ function _FCLTcalendar (fieldID, params)
else
{
$("#show_<%=fieldID%>").attr("type", "date")
.val("<%=iniDate%>")
.val("<%=iniDateDate%>")
.change(function ()
{
<%=safe.jsstring(params.onChangeDate)%>;