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

Merge 2018.1 Gold A changes

Browse Source 
svn path=/Website/trunk/; revision=38662
This commit is contained in:
Jos Groot Lipman
2018-07-26 14:53:36 +00:00
parent acce57eaf2 6686fcfd6f
commit ea64031e97
49 changed files with 399 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -26,6 +26,7 @@
<%
FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: []})
var ins_score_enabled = S("ins_score_enabled") == 1;
var bld_key = getQParamInt("bld_key");
var onrgoedlvl = "G";
@@ -229,7 +230,8 @@ else
);
if (this_alg.writeman)
CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({ onrgoed_key : bld_key,

4
APPL/ALG/alg_edit_locatie.asp
View File

@@ -22,6 +22,7 @@
<%
FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: []})
var ins_score_enabled = S("ins_score_enabled") == 1;
var loc_key = getQParamInt("loc_key", -1);
var dis_key
@@ -139,7 +140,8 @@ manRWFIELD("pst_land", "fld", L("lcl_prs_address_post_land"), p
manRWFIELD("loc_vw", "fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {maxlength: 30});
manRWFIELD("loc_vwtel", "fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {maxlength: 15});
manRWFIELD("loc_mail", "fld", L("lcl_noti_email"), loc_mail, {maxlength: 200});
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
BLOCK_END();

6
APPL/ALG/alg_gebouw_list.inc
View File

@@ -119,6 +119,7 @@ function gebouw_list(pautfunction, params)
var noref = params.noref;
var ins_score_enabled = S("ins_score_enabled") == 1;
var reg_key = params.reg_key;
var dis_key = params.dis_key;
var loc_key = params.loc_key;
@@ -126,7 +127,6 @@ function gebouw_list(pautfunction, params)
var srtgebouw_key = params.srtgebouw_key;
var verantw_key = params.verantw_key;
var expalgincl = params.expalgincl;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
@@ -224,7 +224,7 @@ function gebouw_list(pautfunction, params)
if (!expalgincl)
sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
if (params.mjob)
if (ins_score_enabled)
{ // Conditiescore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
@@ -276,7 +276,7 @@ function gebouw_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
}
if (params.mjob)
if (ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1"}));
rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault: true});

5
APPL/ALG/alg_gebouw_search.asp
View File

@@ -14,13 +14,13 @@
<%
FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
var ins_score_enabled = S("ins_score_enabled") == 1;
var locatie_key = getQParamInt("locatie_key", -1); // Locatie
var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var autosearch = getQParamInt("autosearch", 0) == 1;
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var authparams = alg.checkAutorisation();
var this_alg = alg.func_enabled(gebouw_key);
%>
@@ -51,7 +51,6 @@ var this_alg = alg.func_enabled(gebouw_key);
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
<input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">
@@ -113,7 +112,7 @@ var this_alg = alg.func_enabled(gebouw_key);
whenEmpty: L("lcl_search_generic") // want filter
});
if (mjob)
if (ins_score_enabled)
{ // Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>

2
APPL/ALG/alg_gebouw_search_list.asp
View File

@@ -32,7 +32,6 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
@@ -48,7 +47,6 @@ gebouw_list ( "*",
bld_key: (bld_key != -1? bld_key : null),
bld_code: bld_code,
bld_name: bld_name,
mjob: mjob,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
noref: (noref != -1? noref : null),

6
APPL/ALG/alg_locatie_list.inc
View File

@@ -111,10 +111,10 @@ function locatie_list(pautfunction, params)
var noref = params.noref;
var ins_score_enabled = S("ins_score_enabled") == 1;
var reg_key = params.reg_key;
var dis_key = params.dis_key;
var loc_key = params.loc_key;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
@@ -199,7 +199,7 @@ function locatie_list(pautfunction, params)
if (params.loc_descr)
sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");
if (params.mjob)
if (ins_score_enabled)
{ // Conditiescore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
@@ -240,7 +240,7 @@ function locatie_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
if (params.mjob)
if (ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1"}));
if (outputmode != 0)

5
APPL/ALG/alg_locatie_search.asp
View File

@@ -12,10 +12,10 @@
<%
FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
var ins_score_enabled = S("ins_score_enabled") == 1;
var district_key = getQParamInt("district_key", -1); //district
var locatie_key = getQParamInt("locatie_key", -1); //locatie
var autosearch = getQParamInt("autosearch", 0) == 1;
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var authparams = alg.checkAutorisation();
%>
@@ -45,7 +45,6 @@ var authparams = alg.checkAutorisation();
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
<input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">
@@ -73,7 +72,7 @@ var authparams = alg.checkAutorisation();
<!-- Second column -->
<td class="searchkolom2">
<table><!-- x rijen, 2 kolommen: label + veld -->
<% if (mjob)
<% if (ins_score_enabled)
{ // Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>

2
APPL/ALG/alg_locatie_search_list.asp
View File

@@ -27,7 +27,6 @@ var dis_key = getQParamInt("districtkey", -1); // District
var loc_key = getQParamInt("locatiekey", -1); // Locatie
var loc_code = getQParam("loc_code", ""); // Locatiecode
var loc_descr = getQParam("loc_descr", ""); // Locatienaam
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
@@ -39,7 +38,6 @@ locatie_list ( "*",
loc_key: (loc_key != -1? loc_key : null),
loc_code: loc_code,
loc_descr: loc_descr,
mjob: mjob,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
noref: (noref != -1? noref : null)

4
APPL/ALG/alg_show_gebouw.asp
View File

@@ -24,6 +24,7 @@
FCLTHeader.Requires({ plugins:["jQuery"],
js: [] })
var ins_score_enabled = S("ins_score_enabled") == 1;
var bld_key = getQParamInt("bld_key");
var onrgoedlvl = "G";
var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
@@ -223,7 +224,8 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({ onrgoed_key : bld_key,

4
APPL/ALG/alg_show_locatie.asp
View File

@@ -21,6 +21,7 @@
<%
FCLTHeader.Requires({plugins:["jQuery"], js: []})
var ins_score_enabled = S("ins_score_enabled") == 1;
var loc_key = getQParamInt("loc_key");
var onrgoedlvl = "L";
var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
@@ -157,7 +158,8 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
BLOCK_END();

2
APPL/API2/model_bes_srtkenmerk.inc
View File

@@ -54,7 +54,7 @@ function model_bes_srtkenmerk(params)
"system": {
"dbs": "bes_srtkenmerk_systeem",
"label": L("mgt_srtkenmerk_systeem"),
"typ": "check"
"typ": "check0"
},
"length": {
"dbs": "bes_srtkenmerk_lengte",

3
APPL/API2/model_generic.inc
View File

@@ -188,6 +188,9 @@ function model_generic(table, autfunction)
// field.sql = "'$mld_t_uitvoertijd not supported yet$'";
field.sql = "mld.uitvoertijd_to_char({0})".format(field.dbs);
break;
case "CLOB":
field.typ = 'memo';
break;
default:
abort_with_warning("Unknown Oracle type '{0}'".format(ora_type));
}

6
APPL/API2/model_mld_stdmelding.inc
View File

@@ -194,7 +194,8 @@ function model_mld_stdmelding()
"key": "prs_dienst_key",
"desc": "prs_dienst_omschrijving"
},
"emptyoption": ""
"emptyoption": "",
"multiedit": true
},
"ordertype": {
"dbs": "mld_typeopdr_key",
@@ -208,7 +209,8 @@ function model_mld_stdmelding()
"key": "mld_typeopdr_key",
"desc": "mld_typeopdr_omschrijving"
},
"emptyoption": ""
"emptyoption": "",
"multiedit": true
},
"regime": {
"dbs": "mld_stdmelding_regime",

4
APPL/API2/model_reports.inc
View File

@@ -427,7 +427,7 @@ function report_GET(params)
field.sql = "SUM(" + field_expression + ")";
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_SUM").format(field.label);
field.newtyp = "float";
field.newtyp = field.typ == "currency" ? "currency" : "float";
field.total = true;
break;
case "C":
@@ -442,7 +442,7 @@ function report_GET(params)
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_AVG").format(field.label);
field.total = false;
field.newtyp = "float";
field.newtyp = field.typ == "currency" ? "currency" : "float";
break;
case "H":
if (field.typ == "date" || field.typ == "datetime")

265
APPL/AUT/Login.inc
View File

@@ -769,244 +769,6 @@ function tryLogin(username, wachtwoord, params)
return true;
}
// function SecureSSO
// Verzorgt de secure Single Signon communicatie protocol
//
// ssoProps
// strSharedKey: afgesproken shared key
// onSuccess: functie die aangeroepen wordt bij success
// We kunnen hier nog via twee routes komen: oude stijl (cust/xxxx/sso.asp)
// en nieuwe stijl (xxxx.facilitor.nl?sso=1)
// In het laatste geval zal ssoProps.sso ook 1 of 2 zijn
function SecureSSO(ssoProps)
{
var strAction, strReturnURL, strKey, strGUID, strCTID
var strUserName, strDecryptedCode, strControlID, strControlDecryptedCode, strLengthCode
//'* variables *******************************************************
//'*******************************************************************
Response.Buffer=true
%>
<HTML>
<HEAD>
<script type="text/javascript">
function fnSubmit() {
window.document.form.submit();
return;
}
</SCRIPT>
</HEAD>
<%
strReturnURL = getFParam("returnurl", "");
strReturnURL= strReturnURL.replace("<", "");
strReturnURL= strReturnURL.replace(">", "");
strAction = getFParam("action", "");
if (!strAction && ssoProps.ssoURL) // we zijn begonnen in Facilitor en moeten nog naar de klant
{
strReturnURL = ssoProps.ssoURL;
if (!strReturnURL)
{
__DoLog("Secure SSO login error 0");
Response.Write("Foute aanroep");
Response.End;
}
strAction = "requestid";
Session("SSO_QUERYSTRING") = String(Request.ServerVariables("QUERY_STRING")); // Deze onthouden we
Session("SSO_URL") = String(Request.ServerVariables("URL")); // Deze onthouden we
}
if (strAction == "requestid")
{
// * action = requestid *******************************************
%>
<BODY LANGUAGE="javascript" onload="return fnSubmit()">
<%
if (strReturnURL == "")
{
__DoLog("Secure SSO login error 1");
Response.write("Error: onvoldoende informatie ontvangen.")
Response.end
}
else
{
Response.write("Een moment aub..")
strGUID = GetGuid(64)
strCTID = GetGuid(strReturnURL.length)
// Save GUID
Session("GUID") = strGUID;
Session("CTID") = strCTID;
Session("GUIDEXPIRE") = (new Date()).valueOf()
+ (ssoProps.Timeout?ssoProps.Timeout:30)*1000;
if (Request.Form("Jumpto").Count>0) // Remember it (old style)
{
Session("FirstPage")=""+Request.Form("Jumpto")
}
%>
<form action='<%=strReturnURL%>' method="post" name="form" ID="Form1">
<input type="hidden" name="guid" value="<%=strGUID%>" ID="Hidden1">
<input type="hidden" name="ctid" value="<%=strCTID%>" ID="Hidden2">
<%
}
}
else if (strAction == "processcode")
{
// * action = processcode *****************************************
%>
<BODY>
<%
strUserName = String(Request.form("code"))
strControlID = String(Request.form("ctcode"))
strLengthCode = Request.form("ltcode")
strGUID = Session("GUID")
strCTID = Session("CTID")
var expire = Session("GUIDEXPIRE");
// Clean session memory
Session.Contents.Remove("GUID");
Session.Contents.Remove("CTID");
Session.Contents.Remove("GUIDEXPIRE");
if (typeof expire == "undefined" || !expire || (new Date()).valueOf() > expire ||
typeof strGUID == "undefined" || strUserName == "" || typeof strCTID == "undefined" || strControlID == "")
{
Session.Contents.Remove("FirstPage");
if (strReturnURL == "")
{
__DoLog("Secure SSO login error 2");
Response.write("Error: onvoldoende informatie ontvangen.")
Response.end
}
else
{
// FSN#25537 deze komt erg regelmatig voor maar oorzaak onbekend
__Log("Secure SSO login error 3");
Response.write("Error: onvoldoende informatie ontvangen.")
Response.End;
// Response.redirect(strReturnURL) kan oneindige loop geven
}
}
// Convert from ASC chars
strUserName = ConvertFromAsc(strUserName)
strControlID = ConvertFromAsc(strControlID)
// * decrypt ******************************************************
//First decoding phase
var strKey = (ssoProps.strSharedKey + strGUID).substr(0,strUserName.length);
strDecryptedCode = DeCrypt(strUserName)
//Second decoding phase
var strKey = strGUID.substr(0,strDecryptedCode.length);
strDecryptedCode = DeCrypt(strDecryptedCode)
// * decrypt Controlkey ********************************************
// First decoding phase
strKey = (ssoProps.strSharedKey + strCTID).substr(0,strControlID.length)
strControlDecryptedCode = DeCrypt(strControlID)
// Second decoding phase
strKey = strCTID.substr(0,strControlDecryptedCode.length)
strControlDecryptedCode = DeCrypt(strControlDecryptedCode)
// ltcode strLengthCode
if (strControlDecryptedCode == strReturnURL && parseInt(strLengthCode,10) == strDecryptedCode.length)
{
// For the ASP: User is authenticated, strDecryptedCode contains the validated Domain\Username
__Log("SSO Gebruikersnaam = " + strDecryptedCode)
if (ssoProps.fnparseName)
{
strDecryptedCode = ssoProps.fnparseName(strDecryptedCode)
//Response.write ("<p>Na fnparseName: " + strDecryptedCode)
}
if (tryLogin(strDecryptedCode, null, { noPassword: true }))
{
if (ssoProps.fnonSuccess)
ssoProps.fnonSuccess(user_key);
else // Alles goed!
{
var sso_qs = Session("SSO_QUERYSTRING")||"";
var sso_url = Session("SSO_URL")||"/default.asp";
Session.Contents.Remove("SSO_QUERYSTRING");
Session.Contents.Remove("SSO_URL");
Response.Redirect(sso_url + (sso_qs?"?":"") + sso_qs);
}
}
else
{ // Automatisch naar het inlogscherm
// Geen lcl nodig, deze SSO-variant vervalt (hopelijk) met 2018.1
shared.auditfail("Secure SSO login niet gevonden binnen Facilitor: " + strDecryptedCode);
Response.Redirect(rooturl + "/default.asp");
}
}
else
{
if (strReturnURL == "")
{
__DoLog("Secure SSO login error 4");
Response.write("Error: onvoldoende informatie ontvangen.")
Response.end
}
else
{
__Log("Secure SSO login error 5");
Response.Write("Decodeer fout");
Response.End;
Response.redirect(strReturnURL)
}
}
}
else
{
__Log("Secure SSO login error 6");
Response.Write("Foute aanroep");
Response.End;
}
// * Functions ********************************************************
function ConvertFromAsc(strAsc)
{
var iCount
var iChars
var sConvertFromAsc = ""
iCount = 0
do
{
iChars = parseInt(strAsc.substr(iCount,1))
iCount = iCount + 1
sConvertFromAsc = sConvertFromAsc + String.fromCharCode(parseInt(strAsc.substr(iCount,iChars)))
iCount = iCount + iChars
} while (iCount < strAsc.length);
return sConvertFromAsc;
}
function GetGuid(iDigits)
{
var lsGUID
var lsTemp
var TypeLib = Server.CreateObject("Scriptlet.TypeLib")
var lsTemp = ""
do
{
lsGUID = String(TypeLib.Guid).substr(0, 38)
lsTemp = lsTemp + lsGUID.substr(1,8) + lsGUID.substr(10,4) + lsGUID.substr(15,4) + lsGUID.substr(20,4) + lsGUID.substr(25,12)
} while (lsTemp.length < iDigits)
TypeLib = null
return lsTemp.substr(0,iDigits);
}
function DeCrypt(strEncrypted)
{
var strChar, iKeyChar, iStringChar, i
var strDecrypted = "";
for (i=0; i<strEncrypted.length; i++)
{
iKeyChar = strKey.charCodeAt(i);
iStringChar = strEncrypted.charCodeAt(i);
iDeCryptChar = iStringChar ^ iKeyChar
strDecrypted = strDecrypted + String.fromCharCode(iDeCryptChar);
}
return strDecrypted;
}
// *********************************************************************
%>
</form>
</BODY>
</HTML>
<%
Response.End;
}
var base64s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
function decode_b64(encStr) {
@@ -1029,26 +791,6 @@ function decode_b64(encStr) {
return unescape(undecOut); //line add for chinese char
}
function SimpleSSO()
{
if (S("use_simple_sso") == 0)
return;
var username = String(Session("UID_DEC"));
__Log('User#1 = '+username);
// facilitorplace SSO decoded/descripted login?
// Bij decoded login moet de setting "S("use_simple_sso")" aan staan
if (username != '' && username!='undefined')
{
username = decode_b64(username);
Session.Contents.Remove("UID_DEC"); // nooit twee keer
__Log('User#2a = '+username);
}
if (username !='' && username!='undefined') {
tryLogin(username, null, { noPassword: true });
}
}
function IntegratedSSO()
{
var username = String( Request.ServerVariables("REMOTE_USER") ).toUpperCase();
@@ -1330,12 +1072,7 @@ function trySSO(ssocode)
if (oRs("aut_idp_type").Value == 3) // Oldstyle SecureSSO, die doet het verder zelf
{
SecureSSO({ strSharedKey: oRs("aut_idp_secret").Value,
Timeout: oRs("aut_idp_clockskew").Value,
ssoURL: oRs("aut_idp_remote_loginurl").Value,
sso: ssocode
});
/* keert niet terug */
shared.internal_error("This single signon method is no longer supported");
}
else if (oRs("aut_idp_type").Value == 4) // JWT
{

3
APPL/AUT/loginTry.asp
View File

@@ -97,9 +97,6 @@ if (user_key < 0)
}
}
if (user_key < 0)
SimpleSSO(); // de base64 simple sso
// Ingescande QR-code bookmark gaat naar \appl\prs\prs_perslid_qr_confirm.asp
if (user_key < 0) // Probeer de user_key uit een cookie te halen

7
APPL/FAC/facilitor.inc
View File

@@ -44,13 +44,6 @@ if (Request.QueryString("API2").Count>0)
}
}
// Simpele SSO, base64 encoded
// login.asp wordt uiteindelijk aangeroepen via een GET, daarom moeten we deze POST veilig stellen
if (Request.Form("UID").Count>0)
Session("UID_DEC") = Request.Form("UID")(1);
else
Session.Contents.Remove("UID_DEC");
CACHE_checkfreshness=1;
%>
<!--#include file="../shared/common.inc" -->

129
APPL/INS/ins.inc
View File

@@ -1014,7 +1014,7 @@ ins = {checkAutLevel:
},
func_get_nextdate: // Bepaal de volgende inspectie datum.
function _func_get_nextdate(pins_key, psrtcont_key, pscen_key)
function _func_get_nextdate(pins_key, psrtcont_key, pscen_key, params)
{
var mjb_freeze_year = S("mjb_freeze_year");
var nextdate = null;
@@ -1126,7 +1126,7 @@ ins = {checkAutLevel:
{ // Bereken de volgende inspectiedatum. Het object is minstens 1 keer geinspecteerd.
sql = "SELECT ins.nextcyclusdate (" + pins_key
+ ", " + psrtcont_key
+ ", " + (mjob? pscen_key : "1")
+ ", " + (params && params.mjob? pscen_key : "1")
+ ", 1) nextdate FROM DUAL";
var oRsN = Oracle.Execute(sql);
nextdate = new Date(oRsN("nextdate").Value);
@@ -1186,6 +1186,7 @@ ins = {checkAutLevel:
getobjectinspect_sql:
function (pautfunction, params)
{ // Lever de objecten of inpectie sql op.
var ins_score_enabled = S("ins_score_enabled") == 1;
var urole = params.urole;
var fronto = (urole == "fo");
var backo = (urole == "bo");
@@ -2244,7 +2245,7 @@ ins = {checkAutLevel:
sql_ex += getKenmerkSql("INS", "i.ins_deel_key");
var sql_score = "";
if (mjob)
if (mjob && ins_score_enabled)
{
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
@@ -2728,6 +2729,7 @@ ins = {checkAutLevel:
getmjblist_sql:
function (params)
{ // Lever de mjbsearchlist sql op.
var ins_score_enabled = S("ins_score_enabled") == 1;
var inflatiepct = S("mjb_inflation");
var inflatiefactor = 1 + (inflatiepct / 100);
var mjb_start_year = S("mjb_start_year");
@@ -3823,6 +3825,7 @@ ins = {checkAutLevel:
+ " FROM prs_kostenplaats k"
+ " WHERE k.prs_kostenplaats_key = CV.prs_kostenplaats_key) kostenplaats"
+ " , cv.isPlanned"
+ " , cv.ins_deelsrtcontrole_freezedate"
+ " , COALESCE((SELECT MAX(idsc2.ins_deelsrtcontrole_key)"
+ " FROM ins_deelsrtcontrole idsc2"
+ " WHERE idsc2.ins_deel_key = cv.ins_deel_key"
@@ -3909,7 +3912,7 @@ ins = {checkAutLevel:
fields.push("alg_district_omschrijving");
if (groupby == 2 || groupby == 3)
{
if (groupby == 2)
if (groupby == 2 && ins_score_enabled)
fields.push("alg_locatie_mjb_score1");
fields.push("alg_locatie_key");
fields.push("alg_locatie_code");
@@ -3918,7 +3921,8 @@ ins = {checkAutLevel:
{
fields.push("alg_gebouw_key");
fields.push("alg_gebouw_omschrijving");
fields.push("alg_gebouw_mjb_score1");
if (ins_score_enabled)
fields.push("alg_gebouw_mjb_score1");
}
}
}
@@ -3934,9 +3938,12 @@ ins = {checkAutLevel:
{
fields.push("ins_deel_aantal");
fields.push("ins_srtdeel_eenheid");
fields.push("ins_deel_mjb_score1");
fields.push("ins_srtdeel_mjb_grensscore1");
fields.push("ins_deel_mjb_score2");
if (ins_score_enabled)
{
fields.push("ins_deel_mjb_score1");
fields.push("ins_srtdeel_mjb_grensscore1");
fields.push("ins_deel_mjb_score2");
}
}
var sql_cost = "SELECT " + fields.join(", ")
@@ -3986,59 +3993,62 @@ ins = {checkAutLevel:
sql += " WHERE ins_scenario_key = 1";
}
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
var mjb_score = "ins_deel_mjb_score1";
if (groupby == 2)
mjb_score = "alg_locatie_mjb_score1";
else if (groupby == 3)
mjb_score = "alg_gebouw_mjb_score1";
if (fitness_score1_from > 0)
sql += " AND " + mjb_score + " >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sql += " AND " + mjb_score + " <= " + fitness_score1_through;
// Negatieve afwijking (=dus slechter) van de conditiescore (ins_deel_mjb_score1) in hele getallen t.o.v. de norm (ins_srtdeel_mjb_grensscore1) .
// Wanneer een element NIET is gemeten (conditiemeting is niet geweest) dan is ins_deel_score1 LEEG,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_neg = [];
if (fitness_score1_from_neg > 0 || fitness_score1_through_neg > 0)
if (ins_score_enabled)
{
if (fitness_score1_from_neg > 0)
fitness_score1_neg.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_from_neg + ")");
if (fitness_score1_through_neg > 0)
{
fitness_score1_neg.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_through_neg + ")");
if (fitness_score1_from_neg == -1)
fitness_score1_neg.push("ins_deel_mjb_score1 > ins_srtdeel_mjb_grensscore1");
}
sql += "AND (" + fitness_score1_neg.join(" AND ") + ")"
}
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
var mjb_score = "ins_deel_mjb_score1";
if (groupby == 2)
mjb_score = "alg_locatie_mjb_score1";
else if (groupby == 3)
mjb_score = "alg_gebouw_mjb_score1";
// Positieve afwijking (=dus beter) van de conditiescore (ins_deel_mjb_score1) in hele getallen t.o.v. de norm (ins_srtdeel_mjb_grensscore1) .
// Wanneer een element NIET is gemeten (conditiemeting is niet geweest) dan is ins_deel_score1 LEEG,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_pos = [];
if (fitness_score1_from_pos > 0 || fitness_score1_through_pos > 0)
{
if (fitness_score1_from_pos > 0)
fitness_score1_pos.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_from_pos + ")");
if (fitness_score1_through_pos > 0)
{
fitness_score1_pos.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_through_pos + ")");
if (fitness_score1_from_pos == -1)
fitness_score1_pos.push("ins_deel_mjb_score1 < ins_srtdeel_mjb_grensscore1");
}
sql += "AND (" + fitness_score1_pos.join(" AND ") + ")"
}
if (fitness_score1_from > 0)
sql += " AND " + mjb_score + " >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sql += " AND " + mjb_score + " <= " + fitness_score1_through;
// Prioriteitsscore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (priority_score2_from > 0)
sql += " AND ins_deel_mjb_score2 >= " + priority_score2_from;
if (priority_score2_through > 0)
sql += " AND ins_deel_mjb_score2 <= " + priority_score2_through;
// Negatieve afwijking (=dus slechter) van de conditiescore (ins_deel_mjb_score1) in hele getallen t.o.v. de norm (ins_srtdeel_mjb_grensscore1) .
// Wanneer een element NIET is gemeten (conditiemeting is niet geweest) dan is ins_deel_score1 LEEG,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_neg = [];
if (fitness_score1_from_neg > 0 || fitness_score1_through_neg > 0)
{
if (fitness_score1_from_neg > 0)
fitness_score1_neg.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_from_neg + ")");
if (fitness_score1_through_neg > 0)
{
fitness_score1_neg.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_through_neg + ")");
if (fitness_score1_from_neg == -1)
fitness_score1_neg.push("ins_deel_mjb_score1 > ins_srtdeel_mjb_grensscore1");
}
sql += "AND (" + fitness_score1_neg.join(" AND ") + ")"
}
// Positieve afwijking (=dus beter) van de conditiescore (ins_deel_mjb_score1) in hele getallen t.o.v. de norm (ins_srtdeel_mjb_grensscore1) .
// Wanneer een element NIET is gemeten (conditiemeting is niet geweest) dan is ins_deel_score1 LEEG,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_pos = [];
if (fitness_score1_from_pos > 0 || fitness_score1_through_pos > 0)
{
if (fitness_score1_from_pos > 0)
fitness_score1_pos.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_from_pos + ")");
if (fitness_score1_through_pos > 0)
{
fitness_score1_pos.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_through_pos + ")");
if (fitness_score1_from_pos == -1)
fitness_score1_pos.push("ins_deel_mjb_score1 < ins_srtdeel_mjb_grensscore1");
}
sql += "AND (" + fitness_score1_pos.join(" AND ") + ")"
}
// Prioriteitsscore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (priority_score2_from > 0)
sql += " AND ins_deel_mjb_score2 >= " + priority_score2_from;
if (priority_score2_through > 0)
sql += " AND ins_deel_mjb_score2 <= " + priority_score2_through;
}
if (fulldetails && sqlArray.length)
sql += " AND ((" + sqlArray.join(") OR (") + "))";
@@ -4049,6 +4059,9 @@ ins = {checkAutLevel:
sql += "," + String(i)
}
if (groupby == 3)
sql += ", 6"; // Ook op gebouwomschrijving sorteren.
// Bulkactie accorderen (freeze) of voltooien/afronden (finish).
// Ik moet nog de juiste insert waarden ophalen voor alle objecten die de sql oplevert.
if (niveau >= 1 && niveau <= 7 && (freeze || finish))

10
APPL/INS/ins_edit_deel.asp
View File

@@ -34,6 +34,7 @@
FCLTHeader.Requires({plugins:["jQuery"],
js: ["../shared/kenmerk_js.asp", "../ins/ins_edit_deel.js", "../ins/bind.js"]})
var ins_score_enabled = S("ins_score_enabled") == 1;
var ins_key = getQParamInt("ins_key");
var copy = (getQParamInt("ins_copy", 0) == 1);
var urole = getQParamSafe("urole");
@@ -807,10 +808,11 @@ var ins_deel_aantal = 1;
if (isLendOut)
ROFIELDTR("fld", "", L("lcl_obj_is_lent_out"));
if (S("mjb_enabled") == 1) {
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score1"), mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score2"), mjb_score2, {suppressEmpty: true});
if (ins_score_enabled)
{
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score1"), mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score2"), mjb_score2, {suppressEmpty: true});
}

3
APPL/INS/ins_edit_srtdeel.asp
View File

@@ -32,6 +32,7 @@ var urole = "bo"; // eventjes voor de flex
var authparams = user.checkAutorisation("WEB_INSMGT");
user.auth_required_or_abort(authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9);
var ins_score_enabled = S("ins_score_enabled") == 1;
var srtdeel_key = getQParamInt("srtdeel_key", -1);
if (srtdeel_key > 0) // bestaande ins_utel/cilinder
@@ -210,7 +211,7 @@ else
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_obj_image_upload"), L("lcl_fg_upload"), params);
if (S("mjb_enabled") == 1)
if (ins_score_enabled)
RWFIELDTR("srtdeel_grensscore1", "fldnum", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1,
{ datatype: "number",
maxlength: 10

6
APPL/INS/ins_edit_srtdeel_save.asp
View File

@@ -19,6 +19,7 @@ FCLTHeader.Requires({ plugins:["jQuery"],
var authparams = user.checkAutorisation("WEB_INSMGT");
user.auth_required_or_abort(authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9);
var ins_score_enabled = S("ins_score_enabled") == 1;
var srtdeel_key = getQParamInt("srtdeel_key", -1);
var isNew = (srtdeel_key < 0);
@@ -41,12 +42,13 @@ var fields = [ { dbs: "ins_srtgroep_key", typ: "key", frm:
{ dbs: "prs_bedrijf_key", typ: "key", frm: "prs_bedrijf_key", track: L("lcl_ins_leverancier"), foreign: "prs_bedrijf" },
{ dbs: "ins_srtdeel_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_ins_vervaldatum") },
{ dbs: "ins_srtdeel_image", typ: "varchar", frm: "srtdeel_image", track: L("lcl_ins_image") },
{ dbs: "ins_srtdeel_mjb_grensscore1", typ: "float", frm: "srtdeel_grensscore1", track: L("ins_srtdeel_mjb_grensscore1") },
{ dbs: "ins_srtdeel_module", typ: "varchar", val: "INS" },
{ dbs: "ins_srtdeel_binding", typ: "number", val: binding, track: L("lcl_obj_bind") }];
var warning = "";
if (ins_score_enabled)
fields.push({ dbs: "ins_srtdeel_mjb_grensscore1", typ: "float", frm: "srtdeel_grensscore1", track: L("ins_srtdeel_mjb_grensscore1") });
var warning = "";
var insUpd = { trackarray: [] };
if (srtdeel_key > 0)
{

4
APPL/INS/ins_inspect_save.asp
View File

@@ -602,7 +602,7 @@ else
// 2) De laatste inspectie is NIET succesvol voltooid. De volgende is in het freeze jaar.
// 3) De laatste inspectie is geaccordeerd/bevroren/gestart(2): De volgende is een periode verder als het freeze jaar.
// 4) Er is geen inspectie geweest of gestart.
var nextdate = ins.func_get_nextdate(ingesloten[i].ins_key, ingesloten[i].srtcont_key, ingesloten[i].scen_key);
var nextdate = ins.func_get_nextdate(ingesloten[i].ins_key, ingesloten[i].srtcont_key, ingesloten[i].scen_key, {mjob: mjob});
var fields = [{dbs: "ins_deelsrtcontrole_key", typ: "key", seq: "ins_s_ins_deelsrtcontrole_key"},
@@ -947,7 +947,7 @@ else
if (!oRs.eof)
{ // Bereken de volgende orginele inspectiedatum (nextdate).
// Het is schuiven vanuit mjob scherm. De laatste inspectie kan niet succesvol zijn. Dus ins.nextcyclusdate(ins_key, srtcont_key, scen_key) kan ik hier niet gebruiken.
var nextdate = ins.func_get_nextdate(ingesloten[0].ins_key, ingesloten[0].srtcont_key, ingesloten[0].scen_key);
var nextdate = ins.func_get_nextdate(ingesloten[0].ins_key, ingesloten[0].srtcont_key, ingesloten[0].scen_key, {mjob: mjob});
// Is jaar plandatum gelijk aan jaar orginele datum?
var plandatum_jaar = plandatum.getFullYear();

6
APPL/INS/ins_list.inc
View File

@@ -81,6 +81,7 @@ function ins_list (pautfunction, params)
var authparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
var hasWriteINSMAN = (authparamsINSMAN && authparamsINSMAN.ALGwritelevel < 9 && authparamsINSMAN.PRSwritelevel < 9)
var ins_score_enabled = S("ins_score_enabled") == 1;
var urole = params.urole;
var fronto = (urole == "fo");
var backo = (urole == "bo");
@@ -114,7 +115,6 @@ function ins_list (pautfunction, params)
var checkout = params.checkout;
var inacObjIncl = params.inacObjIncl;
var inspDone = params.inspDone;
var mjob = params.mjob;
var withflex = params.withflex;
var fitness_score1_from = params.fitness_score1_from;
@@ -938,13 +938,13 @@ function ins_list (pautfunction, params)
if (!fgraph)
rst.addColumn(new Column({caption: L("lcl_obj_owner"), content: "uitgeleend_aan", combine: true}));
}
if (params.mjob)
if (ins_score_enabled)
{
rst.addColumn(new Column({caption: L("lcl_discipline"), content: "ins_disc_oms"}));
rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_groep_oms"}));
}
rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "soort"}));
if (params.mjob)
if (ins_score_enabled)
{
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", align: "center"}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", align: "center"}));

211
APPL/INS/ins_search.asp
View File

@@ -33,6 +33,7 @@ FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"],
});
/***** Get webform parameters *****/
var ins_score_enabled = S("ins_score_enabled") == 1;
var urole = getQParamSafe("urole");
var fronto = (urole == "fo");
var backo = (urole == "bo");
@@ -71,9 +72,6 @@ var insAvail = getQParamInt("insAvail", 1) == 1; // Beschikbaar
var insInspect = getQParamInt("inspect", 0) == 1; // inspectievelden toevoegen
var inspBusy = getQParamInt("inspBusy", 0) == 1; // Gestarte/begonnen inspecties (status 2).
var inspClosed = getQParamInt("inspClosed", 0) == 1; // Afgemelde inspecties (status 5). Actie vereist.
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
/***** End get webform parameters *****/
if (ctrdisc_key > 0)
@@ -195,7 +193,6 @@ var authparams = user.checkAutorisation(autfunction);
<form name="u2" target="workFrame" action="ins_search_list.asp" method="get">
<input type=hidden name="urole" value="<%=urole%>">
<input type=hidden name="autfunction" id="autfunction" value="<%=autfunction%>">
<input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
<%
if (fronto)
{ %>
@@ -385,112 +382,112 @@ var authparams = user.checkAutorisation(autfunction);
});
}
if (mjob)
if (ins_score_enabled)
{
// Conditie score
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditiescore"%>:</label> <% /* L("lcl_mjb_fitness_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
// Conditie score
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditiescore"%>:</label> <% /* L("lcl_mjb_fitness_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<%
// Grenswaarde conditie score
%> <tr class="primsearch fldgwfitness_score" id="gwfitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%=L("ins_srtdeel_mjb_grensscore1")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_from"
name="gwfitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_through"
name="gwfitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
// Grenswaarde conditie score
%> <tr class="primsearch fldgwfitness_score" id="gwfitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%=L("ins_srtdeel_mjb_grensscore1")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_from"
name="gwfitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_through"
name="gwfitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<%
// Prioriteitsscore
%> <tr class="primsearch fldpriority_score" id="priority_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_priority_score_from"><%="Prioriteit"%>:</label> <% /* L("lcl_mjb_priority_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_from"
name="priority_score2_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_through"
name="priority_score2_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
// Prioriteitsscore
%> <tr class="primsearch fldpriority_score" id="priority_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_priority_score_from"><%="Prioriteit"%>:</label> <% /* L("lcl_mjb_priority_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_from"
name="priority_score2_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_through"
name="priority_score2_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% }
if (backo)
{ %>

12
APPL/INS/ins_show_deel.asp
View File

@@ -22,6 +22,7 @@
FCLTHeader.Requires({ plugins: ["jQuery"],
js: ["../Shared/kenmerk_js.asp"] })
var ins_score_enabled = S("ins_score_enabled") == 1;
var urole = getQParamSafe("urole");
var ins_key = getQParamInt("ins_key");
@@ -420,11 +421,12 @@ oRs.Close();
if (lent_out)
ROFIELDTR("fld", "", L("lcl_obj_is_lent_out"));
//if (S("mjb_enabled") == '1') {
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score1"), ins_deel_mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score2"), ins_deel_mjb_score2, {suppressEmpty: true});
//}
if (ins_score_enabled)
{
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score1"), ins_deel_mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score2"), ins_deel_mjb_score2, {suppressEmpty: true});
}
if (tekenbaar)
if (getekend)

4
APPL/INS/ins_show_srtdeel.asp
View File

@@ -24,6 +24,7 @@ var urole = "bo"; // eventjes voor de flex
var authparamsINS_BOF = user.checkAutorisation("WEB_INSMGT");
var ins_score_enabled = S("ins_score_enabled") == 1;
var srtdeel_key = getQParamInt("srtdeel_key");
var sql = "SELECT *"
@@ -133,7 +134,8 @@ oRs.close();
});
ROFIELDTR("fld", L("lcl_ins_vervaldatum"), toDateString(srtdeel.srtdeel_vervaldatum), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_image"), srtdeel.srtdeel_image, {suppressEmpty: true } );
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1, {suppressEmpty: true});
if (ins_score_enabled)
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1, {suppressEmpty: true});
BLOCK_END();
BLOCK_START("insBind", L("lcl_obj_bind"));

3
APPL/MGT/mgt_generic.asp
View File

@@ -78,6 +78,9 @@
},
"mld_melding_note": { "track": null,
"fields": ["name"]
},
"fac_bookmark": { "track": null,
"fields": ["fac_bookmark_id"]
}
}

15
APPL/MJB/mjb_search.asp
View File

@@ -24,6 +24,7 @@ FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"],
});
/***** Get webform parameters *****/
var ins_score_enabled = S("ins_score_enabled") == 1;
var urole = getQParamSafe("urole", "bo");
var autosearch = getQParamInt("autosearch", 0) == 1;
var mode = getQParamInt("mode", 1); // Schermmode begroting 1=aankomende jaren (=default), 2=lopende jaar/jaren, 3=geschiedenis.
@@ -103,9 +104,9 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<% FCLTHeader.Generate(); %>
<script type="text/javascript">
var urole = "<%=urole%>";
var scen_key = <%=scen_key%>;
function doSubmit()
{
document.forms.u2.submit();
@@ -164,7 +165,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ %>
window.afterfiltersready = function () { doSubmit() };
<% } %>
onChangeGroupBy();
<% if (ins_score_enabled)
{ %>
onChangeGroupBy();
<% } %>
});
</script>
</head>
@@ -242,7 +246,8 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
whenEmpty: L("lcl_search_generic") // want dit is een filter
});
if (ins_score_enabled)
{
// Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
@@ -381,8 +386,8 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
maxlength="1">
</td>
</tr>
<%
}
// Scenarios
if (mode == 1)
@@ -530,7 +535,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
sql,
{ initKey: groupby,
label: L("lcl_mjb_group"),
onChange: "onChangeGroupBy()"
onChange: (ins_score_enabled? "onChangeGroupBy()" : null)
});
if (mode == 1)

17
APPL/MJB/mjb_search_list.asp
View File

@@ -21,7 +21,7 @@ FCLTHeader.Requires({plugins: ["jQuery"],
js : ["jquery-ui.js", "../ins/ins_list.js"]}); // Voor slepen en acties.
var urole = getQParamSafe("urole", ""); // Indien niet meegegeven, veronderstel dan frontend gebruik
var ins_score_enabled = S("ins_score_enabled") == 1;
// FORM parameters: de waarde indien aanwezig, anders null
// Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
@@ -565,7 +565,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
function fnrowClass(oRs)
{
var lclass = "";
if (groupby >= 7 && oRs("ins_deel_mjb_score1").Value != null)
if (groupby >= 7 && ins_score_enabled && oRs("ins_deel_mjb_score1").Value != null)
lclass += safe.htmlattr("dcscore"+oRs("ins_deel_mjb_score1").Value); // nog trimmen ofzo?
if (!fulldetails)
@@ -885,18 +885,21 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
if (groupby >= 5) rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_srtgroep_omschrijving"}));
if (groupby >= 6) rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "ins_srtdeel_omschrijving"}));
}
if (groupby == 2)
if (groupby == 2 && ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1", align: "center"}));
if (groupby == 3)
if (groupby == 3 && ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1", align: "center"}));
if (groupby >= 7)
{
rst.addColumn(new Column({caption: L("lcl_ins_object"), content: fnDeel}));
rst.addColumn(new Column({caption: L("lcl_amount"), content: "ins_deel_aantal", datatype: "float"}));
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", align: "center"}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", align: "center"}));
if (ins_score_enabled)
{
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", align: "center"}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", align: "center"}));
}
}
if (fulldetails)
{

1
APPL/MLD/mld_close_confirm.asp
View File

@@ -429,7 +429,6 @@ for (var i = 2; i >= 0; i--)
+ " , " + lcl.xsqla('ins_controlemode_oms', 'ins_controlemode_key')
+ " FROM ins_controlemode"
+ " WHERE ins_srtcontrole_type = " + controleModeArray[i]
+ " AND ins_controlemode_success = 1"
+ " ORDER BY 2";
// Methode is voor de status Afgemeld(5) en Historie/Verwerkt(6) altijd ingevuld.

5
APPL/MLD/opdr_list.inc
View File

@@ -784,9 +784,12 @@ function opdr_list(params)
<tr class="expired2">
<td title="<%= L("lcl_mld_legenda_expired2_tt") %>"><%= L("lcl_mld_legenda_expired2") %></td>
</tr>
<tr class="recentlychangedopdr">
<tr class="updated">
<td title="<%= L("lcl_mld_legenda_updated_tt") %>"><%= L("lcl_mld_legenda_updated") %></td>
</tr>
<tr class="recentlychangedopdr">
<td title="<%= L("lcl_mld_legenda_updated_tt") %>">Nog niet bekeken</td>
</tr>
<tr class="expired2 updated">
<td title="<%= L("lcl_mld_legenda_expired2_tt") %>/<%= L("lcl_mld_legenda_updated_tt")%>"><%= L("lcl_mld_legenda_expired2") %>/<%= L("lcl_mld_legenda_updated") %></td>
</tr>

2
APPL/PDA/iface.inc
View File

@@ -70,7 +70,7 @@ function HEADER(params)
%><a data-rel="back" data-role="button" data-icon="back" data-iconpos="<%=jQButtonIconpos%>"><%=L("lcl_back")%></a><%
}
if (params.search) {
%><a href="productsearch.asp" data-role="button" data-icon="search" data-iconpos="<%=jQButtonIconpos%>" data-direction="reverse"><%=L("lcl_search")%></a><%
%><a href="<%=rooturl + "/appl/pda/"%>productsearch.asp" data-role="button" data-icon="search" data-iconpos="<%=jQButtonIconpos%>" data-direction="reverse"><%=L("lcl_search")%></a><%
}
if (params.useraction) {
%><a onclick="<%=params.useraction.action%>" data-role="button" data-icon="<%=params.useraction.icon%>" data-iconpos="<%=jQButtonIconpos%>" data-direction="reverse"><%=params.useraction.label%></a><%

10
APPL/PDA/ins_deel.asp
View File

@@ -25,6 +25,7 @@
<!-- #include file="./iface.inc" -->
<%
var ins_score_enabled = S("ins_score_enabled") == 1;
var ins_key = getQParamInt("ins_key");
var qrc = getQParamInt("qrc", 0) != 0;
var stdmkina = getQParamInt("stdmkina", -1); //STDMeldingKeyIfNotAuthorized
@@ -177,10 +178,11 @@ oRs.Close();
ROFIELD("fld", L("lcl_ins_manager"), prs_melder.naam());
}
//if (S("mjb_enabled") == '1') { // readonly, gewoon laten zien als die hoe-dan-ook gevuld is
ROFIELD("fld", L("lcl_ins_deel_mjb_score1"), ins_deel_mjb_score1, {suppressEmpty: true});
ROFIELD("fld", L("lcl_ins_deel_mjb_score2"), ins_deel_mjb_score2, {suppressEmpty: true});
//}
if (ins_score_enabled)
{
ROFIELD("fld", L("lcl_ins_deel_mjb_score1"), ins_deel_mjb_score1, {suppressEmpty: true});
ROFIELD("fld", L("lcl_ins_deel_mjb_score2"), ins_deel_mjb_score2, {suppressEmpty: true});
}
// Plus flexkenmerken
generateFlexKenmerkBlock({

3
APPL/SCF/scaffolding_list.inc
View File

@@ -431,7 +431,10 @@ function scaffolding_list(model, scf_params)
if (field.iscurrency)
field.decimals = 2;
else
{
field.decimals = fnfndbcol(model.table, field.dbs).decimals;
if (field.decimals === null) field.decimals = 2; // Float default naar 2
}
var coldata = { caption: field.orglabel? field.orglabel: field.label,
content: fld,

2
APPL/Shared/BijlagenPreview.asp
View File

@@ -102,7 +102,7 @@ function OpenFlexFile(module, niveau, key, kenmerk_key, fname, params)
for (var i = 0; i < lijst.length; i++)
{
href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, lijst[i], { mime_type: mime_types[i] }));
href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, lijst[i], { mime_type: mime_types[i], contentdp: "inline" }));
if (i % picsPerLine == 0)
{
%> <tr valign="top">

2
APPL/Shared/default.csx
View File

@@ -753,7 +753,7 @@ div.widget {
color:red;
}
tr.recentlychangedopdr td {
background-color: #00FF9F;
background-color: #90E9A6;
color: ==textcolor==;
opacity: 1.0;
}

2
APPL/Shared/default.inc
View File

@@ -8,7 +8,7 @@
Context: Vanuit ELK asp bestand
*/
var FCLTVersion="2018.1";
var FCLTVersion="2018.1a";
var FCLTMinDatabaseSchema="34";
var custpath = rooturl + "/cust/" + customerId; // path to customer files

2
APPL/Shared/expired.asp
View File

@@ -27,7 +27,7 @@ if (trycust)
%>
<html>
<head>
<script type="text/javascript" src="../LocalScripts/jquery-3.3.1.js"></script>
<script type="text/javascript" src="../LocalScripts/jquery.min.js"></script>
<script type="text/javascript" src="../LocalScripts/FCLTMgr.js?tm=<%=(new Date).getTime()%>"></script>
</head>
<body onload="if (FcltMgr.getData('expired')) FcltMgr.getData('expired')()">

2
APPL/Shared/kenmerk_common.inc
View File

@@ -249,7 +249,7 @@ function kenmerk_regel(kv_params)
kv_params.props.label_colspan = 2;
if (kv_params.props.wfbuilder) // Workflow Expression Builder
kvhtml += ("<td>:flex{0}</td>".format(kkey));
kvhtml += ("<td>:flex{0}</td>".format(kv_params.kkey));
if (!kv_params.formobile && !kv_params.nolabel)
kvhtml += ('\n <td class="label' + (kv_params.ktype == 'L' || kv_params.ktype == 'l'? ' flexlabel' : '')+ (kv_params.kenmerk_search? ' flexsearch' : '') + '"'

5
APPL/Shared/resultset_table_v2.inc
View File

@@ -1713,7 +1713,10 @@ ResultsetTable.formatValue = function (val, params) //datatype, decimals)
val = "";
return val;
}
case "processingtime": { val = val["duration"] + " " + (val["unit"]=="U"?L("lcl_mld_hours"):L("lcl_mld_days"));
case "processingtime": { if (val["duration"] == null)
val = "";
else
val = val["duration"] + " " + (val["unit"]=="U"?L("lcl_mld_hours"):L("lcl_mld_days"));
return val;
}
case "currency": return safe.curr(val);

2
CUST/ARAI/export/sendmail.vbs
View File

@@ -7,7 +7,7 @@ For each folderIdx In files
If InStrRev(folderIdx.Name, ".pdf") > 0 Then
Set objEmail = CreateObject("CDO.Message")
objEmail.From = "no_reply@rai.facilitor.nl"
objEmail.To = "r.stoker@facilitor.nl;c.overmars@rai.nl;l.vd.ijssel@rai.nl;r.stokvis@rai.nl;h.nietvelt@rai.nl"
objEmail.To = "w7esp56tzt3p4fayc28d@rai.nl"
objEmail.Subject = "Facilitor: Dagrapportage van " & day(date) -1 & "-" & month(date) & "-" & year(date)
objEmail.Textbody = "Deze email is automatisch verzonden en bevat een PDF van de laatste dagrapportage."
objEmail.AddAttachment "d:\Apps\Facilitor\Fplace5i\CUST\ARAI\export\PDF\" + folderIdx.Name

187
CUST/HPJI/xsl/Veldmans.xsl
View File

@@ -1,141 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" encoding="UTF-8" indent="yes"/>
<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format name="european" decimal-separator="." grouping-separator=","/>
<xsl:param name="mode"/>
<xsl:template match="bestelopdracht">
<!--Facilitor custom XSL template for cXML bestelopdracht-->
<xsl:element name="cXML">
<xsl:attribute name="version">1.2.016</xsl:attribute>
<xsl:attribute name="payloadID">
<xsl:value-of select="key"/>
</xsl:attribute>
<xsl:attribute name="timestamp">
<xsl:value-of select="datum/jaar"/>-<xsl:value-of select="datum/maand"/>-<xsl:value-of select="datum/dag"/>T<xsl:value-of select="datum/tijd"/>:00+01:00</xsl:attribute>
<xsl:attribute name="xml:lang">NL</xsl:attribute>
<Header>
<From>
<xsl:element name="Credential">
<xsl:attribute name="domain">Het Poortje Jeugdinrichtingen</xsl:attribute>
<!--Bij Identity de Klantcode zoals door Veldmans Technische Handelsonderneming B.V. aan HPJI toegekend, invullen bij overeenkomstnummer -->
<Identity><xsl:value-of select="bedrijf/kenmerk[@key='1040']"/></Identity>
</xsl:element>
</From>
<To>
<xsl:element name="Credential">
<xsl:attribute name="domain">Veldmans</xsl:attribute>
<Identity></Identity>
</xsl:element>
</To>
<Sender>
<xsl:element name="Credential">
<!--Of fixed NetworkId???-->
<xsl:attribute name="domain">Facilitor</xsl:attribute>
<Identity>Facilitor</Identity>
</xsl:element>
<UserAgent>Facilitor EDI export 1.0</UserAgent>
</Sender>
</Header>
<Request>
<OrderRequest>
<xsl:element name="OrderRequestHeader">
<xsl:attribute name="orderID">
<xsl:value-of select="id"/>
</xsl:attribute>
<xsl:attribute name="orderDate">
<xsl:value-of select="datum/jaar"/>-<xsl:value-of select="datum/maand"/>-<xsl:value-of select="datum/dag"/>
</xsl:attribute>
<Total>
<Money currency="EUR">
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0.00', 'european')"/>
</Money>
</Total>
<ShipTo>
<xsl:element name="Address">
<xsl:attribute name="isoCountryCode">NL</xsl:attribute>
<xsl:attribute name="addressID"><xsl:value-of select="afleveradres/naam"/></xsl:attribute>
<Name xml:lang="NL"><xsl:value-of select="afleveradres/naam"/></Name>
<PostalAddress>
<DeliverTo><xsl:value-of select="bestelling/aanvrager/naam_full"/></DeliverTo>
<Street><xsl:value-of select="afleveradres/bezoek_adres"/></Street>
<City><xsl:value-of select="afleveradres/bezoek_plaats"/></City>
<State></State>
<PostalCode><xsl:value-of select="afleveradres/bezoek_postcode"/></PostalCode>
<Country isoCountryCode="NL"></Country>
</PostalAddress>
<Email>
<xsl:value-of select="bestelling/aanvrager/email"/>
</Email>
</xsl:element>
</ShipTo>
<BillTo>
<xsl:element name="Address">
<xsl:attribute name="isoCountryCode">NL</xsl:attribute>
<xsl:attribute name="addressID">HPJI</xsl:attribute>
<Name xml:lang="NL">
<xsl:value-of select="bedrijf/factuuradres/naam"/>
</Name>
<PostalAddress>
<Street><xsl:value-of select="bedrijf/factuuradres/post_adres"/></Street>
<City><xsl:value-of select="bedrijf/factuuradres/post_plaats"/></City>
<State></State>
<PostalCode><xsl:value-of select="bedrijf/factuuradres/post_postcode"/></PostalCode>
<Country isoCountryCode="NL"></Country>
</PostalAddress>
</xsl:element>
</BillTo>
<Contact>
<Name xml:lang="NL">
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
</Name>
<Email>
<xsl:value-of select="bestelling/aanvrager/email"/>
</Email>
</Contact>
<Extrinsic name="Costcenter">
<xsl:value-of select="bestelling/kostenplaats/nr"/> - <xsl:value-of select="bestelling/kostenplaats/omschrijving"/>
</Extrinsic>
</xsl:element>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="srtdeel/omschrijving"/>
<xsl:sort select="posnr"/>
<xsl:element name="ItemOut">
<xsl:attribute name="quantity">
<xsl:value-of select="aantal"/>
</xsl:attribute>
<xsl:attribute name="lineNumber">
<xsl:value-of select="posnr"/>
</xsl:attribute>
<xsl:attribute name="requestedDeliveryDate">
<xsl:value-of select="../bestelling/leverdatum/jaar"/>-<xsl:value-of select="../bestelling/leverdatum/maand"/>-<xsl:value-of select="../bestelling/leverdatum/dag"/>
</xsl:attribute>
<ItemID>
<SupplierPartID>
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</SupplierPartID>
</ItemID>
<ItemDetail>
<UnitPrice>
<Money currency="EUR">
<xsl:value-of select="format-number(prijs, '0.00', 'european')"/>
</Money>
</UnitPrice>
<Description xml:lang="NL">
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>
</Description>
<UnitOfMeasure>
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</UnitOfMeasure>
<Classification domain=""/>
</ItemDetail>
</xsl:element>
</xsl:for-each>
</OrderRequest>
</Request>
</xsl:element>
<!--Facilitor custom XSL template for cXML bestelopdracht-->
<Order xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.gs1.nl/order/insbou/004" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gs1.nl/order/insbou/004 Order_insbou004.xsd">
<OrderType>220</OrderType>
<OrderNumber><xsl:value-of select='id'/></OrderNumber>
<OrderDate><xsl:value-of select="datum/jaar"/>-<xsl:value-of select="datum/maand"/>-<xsl:value-of select="datum/dag"/></OrderDate>
<OrderTime><xsl:value-of select="datum/tijd"/>:00</OrderTime>
<Buyer>
<GLN></GLN>
<Name><xsl:value-of select='bestelling/voor/afdeling/parent/bedrijf/factuuradres/naam'/></Name>
<StreetAndNumber><xsl:value-of select='bestelling/voor/afdeling/parent/bedrijf/factuuradres/bezoek_adres'/></StreetAndNumber>
<City><xsl:value-of select='bestelling/voor/afdeling/parent/bedrijf/factuuradres/bezoek_plaats'/></City>
<PostalCode><xsl:value-of select='bestelling/voor/afdeling/parent/bedrijf/factuuradres/bezoek_postcode'/></PostalCode>
<Country><xsl:value-of select='bestelling/voor/afdeling/parent/bedrijf/factuuradres/bezoek_land'/></Country>
</Buyer>
<Supplier>
<GLN>8713783614143</GLN>
<Name><xsl:value-of select='bedrijf/naam'/></Name>
<StreetAndNumber><xsl:value-of select='bedrijf/bezoek_adres'/></StreetAndNumber>
<City><xsl:value-of select='bedrijf/bezoek_plaats'/></City>
<PostalCode><xsl:value-of select='bedrijf/bezoek_postcode'/></PostalCode>
<Country><xsl:value-of select='bedrijf/bezoek_land'/></Country>
</Supplier>
<DeliveryParty>
<Name><xsl:value-of select='bestelling/afleveradres/naam'/></Name>
<StreetAndNumber><xsl:value-of select='bestelling/afleveradres/bezoek_adres'/></StreetAndNumber>
<City><xsl:value-of select='bestelling/afleveradres/bezoek_plaats'/></City>
<PostalCode><xsl:value-of select='bestelling/afleveradres/bezoek_postcode'/></PostalCode>
<Country><xsl:value-of select='bestelling/afleveradres/bezoek_land'/></Country>
</DeliveryParty>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="bestelitem/kenmerk[@key='8']"/>
<OrderLine>
<LineNumber><xsl:value-of select="key"/></LineNumber>
<OrderedQuantity><xsl:value-of select="aantal"/></OrderedQuantity>
<OrderedQuantityUoM><xsl:value-of select="bestelitem/srtdeel/eenheid"/></OrderedQuantityUoM>
<LineIdentification><xsl:value-of select="key"/></LineIdentification>
<TradeItemIdentification>
<GTIN></GTIN>
<SuppliersTradeItemId><xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/></SuppliersTradeItemId>
<AdditionalItemIdentification>
<TradeItemDescription><xsl:value-of select="bestelitem/srtdeel/omschrijving"/></TradeItemDescription>
</AdditionalItemIdentification>
</TradeItemIdentification>
<DeliveryDateTimeInformation>
<RequiredDeliveryDate><xsl:value-of select="../bestelling/leverdatum/jaar"/>-<xsl:value-of select="../bestelling/leverdatum/maand"/>-<xsl:value-of select="../bestelling/leverdatum/dag"/></RequiredDeliveryDate>
</DeliveryDateTimeInformation>
</OrderLine>
</xsl:for-each>
</Order>
</xsl:template>
<xsl:template match="facilitor">
@@ -150,17 +70,16 @@
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="facilitor"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylus Studio meta-information - (c) 2004-2009. Progress Software Corporation. All rights reserved.
</xsl:stylesheet><!-- Stylus Studio meta-information - (c) 2004-2009. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios>
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\HPJI_files\bestelopdr5243_20180713154317_325.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\HPJI_files\bestelopdr5243_20180724102118_495.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no"
validator="internal" customvalidator="">
<advancedProp name="bSchemaAware" value="true"/>

0
CUST/INLO/xsl/inlo_opdr_logo.gif → CUST/INLO/inlo_opdr_logo.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
CUST/INLO/xsl/cust_settings.xsl
View File

@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:variable name="logo_file">../../cust/inlo/xsl/inlo_opdr_logo.gif</xsl:variable>
<xsl:variable name="logo_file">../../cust/inlo/inlo_opdr_logo.gif</xsl:variable>
<xsl:template name="customer">INLO</xsl:template>
<xsl:template name="customer_code">INLO</xsl:template>

25
CUST/MARX/xsl/F_GetApiXML.xsl
View File

@@ -145,6 +145,31 @@
</xsl:choose>
</xsl:if>
<!-- ******************************************************************* -->
<!-- *****Request: EINDEGEPLANDE_OPDR_4AX -->
<!-- ******************************************************************* -->
<xsl:if test="@view='mar_v_opdr_plandatum2_ax'">
<xsl:choose>
<xsl:when test="$mode='EINDEGEPLANDE_OPDR_4AX'">
<xml>
<xsl:for-each select="//data_row">
<xsl:sort select="MLD_OPDR_KEY"/>
<mld_ordr>
<mld_opdr_key><xsl:value-of select="MLD_OPDR_KEY"/></mld_opdr_key>
<ax_company_id><xsl:value-of select="AX_COMPANY_ID"/></ax_company_id>
<mld_melding_externnr><xsl:value-of select="MLD_MELDING_EXTERNNR"/></mld_melding_externnr>
<mld_opdr_externnr><xsl:value-of select="MLD_OPDR_EXTERNNR"/></mld_opdr_externnr>
<mld_opdr_ordernr><xsl:value-of select="MLD_OPDR_ORDERNR"/></mld_opdr_ordernr>
<mld_opdr_plandatum><xsl:value-of select="MLD_OPDR_PLANDATUM2"/></mld_opdr_plandatum>
<mld_opdr_opmerking><xsl:value-of select="MLD_OPDR_OPMERKING"/></mld_opdr_opmerking>
</mld_ordr>
</xsl:for-each>
</xml>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<!-- ******************************************************************* -->
<!-- *****Request: ACCEPT_REFUSED_OPDR_4AX -->
<!-- ******************************************************************* -->
<xsl:if test="@view='mar_v_opdr_accept_refused_ax'">

10
CUST/MARX/xsl/F_PutOpdrachtSIDB.xsl
View File

@@ -70,7 +70,10 @@
<status><xsl:apply-templates select="InstructionData/Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<xsl:if test="InstructionData/Status = 'VER'">
<plandatum2><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="InstructionData/Status = 'GER'">
<mut_datum><xsl:apply-templates select="InstructionData/DateReady"/></mut_datum>
@@ -88,7 +91,10 @@
<status><xsl:apply-templates select="sales005:InstructionData/sales005:Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<xsl:if test="sales005:InstructionData/sales005:Status = 'VER'">
<plandatum2><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="sales005:InstructionData/sales005:Status = 'GER'">
<mut_datum><xsl:apply-templates select="sales005:InstructionData/sales005:DateReady"/></mut_datum>

9
CUST/MARX/xsl/F_PutOpdrachtSIDB_SALES005_1.0.xsl
View File

@@ -70,7 +70,11 @@
<status><xsl:apply-templates select="InstructionData/Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<!-- MARX#54121: De status VER - verlengen (het gaat langer duren -->
<xsl:if test="InstructionData/Status = 'VER'">
<plandatum2><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="InstructionData/Status = 'GER'">
<mut_datum><xsl:apply-templates select="InstructionData/DateReady"/></mut_datum>
@@ -89,6 +93,9 @@
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<xsl:if test="sales005:InstructionData/sales005:Status = 'VER'">
<plandatum2><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="sales005:InstructionData/sales005:Status = 'GER'">
<mut_datum><xsl:apply-templates select="sales005:InstructionData/sales005:DateReady"/></mut_datum>

27
CUST/MARX/xsl/mareon.xsl
View File

@@ -159,12 +159,27 @@
<td><b>Uitvoeren voor: </b></td>
<td><xsl:value-of select="einddatum/datum"/></td>
</tr>
<xsl:if test="plandatum/datum!=''">
<tr>
<td><b>Plandatum/-tijd: </b></td>
<td><xsl:value-of select="plandatum/datum"/>&#160;<xsl:value-of select="plandatum/tijd"/></td>
<td colspan="2"/>
</tr>
<xsl:if test="plandatum/datum!='' or plandatum2/datum!=''">
<tr>
<xsl:choose>
<xsl:when test="plandatum/datum!=''">
<td><b>Plan/afspraak datum: </b></td>
<td><xsl:value-of select="plandatum/datum"/>&#160;<xsl:value-of select="plandatum/tijd"/></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="plandatum2/datum!=''">
<td><b>Geplande einddatum: </b></td>
<td><xsl:value-of select="plandatum2/datum"/>&#160;<xsl:value-of select="plandatum2/tijd"/></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:if>
<tr><td colspan="4" height="4px"></td></tr>

2
UTILS/PutOrders/puo_sendhttp.js
View File

@@ -51,7 +51,7 @@ function submitHTTP( p_connect
// Bij status buiten de 200 range is er al een exception geweest
Log2File(3, "SOAP response = " + XMLhttp.responseText);
Log2File(1, "XMLhttp.status: " + XMLhttp.status);
Log2File(2, "XMLhttp.status: " + XMLhttp.status);
Log2File(3, "HTTP response = " + XMLhttp.responseText);
Log2File(2, "*< submitHTTP");