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

Merge 2018.2 Gold C patches

Browse Source 
svn path=/Website/trunk/; revision=40686
This commit is contained in:
Jos Groot Lipman
2019-01-28 11:26:49 +00:00
parent 8e5f5b0fe0 279d8d9519
commit ffd00a39b2
19 changed files with 328 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API/shorturl.asp
View File

@@ -227,7 +227,9 @@ __Log("== Entering shorturl.asp ==");
}
var no302 = getQParamInt("no302", 0) == 1;
if (no302)
// locked_bdradr_key wordt nogal eens vanuit e-mails geopend.
// Dan wil je ook een gewone redirect (Melding 56152)
if (no302 || locked_bdradr_key > 0)
{
%> <html>
<head>

4
APPL/API2/model_mld_opdr.inc
View File

@@ -987,6 +987,8 @@ obj._is_clone=2 --> nieuwe sub-opdracht
break;
}
if (!data_mutatie.contract_datum)
data_mutatie.contract_datum = new Date();
var sql_m = "INSERT INTO bgt_budgetmutatie"
+ "( bgt_budgetmutatie_datum"
+ ", bgt_budgetmutatie_omschrijving"
@@ -1001,7 +1003,7 @@ obj._is_clone=2 --> nieuwe sub-opdracht
+ ", bgt_budgetmutatie_code"
+ (voor_debug ? ", bgt_budgetmutatie_volgnr" : "")
+ ") VALUES"
+ "( COALESCE(" + data_mutatie.contract_datum.toSQL() + ",SYSDATE)"
+ "( " + data_mutatie.contract_datum.toSQL()
+ ", " + safe.quoted_sql(mutatie_omschr)
+ ", " + user_key
+ ", " + data_mutatie.budget_res_key

12
APPL/API2/model_prs_dienst.inc
View File

@@ -55,7 +55,7 @@ function model_prs_dienst()
var fields_1 = this.fields;
var fields_2 = {
"company": {
"dbs": "prs_bedrijfdienstlocatie.prs_bedrijf_key",
"dbs": "prsd.prs_bedrijf_key",
"label": L("prs_bedrijf_key"),
"typ": "key",
"foreign": {
@@ -68,11 +68,15 @@ function model_prs_dienst()
this.fields = object_merge({}, fields_1, fields_2);
var tbl_prsd = "(SELECT DISTINCT prs_dienst_key"
+ " , prs_bedrijf_key"
+ " FROM prs_bedrijfdienstlocatie"
+ ") prsd";
gparams = {
GET: {
tables: ["prs_bedrijfdienstlocatie"],
wheres: ["prs_dienst.prs_dienst_key = prs_bedrijfdienstlocatie.prs_dienst_key",
"prs_bedrijfdienstlocatie.prs_bedrijf_key = " + company_key
tables: [tbl_prsd],
wheres: ["prs_dienst.prs_dienst_key = prsd.prs_dienst_key",
"prsd.prs_bedrijf_key = " + company_key
]
}
};

41
APPL/Localscripts/modal_kenmerken.js
View File

@@ -347,6 +347,47 @@ function showKenmerkModal(purl, ptitle, init)
for (var n = 0; n < kenmerk_waarden.length; n++)
setAdvFlexValue(kenmerk_waarden[n]);
}
$("input.fldSflexD").not("[readonly]").datepicker({
// buttonImage: "../pictures/calendar2.png",
// buttonImageOnly: true,
showOn: "none",
duration: 'fast',
dateFormat: 'dd-mm-yy', // zo verwacht de flex-code het.
changeYear: true,
changeMonth: true,
duration: 'fast',
beforeShow: function(input, inst) { setTimeout("FcltMgr.resized(window)", 100) },
dayNames: calendar_names.days,
dayNamesMin: calendar_names.daysMin,
dayNamesShort: calendar_names.daysMin,
firstDay: 1,
monthNamesShort: calendar_names.monthsShort,
monthNames: calendar_names.months,
showWeek: true
});
if (typeof Modernizr == "undefined" || !Modernizr.inputtypes.time)
{ // timepicker
$(".fldSflexT").not("[readonly]").each(function() {
$(this).timePicker({
step: 15,
startTime : "00:00",
endTime : "23:59",
columns : 4,
onChange : function () {
$timeInput = $(this).parents("div.time-holder").prev("input.fldSflexT")
$timeInput.removeClass("bad");
$timeInput.trigger("change");
}
});
});
}
else
{ // Native timepicker
$(".fldSflexT").not("[readonly]").each(function() {
$(this).attr("type", "time");
});
}
$("div.time-holder").each(function() { console.log(this); $(this).css('top', "").css('left', ""); });
});
}

4
APPL/MLD/mld_forward.asp
View File

@@ -273,10 +273,10 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
<% /* Wrapper div voor dynamisch herladen */ %>
</div>
<% BLOCK_START("mldBehandel", L("lcl_behandelgegevens"));
<% BLOCK_START("mldBehandel", L("lcl_mld_behandeling"));
RWTEXTAREATR("opmerk",
"fldtxt" + ((S("mld_forward_opm_flags") & 1) == 1? " required" : ""),
(S("mld_forward_opm_flags") & 2) == 2 ? L("lcl_mld_note") : L("lcl_mld_inf_Opmerking"),
(S("mld_forward_opm_flags") & 2) == 2 ? L("lcl_mld_note_new") : L("lcl_mld_inf_Opmerking"),
"",
{html: "rows='8' cols='80'"});

4
APPL/MLD/mld_search.asp
View File

@@ -78,7 +78,9 @@
<%
FCLTHeader.Requires({plugins:["jQuery", "kenmerk"],
js: ["../mld/mld_search.js"]});
js: ["../mld/mld_search.js", "jquery.timepicker-table.js"],
css: ["timePicker-table.css"]
});
FCLTHeader.Title(L("lcl_menu_mld_fo_overview"));
/***** Get webform parameters *****/

4
APPL/RES/res_list_ppi.inc
View File

@@ -263,6 +263,7 @@ function calcTotals(sql)
+ " , res_ruimte rr"
+ " , res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
@@ -296,6 +297,7 @@ function calcTotals(sql)
+ " , res_alg_ruimte ra"
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key"
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rr1.res_ruimte_vervaldatum IS NULL OR rr1.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND (ra.res_alg_ruimte_verwijder IS NULL"
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1 + ")) beschik"
+ " , alg_v_ruimte_gegevens_all ruimte_geg"
@@ -340,6 +342,7 @@ function calcTotals(sql)
+ " , res_ruimte rr"
+ " , res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
@@ -442,6 +445,7 @@ function calcTotals(sql)
+ " , ("+ sql_werkperiode +") sw"
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key"
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rr1.res_ruimte_vervaldatum IS NULL OR rr1.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND ( ra.res_alg_ruimte_verwijder IS NULL"
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1
+ " )";

5
APPL/Shared/Shared.inc
View File

@@ -1448,7 +1448,10 @@ var protectQS =
if (params.relaxed)
return false;
else
INTERNAL_ERROR_HMAC_URL_EXTENSION;
{
__DoLog("HMAC url extension not allowed: {0}".format(checkurl), "#ff0000");
shared.internal_error("HMAC url extension not allowed"); // Net iets minder erg dan een AiAi
}
}
var qs = checkurl.substring(0,indexHmac);

3
APPL/Shared/default.csx
View File

@@ -2343,6 +2343,9 @@ input[type=text].mldres {
.hasDatepicker {
float:left;
}
.fldSflexD.hasDatepicker {
float:inherit;
}
.ui-datepicker-trigger {
float:left;
margin: 2px 10px 0 2px;

9
APPL/Shared/default.xsl
View File

@@ -1912,15 +1912,6 @@ END:VCALENDAR
<xsl:value-of select="datumgereed/datum"/>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_verzonden"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datumverzonden/datum"/>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">

50
APPL/Shared/kenmerk_common.inc
View File

@@ -216,7 +216,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
// var res = L("lcl_flex_autocopy");
// else // pf: op 1 regel tbv mijn syntaxhiliting
// {
var res ="<input type='button' isBijlage='1' nBijlagen='" + lijst.length + "'" + identify + " class='bijlage button " + pRequired + "' value='" + label.format(lijst.length) + "'";
var res ="<input type='button' isBijlage='1' nBijlagen='" + lijst.length + "'" + identify + " class='bijlage button " + (params.isExpression? " expression " + params.expressionClass : "") + pRequired + "' value='" + label.format(lijst.length) + "'";
var url = rooturl + "/appl/shared/BijlagenForm.asp?module=" + pModule
+ "&key=" + pKey
+ (pNiveau != ""? "&niveau=" + pNiveau : "")
@@ -350,7 +350,7 @@ function kenmerk_regel(kv_params)
if (!kv_params.nolabel && !kv_params.ishidden)
kvhtml += ((kv_params.formobile && kv_params.ktype == 'l'? '<div data-role="collapsible" data-theme="c" data-content-theme="c"><h3 id="collLabel'+kv_params.clabelCounter+'">' : '')
+ '\n <label for="' + kv_params.nameprefix + kv_params.idCounter + 'val" class="' + (kv_params.ktype == 'L' || kv_params.ktype == 'l'? ' flexlabellabel' : '')
+ (kv_params.isExpression ? ' expression' + kv_params.expressionClass : '') + '">' + '<span title="' + safe.htmlattr(kv_params.hint) + '">'
+ (kv_params.isExpression ? ' expression ' + kv_params.expressionClass : '') + '">' + '<span title="' + safe.htmlattr(kv_params.hint) + '">'
+ kv_params.flexkenmerklabel + (kv_params.label_ext ? " "+kv_params.label_ext : "")
+ ( (kv_params.kdim != null && kv_params.kdim != "xxx")
? " [" + kv_params.kdim + "]"
@@ -424,7 +424,7 @@ function kenmerk_regel(kv_params)
kvhtml += "\n <input type=hidden id='" + kv_params.nameprefix + kv_params.idCounter + "val' name='" + kv_params.nameprefix + kv_params.idCounter + "val' value='" + safe.htmlattr(kv_params.flexkenmerkwaarde) + "'>";
}
if ((!kv_params.maskeren && (kv_params.kenmerk_search || !kv_params.readonlyfield || (kv_params.flexkenmerkwaarde && kv_params.forceReadonly)) && kv_params.ktype != "M" && kv_params.ktype != "L" && kv_params.ktype != "l") ||
if ((!kv_params.maskeren && (kv_params.kenmerk_search || !kv_params.readonlyfield || (kv_params.flexkenmerkwaarde && kv_params.forceReadonly)) && kv_params.ktype != "L" && kv_params.ktype != "l") ||
(!kv_params.ishidden && kv_params.maskeren && kv_params.flexkenmerkwaarde && (kv_params.ktype == "F" || kv_params.ktype == "E")))
{
// Alleen dan hidden name-velden er bij
@@ -564,6 +564,7 @@ function listKenmerk(sql, module, key, props)
// Zitten er expressie kenmerken tussen?
var flexExprIncluded = false;
var forceFlexExprInclusion = false;
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
@@ -571,6 +572,7 @@ function listKenmerk(sql, module, key, props)
if (kdefault && (kdefault.match('##EXPR##') != null || kdefault.match('##SHOW##') != null))
{
flexExprIncluded = true;
forceFlexExprInclusion = true;
break;
}
oRs.MoveNext();
@@ -846,7 +848,7 @@ function listKenmerk(sql, module, key, props)
// ==========================================================================================
if (ktype == 'C')
{
if (flexExprIncluded && !isExpression)
if (flexExprIncluded && (!isExpression || forceFlexExprInclusion))
{
onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\""
@@ -1144,6 +1146,7 @@ function listKenmerk(sql, module, key, props)
if (ktype == "R")
kv = '<input class="fldflexR'
+ showdetail
+ (isExpression? " expression " + expressionClass : "")
+ (inactiveval? ' inactive' : '')
+ '" type="text" readonly tabindex=-1 value="' + safe.htmlattr(kvv) + '"'
+ clickdetail
@@ -1151,6 +1154,7 @@ function listKenmerk(sql, module, key, props)
else
kv = '<input class="fldflexS'
+ showdetail
+ (isExpression? " expression " + expressionClass : "")
+ (inactiveval ? ' inactive' : '')
+ '" type="text" readonly tabindex=-1 value="' + safe.htmlattr(kvv) + '"'
+ clickdetail
@@ -1159,7 +1163,7 @@ function listKenmerk(sql, module, key, props)
else
{
// is dus impliciet ook type R
if (flexExprIncluded && !isExpression)
if (flexExprIncluded && (!isExpression || forceFlexExprInclusion))
{
onchangeExp = "calculateFlexExpressions(this"
+ ", \"" + module + "\""
@@ -1177,13 +1181,14 @@ function listKenmerk(sql, module, key, props)
+ (initTriggerChange ? " initTriggerChange " : "")
+ (kenmerk_search ? "fldSflexR " : "fldflexR ")
+ (required ? required_class : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
//+ " placeholder='"+flexkenmerklabel+"'"
+ (kenmerk_search ? " advmulti=1 " : "")
+ (required ? " required='required' " : "")
+ (required > 1
? " onChange='checkRequiredGroup(\"" + required_group + "\");" + onchangeExp + "'"
: (flexExprIncluded && !isExpression? " onChange='" + onchangeExp + "'" : ""))
: (flexExprIncluded && (!isExpression || forceFlexExprInclusion)? " onChange='" + onchangeExp + "'" : ""))
+ ">"
+ "<option value='-1' " + (required? " class='" + required_class + "'" : "") + "><!--lege waarde--></option>"
+ kvv
@@ -1367,6 +1372,7 @@ function listKenmerk(sql, module, key, props)
? "fldSflex" + ktype + " "
: "fldflex" + ktype + " ")
+ (missing ? " missing " : " details ")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (required > 1
@@ -1416,7 +1422,9 @@ function listKenmerk(sql, module, key, props)
if (!readonlyfield && !otherPath) // Altijd aanwezig
{
kv += "<input type='button' "
+ "class='bijlage1 button " + (required? required_class : "") + "' "
+ "class='bijlage1 button "
+ (isExpression? " expression " + expressionClass : "")
+ (required? required_class : "") + "' "
+ "isBijlage='1' nBijlagen='"+(flexkenmerkwaarde?1:0)+"' "
+ "value='" + L("lcl_add") + "'"
+ (flexkenmerkwaarde?" style='display:none' ": " ")
@@ -1444,6 +1452,8 @@ function listKenmerk(sql, module, key, props)
props.nameprefix = nameprefix;
props.idCounter = idCounter;
props.ktype = ktype;
props.isExpression = isExpression;
props.expressionClass = expressionClass;
var res = BijlagenButton(module, niveau, key, tmpfolder, kkey, readonlyfield,
requiredfield, kdim, kregexp, otherPath, identify, L("lcl_appendixes_teller"), props);
@@ -1551,7 +1561,7 @@ function listKenmerk(sql, module, key, props)
if (kv == "" && ktype != "M" && ktype != "F" && ktype != "E" && !makeCheckbox)
{ // Ook lege folders met bestanden en een enkele bestandsnaam krijgen we via de query mee. Maar deze niet tonen.
// Ooit meer HTML-types toepassen (number, float)
if (flexExprIncluded && (ktype == "N" || ktype == "D" || ktype == "S") && !isExpression)
if (flexExprIncluded && (ktype == "N" || ktype == "D" || ktype == "S") && (!isExpression || forceFlexExprInclusion))
{
onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\""
@@ -1619,8 +1629,9 @@ function listKenmerk(sql, module, key, props)
kv = "<input type='checkbox' class='"
+ (kenmerk_search ? "fldCSflexN " : "fldCflexN ")
+ (required ? required_class : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+ " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+ onchangeExp
+ "' "
+ " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")' "
@@ -1656,6 +1667,17 @@ function listKenmerk(sql, module, key, props)
// ==========================================================================================
if (ktype == 'D')
{
if (flexExprIncluded && (!isExpression || forceFlexExprInclusion))
{
onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\""
+ ", " + key
+ ", \"" + (props.kenmerk_module || "") + "\""
+ ", \"" + nameprefix + "\""
+ ", \"" + extraserie + "\""
+ ");";
initTriggerChange = true;
}
kv += " class='"
+ (initTriggerChange ? "initTriggerChange " : "")
+ (kenmerk_search ? "fldSflexD " : "fldflexD ")
@@ -1664,10 +1686,11 @@ function listKenmerk(sql, module, key, props)
+ "'"
+ (required ? " required='required' " : "")
+ (isReadonly ? " readonly " : "")
+ " onChange='" + onchangeExp + "' "
+ " value='" + safe.htmlattr(flexkenmerkwaarde) + "'"
+ ">";
if (!readonlyfield && !isExpression && !maskeren)
if (!readonlyfield && (!isExpression || isShowExpr) && !maskeren)
kv += "<i class=\"fa fa-calendar fa-fw dateklikker\" onclick=\"$('#" + nameprefix + idCounter + "val').datepicker('show')\"></i>";
// Als er voor een datumveld geen kmin en kmax is ingevuld dan is de yearRange default -10 tot +10 jaar vanaf geselecteerd jaar.
@@ -1854,6 +1877,7 @@ function listKenmerk(sql, module, key, props)
+ "name='Suggest" + nameprefix + idCounter + "_show' "
+ "value='" + safe.htmlattr(currval) + "' "
+ "class='" + (kenmerk_search ? "fldflexS" : "fldSflexS")
+ (isExpression? " expression " + expressionClass : "")
+ (required ? required_class : "") + "'"
// zo wordt het veld rood, ongeacht de waarde, wat verwarrend is, dus niet + (inactiveval ? " inactive " : "")
+ (required ? " required='required' " : "")
@@ -1912,6 +1936,12 @@ function listKenmerk(sql, module, key, props)
var kdefault = oRs("kenmerk_default").Value;
var ishidden = (props.fnIsHidden && props.fnIsHidden(kvolgnr, kdefault));
// reset forceFlexExprInclusion when flexExpr is included
if (kv && kv.indexOf('calculateFlexExpressions') > -1)
{
forceFlexExprInclusion = false;
}
kv_arr.push({label: "", waarde: kv});
for(kv_i=0; kv_i< kv_arr.length; kv_i++)
{

4
APPL/Shared/kenmerk_js.asp
View File

@@ -326,10 +326,10 @@ function callback_flex_expr_info(json)
{
for (var kenmerk=0; kenmerk < json.length; kenmerk++)
{
if ($("#" + json[kenmerk].kfieldid + "val").hasClass("flexshow"))
if ($("#" + json[kenmerk].kfieldid + "val").hasClass("flexshow") || $("#Suggest" + json[kenmerk].kfieldid + "_show").hasClass("flexshow"))
{
var $td = $("#" + json[kenmerk].kfieldid + "val").parent("td");
$td.add($td.prev(".label")).toggle(json[kenmerk].waarde == 1);
$td.add($td.prev(".label")).toggle(json[kenmerk].waarde != 0 && json[kenmerk].waarde != null);
}
else
{

9
CUST/ARAI/xsl/ARAI.xsl
View File

@@ -405,8 +405,10 @@ Amsterdam RAI
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<b><xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
</td>
<xsl:element name="a">
<xsl:attribute name="href">https://arai.facilitor.nl/?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/></xsl:attribute><b><xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
</xsl:element>
</td>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<xsl:if test="spoed&lt;3">
<b><xsl:value-of select="//lcl/MLD/spoed"/></b>
@@ -675,10 +677,13 @@ Amsterdam RAI
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:0px">
<xsl:element name="a">
<xsl:attribute name="href">https://arai.facilitor.nl/?<xsl:value-of select="../bookmarks/opdracht"/><xsl:value-of select="key"/></xsl:attribute>
<b>
<xsl:value-of select="opdrachttype/omschrijving"/>&#160;
<xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
</xsl:element>
</td>
</tr>
<xsl:if test="extra_key">

80
CUST/MDUX/xsl/MDUX.xsl
View File

@@ -2104,6 +2104,86 @@
</html>
</xsl:when>
<xsl:when test="$srtnotificatiecode = 'CUST06'">
<html>
<xsl:call-template name="htmlhead"/>
<xsl:element name="body">
<table width="100%" CLASS='DefResultsetTable'>
<xsl:if test=" count(rapport_data/data_row) = 0">
<tr><td>
<center><b>Geen gegevens gevonden</b></center>
</td></tr>
</xsl:if>
<tr>
<td colspan = "4">
<br/>
Beste <xsl:value-of select="rapport_data/data_row/OPDRACHT_UITVOERENDE"/>,<br/><br/>
Hierbij sturen wij een overzicht van de opdrachten die wij bij u hebben open staan. <br/><br/>
Wij verzoeken u, om in de kolom ‘status’ aan te geven, welke opdrachten inmiddels zijn uitgevoerd, welke opdrachten nog in uitvoering zijn, én wat er is uitgevoerd.<br/>
Indien van toepassing, graag van de overige opdrachten de einddatum aanpassen naar de geplande uitvoeringsdatum, zodat wij de melder(s) kunnen informeren.<br/><br/>
</td>
</tr>
<xsl:if test=" count(rapport_data/data_row) = 0">
<tr><td>
<center><b>Geen gegevens gevonden</b></center>
</td></tr>
</xsl:if>
<tr>
<td>
<table width="98%">
<xsl:variable name="sortedall">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="OPDRACHT_DATUM"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<tr>
<th width="5%" style="text-align:left">Opdrachtnr</th>
<th width="10%" style="text-align:left">Opdrachttype</th>
<th width="10%" style="text-align:left">Plaats</th>
<th width="10%" style="text-align:left">Melding</th>
<th width="25%" style="text-align:left">Omschrijving</th>
<th width="10%" style="text-align:left">Behandelaar</th>
<th width="10%" style="text-align:left">Aanvrager</th>
<th width="5%" style="text-align:left">Opdrachtdatum</th>
<th width="5%" style="text-align:left">Einddatum</th>
<th width="10%" style="text-align:left">Status</th>
</tr>
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="OPDRACHT_DATUM"/>
<tr>
<td width="5%"><xsl:value-of select="OPDRACHT_NUMMER"/></td>
<td width="10%"><xsl:value-of select="OPDRACHT_TYPE"/></td>
<td width="10%"><xsl:value-of select="OPDRACHT_LOCATIE"/></td>
<td width="10%"><xsl:value-of select="MELDING"/></td>
<td width="25%"><xsl:value-of select="OMSCHRIJVING"/></td>
<td width="10%"><xsl:value-of select="OPDRACHT_BEHANDELAAR"/></td>
<td width="10%"><xsl:value-of select="AANVRAGER"/></td>
<td width="5%"><xsl:value-of select="substring(OPDRACHT_DATUM, 1, string-length(OPDRACHT_DATUM) - 9)"/></td>
<td width="5%"></td>
<td width="10%"></td>
</tr>
</xsl:for-each>
</table>
</td>
</tr>
<tr>
<td>
<br/><br/>
Het overzicht ontvangen wij graag uiterlijk a.s. donderdag via facilitair@medux.nl retour.<br/><br/>
Wij zien uw (re)actie graag tegemoet, alvast bedankt.<br/><br/><br/><br/>
Met vriendelijke groet,<br/><br/>
Afdeling Facilitaire Zaken<br/><br/><br/><br/>
<i>Dit is een geautomatiseerd bericht.</i>
</td>
</tr>
<tr height="20px">
<td colspan="6"/>
</tr>
</table>
</xsl:element>
</html>
</xsl:when>
<xsl:otherwise>
<html>

6
CUST/SVRZ/SVRZ.css
View File

@@ -7,3 +7,9 @@
background: url(header.gif) no-repeat;
background-color: 8FB5C5;
}
.ui-widget-overlay {
background: #aaa;
opacity: .8;
filter: Alpha(Opacity=30);
}

4
CUST/TWYN/xsl/TWYN.xsl
View File

@@ -2020,11 +2020,9 @@
<xsl:template name="overzicht_meerminder_factuur">
<table width="100%" cellspacing="0" cellpadding="5" class="tab_cat_sched nofloat">
<xsl:variable name="v_periode">
<!--
<xsl:call-template name="GET_PERIODE">
<xsl:with-param name="p_periode_veld">adviesdatum</xsl:with-param>
<xsl:with-param name="p_periode_veld">fin_factuur_datum</xsl:with-param>
</xsl:call-template>
-->
</xsl:variable>
<thead>

257
CUST/UBRH/xsl/UBRH.xsl
View File

@@ -56,7 +56,7 @@
Beatrixpark, Wilhelmina van Pruiseweg 52 | 2595 AN | Den Haag | Geel, 5e etage <br/>
Postbus 20011 | 2500 EA | Den Haag
<br/>-----------------------------------------------------------<br/>
<font color="red"> Telefoonnummer (Standaard CC): 070-xxxxxxxx </font> <br/>
<font color="black"> Telefoonnummer (Standaard CC): 070 – 7000521-xxxxxxxx </font> <br/>
E-mailadres: <a href="mailto:contactUBR.HIS@rijksoverheid.nl"><nobr><u>contactUBR.HIS@rijksoverheid.nl</u></nobr></a> <br/>
Website: <a href="http://www.UBRijk.nl"><nobr><u>http://www.UBRijk.nl</u></nobr></a>
<br/>-----------------------------------------------------------<br/>
@@ -129,14 +129,14 @@
</xsl:otherwise>
</xsl:choose>
<br/>
<xsl:choose>
<!-- <xsl:choose>
<xsl:when test="//melding/tracking/track[@code='MLDNEW']/user/mobiel!=''">
<xsl:value-of select="//melding/tracking/track[@code='MLDNEW']/user/mobiel"/>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
-->
</xsl:when>
@@ -163,14 +163,14 @@
</xsl:otherwise>
</xsl:choose>
<br/>
<xsl:choose>
<!-- <xsl:choose>
<xsl:when test="//melding/tracking/track[@code='MLDAFM']/user/mobiel!=''">
<xsl:value-of select="//melding/tracking/track[@code='MLDAFM']/user/mobiel"/>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
-->
</xsl:when>
@@ -214,14 +214,14 @@
</xsl:otherwise>
</xsl:choose>
<br/>
<xsl:choose>
<!-- <xsl:choose>
<xsl:when test="//melding/tracking/track[@code='MLDNOT']/user/mobiel!=''">
<xsl:value-of select="//melding/tracking/track[@code='MLDNOT']/user/mobiel"/>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
-->
</xsl:when>
@@ -254,14 +254,15 @@
</xsl:otherwise>
</xsl:choose>
<br/>
<xsl:choose>
<!-- <xsl:choose>
<xsl:when test="//melding/tracking/track[@code='MLDMAI']/user/mobiel!=''">
<xsl:value-of select="//melding/tracking/track[@code='MLDMAI']/user/mobiel"/>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
</td>
-->
</td>
</tr>
</xsl:when>
@@ -277,6 +278,33 @@
staat voor jullie klaar in Facilitor. <br/><br/>
</xsl:when>
<!--================================================================================-->
<!-- STANDAARD MAIL VOOR MLDNW3 - Voor Uitvoeringsteam dat er melding klaar staat -->
<!--================================================================================-->
<xsl:when test="$srtnotificatiecode='MLDBE2'">
<!-- Hoi collega, <br/><br/>
Onderstaande melding
<b><xsl:value-of select="stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/> </b>
is aan jou toegewezen om verderop te pakken. <br/><br/>
</xsl:when> -->
<tr>
<td colspan="2" class="opdrtd" style="padding-top:20px;padding-bottom:20px">
Hallo collega, <br/><br/>
Onderstaande melding is aan jou doorgewezen.<br/><br/>
Ps. Voor degene met gebruikersaccount in Facilitor. Klik op de meldings-link en dan kom je in de melding in facilitor. <br/>
</td>
</tr>
<tr>
<td><b>
<xsl:element name="a">
<xsl:attribute name="href">https://ubrh.facilitor-test.nl/?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/></xsl:attribute><xsl:value-of select="stdmelding/omschrijving"/>&#160;#<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/>
</xsl:element></b>
<!--:&#160;<xsl:value-of select="kenmerk[@naam='Klantnaam']"/><xsl:value-of select="kenmerk[@naam='Klantcode']"/>-->
</td>
</tr>
</xsl:when>
</xsl:choose>
</td>
@@ -287,10 +315,11 @@
<!-- STANDAARD MAILAFSLUITING - Voor uitgaande mail -->
<!--===========================================================-->
<!-- NOG INBOUWEN - MAILFOOTER alleen voor EXTERNE MAIL <xsl:when test="$srtnotificatiecode='MLDNEW' or $srtnotificatiecode='MLDAFM' or $srtnotificatiecode='MLDMAI' or $srtnotificatiecode='MLDNOT'">-->
<tr>
<tr>
<xsl:copy-of select="$Mailafsluiting"/>
</tr>
</tr>
<!--===========================================================-->
@@ -412,18 +441,30 @@
<xsl:template match="opdracht" mode="include">
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="6" align="center">
<table border="0" width="100%">
<tr>
<td>
<xsl:apply-templates select="melding" mode="bijopdracht"/>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="16">
<hr/>
</td>
</tr>
<table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>
<xsl:choose>
<xsl:when test="statusopdr_key = 10 and statusopdr_key_refiat &gt; 0">
<xsl:value-of select="//lcl/MLD/hergoedkeuring"/>:&#xA0;
</xsl:when>
<xsl:when test="(statusopdr_key = 3 or statusopdr_key = 4) and statusopdr_key_refiat &gt; 0">
<xsl:value-of select="//lcl/MLD/herfiattering"/>:&#xA0;
</xsl:when>
</xsl:choose>
<xsl:value-of select="opdrachttype/omschrijving"/>&#160;
<xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
@@ -469,33 +510,6 @@
<xsl:value-of select="contactpersoon/naam_full"/>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td>
<xsl:value-of select="contactpersoon/telefoon1"/>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/adres"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_adres"/>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/plaats"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_plaats"/>
</td>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
@@ -514,12 +528,6 @@
</td>
<td align="left">
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kostenplaats/nr"/>
</td>
</tr>
<xsl:if test="melding/kenmerk[@naam='Ordernr']!=''">
<tr>
@@ -570,111 +578,56 @@
</td>
</tr>
<tr>
<td colspan="6">
<td colspan="16">
<hr/>
</td>
</tr>
<tr>
<td colspan="6" align="center">
<table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
<tr>
<td>
<xsl:apply-templates select="melding" mode="include"/>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="6" height="30px" valign="center">
<hr/>
</td>
</tr>
<xsl:variable name="arbeid" select="uren*uurloon"/>
<xsl:variable name="arbeid_refiat" select="uren_refiat*uurloon_refiat"/>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/uren"/>:</b>
</td>
<td>
<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
<b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/></td>
<td style="width:2in;text-align:left">
<xsl:if test="statusopdr_key_refiat &gt; 0">
(<xsl:value-of select="//lcl/MLD/was"/>&#xA0;<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
<b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/>)
</xsl:if>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/arbeid"/>:</b>
</td>
<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
<td style="width:1in;text-align:right">
<xsl:if test="statusopdr_key_refiat &gt; 0">
(<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid_refiat, '0,00', 'european')"/>)
</xsl:if>
</td>
</tr>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/materiaal"/>:</b>
</td>
<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal, '0,00', 'european')"/></td>
<td style="width:1in;text-align:right">
<xsl:if test="statusopdr_key_refiat &gt; 0">
(<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal_refiat, '0,00', 'european')"/>)
</xsl:if>
</td>
</tr>
<xsl:variable name="correctie0" select="$arbeid + materiaal"/>
<xsl:variable name="correctie" select="kosten - $correctie0"/>
<xsl:variable name="correctie0_refiat" select="$arbeid_refiat + materiaal_refiat"/>
<xsl:variable name="correctie_refiat" select="kosten_refiat - $correctie0_refiat"/>
<xsl:if test="$correctie!=0">
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/correctie"/>:</b>
</td>
<td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($correctie, '0,00', 'european')"/></td>
<td style="width:1in;text-align:right">
<xsl:if test="statusopdr_key_refiat &gt; 0">
(<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($correctie_refiat, '0,00', 'european')"/>)
</xsl:if>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="3"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/totaal"/>:</b>
</td>
<td style="width:1in;text-align:right">
<b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
</td>
<td style="width:1in;text-align:right">
<xsl:if test="statusopdr_key_refiat &gt; 0">
(<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(kosten_refiat, '0,00', 'european')"/>)
</xsl:if>
</td>
</tr>
</table>
</xsl:template>
<xsl:template match="melding" mode="bijopdracht">
<tr>
<td>
Beste Logius, <br/>
Wij escaleren onderstaande melding. Zouden jullie hem willen oppakken?<br/>
</td>
</tr>
<tr>
<td>
</td>
</tr>
<tr>
<td>
Jullie referenties:
</td>
</tr>
<xsl:if test="//opdracht/kenmerk[@naam='Meldingsnummer']!=''">
<tr>
<td>Meldingsnummer:
<b><xsl:value-of select="//opdracht/kenmerk[@key='32']"/></b>
</td>
</tr>
</xsl:if>
<xsl:if test="//opdracht/kenmerk[@naam='Meldingskenmerk-ID']!=''">
<tr>
<td>Meldingkenmerk_ID:
<b><xsl:value-of select="//opdracht/kenmerk[@key='33']"/></b>
</td>
</tr>
</xsl:if>
<xsl:if test="//opdracht/kenmerk[@naam='Meldingskenmerk-ID']=''">
<tr>
<td>Meldingkenmerk_ID: <b> Deze ontvangen wij graag van u </b>
</td>
</tr>
</xsl:if>
<br/> <br/>
</xsl:template>
</xsl:stylesheet><!-- Stylus Studio meta-information - (c) 2004-2009. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios/>
<MapperMetaTag>
<MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
<MapperBlockPosition></MapperBlockPosition>
<TemplateContext></TemplateContext>
<MapperFilter side="source"></MapperFilter>
</MapperMetaTag>
</metaInformation>
-->
</xsl:stylesheet>

13
CUST/VLKC/xsl/prsimp.xsl Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="text"/>
<xsl:variable name="new_line" select="'&#xA;'"/>
<xsl:template match="/">
<xsl:if test="facilitor/personen">Personeelsnummer;Login;Achternaam;Tussenvoegsel;Voorletters;Voornaam;Afdelingscode;Functie;Email;Telefoonnr;Mobiel;Stamplaats;Login2<xsl:value-of select="$new_line"/></xsl:if>
<xsl:for-each select="facilitor/personen/persoon">
<xsl:value-of select="persnr"/>;<xsl:value-of select="login"/>;<xsl:value-of select="an"/>;<xsl:value-of select="tv"/>;<xsl:value-of select="vl"/>;<xsl:value-of select="vn"/>;<xsl:value-of select="afdcode"/>;<xsl:value-of select="functie"/>;<xsl:value-of select="email"/>;<xsl:value-of select="telnr"/>;<xsl:value-of select="mobiel"/>;<xsl:value-of select="plaats"/>;<xsl:value-of select="login2"/><xsl:value-of select="$new_line"/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>

3
UTILS/mail_receive/mailbox_cleaner.bat Normal file
View File

@@ -0,0 +1,3 @@
@REM Aan te roepen met mailbox_cleaner administrator ****
@cd /D "%~dp0"
@cscript //NoLogo mailbox_cleaner.js %* >>%0.log 2>&1