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

Merge 2017.1 Gold E patches

Browse Source 
svn path=/Website/trunk/; revision=34926
This commit is contained in:
Jos Groot Lipman
2017-08-14 09:06:15 +00:00
parent cd3a585fcd
commit d870b5e809
20 changed files with 802 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_notes.inc
View File

@@ -159,7 +159,7 @@ function model_notes(module)
case "POST":
var mld_key = params.filter.parent_key;
var this_mld = mld.func_enabled_melding(mld_key, params);
user.auth_required_or_abort(!this_mld.canWriteNotes);
user.auth_required_or_abort(this_mld.canWriteNotes);
params.isNew = true;
break;
}

1
APPL/CNT/cnt.inc
View File

@@ -876,6 +876,7 @@ cnt = { setcontractstatus:
+ " , (SELECT COUNT(fin_factuur_key)"
+ " FROM fin_factuur"
+ " WHERE cnt_contract_key = " + cnt_key
+ " AND fin_factuur_verwijder is null"
+ " AND fin_factuur_statuses_key < 7) openfinref" // Aantal openstaande facturen met een referentie naar dit contract.
+ " FROM cnt_contract cc"
+ " , cnt_discipline cs"

22
APPL/FAC/fac_verify_data.asp
View File

@@ -63,6 +63,24 @@ if (Server.ScriptTimeout<600) Server.ScriptTimeout=600; // 10 minuten moet lukke
var hrefBase = window.location.href;
window.location.href = hrefBase;
}
function showSQL(sql)
{
window.genericsql = sql;
var url = "../mgt/mgt_genericsql.asp?sql=opener"; // requires window.opener and is safe
window.open(url);
}
document.addEventListener("DOMContentLoaded", function(event) {
var times = document.getElementsByClassName('fcltsql');
for (var i = 0; i < times.length; i++)
{
var tddata = times[i];
if (tddata.innerText.substr(0, 6).toUpperCase() == 'SELECT')
tddata.innerHTML = '<a href="#" onclick="showSQL(this.parentElement.innerText);return false;" title="View SQL">SELECT</a>' + tddata.innerHTML.substr(6);
}
});
</script>
</head>
<body>
@@ -699,7 +717,7 @@ checker("Controle: queries die geen records mogen opleveren",
if (cnt>0)
{
var txt = [noResults[noResult].msg + " ("+cnt+")",
noResults[noResult].sql];
"<span class='fcltsql'>" + noResults[noResult].sql + "</span>"];
if (cnt < 10) // Dan tonen we de data
{
oRs.Close();
@@ -774,7 +792,7 @@ checker("Controle: melding flexkenmerken van type 'R,S' waarvan de waarde niet t
}
var oRs = Oracle.Execute(noResults[noResult].sql);
if (!oRs.Eof)
messages.push(noResults[noResult].msg + "\n<br>"+noResults[noResult].sql);
messages.push(noResults[noResult].msg + "\n<br>"+"<span class='fcltsql'>" + noResults[noResult].sql + "</span>");
oRs.Close();
}
if (!messages.length)

10
APPL/IMP/imp_shared.js
View File

@@ -367,7 +367,7 @@ function impProcessStream(import_key, params)
flexcode = oRs("fac_result_waarde").Value;
}
oRs.Close();
debugger;
//flexcode = "MLD:995837:544:M";
if (flexcode) // FIN:12345:18:F (12345=factuurkey, 18=kenmerkkey, F=factuur (versus R=regels)
{
@@ -464,6 +464,7 @@ function XMLval(xml, tag)
function extractAttachments(safeSourceXML, filename, flexcode)
{
debugger;
__Log("Attachments uit {0} extraheren en opslaan volgens {1}".format(safeSourceXML, flexcode));
var arr = flexcode.split(":"); // FIN:12345:18:F
var pModule = arr[0];
@@ -540,11 +541,18 @@ function extractAttachments(safeSourceXML, filename, flexcode)
// </cac:Attachment>
// </cac:AdditionalDocumentReference>
//
// filename kan ook opgegeven zijn via:
// <cbc:EmbeddedDocumentBinaryObject mimeCode="application/pdf" filename="1205_17180793_03002557.pdf">
var Attachments = xmldoc.getElementsByTagName("cac:AdditionalDocumentReference");
for (var i=0; i < Attachments.length; i++)
{
var safefilename = safe.filename(XMLval(Attachments[i], "cbc:ID"));
if (!safefilename)
{ // Dan als attribute 'filename' zoeken
var xx = xml.getElementsByTagName(Attachments[i]);
var safefilename = safe.filename(Attachments[i].getAttribute("filename"));
}
if (!params.isAllowedName(safefilename))
{
// TODO: Misschien ook terugkoppelen in IMP_LOG?

2
CUST/ALLI/xsl/cust.xsl
View File

@@ -621,7 +621,7 @@
<xsl:variable name="l_visitekaartje_key">10501</xsl:variable>
<xsl:variable name="l_visitekaartje_vve_key">10502</xsl:variable>
<xsl:variable name="l_visitekaartje_ssc_key">10503</xsl:variable>
<xsl:variable name="l_visitekaartje_ont">16881</xsl:variable>
<xsl:variable name="l_visitekaartje_ont">21101</xsl:variable>
<html xmlns:msxml="urn:schemas-microsoft-com:xslt">
<xsl:comment>================================ VISITEKAARTJES ==============================</xsl:comment>
<head>

BIN
CUST/CWTD/banner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
CUST/CWTD/tmpl_logo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

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

@@ -31,10 +31,17 @@
<mar_sync_opdr_past_days><xsl:value-of select="MAR_SYNC_OPDR_PAST_DAYS"/></mar_sync_opdr_past_days>
<mar_sync_opdr_past_secs_start><xsl:value-of select="MAR_SYNC_OPDR_PAST_SECS_START"/></mar_sync_opdr_past_secs_start>
<mar_sync_opdr_past_secs_stop><xsl:value-of select="MAR_SYNC_OPDR_PAST_SECS_STOP"/></mar_sync_opdr_past_secs_stop>
<mar_sync_loglevel><xsl:value-of select="MAR_SYNC_LOGLEVEL"/></mar_sync_loglevel>
<mar_sync_date_sendlogfile><xsl:value-of select="MAR_SYNC_DATE_SENDLOGFILE"/></mar_sync_date_sendlogfile>
</mareon_info>
</xsl:for-each>
</xml>
</xsl:when>
<xsl:when test="$mode='MAREONSYNCADAPTER_SEND_LOG'">
<xml>
<response>MAREONSYNCADAPTER_SEND_LOG</response>
</xml>
</xsl:when>
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>

254
CUST/MNNL/xsl/cust.xsl
View File

@@ -6,7 +6,7 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">RESMAI</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">CUST01</xsl:variable>
<xsl:template match="bestelling" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
@@ -1214,7 +1214,7 @@
<xsl:for-each select="afspraak/bezoeker">
<xsl:sort select="naam"/>
<xsl:choose>
<xsl:when test="position() = 1">
<xsl:when test="position()=1">
<tr>
<td class="tekst" style="border-style:solid;border-width:0px;">
<br/><xsl:value-of select="//lcl/BEZ/bezoekers"/></td>
@@ -1299,19 +1299,57 @@
</xsl:template>
<xsl:template match="melding" mode="include">
<xsl:variable name="slatijd">
<xsl:choose>
<xsl:when test="uitvoertijd[@eenheid='U']"><xsl:value-of select="uitvoertijd"/>&#xA0;<xsl:value-of select="//lcl/MLD/uren"/></xsl:when>
<xsl:otherwise><xsl:value-of select="uitvoertijd"/>&#xA0;<xsl:value-of select="//lcl/FAC/dagen"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<table border="0" width="100%" cellpadding="2">
<xsl:choose>
<xsl:when test="$srtnotificatiecode='CUST01' or $srtnotificatiecode='CUST02'">
<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"/><xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if></b>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
<!--b><xsl:value-of select="//lcl/MLD/melding"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp!=''">:&#xA0;<xsl:value-of select="onderwerp"/></xsl:if></b-->
<xsl:element name="a"><xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/></xsl:attribute><u><b><xsl:value-of select="//lcl/MLD/melding"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp!=''">:&#xA0;<xsl:value-of select="onderwerp"/></xsl:if></b></u></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></xsl:if>
</tr>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/></td>
</tr>
<tr>
<td><b><xsl:value-of select="//lcl/FAC/afdeling"/>:</b></td>
<td><xsl:value-of select="voor/afdeling/omschrijving"/></td>
</tr>
<tr><td colspan="4"><hr/></td></tr>
<tr>
<td><b><xsl:value-of select="//lcl/MLD/stdmelding"/>:</b></td>
<td><xsl:if test="stdmelding/omschrijving=''">-</xsl:if><xsl:value-of select="stdmelding/omschrijving"/></td>
</tr>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test="@key='381' or @key='382' or @volgnummer='65' or @volgnummer='80'">
<tr>
<td><b><xsl:value-of select="@naam"/>:</b></td>
<td colspan="3"><xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
<b><xsl:value-of select="//lcl/MLD/melding"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp != ''">:&#xA0;<xsl:value-of select="onderwerp"/></xsl:if></b><xsl:if test="spoed&lt;3"><b><xsl:value-of select="//lcl/MLD/spoed"/></b></xsl:if>
</td>
</tr>
<xsl:if test="not(//opdracht/extra_key) and extra_key">
<xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:10px;">
<td style="padding-top:10px;">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:10px;">
@@ -1321,178 +1359,118 @@
<tr><td colspan="4" style="padding-bottom:20px;"><hr/></td></tr>
</xsl:if>
<tr>
<td align="right" width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td align="left" width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td align="right" width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td align="left" width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/> </td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/> </td>
</tr>
<xsl:if test="string(voor/naam_full)!=string(voor/naam_full)">
<tr>
<td align="right" width="16%"><b><xsl:value-of select="//lcl/MLD/meldingvoor"/>:</b></td>
<td align="left" width="34%"><xsl:value-of select="voor/naam_full"/></td>
</tr>
</xsl:if>
<tr>
<td align="right"><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td align="left"><xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if></td>
<td align="right" valign="top"><b><xsl:value-of select="//lcl/FAC/afdeling"/>:</b></td>
<td align="left"><xsl:value-of select="voor/afdeling/omschrijving"/></td>
<td><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if></td>
<td><b><xsl:value-of select="//lcl/FAC/afdeling"/>:</b></td>
<td><xsl:value-of select="voor/afdeling/omschrijving"/></td>
</tr>
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/code!=''">
<tr>
<td align="right" valign="top"><b><xsl:value-of select="//lcl/FAC/werkplek"/>:</b></td>
<td align="left">
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/><br/>
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
<td><b><xsl:value-of select="//lcl/FAC/werkplek"/>:</b></td>
<td>
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/>
<br/><xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
</td>
<td colspan="2"/>
</tr>
</xsl:if>
<tr><td colspan="4"><hr/></td></tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/locatie"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
<td><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if></td>
<td><b><xsl:value-of select="//lcl/MLD/status"/>:</b></td>
<td><xsl:value-of select="status"/></td>
</tr>
<tr>
<xsl:choose>
<xsl:when test="plaats/@type='T'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/terrein"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/></td>
<td><b><xsl:value-of select="//lcl/FAC/terrein"/>:</b></td>
<td><xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/gebouw"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/></td>
<td><b><xsl:value-of select="//lcl/FAC/gebouw"/>:</b></td>
<td><xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/></td>
</xsl:otherwise>
</xsl:choose>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/melddatum"/>:</b>
</td>
<td align="left">
<xsl:value-of select="gemeld/datum"/>&#xA0;
<xsl:value-of select="gemeld/tijd"/>
</td>
<td><b><xsl:value-of select="//lcl/MLD/melddatum"/>:</b></td>
<td><xsl:value-of select="gemeld/datum"/>&#xA0;<xsl:value-of select="gemeld/tijd"/></td>
</tr>
<tr>
<xsl:if test="plaats/@type='T' or plaats/@type='G'">
<td colspan="2"/>
</xsl:if>
<xsl:if test="plaats/@type!='T' and plaats/@type!='G'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if>
</td>
</xsl:if>
<xsl:choose>
<xsl:when test="uitvoertijd[@eenheid='U']">
<td width="16%" align="right">
<b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
</td>
<td width="34%">
<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/MLD/uren"/>
</td>
</xsl:when>
<xsl:otherwise>
<td width="16%" align="right">
<b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
</td>
<td width="34%">
<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/FAC/dagen"/>
</td>
</xsl:otherwise>
<xsl:when test="plaats/regio/district/locatie/gebouw/verdieping!=''">
<td><b><xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b></td>
<td><xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
<td><b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b></td>
<td><xsl:value-of select="$slatijd"/></td>
</tr>
<tr>
<xsl:if test="plaats/@type='R'">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/ruimte"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
</td>
</xsl:if>
<xsl:if test="plaats/@type!='R'">
<td colspan="2"/>
</xsl:if>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
</td>
<xsl:choose>
<xsl:when test="plaats/regio/district/locatie/gebouw/verdieping/ruimte!=''">
<td><b><xsl:value-of select="//lcl/FAC/ruimte"/>:</b></td>
<td><xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if></td>
</xsl:when>
<xsl:otherwise>
<td colspan="2"/>
</xsl:otherwise>
</xsl:choose>
<td><b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b></td>
<td><xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/></td>
</tr>
<xsl:if test="kenmerk[@naam='Ordernr']!=''">
<tr>
<td colspan="2"/>
<td align="right"><b><xsl:value-of select="//lcl/MLD/ordernr"/>:</b></td>
<td align="left"><xsl:value-of select="kenmerk[@naam='Ordernr']"/></td>
</tr>
</xsl:if>
<!--tr height="30px"><td colspan="4"/></tr-->
<tr>
<td align="right"><br/><b><xsl:value-of select="//lcl/MLD/stdmelding"/>:</b></td>
<td align="left"><br/><xsl:if test="stdmelding/omschrijving=''">-</xsl:if><xsl:value-of select="stdmelding/omschrijving"/></td>
<td align="right"><br/><b><xsl:value-of select="//lcl/MLD/vakgroep"/>:</b></td>
<td align="left"><br/><xsl:if test="discipline/omschrijving=''">-</xsl:if><xsl:value-of select="discipline/omschrijving"/></td>
<td><br/><b><xsl:value-of select="//lcl/MLD/stdmelding"/>:</b></td>
<td><br/><xsl:if test="stdmelding/omschrijving=''">-</xsl:if><xsl:value-of select="stdmelding/omschrijving"/></td>
<td><br/><b><xsl:value-of select="//lcl/MLD/vakgroep"/>:</b></td>
<td><br/><xsl:if test="discipline/omschrijving=''">-</xsl:if><xsl:value-of select="discipline/omschrijving"/></td>
</tr>
<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>
<tr>
<td align="right" valign="top"><b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b></td>
<td align="left" colspan="3"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>
<td><b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b></td>
<td colspan="3"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>
</tr>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td align="right"><b><xsl:value-of select="@naam"/>:</b></td>
<td><b><xsl:value-of select="@naam"/>:</b></td>
<td colspan="3"><xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="count(deel)&gt;0">
<xsl:for-each select="deel">
<xsl:sort select="omschrijving"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1">
<td align="right" valign="top"><b><xsl:value-of select="//lcl/MLD/objecten"/>:</b></td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
<xsl:when test="position()=1"><td><b><xsl:value-of select="//lcl/MLD/objecten"/>:</b></td></xsl:when>
<xsl:otherwise><td/></xsl:otherwise>
</xsl:choose>
<td align="left" valign="top"><xsl:value-of select="omschrijving"/></td>
<td colspan="2" valign="top"><xsl:comment>NADER TE DEFINIEREN</xsl:comment></td>
<td><xsl:value-of select="omschrijving"/></td>
<td><xsl:comment>NADER TE DEFINIEREN</xsl:comment></td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="ascending"/>
<xsl:sort select="aanmaak/timestamp" order="ascending"/>
<tr>
<xsl:choose>
<xsl:when test="position() = 1"><td align="right" valign="top"><b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b></td></xsl:when>
<xsl:when test="position()=1"><td><b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b></td></xsl:when>
<xsl:otherwise><td/></xsl:otherwise>
</xsl:choose>
<td colspan="3">
@@ -1502,16 +1480,17 @@
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="opmerking!=''">
<tr>
<td align="right" valign="top"><b><xsl:value-of select="//lcl/MLD/afhandeling"/>:</b></td>
<td><b><xsl:value-of select="//lcl/MLD/afhandeling"/>:</b></td>
<td colspan="3"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="opmerking"/></xsl:call-template></td>
</tr>
</xsl:if>
<xsl:variable name="behandeling">
<!--xsl:for-each select="tracking/track"-->
<xsl:for-each select="tracking/track[code!='MLDNOT']">
<!--xsl:for-each select="tracking/track"-->
<xsl:for-each select="tracking/track[code!='MLDNOT']">
<xsl:if test=".!=''">
<data_row>
<timestamp><xsl:value-of select="datum/timestamp"/></timestamp>
@@ -1549,19 +1528,20 @@
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:if test="$mode!='email'">
<tr><td colspan="4"><hr/></td></tr>
<xsl:for-each select="msxml:node-set($behandeling)/data_row">
<xsl:sort select="timestamp"/>
<xsl:sort select="code"/>
<xsl:for-each select="msxml:node-set($behandeling)/data_row">
<xsl:sort select="timestamp"/>
<xsl:sort select="code"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1"><td><b>Behandeling:</b></td></xsl:when>
<xsl:otherwise><td/></xsl:otherwise>
</xsl:choose>
<td colspan="3">
<span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/> [<xsl:value-of select="code"/>]</span>&#xA0;
<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template>
<!--span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/> [<xsl:value-of select="code"/>]</span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template-->
<span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/></span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template>
</td>
</tr>
</xsl:for-each>
@@ -1584,7 +1564,7 @@
<xsl:when test="$srtnotificatiecode = 'MLDKTO'"><xsl:apply-templates select="." mode="kto"/></xsl:when>
<xsl:otherwise><xsl:apply-templates select="." mode="include"/></xsl:otherwise>
</xsl:choose>
<xsl:call-template name="pagefooter"/>
<!--xsl:call-template name="pagefooter"/-->
</xsl:element>
</html>
</xsl:otherwise>

1043
CUST/UWVA/xsl/cust.xsl
View File

File diff suppressed because it is too large Load Diff

2
CUST/WTCA/xsl/cust.xsl
View File

@@ -656,7 +656,7 @@ if you have any questions about your call, please contact the WTC Servicepoint v
</td>
<td style="border-bottom:none;">
<br/><b>Uit te voeren werk</b>
<br/><br/>Datum: <xsl:value-of select="kenmerk[@volgnummer='42']"/>
<br/><br/>Datum: <xsl:value-of select="datum_gepland/datum"/>
<br/>Tijdstip (van/tot): <xsl:value-of select="kenmerk[@volgnummer='44']"/> / <xsl:value-of select="kenmerk[@volgnummer='46']"/>
<br/><br/>Locatie:
<!--br/><xsl:value-of select="plaats/plaatsaanduiding"/-->

50
UTILS/PutOrders/puo_allorders.js
View File

@@ -54,6 +54,7 @@ function sendAllOrders()
var Sender = oRs("Sender").value||"";
var cust = oRs("cust").value;
var keeploglevel = S("puo_loglevel");
if (send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender, cust))
{
switch(XMLnode)
@@ -64,6 +65,8 @@ function sendAllOrders()
default: CustRecSaved ++;
}
}
if (S("puo_loglevel") != keeploglevel)
settings.overrule_setting("puo_loglevel", keeploglevel); // was mogelijk overruled door send1Order
oRs.MoveNext();
RecTotal ++;
@@ -75,13 +78,17 @@ function sendAllOrders()
// Als er minder opdrachten verstuurd zijn dan er te versturen waren, dan noemen we dat een error
var recSaved = BESRecSaved + MLDRecSaved + CNTRecSaved + CustRecSaved;
var errLevel = (recSaved == RecTotal ? 1 : 0);
var recMsg = " CUST:" + String(CustRecSaved)
var recMsg = "\nCUST:" + String(CustRecSaved)
+ " and BES:" + String(BESRecSaved)
+ " and MLD:" + String(MLDRecSaved)
+ " and CNT:" + String(CNTRecSaved)
+ " of " + String(RecTotal)
+ " orders put";
Log2File(errLevel, recMsg);
if (recSaved != RecTotal)
{
Log2File(1, "That makes {0} failure(s)".format(RecTotal - recSaved));
}
}
else
{
@@ -101,6 +108,47 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
Log2File(1, "====== Skipping actual sending because of puo_flags");
return false;
}
// Hoe vaak al mislukt? Steeds minder vaak proberen
if (XMLnode == "opdracht" || XMLnode == "bestelopdr") // mislukte contracten tracken we nog niet
{
var sql = "SELECT fac_tracking_refkey,"
+ " fac_srtnotificatie_xmlnode,"
+ " fac_srtnotificatie_code,"
+ " MIN (fac_tracking_datum) firstdatum,"
+ " MAX (fac_tracking_datum) faildatum,"
+ " COUNT (*) failcount"
+ " FROM fac_tracking ft, fac_srtnotificatie fs"
+ " WHERE ft.fac_srtnotificatie_key = fs.fac_srtnotificatie_key"
+ " AND ft.fac_tracking_refkey = " + OpdrKey
+ " AND fac_srtnotificatie_code = " + (XMLnode == "opdracht" ? "'ORDSNX'" : "'BES2SX'")
+ " GROUP BY fac_tracking_refkey, fac_srtnotificatie_xmlnode, fac_srtnotificatie_code"
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
var failcount = oRs("failcount").Value;
var faildatum = new Date(oRs("faildatum").Value);
var firstdatum = new Date(oRs("firstdatum").Value);
var backofminutes = Math.min(120, failcount * 10); // Interval tussen pogingen steeds 10 minuten langer, max 2 uur
var nextdatum = new Date(faildatum);
nextdatum.setMinutes(nextdatum.getMinutes() + backofminutes);
if (nextdatum > new Date())
{
Log2File(1, "Failed {0} time(s) between {1} and {2}, delaying until {3}".format(failcount, toDateTimeString(firstdatum), toDateTimeString(faildatum), toDateTimeString(nextdatum)));
return false;
}
else
{
if (failcount == 3 && S("puo_loglevel") < 4) // *Eenmalig* loggen we deze opdracht extra veel
{
Log2File(1, "Failed 3 times, increasing logging just once");
settings.overrule_setting("puo_loglevel", 4);
}
Log2File(1, "Failed {0} times between {1} and {2}, trying again".format(failcount, toDateTimeString(firstdatum), toDateTimeString(faildatum)));
}
}
oRs.Close();
}
var sqlB = "SELECT prs_bedrijfadres_url, "
+ " prs_bedrijfadres_encoding, "

6
UTILS/PutOrders/puo_putorders.wsf
View File

@@ -33,6 +33,12 @@
<script language="JScript">
if (isOffline())
{
__Log("FACILITOR is offline, putorders skipped");
WScript.Quit(1);
}
var applicatieRun = new Date();
var Oracle = Connect2Oracle('puo_Putorders.wsf');

2
UTILS/PutOrders/puo_shared.js
View File

@@ -131,7 +131,7 @@ function cleanPopup()
{
// Wissen oude (gisteren) popups
// Met 4.80 wilden we dit eigenlijk via een FAC_JOB en package doen
Log2File(1, "** START cleanPopup (" + toDateTimeString(new Date) + ")");
Log2File(2, "** START cleanPopup (" + toDateTimeString(new Date) + ")");
var sql = "UPDATE fac_notificatie n"
+ " SET n.fac_notificatie_status = BITAND(n.fac_notificatie_status, 255 - 8)"
+ " WHERE BITAND (n.fac_notificatie_status, 8) = 8"

15
UTILS/gen_export/gen_export.wsf
View File

@@ -16,6 +16,12 @@
<script language="JScript" src="../../appl/exp/exp_shared.js"/>
<script language="JScript">
if (isOffline())
{
__Log("FACILITOR is offline, export skipped");
WScript.Quit(1);
}
__Log('$Id$');
if (WScript.Arguments.length < 1)
{
@@ -25,14 +31,7 @@
var export_app_id = WScript.Arguments(0);
var udl = "../Oracle.udl";
var Oracle = new ActiveXObject("ADODB.Connection");
Oracle.Open('File Name='+udl);
var sql = "BEGIN DBMS_APPLICATION_INFO.SET_MODULE ('gen_export.wsf', NULL); END;";
Oracle.Execute(sql);
sql = "BEGIN fac.initsession(NULL); END;"
Oracle.Execute(sql)
var Oracle = Connect2Oracle('gen_export.wsf');
var sql = "SELECT fac_version_cust FROM fac_version";
var oRs = Oracle.Execute(sql);

18
UTILS/gen_import/gen_import.wsf
View File

@@ -19,16 +19,15 @@
<script language="JScript" src="../../appl/imp/imp_shared.js"/>
<script language="JScript">
__Log("gen_import.wsf $Revision$");
// De echte gen_import code
var udl = "../Oracle.udl";
var Oracle = new ActiveXObject("ADODB.Connection");
Oracle.Open('File Name='+udl);
var sql = "BEGIN DBMS_APPLICATION_INFO.SET_MODULE ('gen_import.wsf', NULL); END;";
Oracle.Execute(sql);
sql = "BEGIN fac.initsession(NULL); END;"
Oracle.Execute(sql)
if (isOffline())
{
__Log("FACILITOR is offline, import skipped");
WScript.Quit(1);
}
__Log("$Id$");
// De echte gen_import code
var Oracle = Connect2Oracle('gen_import.wsf');
if (WScript.Arguments.length < 2)
{
__Log("Usage: CScript gen_import.wsf XXXX 41 \n"
@@ -39,6 +38,7 @@
}
var customerId = WScript.Arguments(0);
var import_app_key = WScript.Arguments(1);
var ref_key = null;
if (WScript.Arguments.length > 2)
{

19
UTILS/gen_notify/gen_notify.js
View File

@@ -17,6 +17,25 @@ function __Log(s)
flog.Close();
}
function isOffline()
{
var fso = new ActiveXObject("Scripting.FileSystemObject");
if (fso.FileExists("../offline.html"))
return true;
if (fso.FileExists("../../offline.html"))
return true;
if (fso.FileExists("../../../temp/offline.html"))
return true;
return false;
}
if (isOffline())
{
__Log("FACILITOR is offline, gen_notify skipped");
WScript.Quit(1);
}
var str = WScript.Arguments(0);
var CustId = WScript.Arguments(1);

20
UTILS/gen_scheduler/gen_scheduler.js
View File

@@ -19,6 +19,26 @@ function __Log(s)
flog.Close();
}
function isOffline()
{
var fso = new ActiveXObject("Scripting.FileSystemObject");
if (fso.FileExists("../offline.html"))
return true;
if (fso.FileExists("../../offline.html"))
return true;
if (fso.FileExists("../../../temp/offline.html"))
return true;
return false;
}
if (isOffline())
{
__Log("FACILITOR is offline, scheduler skipped");
WScript.Quit(1);
}
__Log("Starting at " + new Date());
var udlstr = 'File Name='+str;

19
UTILS/rap_tabelizer/rap_tabelizer.js
View File

@@ -31,6 +31,25 @@ function __Log(s)
flog.Close();
}
function isOffline()
{
var fso = new ActiveXObject("Scripting.FileSystemObject");
if (fso.FileExists("../offline.html"))
return true;
if (fso.FileExists("../../offline.html"))
return true;
if (fso.FileExists("../../../temp/offline.html"))
return true;
return false;
}
if (isOffline())
{
__Log("FACILITOR is offline, tabelizer skipped");
WScript.Quit(1);
}
__Log("Starting at " + new Date());
var udlstr = 'File Name='+str;

13
UTILS/wsf_shared.js
View File

@@ -36,6 +36,19 @@ function Fill(i, c)
return new Array(i + 1).join(c);
}
function isOffline()
{
var fso = new ActiveXObject("Scripting.FileSystemObject");
if (fso.FileExists("../offline.html"))
return true;
if (fso.FileExists("../../offline.html"))
return true;
if (fso.FileExists("../../../temp/offline.html"))
return true;
return false;
}
function Connect2Oracle(modulename)
{
var udl = "../Oracle.udl";