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

MNNL#40541 Flex tijdveld aangepast; default nu 00:00 - 23:59 met kmin en kmax leidend

Browse Source 
svn path=/Website/trunk/; revision=38150
This commit is contained in:
Koen Reefman
2018-06-11 11:37:02 +00:00
parent ab461c0246
commit ca45770af6
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/Shared/kenmerk_beheer.inc
View File

@@ -15,6 +15,7 @@ var kenmerk =
{ types : { "C": "Karakter",
"N": "Numeriek",
"D": "Datum",
"T": "Tijd",
"R": "Referentie (listbox)",
"S": "Referentie (suggest)",
"X": "Bestandsnaam",

50
APPL/Shared/kenmerk_common.inc
View File

@@ -34,6 +34,15 @@ function kenmerk_write(s)
Response.Write(s);
}
function pad(val, len)
{
if (typeof val != "string")
return val;
while (val.length < len)
val = "0" + val;
return val;
}
// Tel/ zoek de bijlagen in een folder
// Resultaat: array met bijlage namen
function BijlagenList(pModule, pNiveau, pKey, pKenmerk_key, otherKenmerk_path)
@@ -1335,34 +1344,19 @@ function listKenmerk(sql, module, key, props)
// ==========================================================================================
if (ktype == 'T')
{
if (kmin === null)
{
switch(module)
{
case "BEZ": kmin = S("vis_t1"); break;
case "PRS": kmin = S("prs_t1"); break;
case "RES": kmin = S("res_t1"); break;
default: kmin = S("fac_t_startofworkday"); break;
}
}
if (kmax === null)
{
switch(module)
{
case "BEZ": kmax = S("vis_t2"); break;
case "PRS": kmax = S("prs_t2"); break;
case "RES": kmax = S("res_t2"); break;
default: kmax = S("fac_t_endofworkday"); break;
}
}
if (parseFloat(kmin) % 1 != 0) kmin = Math.floor(kmin) + ":" + parseInt(parseFloat(kmin) % 1 * 60, 10);
if (parseFloat(kmax) % 1 != 0) kmax = Math.floor(kmax) + ":" + parseInt(parseFloat(kmax) % 1 * 60, 10);
kmin = String(kmin);
kmax = String(kmax);
if (kmin.indexOf(":") == -1) kmin += ":00";
if (kmax.indexOf(":") == -1) kmax += ":00";
if (kmin.split(":")[0].length == 1) kmin = "0" + kmin; // pad
if (kmax.split(":")[0].length == 1) kmax = "0" + kmax; // pad
if (kmin === null) kmin = "0"; // Default
else kmin = (Math.round(kmin * 4) / 4).toFixed(2); // Rounded to nearest quarter
if (kmax === null) kmax = "23.99"; // Default (Not 23.75 because you want to be able to manually enter 23:59)
else kmax = (Math.round(kmax * 4) / 4).toFixed(2); // Rounded to nearest quarter
var kminH = Math.floor(kmin);
var kminM = Math.round(kmin * 60 % 60, 10);
var kmaxH = Math.floor(kmax);
var kmaxM = Math.round(kmax * 60 % 60, 10);
kmin = pad(String(kminH), 2) + ":" + pad(String(kminM), 2);
kmax = pad(String(kmaxH), 2) + ":" + pad(String(kmaxM), 2);
minMax.push({id: idCounter, kmin: kmin, kmax: kmax});