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

Merge 2016.1 patches

Browse Source 
svn path=/Website/trunk/; revision=29677
This commit is contained in:
Jos Groot Lipman
2016-06-09 08:19:54 +00:00
parent 3c28e876e9 8db81a2347
commit dc26dea61c
22 changed files with 440 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API2/model_prs_ruimteafdeling.inc
View File

@@ -20,8 +20,8 @@ function model_prs_ruimteafdeling()
this.records_name = "prs_ruimteafdelings";
this.record_name = "prs_ruimteafdeling";
this.autfunction = "WEB_ALGUSE";
this.record_title = L("prs_ruimteafdeling");
this.records_title = L("prs_ruimteafdeling_m");
this.record_title = "prs_ruimteafdeling";
this.records_title = "prs_ruimteafdeling_m";
this.fields = {

1
APPL/BEZ/bez_edit_bezoekers.asp
View File

@@ -24,6 +24,7 @@ FCLTHeader.Requires({ js: ["../bez/bez.js"]
})
var urole = getQParamSafe("urole");
// authparams wordt gebruikt in bez_edit_bezoekers.inc !!
var authparams = user.checkAutorisation({ fe: "WEB_BEZUSE",
bo: "WEB_BEZBOF",
fo: "WEB_BEZFOF"} [urole]);

5
APPL/BEZ/bez_show_bezoekers.asp
View File

@@ -28,11 +28,6 @@ var afspraak_key = getQParamInt("afspraak_key", -1);
var embedded = getQParamInt("embedded", 0) == 1;
var urole = getQParamSafe("urole", "fe");
var authparams = user.checkAutorisation({ fe: "WEB_BEZUSE",
bo: "WEB_BEZBOF",
fo: "WEB_BEZFOF"} [urole]);
var canWrite = authparams && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
var rsv_ruimte_key = -1;
var canChange = true;

2
APPL/FIN/fin_list.inc
View File

@@ -249,7 +249,7 @@ function fin_list (params)
+ " ON f.bes_bestelopdr_key = bb.bes_bestelopdr_key "
+ " LEFT OUTER JOIN (SELECT prs.getkpverantwoordelijke ( "
+ " prs_kostenplaats_key, "
+ " 2, "
+ S("prs_approvemethod") + ", "
+ " -1) "
+ " budgethouder, "
+ " kp.* "

7
APPL/PRS/prs_perslid_otp_new.asp
View File

@@ -7,7 +7,8 @@
Description: Genereert en toont de persoonlijke QR voor de Google Authenticator
Parameters:
Context:
Note: Vooralsnog niet bedoeld voor het grote publiek
Note: De nieuwe code wordt pas definitief als de gebruiker hem
heeft gescanned en bevestigd via prs_perslid_otp_new_save.asp
*/ %>
<!--#include file="../Shared/common.inc"-->
@@ -20,9 +21,9 @@ var newsecret = '';
for (var i = 0; i < raw.length; i++)
{
var chr = raw.charCodeAt(i);
if (i < 16)
if (chr < 16)
newsecret += "0";
newsecret += i.toString(16);
newsecret += chr.toString(16);
}
Session("otp_secret_temp") = '1$30$6$0$' + newsecret;
//__Log("newsecret: " + newsecret);

8
CUST/AAAH/absoluta_mut.asp
View File

@@ -33,15 +33,15 @@ user.auth_required_or_abort(this_bes.canRetourURL);
if (!oRs.eof) {
succes = 1;
//remoteUrl = "http://www.facilitor.nl/?id=" + oRs(0).value + "&accounthash=" + safe.url(accounthash);
remoteUrl = safe.jsstring("https://corp.dev.sotasty.nl/index/login/accounthash/" + safe.url(accounthash) + "/orderid/" + oRs(0).value + "/actie/choose/");
msg = safe.html("Een moment... U wordt doorgezet naar de site van de leverancier.");
remoteUrl = "https://corp.dev.sotasty.nl/index/login/accounthash/" + safe.url(accounthash) + "/orderid/" + oRs(0).value + "/actie/choose/";
msg = "Een moment... U wordt doorgezet naar de site van de leverancier.";
}
else {
msg = "U heeft hiervoor geen autorisatie.";
}
%>
<html>
<body onload="succes=<%=succes%>;if(succes)window.open('<%=remoteUrl%>');">
<p><%=msg%></p>
<body onload="succes=<%=succes%>;if(succes)window.open('<%=safe.jsstring(remoteUrl)%>');">
<p><%=safe.html(msg)%></p>
</body>
</html>

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

@@ -3070,7 +3070,7 @@ p.MsoNormal {
<xsl:element name="img">
<xsl:attribute name="style">height: 4.25cm; width: 4.25cm; margin:0cm; padding:0; border:none</xsl:attribute>
<xsl:attribute name="src">
../../appl/shared/qrcode.asp?size=16&amp;text=/%3Fu%3D<xsl:value-of select="HIDE_F_BOOKMARK_ID"/>%26ins_key%3D<xsl:value-of select="INS_DEEL_KEY"/>
../../appl/shared/qrcode.asp?size=16&amp;text=/%3Fu%3D<xsl:value-of select="HIDE_F_BOOKMARK_ID"/>%26k%3D<xsl:value-of select="INS_DEEL_KEY"/>
</xsl:attribute>
</xsl:element>
</td>

36
CUST/ASDL/afmelden_locatie.asp
View File

@@ -41,21 +41,36 @@ if (locatie_key != -1)
HEADER({title: "Locatie ingevuld", back:0, home:1});
CONTENT_START();
var sql =
" SELECT DISTINCT ins_deel_key, ins_srtcontrole_key, p.prs_perslid_key from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
" SELECT DISTINCT ins_deel_key, ins_srtcontrole_key, p.prs_perslid_key, ins_deelsrtcontrole_key "
+ " FROM asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND p.prs_perslid_key = " + user_key
+ " AND kl.prs_link_key = " + user_key
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys ";
+ " AND s.maand = DECODE(INSTR(" + safe.quoted_sql(locatie) + ", 'PERIODIEK'), 0, 0, 1)"
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys "
+ " AND alg_locatie_key = " + locatie_key;
oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
sqll = "INSERT INTO ins_deelsrtcontrole (ins_deelsrtcontrole_datum, ins_deel_key, ins_srtcontrole_key, ins_controlemode_key, prs_perslid_key, ins_deelsrtcontrole_datum_org) "
+ " VALUES (SYSDATE, " + oRs("ins_deel_key").Value
+ ", " + oRs("ins_srtcontrole_key").Value
+ ", 10, " + oRs("prs_perslid_key").Value
+ ", SYSDATE )";
Oracle.Execute(sqll);
{
if (oRs("ins_deelsrtcontrole_key").Value == null)
{
sql = "INSERT INTO ins_deelsrtcontrole (ins_deelsrtcontrole_datum, ins_deel_key, ins_srtcontrole_key, ins_controlemode_key, prs_perslid_key, ins_deelsrtcontrole_datum_org) "
+ " VALUES (SYSDATE, " + oRs("ins_deel_key").Value
+ ", " + oRs("ins_srtcontrole_key").Value
+ ", 10, " + oRs("prs_perslid_key").Value
+ ", SYSDATE )";
}
else {
sql = "UPDATE ins_deelsrtcontrole"
+ " SET ins_deelsrtcontrole_datum = SYSDATE,"
+ " ins_controlemode_key = 10,"
+ " prs_perslid_key = " + user_key + ","
+ " ins_deelsrtcontrole_plandatum = NULL, "
+ " ins_deelsrtcontrole_status = 6" // afgerond
+ " WHERE ins_deelsrtcontrole_key = " + oRs("ins_deelsrtcontrole_key").Value;
}
Oracle.Execute(sql);
oRs.MoveNext();
}
oRs.Close();
@@ -75,12 +90,13 @@ else
};
var sql = "SELECT DISTINCT alg_locatie_key, alg_locatie_omschrijving, alg_locatie_x from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(SUM(maand),0,'', ' *PERIODIEK*') alg_locatie_omschrijving, alg_locatie_x from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND p.prs_perslid_key = " + user_key
+ " AND kl.prs_link_key = " + user_key
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys "
+ " GROUP BY alg_locatie_key, alg_locatie_omschrijving, maand, alg_locatie_x "
+ " ORDER BY alg_locatie_x"
var rst = new ResultsetTable({sql: sql,

15
CUST/ASDL/kies_locatie.asp
View File

@@ -42,7 +42,12 @@ if (locatie_key != -1)
CONTENT_START();
var sql = "UPDATE prs_perslid SET alg_onroerendgoed_keys =" + locatie_key + ", alg_onroerendgoed_type = 'L' WHERE prs_perslid_key = " + user_key;
Oracle.Execute(sql);
ROFIELD("sel_srtcontrole_oms", "Locatie", locatie, {});
Oracle.Execute(sql);
%>
<script>
window.history.go(-2);
</script>
<%
}
else
{
@@ -58,11 +63,9 @@ else
return "../../cust/asdl/kies_locatie.asp?locatie_key=" + oRs("alg_locatie_key").Value+"&locatie=" + oRs("alg_locatie_omschrijving").Value;
};
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(COUNT(maand),0,'', ' PERIODIEK') alg_locatie_omschrijving "
+ " FROM asdl_v_rap_schoonmaak_today1 s, prs_kenmerklink kl"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND kl.prs_link_key = " + user_key
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(SUM(maand),0,'', ' *PERIODIEK*') alg_locatie_omschrijving "
+ " FROM asdl_v_rap_schoonmaak_today1 s"
+ " WHERE s.fclt_3d_user_key = " + user_key
+ discx3d ("",
"s.ins_discipline_key",
"s.alg_regio_key",

6
CUST/ASDL/kies_route.asp
View File

@@ -41,7 +41,11 @@ if (route != "none")
CONTENT_START();
var sql = "BEGIN PRS.upsertkenmerk (1000, " + user_key + ", " + safe.quoted_sql(route) + "); END;"
Oracle.Execute(sql);
ROFIELD("sel_srtcontrole_oms", "Route", route, {});
%>
<script>
window.history.go(-2);
</script>
<%
}
else
{

4
CUST/BLCC/export/gen_export_PROQURO.bat
View File

@@ -21,10 +21,12 @@ REM ================================================== create exportfile
CALL ..\..\..\utils\gen_export\gen_export.bat PROQURO
REM ================================================== delete empty file(s)
cd Proquro
for %%A in (*.xml) do if %%~zA==0 del %%A
cd ..
REM ================================================== transfer file(s) to PQ
if not exist *.xml goto einde
if not exist Proquro\*.xml goto einde
psftp -i ProQuro.ppk -l ftp_facilitor_upload -pw vYY+).+8u/ -P 22 ppnhub.proquro.com -b sftp_F2PQ.scr

6
CUST/DENB/xsl/cust.xsl
View File

@@ -226,7 +226,9 @@ Ter verbetering van onze service willen we graag weten wat uw mening is over de
<tr><td colspan="4"><hr/></td></tr>
<tr>
<td colspan="4">
Onderwerp: <xsl:value-of select="discipline/omschrijving"/>/<xsl:value-of select="stdmelding/omschrijving"/>
Meldingsnummer: <xsl:value-of select="key"/>
<br/>Aanvrager: <xsl:value-of select="voor/naam_friendly"/>
<br/><br/>Onderwerp: <xsl:value-of select="discipline/omschrijving"/>/<xsl:value-of select="stdmelding/omschrijving"/>
<br/>Omschrijving melding:
<br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
@@ -295,7 +297,7 @@ Onderwerp: <xsl:value-of select="discipline/omschrijving"/>/<xsl:value-of select
</tr>
</table>
</xsl:template>
<xsl:template match="opdracht" mode="include">
<xsl:variable name="slatijd">

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

@@ -194,7 +194,7 @@
<div style="background-color: black; position: relative; margin: 0; padding: 0; width: 58.5mm; height: 19.5mm; page-break-after: always; border-bottom: 1px solid white;">
<xsl:element name="img">
<xsl:attribute name="src">
../../appl/shared/qrcode.asp?size=2&amp;text=/%3Fu%3D<xsl:value-of select="HIDE_F_BOOKMARK_ID"/>%26ins_key%3D<xsl:value-of select="INS_DEEL_KEY"/>
../../appl/shared/qrcode.asp?size=2&amp;text=/%3Fu%3D<xsl:value-of select="HIDE_F_BOOKMARK_ID"/>%26k%3D<xsl:value-of select="INS_DEEL_KEY"/>
</xsl:attribute>
<xsl:attribute name="style">position: absolute; margin: 0; padding: 0; top: 1mm; left: 1mm; width: 17.5mm; height: 17.5mm; border: none;</xsl:attribute>
</xsl:element>

5
CUST/KFHT/xsl/cust.xsl
View File

@@ -562,7 +562,10 @@ De Algemene Inkoopvoorwaarden van HTCE Site Management BV worden tevens op eerst
<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"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
<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>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<xsl:if test="spoed&lt;3">

7
CUST/KFNS/xsl/cust.xsl
View File

@@ -578,7 +578,12 @@
</td>
</tr>
<tr>
<td colspan="2" class="caption"><b><xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b></td>
<td colspan="2" class="caption">
<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>
<td colspan="2" class="caption"><xsl:if test="spoed&lt;3"><b><xsl:value-of select="//lcl/MLD/spoed"/></b></xsl:if></td>
</tr>
<tr>

11
CUST/MDUX/xsl/fin_factuur_navision_2_facilitor.xsl
View File

@@ -7,7 +7,7 @@
<xsl:comment>leveranciernr;factuurnr;factuurdatum;opdrachtnr;omschrijving;bedrag;btwperc;document;navision_nr</xsl:comment>
<xsl:for-each select="//factuur">
<xsl:for-each select="factuurregel">
;<xsl:value-of select="../nr"/>;<xsl:value-of select="../datum"/>;<xsl:value-of select="../opdrachtnr"/>;<xsl:call-template name="puntkomma"><xsl:with-param name="p_string" select="omschrijving"/></xsl:call-template>;<xsl:value-of select="prijs"/>;<xsl:apply-templates select="btwpercentage"/>;<xsl:value-of select="../bestand"/>;<xsl:value-of select="../navision_nr"/>;&#10;</xsl:for-each></xsl:for-each>
;<xsl:value-of select="../nr"/>;<xsl:value-of select="../datum"/>;<xsl:value-of select="../opdrachtnr"/>;<xsl:call-template name="puntkomma"><xsl:with-param name="p_string" select="omschrijving"/></xsl:call-template>;<xsl:apply-templates select="prijs"><xsl:with-param name="p_navision_nr" select="../navision_nr"/></xsl:apply-templates>;<xsl:apply-templates select="btwpercentage"/>;<xsl:value-of select="../bestand"/>;<xsl:value-of select="../navision_nr"/>;&#10;</xsl:for-each></xsl:for-each>
</xsl:template>
<xsl:template name="puntkomma">
@@ -15,4 +15,13 @@
<xsl:value-of select="translate($p_string,';',':')"/>
</xsl:template>
<xsl:template match="prijs">
<!-- MDUX36778. Negatief maken van de prijs in geval van credit factuur -->
<xsl:param name="p_navision_nr"/>
<xsl:choose>
<xsl:when test="substring(normalize-space($p_navision_nr),1,2) = 'IC'">-<xsl:value-of select="."/></xsl:when>
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

270
CUST/PNBR/xsl/cust.xsl
View File

@@ -132,274 +132,8 @@
<!-- <xsl:template match="melding" mode="include"> in melding.xsl -->
<!-- <xsl:template match="opdracht" mode="include"> in melding.xsl -->
<xsl:template match="deel" mode="include">
<xsl:choose>
<xsl:when test="srtdeel/key = '41'">
<p>
<b>Bruikleenovereenkomst</b>
<br/>
<br/>Bruikleenovereenkomst voor een kunstwerk in een werkruimte voor provinciale medewerkers.</p>
<table border="1" bordercolor="#000000" cellpadding="1" cellspacing="0" width="100%">
<tr>
<td class="smallcaption" rowspan="3">Aanvrager:</td>
<td class="label">Naam:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Uitgeleend aan']/perslid/naam_full"/>
</td>
<td width="200px" rowspan="10">
<xsl:element name="img">
<xsl:attribute name="src">../../cust/pnbr/flexfiles/INS/I<xsl:value-of select="key"/>/4/<xsl:value-of select="kenmerk[@naam = 'Foto']"/></xsl:attribute>
<xsl:attribute name="width">200px</xsl:attribute>
</xsl:element>
</td>
</tr>
<tr>
<td class="label">Telefoonnummer:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Uitgeleend aan']/perslid/telefoonnr"/>
</td>
</tr>
<tr>
<td class="label">Handtekening aanvrager:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="smallcaption" rowspan="4">Kunstwerk:</td>
<td class="label">kunstenaar:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Naam kunstenaar']"/>
</td>
</tr>
<tr>
<td class="label">titel:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Titel kunstwerk']"/>
</td>
</tr>
<tr>
<td class="label">ID code:</td>
<td class="value">
<xsl:value-of select="omschrijving"/>
</td>
</tr>
<tr>
<td class="label">gewenste locatie</td>
<td class="value">
<xsl:value-of select="plaats/plaatsaanduiding"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>
</td>
</tr>
<tr>
<td class="smallcaption" rowspan="3">Eigendom:</td>
<td class="label">Kunstcollectie provincie:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="label">Privé eigendom:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="label">Aankoop ikv projecten</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord beheerder</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Datum plaatsing</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord voor ontvangst aanvrager</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Einde uitleentermijn</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord voor retourontvangst beheerder</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
</table>
</xsl:when>
<xsl:otherwise>
<table border="0" cellpadding="1" width="100%" bordercolor="#000000">
<xsl:if test="binding='P'">
<tr>
<td colspan="5" style="border-bottom:solid; border-top:solid; border-width:2px" class="smallcaption">
<strong>INLEVERBEWIJS / ONTVANGSTBEWIJS* <xsl:value-of select="srtdeel/omschrijving"/>&#xA0;<xsl:value-of select="omschrijving"/></strong>
</td>
</tr>
<tr>
<td class="label">Naam</td>
<td class="value">
<xsl:value-of select="persoon/naam_full"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Dir./bureau</td>
<td class="value">
<xsl:value-of select="persoon/afdeling/naam"/>&#xA0;-&#xA0;<xsl:value-of select="persoon/afdeling/omschrijving"/></td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Locatie</td>
<td class="value">
<xsl:value-of select="persoon/werkplek/plaats/plaatsaanduiding"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Telefoon</td>
<td class="value">
<xsl:value-of select="persoon/telefoonnr"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Userid</td>
<td class="value">
<xsl:value-of select="persoon/oslogin"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td height="20px"></td>
</tr>
<tr>
<td colspan="5" style="border-bottom:solid; border-top:solid; border-width:2px" class="smallcaption">
<strong>Object:</strong>
</td>
</tr>
</xsl:if>
<xsl:if test="binding!='P'">
<tr>
<td colspan="3" class="caption">
<strong>
<xsl:value-of select="srtdeel/omschrijving"/>&#xA0;<xsl:value-of select="omschrijving"/></strong>
</td>
<td style="text-align:right">
<xsl:element name="img">
<xsl:attribute name="width">140px</xsl:attribute>
<xsl:attribute name="src">../../appl/shared/barcode.asp?text=<xsl:value-of select="key"/>&amp;height=50&amp;narrow=1&amp;wide=3</xsl:attribute>
</xsl:element>
</td>
</tr>
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/groep"/>
</td>
<td class="value">
<xsl:value-of select="srtdeel/srtgroep/omschrijving"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
</xsl:if>
<xsl:if test="binding='R'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="plaats/plaatsaanduiding"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='T'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="terreinsector/naam"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='Px'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/eigenaar"/>
</td>
<td class="value">
<xsl:value-of select="persoon/naam_full"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='A'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/eigenaar"/>
</td>
<td class="value">
<xsl:value-of select="afdeling/omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='W'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="werkplek/plaats/plaatsaanduiding"/>/<xsl:value-of select="werkplek/volgnr"/></td>
</tr>
</xsl:if>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td class="label">
<xsl:value-of select="@naam"/>:</td>
<td class="value" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="."/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td></td>
<td colspan="3">
<table border="1">
<xsl:for-each select="deel">
<xsl:apply-templates select="." mode="include"/>
</xsl:for-each>
</table>
</td>
</tr>
<xsl:if test="binding='P'">
<tr>
<td class="label" colspan="5" style="padding-top:180px;padding-bottom:20px;">
De ontvanger verklaart met het tekenen van dit document dat hij bovenstaand artikel heeft ontvangen/ingeleverd*.
</td>
</tr>
<tr>
<td class="label" colspan="2" style="padding-bottom:100px;">Handtekening:</td>
<td class="label" style="padding-bottom:80px;">Datum:</td>
<td class="label" style="padding-bottom:80px;">&#xA0;&#xA0;&#xA0;/&#xA0;&#xA0;&#xA0;/&#xA0;&#xA0;&#xA0;</td>
</tr>
<tr>
<td colspan="5" class="label" style="padding-bottom:100px;">Naam medewerker Dienstenplein:</td>
</tr>
<tr>
<td colspan="5">* Doorhalen wat niet van toepassing is.</td>
</tr>
</xsl:if>
</table>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<!-- <xsl:template match="deel" mode="include">> in deel.xsl -->
<xsl:param name="mode"/>
<xsl:template match="rapport">

299
CUST/PNBR/xsl/deel.xsl Normal file
View File

@@ -0,0 +1,299 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" version="1.0">
<xsl:import href="./cust.xsl"/>
<xsl:template match="deel" mode="include">
<xsl:choose>
<xsl:when test="srtdeel/key = '41'">
<p>
<b>Bruikleenovereenkomst</b>
<br/>
<br/>Bruikleenovereenkomst voor een kunstwerk in een werkruimte voor provinciale medewerkers.</p>
<table border="1" bordercolor="#000000" cellpadding="1" cellspacing="0" width="100%">
<tr>
<td class="smallcaption" rowspan="3">Aanvrager:</td>
<td class="label">Naam:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Uitgeleend aan']/perslid/naam_full"/>
</td>
<td width="200px" rowspan="10">
<xsl:element name="img">
<xsl:attribute name="src">../../cust/pnbr/flexfiles/INS/I<xsl:value-of select="key"/>/4/<xsl:value-of select="kenmerk[@naam = 'Foto']"/></xsl:attribute>
<xsl:attribute name="width">200px</xsl:attribute>
</xsl:element>
</td>
</tr>
<tr>
<td class="label">Telefoonnummer:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Uitgeleend aan']/perslid/telefoonnr"/>
</td>
</tr>
<tr>
<td class="label">Handtekening aanvrager:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="smallcaption" rowspan="4">Kunstwerk:</td>
<td class="label">kunstenaar:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Naam kunstenaar']"/>
</td>
</tr>
<tr>
<td class="label">titel:</td>
<td class="value">
<xsl:value-of select="kenmerk[@naam = 'Titel kunstwerk']"/>
</td>
</tr>
<tr>
<td class="label">ID code:</td>
<td class="value">
<xsl:value-of select="omschrijving"/>
</td>
</tr>
<tr>
<td class="label">gewenste locatie</td>
<td class="value">
<xsl:value-of select="plaats/plaatsaanduiding"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>
</td>
</tr>
<tr>
<td class="smallcaption" rowspan="3">Eigendom:</td>
<td class="label">Kunstcollectie provincie:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="label">Privé eigendom:</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td class="label">Aankoop ikv projecten</td>
<td class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord beheerder</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Datum plaatsing</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord voor ontvangst aanvrager</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Einde uitleentermijn</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
<tr>
<td height="50" class="smallcaption">Akkoord voor retourontvangst beheerder</td>
<td colspan="3" class="value">&#xA0;</td>
</tr>
</table>
</xsl:when>
<xsl:otherwise>
<table border="0" cellpadding="1" width="100%" bordercolor="#000000">
<xsl:if test="binding='P'">
<tr>
<td colspan="5" style="border-bottom:solid; border-top:solid; border-width:2px" class="smallcaption">
<strong>INLEVERBEWIJS / ONTVANGSTBEWIJS* <xsl:value-of select="srtdeel/omschrijving"/>&#xA0;<xsl:value-of select="omschrijving"/></strong>
</td>
</tr>
<tr>
<td class="label">Naam</td>
<td class="value">
<xsl:value-of select="persoon/naam_full"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Dir./bureau</td>
<td class="value">
<xsl:value-of select="persoon/afdeling/naam"/>&#xA0;-&#xA0;<xsl:value-of select="persoon/afdeling/omschrijving"/></td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Locatie</td>
<td class="value">
<xsl:value-of select="persoon/werkplek/plaats/plaatsaanduiding"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Telefoon</td>
<td class="value">
<xsl:value-of select="persoon/telefoonnr"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td class="label">Userid</td>
<td class="value">
<xsl:value-of select="persoon/oslogin"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
<tr>
<td height="20px"></td>
</tr>
<tr>
<td colspan="5" style="border-bottom:solid; border-top:solid; border-width:2px" class="smallcaption">
<strong>Object:</strong>
</td>
</tr>
</xsl:if>
<xsl:if test="binding!='P'">
<tr>
<td colspan="3" class="caption">
<strong>
<xsl:value-of select="srtdeel/omschrijving"/>&#xA0;<xsl:value-of select="omschrijving"/></strong>
</td>
<td style="text-align:right">
<xsl:element name="img">
<xsl:attribute name="width">140px</xsl:attribute>
<xsl:attribute name="src">../../appl/shared/barcode.asp?text=<xsl:value-of select="key"/>&amp;height=50&amp;narrow=1&amp;wide=3</xsl:attribute>
</xsl:element>
</td>
</tr>
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/groep"/>
</td>
<td class="value">
<xsl:value-of select="srtdeel/srtgroep/omschrijving"/>
</td>
<td colspan="2" width="50%"></td>
</tr>
</xsl:if>
<xsl:if test="binding='R'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="plaats/plaatsaanduiding"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='T'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="terreinsector/naam"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='Px'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/eigenaar"/>
</td>
<td class="value">
<xsl:value-of select="persoon/naam_full"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='A'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/eigenaar"/>
</td>
<td class="value">
<xsl:value-of select="afdeling/omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="binding='W'">
<tr>
<td class="label">
<xsl:value-of select="//lcl/CNT/plaats"/>
</td>
<td class="value">
<xsl:value-of select="werkplek/plaats/plaatsaanduiding"/>/<xsl:value-of select="werkplek/volgnr"/></td>
</tr>
</xsl:if>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td class="label">
<xsl:value-of select="@naam"/>:</td>
<td class="value" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="."/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td></td>
<td colspan="3">
<table border="1">
<xsl:for-each select="deel">
<xsl:apply-templates select="." mode="include"/>
</xsl:for-each>
</table>
</td>
</tr>
<xsl:if test="binding='P'">
<tr>
<td class="label" colspan="5" style="padding-top:160px;padding-bottom:20px;">
De ontvanger verklaart met het tekenen van dit document dat hij bovenstaand artikel heeft ontvangen/ingeleverd*.
</td>
</tr>
<tr>
<td class="label" colspan="2" style="padding-bottom:90px;">Handtekening:</td>
<td class="label" style="padding-bottom:80px;">Datum:</td>
<td class="label" style="padding-bottom:80px;">&#xA0;&#xA0;&#xA0;/&#xA0;&#xA0;&#xA0;/&#xA0;&#xA0;&#xA0;</td>
</tr>
<tr>
<td colspan="5" class="label" style="padding-bottom:100px;">Naam medewerker Dienstenplein:</td>
</tr>
<tr>
<td colspan="5">* Doorhalen wat niet van toepassing is.</td>
</tr>
</xsl:if>
</table>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="afspraak" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>
<xsl:otherwise>
<html>
<xsl:comment>================================ AFSPRAKEN ==============================</xsl:comment>
<xsl:comment>FACILITOR default XSL template for afspraak</xsl:comment>
<xsl:call-template name="htmlhead"/>
<xsl:element name="body">
<xsl:if test="$mode!='email'">
<xsl:attribute name="onload">window.print();</xsl:attribute>
</xsl:if>
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'BEZDON'">
<xsl:apply-templates select="." mode="badge"/>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="pageheader"/>
<xsl:apply-templates select="." mode="include"/>
<xsl:call-template name="pagefooter"/>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</html>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

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

@@ -7673,6 +7673,50 @@ Wij verzoeken je <xsl:call-template name="kto_url"><xsl:with-param name="bmr">r<
</td>
</tr>
</xsl:when>
<!--UWVA#36244: Notificatie 'gebruikers met werkplek op inactief gebouw naar budghethouder -->
<xsl:when test="$srtnotificatiecode = 'CUST26'">
<tr>
<td class="label" colspan="2" style="padding-top:10px;">
<p>Beste collega,</p>
<p>Onderstaande medewerker van jouw kostenplaats heeft als standplaats een locatie die niet meer in gebruik is door UWV. Hierdoor kan het voorkomen dat verschillende zaken niet meer (goed) werken in Facilitor.</p>
<p>Wij verzoeken je de standplaats van je medewerker door HRM aan te laten passen op de daarvoor gebruikelijke wijze. Neem bij vragen hierover contact op met jouw HRM Shared Service Center.</p>
</td>
</tr>
<tr>
<td class="label" colspan="2" style="padding-top:10px;padding-bottom:10px;">
Het gaat om de volgende medewerker:
</td>
</tr>
<tr>
<td class="label" width="20%">Naam</td>
<td class="value" width="80%">: <xsl:value-of select="naam_friendly"/></td>
</tr>
<tr>
<td class="label">Personeelsnummer</td>
<td class="value">: <xsl:value-of select="nr"/></td>
</tr>
<tr>
<td class="label">Kostenplaats</td>
<td class="value">: <xsl:value-of select="afdeling/kostenplaats/nr"/> - <xsl:value-of select="afdeling/kostenplaats/omschrijving"/></td>
</tr>
<tr>
<td class="label">Standplaats</td>
<td class="value">: <xsl:value-of select="werkplek[myvolgnr=2]/plaats/regio/district/locatie/omschrijving"/>&#xA0;(<xsl:value-of select="werkplek[myvolgnr=2]/plaats/regio/district/locatie/code"/>)</td>
</tr>
<tr>
<td class="label" colspan="2" style="padding-top:10px;">
<p>Deze e-mail wordt eenmaal per twee weken automatisch verzonden. Je medewerker ontvangt zelf ook een kopie.</p>
<p>N.B. Het kan voorkomen dat je deze e-mail meerdere keren ontvangt, namelijk eenmaal voor elk van je medewerkers waarvoor dit geldt.</p>
</td>
</tr>
<tr>
<td class="label" colspan="2">
<p>Vriendelijke groeten,<br/>
Functioneel beheer FACILITOR</p>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="prs_begintext"/>
<tr><td height="10px"/></tr>

5
CUST/VENR/xsl/cust.xsl
View File

@@ -837,7 +837,10 @@
<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>
<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>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<xsl:if test="spoed&lt;3">

4
UTILS/Exchange/exchange.js
View File

@@ -121,7 +121,7 @@ var calItems = xmlDoc.selectNodes("//t:CalendarItem");
if (calItems.length == 0)
{
WScript.Echo("No calitems, no need to update syncstate");
WScript.Quit(0);
WScript.Quit(1);
}
__Log2File("Sync_" + room_id + ".xml", xmlDoc.xml); // moet straks gesynced
WScript.Echo("Fetching " + calItems.length + " calendar items");
@@ -135,7 +135,7 @@ for (var i = 0; i < calItems.length; i++)
//var subject = calItem.selectSingleNode("t:CalendarItemType").text;
var cal_id = room_id + "_" + i;
WScript.Echo(" " + cal_id + ": " + start + " type: " + type);
if (type == "Single")
if (type == "Single" || type == "Occurrence" || type == "Exception")
{
var fname = "CalItem_" + cal_id + ".xml";
getCalenderItem('<t:ItemId Id="' + Id + '" ChangeKey="' + ChangeKey + '" />', fname);

11
UTILS/Exchange/exchange_all.js
View File

@@ -57,17 +57,22 @@ var logfile = "Exchange_" + dt.getUTCFullYear() + '_' + pad(dt.getUTCMonth() + 1
var fbat = fso.CreateTextFile(batfile, true /* overwrite */);
while (!oRs.Eof)
{
var syncstate = oRs("res_ruimte_syncstate").Value||"";
if (import_app_key == 'EXCHFULL')
syncstate = import_app_key;
var line = 'CScript /NoLogo ..\\..\\..\\utils\\Exchange\\Exchange.js "'
+ oRs("res_ruimte_extern_id").Value + '" "' + (oRs("res_ruimte_syncstate").Value||"") + '"'
+ oRs("res_ruimte_extern_id").Value + '" "' + syncstate + '"'
+ ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line);
var line = 'Cscript /NoLogo ..\\..\\..\\utils\\gen_import\\gen_import.wsf '
var line = 'IF NOT ERRORLEVEL 1 Cscript /NoLogo ..\\..\\..\\utils\\gen_import\\gen_import.wsf '
+ customerId + ' ' + sync_app_key + ' ' + oRs("res_ruimte_key").Value + ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line);
fbat.WriteLine(line + "\n");
oRs.MoveNext();
}
// E<>n import aan het eind; de room-id is toch uit de XML te halen
fbat.WriteLine("REM Alles is nu ingelezen. Tijd om te gaan verwerken");
var line = 'Cscript /NoLogo ..\\..\\..\\utils\\gen_import\\gen_import.wsf '
+ customerId + ' ' + import_app_key + ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line);