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

HCAS#41319 Datumvelden toegevoegd voor mobile meldingen (nieuw en edit)

Browse Source 
svn path=/Website/trunk/; revision=36837
This commit is contained in:
Koen Reefman
2018-02-05 12:58:54 +00:00
parent 8d2dfb1dcc
commit 59d2c1e7be
2 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
APPL/PDA/melding.asp
View File

@@ -25,6 +25,7 @@ var LOCKED_USER_OK = { "xmlnode": "melding", "key": mld_key };
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/persoonselector.inc" -->
<!-- #include file="../Shared/kostenplaatsselector.inc" -->
@@ -37,8 +38,8 @@ var LOCKED_USER_OK = { "xmlnode": "melding", "key": mld_key };
<%
FCLTHeader.Requires({ js: [rooturl+"/appl/pda/modernizr-3.3.0.custom.min.js"] });
FCLTHeader.Requires({plugins: ["suggest"]});
FCLTHeader.Requires({ js: [rooturl+"/appl/pda/modernizr-3.3.0.custom.min.js", rooturl+"/appl/Localscripts/jquery.timepicker-table.js"] });
FCLTHeader.Requires({ plugins: ["suggest"]});
var action = getQParam("action", "");
var qrc = getQParamInt("qrc", 0) != 0;
@@ -253,7 +254,7 @@ else
if (mandaat_eigen_kp == 1 && mld_info.mld_kk == 1)
mld_info.kostenpl_key = melder_obj.afdeling().prs_kostenplaats_key() || -1;
mld_info.mld_stdmelding_omschrijving = stdm_info.stdmelding_omschrijving ;
mld_info.mld_stdmelding_omschrijving = stdm_info.stdmelding_omschrijving;
mld_info.srtdisc_oms = stdm_info.srtdisc_oms;
mld_info.ins_discipline_omschrijving = stdm_info.discipline_omschrijving;
@@ -504,14 +505,6 @@ if (action != "forward")
<input type="hidden" name="deelsrtcont_key" value="<%=deelsrtcont_key%>">
<%
}
else
{ // Voor bestaande melding moet de start en einddatum mee worden gegeven aan mld_edit_melding_save
// om te voorkomen dat deze daar gevuld worden met default sysdate.
%>
<input type="hidden" name="startdate" value="<%=mld_info.melddatum.getTime()%>">
<input type="hidden" name="enddate" value="<%=mld_info.einddatum.getTime()%>">
<%
}
if (mld_key > -1) // bestaande
{
@@ -633,17 +626,6 @@ if (action != "forward")
var prs_behandelaar = new Perslid(mld_info.behandel_key);
ROFIELD((mld_info._behandel_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar") , prs_behandelaar.naam(), {suppressEmpty: true });
}
generateFlexKenmerkBlock ({
fnpre : function () {},
fnpost : "",
stdm_arr : [mld_info.stdm],
mld_key : mld_key,
prs_key : user_key,
reado : (mld_key > 0 && !this_mld.canFlexChange),
showConfidential : this_mld.canViewConfidential,
mobile : true
});
}
else // Nieuwe
{
@@ -656,18 +638,52 @@ if (action != "forward")
if (stdm_info.freetext > 0)
RWFIELD("melding_omschrijving", L("lcl_txt"), "", {multi: true, pclass: (stdm_info.freetext==2 ? "required" : "") });
generateFlexKenmerkBlock ({
fnpre : function () {},
fnpost : "",
stdm_arr : [mld_info.stdm],
mld_key : mld_key,
prs_key : user_key,
reado : (mld_key > 0 && !this_mld.canFlexChange),
mobile : true
});
}
FCLTcalendar("startdate",
{ label : L("lcl_mld_startdate"),
datum : mld_info.melddatum,
minFuture : (frontend ? 0 : -1),
// onChange: "onChangeStartdatum();",
readonly: mld_key > 0 && !this_mld.canWriteDatums && stdm_info.startdatum, // als hij verborgen is hoeftie niet readonly
required: true,
hidden: !stdm_info.startdatum,
volgnr: 1,
mobile: true,
nofollow: true
});
var einddatumHidden = !stdm_info.planbaar && frontend && mld_key < 0;
// Wordt mogelijk dynamisch vervangen
FCLTcalendar("enddate",
{ label : L("lcl_mld_enddate"),
datum : mld_info.einddatum,
minDate : (frontend ? mld_info.einddatum : null),
timeField: !frontend || (frontend && !stdm_info.planbaar), // Bij FE dus afh van Planbaar eind(datum+tijd) wel/niet in te vullen, anderen (FO en zo) kunnen eind(datum+tijd) altijd invullen.
timeStep : 15, // TODO: Is nog wel erg hard. Zie ook mld_edit_melding.js
startTime: S("fac_t_startofworkday"),
endTime : S("fac_t_endofworkday"),
// onChange: "onChangeEnddate();",
readonly: mld_key > 0 && !this_mld.canWriteDatums,
required: true,
trclass: "trenddate",
hidden: einddatumHidden,
mobile: true,
volgnr: 2
});
generateFlexKenmerkBlock ({
fnpre : function () {},
fnpost : "",
stdm_arr : [mld_info.stdm],
mld_key : mld_key,
prs_key : user_key,
reado : (mld_key > 0 && !this_mld.canFlexChange),
showConfidential : (mld_key > 1 ? this_mld.canViewConfidential : null),
mobile : true
});
// filter
if ((this_mld.canBOWrite || this_mld.canFOwrite) && (S("mld_melding_flags") > 0))
{

5
APPL/Shared/calendar.inc
View File

@@ -115,7 +115,7 @@ function FCLTcalendar (fieldID, params)
{
if (params.mobile)
{ %>
<div><label class="ed"><%=params.label%>:</label>
<div <%=params.hidden? "style='display:none'" : ""%>><label class="ed"><%=params.label%>:</label>
<% }
else
{ %>
@@ -143,6 +143,7 @@ function FCLTcalendar (fieldID, params)
function _FCLTcalendar (fieldID, params)
{
var initDate = params.datum || new Date();
var initUTCDate = new Date(initDate.getTime()-(initDate.getTimezoneOffset()*60000))
if (params.initEmpty == 1)
{
var iniDate = "";
@@ -278,7 +279,7 @@ function _FCLTcalendar (fieldID, params)
else
{
$("#show_<%=fieldID%>").attr("type", "date")
.val("<%=iniDate?initDate.toISOString().substr(0,10):""%>")
.val("<%=iniDate?initUTCDate.toISOString().substr(0,10):""%>")
.change(function ()
{
var dt = new Date(this.value);