From a24e02719659b5a3bd594b8a95fbe7672c672d7b Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Fri, 3 Mar 2017 08:28:38 +0000 Subject: [PATCH 01/35] FSN#39726 print van planbord moet ook nieuwe kleuren tonen svn path=/Website/branches/v2016.3/; revision=33025 --- APPL/RES/res.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/APPL/RES/res.css b/APPL/RES/res.css index 87dab2d741..b7360b1e00 100644 --- a/APPL/RES/res.css +++ b/APPL/RES/res.css @@ -295,12 +295,14 @@ input[type=text].button.required.res_fatal @media print { /* in print-mode doe we de kleuren als border. Daarmee geeft cleaning wel rare 'punten'. Het zij zo. */ - div.res_optie { height:0px!important; border-top:7px solid #31398C; border-bottom:7px solid #31398C; } /* Optie: blauw */ - div.res_definitief { height:0px!important; border-top:7px solid #990000; border-bottom:7px solid #990000; } /* Definitief: rood */ - div.res_blok { height:0px!important; border-top:7px solid #000000; border-bottom:7px solid #000000; } /* Blokkade: zwart */ - div.res_vervallen { height:0px!important; border-top:7px solid #990099; border-bottom:7px solid #990099; } /* Vervallen: paars */ - div.res_nietvrij { height:0px!important; border-top:7px solid #D6D80E; border-bottom:7px solid #D6D80E; } /* Niet beschikbaar: geel */ + div.res_optie_eigen { height:0px!important; border-top:7px solid #E37B00; border-bottom:7px solid #E37B00; } /* Optie eigen reservering: lichtblauw */ + div.res_definitief_eigen { height:0px!important; border-top:7px solid #009979; border-bottom:7px solid #009979; } /* Definitief eigen reservering: lichtrood */ + div.res_optie { height:0px!important; border-top:7px solid rgb(238,176,102); border-bottom:7px solid rgb(238,176,102); } /* Optie: blauw ORANJE */ + div.res_definitief { height:0px!important; border-top:7px solid #66C2AF; border-bottom:7px solid #66C2AF; } /* Definitief: rood */ + div.res_blok { height:0px!important; border-top:7px solid #747578; border-bottom:7px solid #747578; } /* Blokkade: zwart GRIJS*/ + div.res_vervallen { height:0px!important; border-top:7px solid #AB1455; border-bottom:7px solid #AB1455; } /* Vervallen: paars */ + div.res_nietvrij { height:0px!important; border-top:7px solid #B1B3B4; border-bottom:7px solid #B1B3B4; } /* Niet beschikbaar: oranje LICHTGROEN */ + table.planbord td.reserv { border:1px solid #888;} .plancad { display: none; } } - From b045181cb610f678e55118ce314ac30b02b2fa16 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Fri, 3 Mar 2017 08:36:32 +0000 Subject: [PATCH 02/35] FSN#39605 Overzichtslijsten passen niet goed op laptop (1366x768) svn path=/Website/branches/v2016.3/; revision=33026 --- APPL/Shared/default.csx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/APPL/Shared/default.csx b/APPL/Shared/default.csx index ea125c57d0..88b3593468 100644 --- a/APPL/Shared/default.csx +++ b/APPL/Shared/default.csx @@ -2676,7 +2676,9 @@ input.materiaal max-width: 50px; } -@media all and (min-width: 68em){ +/* van 68 naar 69 gezet vanwege problemen met resotie 1366*768 => FSN#39605 + eventueel nog een keer een tussenwidth definieren? */ +@media all and (min-width: 69em){ /* inputs en suggests */ .fld, .fldkp, .fldreg, .flddis, .fldloc, .fldbld, .fldflr, .fldroom, .fldworklocation, .fldwpl, .fldpers, .fldcontactpers, .flduitvoerende, From cf599c4db02775eede944d1ed81e5011e10ac613 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Fri, 3 Mar 2017 08:42:31 +0000 Subject: [PATCH 03/35] BLCC#39727 Bolletjes(Flags) hebben bijna dezelfde kleur svn path=/Website/branches/v2016.3/; revision=33027 --- APPL/Shared/default.csx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APPL/Shared/default.csx b/APPL/Shared/default.csx index 88b3593468..dfe848e20b 100644 --- a/APPL/Shared/default.csx +++ b/APPL/Shared/default.csx @@ -1592,10 +1592,10 @@ border-spacing: 1px; .mldflag0, .resflag0 { color: #eee;} .mldflag1, .resflag1 { color: #4d4d4d; } .mldflag2, .resflag2 { color: #f15854; } -.mldflag3, .resflag3 { color: #decf3f; } +.mldflag3, .resflag3 { color: #ffd600; } .mldflag4, .resflag4 { color: #5da5da; } .mldflag5, .resflag5 { color: #60bd68; } -.mldflag6, .resflag6 { color: #111; } +.mldflag6, .resflag6 { color: #673ab7; } .mldflag7, .resflag7 { color: #faa43a; } .mldflag8, .resflag8 { color: #b276b2; } .mldflag9, .resflag9 { color: #b2912f; } From 41775938400d14cc0113794b4ad559c585020ed7 Mon Sep 17 00:00:00 2001 From: Marcel Bourseau Date: Fri, 3 Mar 2017 16:57:49 +0000 Subject: [PATCH 04/35] MARX#39622: MARX#39622: Roadmap: AX-Bestellingen via Mareon laten verlopen svn path=/Website/branches/v2016.3/; revision=33032 --- CUST/MARX/xsl/AX_TU.xsl | 4 ++++ CUST/MARX/xsl/A_GetBestelOpdracht.xsl | 2 +- CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl | 1 + CUST/MARX/xsl/cXML.xsl | 7 +++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CUST/MARX/xsl/AX_TU.xsl b/CUST/MARX/xsl/AX_TU.xsl index 8fdee06a4d..8b1e1ecc13 100644 --- a/CUST/MARX/xsl/AX_TU.xsl +++ b/CUST/MARX/xsl/AX_TU.xsl @@ -37,6 +37,10 @@ + + + SA + diff --git a/CUST/MARX/xsl/A_GetBestelOpdracht.xsl b/CUST/MARX/xsl/A_GetBestelOpdracht.xsl index 540cd603e5..152530e200 100644 --- a/CUST/MARX/xsl/A_GetBestelOpdracht.xsl +++ b/CUST/MARX/xsl/A_GetBestelOpdracht.xsl @@ -12,7 +12,7 @@ gln_supplier;gln_buyer;bes_afleveradres_code;bes_afleveradres_straat_huisnr;bes_afleveradres_postcode;bes_afleveradres_plaats;bes_bestelling_memo;bes_ordernr;bes_aflever_datumbes_orderline_nr;bes_orderline_gtin;bes_orderline_art_code;bes_orderline_art_descr;bes_orderline_art_eenheid;bes_orderline_art_aantal;bes_orderline_art_prijs;bes_orderline_art_btw -;;;;;;;;;;;;;;;;21; +;;;;;;;;;;;;;;;;21; diff --git a/CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl b/CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl index b77d021245..3f0d7755c7 100644 --- a/CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl +++ b/CUST/MARX/xsl/F_GetBestelOpdracht_SIDB_INSBOU004.xsl @@ -37,6 +37,7 @@ + -- diff --git a/CUST/MARX/xsl/cXML.xsl b/CUST/MARX/xsl/cXML.xsl index 7530e411d5..d0d9a69929 100644 --- a/CUST/MARX/xsl/cXML.xsl +++ b/CUST/MARX/xsl/cXML.xsl @@ -1,6 +1,6 @@ - + @@ -132,7 +132,10 @@ - + + + + From d723d5bcf0a6cd645e73cdf96252e4886d02c165 Mon Sep 17 00:00:00 2001 From: Marcel Bourseau Date: Fri, 3 Mar 2017 23:53:16 +0000 Subject: [PATCH 05/35] MARX#39622: Roadmap: AX-Bestellingen via Mareon laten verlopen svn path=/Website/branches/v2016.3/; revision=33034 --- CUST/MARX/xsl/mareon.xsl | 559 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 556 insertions(+), 3 deletions(-) diff --git a/CUST/MARX/xsl/mareon.xsl b/CUST/MARX/xsl/mareon.xsl index 0eeec96779..910d88fe33 100644 --- a/CUST/MARX/xsl/mareon.xsl +++ b/CUST/MARX/xsl/mareon.xsl @@ -353,7 +353,7 @@ --> - + @@ -364,23 +364,576 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Bestelopdracht  + + https:///?&urole=bo + + + +
+ + + +
GLN:
Post: Bezoek:
+    +   
: Fax:
: +
GLN:
Post: Bezoek:
+    +   
: Fax:
: +
Algemene opdrachtgegevens
MAREON NUMMER: + + INKOOPORDER OPDRACHTGEVER:
Opdrachtdatum: Status:
Afleverdatum: +
+ Aflevernaam/object: + + + +
+ Adres: + + + +
+ Plaats: + +   + +
+
: + + + +
Bestellijst
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GTINArtikelnr
+ + + + + + +   + +
+ :  + 		+ + + + + €  + + €  +
+
+ + + €  + +
+
+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Bestelopdracht  + + https:///?u=bestelopdr&k=&urole=bo + + + +
+ + + +
GLN:
Post: Bezoek:
+    +   
: Fax:
: +
GLN:
Post: Bezoek:
+    +   
: Fax:
: +
Algemene opdrachtgegevens
MAREON NUMMER: + + INKOOPORDER OPDRACHTGEVER:
Opdrachtdatum: Status:
Afleverdatum: +
+ Aflevernaam/object: + + + +
+ Adres: + + + +
+ Plaats: + +   + +
+
: + + + +
Bestellijst
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GTINArtikelnr
+ + + + + + +   + +
+ :  + 		+ + + + + €  + + €  +
+
+ + + €  + +
+
+
+
+
+ +
+ +
+ + + + - / + + + / + + + + + + - + + + + + + + + + From 7c4601302e3ce83fbfd73af013ac955d59cb99a4 Mon Sep 17 00:00:00 2001 From: Suzan Wiegerinck Date: Sat, 4 Mar 2017 15:19:25 +0000 Subject: [PATCH 06/35] VGLD#39269 OCI koppeling VGLD-Huuskes, reference toevoegen voor Facilitor ordernr svn path=/Website/branches/v2016.3/; revision=33039 --- CUST/VGLD/xsl/Huuskes.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/CUST/VGLD/xsl/Huuskes.xsl b/CUST/VGLD/xsl/Huuskes.xsl index 8cb93819fe..191309f6a8 100644 --- a/CUST/VGLD/xsl/Huuskes.xsl +++ b/CUST/VGLD/xsl/Huuskes.xsl @@ -15,6 +15,7 @@ facilitor vogel01 + From 8d99e0f42901219bac1ebeaa1aaa7ea9f2e4182c Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Mon, 6 Mar 2017 07:18:14 +0000 Subject: [PATCH 07/35] AAZC#39741 cust omschrijving svn path=/Website/branches/v2016.3/; revision=33040 --- CUST/AAZC/xsl/cust_settings.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CUST/AAZC/xsl/cust_settings.xsl b/CUST/AAZC/xsl/cust_settings.xsl index d4e77c8934..5522e862e3 100644 --- a/CUST/AAZC/xsl/cust_settings.xsl +++ b/CUST/AAZC/xsl/cust_settings.xsl @@ -4,7 +4,7 @@ ../../cust/aaxx/aafm_banner.gif - ZGN Zorggroep Noorderboog + Zorggroep Noorderboog ZGN servicedesknoorderboog@aa-fm.com invoices.vvt@aa-fm.com From 242b57904cfe9fb6633097ac89a8182487cffa8b Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Mon, 6 Mar 2017 12:29:42 +0000 Subject: [PATCH 08/35] PCHD#39743 svn path=/Website/branches/v2016.3/; revision=33047 --- CUST/PCHX/xsl/default.xsl | 52 +++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/CUST/PCHX/xsl/default.xsl b/CUST/PCHX/xsl/default.xsl index 4add1e2c3b..6ba358b0d7 100644 --- a/CUST/PCHX/xsl/default.xsl +++ b/CUST/PCHX/xsl/default.xsl @@ -2,6 +2,24 @@ FININF + + + + + + 0 + + + + + + + + + + + + @@ -411,20 +429,39 @@ 0 - + + + + + + + + + + + + + + + + - + - + - - + + From cff2ae43ed38bebe26f28a31b2b694f07d4692fb Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Mon, 6 Mar 2017 13:13:21 +0000 Subject: [PATCH 09/35] SKAF#39747 Aanpassen lettertype en logo svn path=/Website/branches/v2016.3/; revision=33048 --- CUST/SKAF/cust.css | 3 ++- CUST/SKAF/fac_head_skaf.png | Bin 0 -> 6807 bytes CUST/SKAF/tmpl_logo.gif | Bin 7867 -> 3693 bytes CUST/SKAF/xsl/cust.xsl | 43 ++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 CUST/SKAF/fac_head_skaf.png diff --git a/CUST/SKAF/cust.css b/CUST/SKAF/cust.css index 5a0d2ba9f4..b69ab25974 100644 --- a/CUST/SKAF/cust.css +++ b/CUST/SKAF/cust.css @@ -8,7 +8,8 @@ */ #headerblok { - background: url(fac_head_skaf.jpg) no-repeat; + background: url(fac_head_skaf.png) no-repeat; + background-position: 50px 0px; } #mywelcome , #mymessages, #myactions{ diff --git a/CUST/SKAF/fac_head_skaf.png b/CUST/SKAF/fac_head_skaf.png new file mode 100644 index 0000000000000000000000000000000000000000..def851df62da8feafb4fc026761d592cc76c442f GIT binary patch literal 6807 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

qQA+Xk)Z!ayCI9eC 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%0D$U^(q0QM~^u}DG7^DfU?F-dDiZP*VU%Vu@B@)nQ zDb!OhIXqLFmtw-KU?1zWbwd@zq{~;T2?J7W9ShsW#^bs#ABoQoE6fjnlz-wF83ci? F{|6P`fz<#2 literal 7867 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 diff --git a/CUST/SKAF/xsl/cust.xsl b/CUST/SKAF/xsl/cust.xsl index c169fe639a..d3bde15ba5 100644 --- a/CUST/SKAF/xsl/cust.xsl +++ b/CUST/SKAF/xsl/cust.xsl @@ -6,6 +6,49 @@ + + + +

: - + + + +  à €  : € €  +
@@ -432,10 +469,11 @@ : € €  +
@@ -454,7 +492,7 @@  (indicatief): - €  + € 
From 66c09094f10ded353658b768353f83c474702c85 Mon Sep 17 00:00:00 2001 From: Arthur Egberink Date: Mon, 6 Mar 2017 16:35:20 +0000 Subject: [PATCH 10/35] FSN#39407 -- Implementatie Yask/KPN svn path=/Website/branches/v2016.3/; revision=33054 --- CUST/YKPN/banner.png | Bin 0 -> 6645 bytes CUST/YKPN/flexfiles/menu/.gitignore | 0 CUST/YKPN/tmpl_logo.gif | Bin 0 -> 3580 bytes CUST/YKPN/xsl/cust.xsl | 32 ++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 CUST/YKPN/banner.png create mode 100644 CUST/YKPN/flexfiles/menu/.gitignore create mode 100644 CUST/YKPN/tmpl_logo.gif create mode 100644 CUST/YKPN/xsl/cust.xsl diff --git a/CUST/YKPN/banner.png b/CUST/YKPN/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..f407db6ee9c5f7ce5966fad0bde0a0ef943ae4a2 GIT binary patch literal 6645 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 literal 0 HcmV?d00001 diff --git a/CUST/YKPN/flexfiles/menu/.gitignore b/CUST/YKPN/flexfiles/menu/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUST/YKPN/tmpl_logo.gif b/CUST/YKPN/tmpl_logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..f31ee0e707703664e18b416885fdd4db532237cf GIT binary patch literal 3580 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 CO`0VD literal 0 HcmV?d00001 diff --git a/CUST/YKPN/xsl/cust.xsl b/CUST/YKPN/xsl/cust.xsl new file mode 100644 index 0000000000..3d84981b4d --- /dev/null +++ b/CUST/YKPN/xsl/cust.xsl @@ -0,0 +1,32 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
Naam bezoeker:
Firma:
Datum:
+ + + + \ No newline at end of file From 868012c2fd6d4f200259e499adeb0a3452695c06 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Tue, 7 Mar 2017 07:56:51 +0000 Subject: [PATCH 11/35] STAM#39619 Zelfstandig aanpassen notificaties svn path=/Website/branches/v2016.3/; revision=33056 --- CUST/STAM/xsl/cust.xsl | 350 --------------------------- CUST/STAM/xsl/deel.xsl | 181 ++++++++++++++ CUST/STAM/xsl/melding.xsl | 411 ++++++++++++++++++++++++++++++++ CUST/STAM/xsl/opdracht.xsl | 306 ++++++++++++++++++++++++ CUST/STAM/xsl/reservering.xsl | 436 ++++++++++++++++++++++++++++++++++ 5 files changed, 1334 insertions(+), 350 deletions(-) create mode 100644 CUST/STAM/xsl/deel.xsl create mode 100644 CUST/STAM/xsl/melding.xsl create mode 100644 CUST/STAM/xsl/opdracht.xsl create mode 100644 CUST/STAM/xsl/reservering.xsl diff --git a/CUST/STAM/xsl/cust.xsl b/CUST/STAM/xsl/cust.xsl index 08eef103be..0d28ae6099 100644 --- a/CUST/STAM/xsl/cust.xsl +++ b/CUST/STAM/xsl/cust.xsl @@ -8,356 +8,6 @@ MLD2B3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - als we binnen een opdracht zijn, tonen we de meldingtekst niet - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - https:///cust/stam/saml/? - -   - - - - - :  - - - - - - - - - -
- - : - - - - -
-
-
- Dear manager, -
- You and your peers have received a request for approval in the service center. If the requestor mentioned below is your direct report, please approve or reject the request. If the requestor is not a direct report, you are notified so you can approve as a back-up in case of urgent requests. -
- - : - - - - -
- Update: - - - - - -   -  -   - - - -
-
- - : - - - - -
- - : - - -
- - : - - - - - - - NADER TE DEFINIEREN -
-
- - : - -   - () - - - : - - -
- - : - - - - - - : - - - - - - : - -   - -
- - - - - : - -   - () - - - : - -   - - - : - -   -
- - : - -   - () - - - - - : - -   -
- - - : - - -
-
-
- - : - - - - - : - - - - -
- - : - - -
- - : - -   - () - - - : - - -
- - : - - - -
-    - () - 		-
-
- - https:///cust/stam/saml/? - - Click here to view this call in the service center -
- - - diff --git a/CUST/STAM/xsl/deel.xsl b/CUST/STAM/xsl/deel.xsl new file mode 100644 index 0000000000..347a01693f --- /dev/null +++ b/CUST/STAM/xsl/deel.xsl @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + 140px + ../../appl/shared/barcode.asp?text=&height=50&narrow=1&wide=3 + +
/
  +
/
+ : + + + +
+ : + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + +
+
 
+ : + +
+ + + +
+ + + + + + + + + ================================ DEEL (OBJECT)=========================== + FACILITOR default XSL template for deel + + + + window.print(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CUST/STAM/xsl/melding.xsl b/CUST/STAM/xsl/melding.xsl new file mode 100644 index 0000000000..91a973c5e9 --- /dev/null +++ b/CUST/STAM/xsl/melding.xsl @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + als we binnen een opdracht zijn, tonen we de meldingtekst niet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + https:///cust/stam/saml/? + +   + + - + + :  + + + + + + + + + +
+ + : + + + + +
+
+
+ Dear manager, +
+ You and your peers have received a request for approval in the service center. If the requestor mentioned below is your direct report, please approve or reject the request. If the requestor is not a direct report, you are notified so you can approve as a back-up in case of urgent requests. +
+ + : + + + + +
+ Update: + + + + + +   -  +   + + + +
+
+ + : + + + + +
+ + : + + +
+ + : + + + + + + + NADER TE DEFINIEREN +
+
+ + : + +   + () + + + : + + +
+ + : + + - + + + : + + - + + + : + +   + +
+ + + + + : + +   + () + + + : + +   + + + : + +   +
+ + : + +   + () + + + + + : + +   +
+ + + : + + +
+
+
+ + : + + + + + : + + - + +
+ + : + + +
+ + : + +   + () + + + : + + +
+ + : + + - +
+    + () + 		+
+
+ + https:///cust/stam/saml/? + + Click here to view this call in the service center +
+ + + + + + + + ================================ MELDINGEN ============================== + FACILITOR default XSL template for melding + + + + window.print(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CUST/STAM/xsl/opdracht.xsl b/CUST/STAM/xsl/opdracht.xsl new file mode 100644 index 0000000000..db65842734 --- /dev/null +++ b/CUST/STAM/xsl/opdracht.xsl @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + :  + + + :  + + +   + + / +
+ : + + + + +
+
+
+ + + + : + + + +
+ + : + + +
+ + : + + +
+ + : + + +
+ + : + + +
+ : + + + +
+ : + + + + + : + + +
+ + : + + +
+ + : + + +
+ + : + + +
+ + : + + +
+ : + + + + +
+
+
+ + + + +
+ +
+
+
+
+ : + + +  à €  + + (  +  à € ) + + + : + €  + + ( € ) + +
+ + : + €  + + ( € ) + +
+ + : + €  + + ( € ) + +
+ + : + + €  + + + ( € ) + +
+ + + + + + + + ================================ OPDRACHTEN ============================== + FACILITOR default XSL template for opdracht + + + + window.print(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CUST/STAM/xsl/reservering.xsl b/CUST/STAM/xsl/reservering.xsl new file mode 100644 index 0000000000..c3181e5e5a --- /dev/null +++ b/CUST/STAM/xsl/reservering.xsl @@ -0,0 +1,436 @@ + + + + + + +   + + + + + +   + + + + + + + + + + +   + +   +   /  + ()  + + + + + + + +   + + + +  -  +   +   /  + + + + + + + + + + : + + + + + + + + : / + + + + + : + + + + + :  + + + + :   + + + + + + + + : + + + + + + + + + + + + + + + + + + + +   + +
(max.  ) + +   + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + : +
+ + + + + + + + + + + +
+ + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +   +   / + +  -  
Contactgegevens:
: : 
: : 
: 
:  
+
: 
+
+ + + + + + + +
+
+ + + + + + + + + + + + + + + + + +
+
: + + + +
+
+ + 		+
+ + + + + + + + + + + + + ================================ RESERVERINGEN ============================== + FACILITOR default XSL template for reservering + + + + window.print(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4723d0d9a86c0f0304669c0f3c23c578d4e38416 Mon Sep 17 00:00:00 2001 From: Maarten van der Heide Date: Tue, 7 Mar 2017 08:54:26 +0000 Subject: [PATCH 12/35] VENR#39178 Fin. rapportages/bevriezen (soortgelijk NS) svn path=/Website/branches/v2016.3/; revision=33059 --- CUST/VENR/export/gen_export_fact.bat | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 CUST/VENR/export/gen_export_fact.bat diff --git a/CUST/VENR/export/gen_export_fact.bat b/CUST/VENR/export/gen_export_fact.bat new file mode 100644 index 0000000000..5227733d3e --- /dev/null +++ b/CUST/VENR/export/gen_export_fact.bat @@ -0,0 +1,17 @@ +REM GEN_EXPORT_FACT.BAT +REM +REM VENR +REM +REM Bevriest kosten en exporteert feitelijk niets +REM +REM Context : roep deze file aan indien nodig, of schedule deze +REM Vereist : de randvoorwaarde voor het gebruik van gen_export +REM +REM $Revision$ +REM $Id$ +REM +REM (c) 2017 Facilitor B.V. +REM + +REM ================================================== create exportfile +CALL ..\..\..\utils\gen_export\gen_export.bat FACT From 4bba0cf4722dd24f695f0e299916a46558e15598 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Tue, 7 Mar 2017 09:14:16 +0000 Subject: [PATCH 13/35] UWVA#39752 nieuw veld "Opmerkingen bij aanvraag" verstoppen svn path=/Website/branches/v2016.3/; revision=33060 --- CUST/UWVA/cust.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CUST/UWVA/cust.css b/CUST/UWVA/cust.css index d1010db174..69e2719830 100644 --- a/CUST/UWVA/cust.css +++ b/CUST/UWVA/cust.css @@ -1,3 +1,5 @@ -#mod_mldfixsla .label { - width: 124px !important; +/* UWVA#39752 Opmerkingen bij aanvraag verstoppen */ + +#lev_opm, label[for="lev_opm"] { + display:none; } \ No newline at end of file From 5ca338fa39bc8c56419f22bc86919e0c463cdc19 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Tue, 7 Mar 2017 09:34:22 +0000 Subject: [PATCH 14/35] UWVA#39753 BES: handelsdrukwerk basis. door klikken op pdf svn path=/Website/branches/v2016.3/; revision=33061 --- APPL/BES/bes_bestelling.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APPL/BES/bes_bestelling.js b/APPL/BES/bes_bestelling.js index 94477f8c73..d2ab5525c8 100644 --- a/APPL/BES/bes_bestelling.js +++ b/APPL/BES/bes_bestelling.js @@ -112,14 +112,14 @@ function show_item_details(bes_item_info) $("#photo").show(); bes_supAddress = bes_item_info.prs_bedrijf_details_loc; } - imgObj.onclick = navigateToSupplier; + $("#fa_img").attr("onclick", "navigateToSupplier()"); } else { $("#faicon").toggleClass("fa-question fa-file-pdf-o").hide(); + $("#fa_img").attr("onclick", ""); imgObj.src = "../Pictures/no_photo.gif"; $("#photo").show(); - imgObj.onclick = null; } $("#srtgroep_text").html(bes_item_info.srtgroup_text); From d5d636e0920d65eb083f77ac7195679cba53b6ac Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Tue, 7 Mar 2017 10:25:53 +0000 Subject: [PATCH 15/35] SUTF#39672 adres IBA opdracht aanpassen svn path=/Website/branches/v2016.3/; revision=33062 --- CUST/SUTF/xsl/cust.xsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CUST/SUTF/xsl/cust.xsl b/CUST/SUTF/xsl/cust.xsl index 0e4001277c..190af5d3d0 100644 --- a/CUST/SUTF/xsl/cust.xsl +++ b/CUST/SUTF/xsl/cust.xsl @@ -419,7 +419,7 @@ Adres: - + De Lunette : @@ -432,7 +432,7 @@ - + Coehoornsingel 3 : @@ -445,7 +445,7 @@ -    + 7201 AA  Zutphen : From 82fc8dfded455bdc0394bfca362cca109024b003 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Tue, 7 Mar 2017 11:13:46 +0000 Subject: [PATCH 16/35] UWVA#39753 BES: handelsdrukwerk basis. door klikken op pdf svn path=/Website/branches/v2016.3/; revision=33063 --- APPL/Shared/Suggest/stdmeldingFilter.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/APPL/Shared/Suggest/stdmeldingFilter.inc b/APPL/Shared/Suggest/stdmeldingFilter.inc index 157a83d71a..d5af9ee0f1 100644 --- a/APPL/Shared/Suggest/stdmeldingFilter.inc +++ b/APPL/Shared/Suggest/stdmeldingFilter.inc @@ -53,7 +53,14 @@ function getFiltClauseStdmelding(pfiltcode, params, init) lfiltClause.where += " AND di.ins_srtdiscipline_key = " + params.srtdisc_key; } - if (params.autfunctionKey > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE + // params.autfunctionKey kan een key of een array met keys zijn. Maak hier altijd een array van. + var autfunctionkeys = []; + if (typeof params.autfunctionKey === "number" && params.autfunctionKey > -1) + autfunctionkeys.push(params.autfunctionKey); + else + autfunctionkeys = params.autfunctionKey; + + if (autfunctionkeys) { if (user_key == params.perslidKey) var same_level = 9; @@ -66,7 +73,7 @@ function getFiltClauseStdmelding(pfiltcode, params, init) } lfiltClause.where += " AND di.ins_discipline_key IN" + " (SELECT ins_discipline_key FROM fac_v_webgebruiker fw" - + " WHERE fac_functie_key = " + params.autfunctionKey + + " WHERE fac_functie_key IN (" + autfunctionkeys.join(",") + ")" + " AND fac_gebruiker_prs_level_write <= " + same_level + " AND fac_gebruiker_alg_level_write < 9" // extra: Vooral voor MLDUSE gebruikers met alleen PRS-leesrechten + " AND prs_perslid_key = " + user_key From 2fcb589db98dacfa732f59e6585d30d6ad3d9c42 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Tue, 7 Mar 2017 12:52:51 +0000 Subject: [PATCH 17/35] FSN#39763 JSON.parse error betere foutmelding svn path=/Website/branches/v2016.3/; revision=33065 --- APPL/Shared/Login.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPL/Shared/Login.inc b/APPL/Shared/Login.inc index f1ae4bed2f..6a1a74d712 100644 --- a/APPL/Shared/Login.inc +++ b/APPL/Shared/Login.inc @@ -973,7 +973,7 @@ function jwt_decode(token) } catch (s) { - return { err: "Invalid JSON: " + e.description }; + return { err: "Invalid JSON: {0} {1}".format(s.name, s.message) }; } return result; From 11394c0b7d1747f317cb715dad481d3d0b24c6d4 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Tue, 7 Mar 2017 13:26:49 +0000 Subject: [PATCH 18/35] PNBR#39759: reserveringen: "naam bijeenkomst" verplicht veld. svn path=/Website/branches/v2016.3/; revision=33066 --- APPL/RES/res_edit_rsv_ruimte.asp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/APPL/RES/res_edit_rsv_ruimte.asp b/APPL/RES/res_edit_rsv_ruimte.asp index f24bdbf46d..62b179ff16 100644 --- a/APPL/RES/res_edit_rsv_ruimte.asp +++ b/APPL/RES/res_edit_rsv_ruimte.asp @@ -919,8 +919,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"], } else { - var oms_verplicht = $("#sel_activity").attr("res_activiteit_omsverplicht") - var bez_verplicht = $("#sel_activity").attr("res_activiteit_aantalverplicht") + var oms_verplicht = $("#sel_activity").attr("res_activiteit_omsverplicht"); + var bez_verplicht = $("#sel_activity").attr("res_activiteit_aantalverplicht"); } $("#descript").toggleClass("required", oms_verplicht == "1"); $("#bezoekers").toggleClass("required", bez_verplicht == 1); @@ -1141,9 +1141,9 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"], " res_activiteit_duur="<%=safe.jsfloat(resDuur)%>" - res_activiteit_omsverplicht="<%=rrr.descript_required%>" + res_activiteit_omsverplicht="<%=rrr.descript_required? 1 : 0%>" res_activiteit_aantalverplicht="<%=rrr.aantal_verplicht%>" - res_activiteit_meteindtijd="<%=rrr.met_eindtijd ? 1 : 0%>"> + res_activiteit_meteindtijd="<%=rrr.met_eindtijd? 1 : 0%>"> <% } if (result.justone) From 1226e8720ad6884c2c580e1c0f051ebef8bc1dd3 Mon Sep 17 00:00:00 2001 From: Arthur Egberink Date: Tue, 7 Mar 2017 14:31:24 +0000 Subject: [PATCH 19/35] FSN#39407 -- Implementatie Yask/KPN svn path=/Website/branches/v2016.3/; revision=33067 --- CUST/YKPN/SAML/default.asp | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 CUST/YKPN/SAML/default.asp diff --git a/CUST/YKPN/SAML/default.asp b/CUST/YKPN/SAML/default.asp new file mode 100644 index 0000000000..e912916a79 --- /dev/null +++ b/CUST/YKPN/SAML/default.asp @@ -0,0 +1,53 @@ +<%@ language = "JavaScript" %> +<% /* + $Revision$ + $Id$ + File: cust/ykpn/saml/default.asp + Description: Single Sign On script + Parameters: + Context: + Note: +*/ %> +<% + Response.Expires=-1; + Session("customerId") = "YKPN"; + ANONYMOUS_Allowed = 1; +%> + + +<% + //for (i=1; i <= Request.ServerVariables.Count; i++) + //{ + // __DoLog(Request.ServerVariables.key(i) + ": " + Request.ServerVariables(i)); + //} + + var uname = String(Request.ServerVariables("HTTP_FCLTACCOUNT")); + + var newUrl = rooturl + "/"; + if (Session("SSO_URL")) // binnen via sso=1 route + { // met 2016.2 moet dit eigenlijk via een JWT + var sso_qs = Session("SSO_QUERYSTRING")||""; + var sso_url = Session("SSO_URL"); + sso_url = sso_url.replace(/^\/default.asp/i, "/"); // default.asp vooraan hoeft niet, ik wil cleane url + + Session.Contents.Remove("SSO_QUERYSTRING"); + Session.Contents.Remove("SSO_URL"); + newUrl = sso_url + (sso_qs?"?":"") + sso_qs; + } + else + { + var sso_qs = String(Request.ServerVariables("QUERY_STRING")); + if (sso_qs) + newUrl += "?" + sso_qs; + } + + if (tryLogin(uname, null)) + { + //Response.Write("Hoera: je bent user: " + user_key); + } + else + { // Automatisch naar het inlogscherm + __DoLog("SAML inlog niet gelukt (Login:" + uname); + } + Response.Redirect(newUrl); +%> \ No newline at end of file From 125f38ff6ac919def5d6399a5f27c131d1941c9f Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Tue, 7 Mar 2017 14:34:50 +0000 Subject: [PATCH 20/35] FSN#39763 Workaround voor dll-bugje in base64_decode svn path=/Website/branches/v2016.3/; revision=33068 --- APPL/Shared/Login.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/APPL/Shared/Login.inc b/APPL/Shared/Login.inc index 6a1a74d712..0f10508261 100644 --- a/APPL/Shared/Login.inc +++ b/APPL/Shared/Login.inc @@ -968,6 +968,12 @@ function jwt_decode(token) try { // base64 decode and parse JSON + + // FSN#39763 SLNKDWF.DLL v4.16 heeft nog een bug in het decoderen van + // url-safe encoded teksten. Daarom hier voor-corrigeren + result.headerSeg = result.headerSeg.replace(/\-/g, "+").replace(/\_/g, "/"); + result.payloadSeg = result.payloadSeg.replace(/\-/g, "+").replace(/\_/g, "/"); + result.header = JSON.parse(oCrypto.base64_decode(result.headerSeg)); result.payload = JSON.parse(oCrypto.base64_decode(result.payloadSeg)); } From a25769cc4789bcb6abd72d71b65b68bb054278ea Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Wed, 8 Mar 2017 06:08:03 +0000 Subject: [PATCH 21/35] PNBR#39759: reserveringen: "naam bijeenkomst" verplicht veld. svn path=/Website/branches/v2016.3/; revision=33077 --- APPL/RES/res_edit_rsv_ruimte.asp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPL/RES/res_edit_rsv_ruimte.asp b/APPL/RES/res_edit_rsv_ruimte.asp index 62b179ff16..8941612ede 100644 --- a/APPL/RES/res_edit_rsv_ruimte.asp +++ b/APPL/RES/res_edit_rsv_ruimte.asp @@ -1142,7 +1142,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"], value="<%=rrr.res_ruimte_extern? rrr.activiteit_key : getQParamInt("activiteit_key",rrr.activiteit_key)%>" res_activiteit_duur="<%=safe.jsfloat(resDuur)%>" res_activiteit_omsverplicht="<%=rrr.descript_required? 1 : 0%>" - res_activiteit_aantalverplicht="<%=rrr.aantal_verplicht%>" + res_activiteit_aantalverplicht="<%=rrr.aantal_verplicht? 1 : 0%>" res_activiteit_meteindtijd="<%=rrr.met_eindtijd? 1 : 0%>"> <% } From 4b1d4cf506f0a249995b036416a3f389034b4ae3 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Wed, 8 Mar 2017 08:34:14 +0000 Subject: [PATCH 22/35] HSLE#39751 Mobiel vs desktop svn path=/Website/branches/v2016.3/; revision=33078 --- APPL/Shared/Suggest/stdmeldingFilter.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/APPL/Shared/Suggest/stdmeldingFilter.inc b/APPL/Shared/Suggest/stdmeldingFilter.inc index d5af9ee0f1..f19f64e8cc 100644 --- a/APPL/Shared/Suggest/stdmeldingFilter.inc +++ b/APPL/Shared/Suggest/stdmeldingFilter.inc @@ -55,12 +55,15 @@ function getFiltClauseStdmelding(pfiltcode, params, init) // params.autfunctionKey kan een key of een array met keys zijn. Maak hier altijd een array van. var autfunctionkeys = []; - if (typeof params.autfunctionKey === "number" && params.autfunctionKey > -1) - autfunctionkeys.push(params.autfunctionKey); - else + if (typeof params.autfunctionKey === "object") autfunctionkeys = params.autfunctionKey; + else + { + if (params.autfunctionKey != -1) + autfunctionkeys.push(params.autfunctionKey); + } - if (autfunctionkeys) + if (autfunctionkeys.length) { if (user_key == params.perslidKey) var same_level = 9; From 6a530241d2120a956268c5d98ccc9d4af3a17c7e Mon Sep 17 00:00:00 2001 From: Suzan Wiegerinck Date: Wed, 8 Mar 2017 08:57:48 +0000 Subject: [PATCH 23/35] MNNL#38730 Aanpassen afspraakbevestiging, teksten onderaan nogmaals aanpassen svn path=/Website/branches/v2016.3/; revision=33080 --- CUST/MNNL/xsl/cust.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CUST/MNNL/xsl/cust.xsl b/CUST/MNNL/xsl/cust.xsl index 369ca7d526..eadb924dea 100644 --- a/CUST/MNNL/xsl/cust.xsl +++ b/CUST/MNNL/xsl/cust.xsl @@ -773,8 +773,8 @@ Klik hier voor uw pdf routebeschrijving met OV of auto, - voor de looproute van en naar het station op www.lopeninhetbeatrixkwartier.nl. - + voor de looproute van en naar het NS station kijk op www.lopeninhetbeatrixkwartier.nl. + From d73fae66eb423ba5109bd7ecaeebc9132ded8705 Mon Sep 17 00:00:00 2001 From: Dennis Hartmann Date: Wed, 8 Mar 2017 13:18:57 +0000 Subject: [PATCH 24/35] BLCC#39084 link naar opdracht toegevoegd onderaan de bon svn path=/Website/branches/v2016.3/; revision=33088 --- CUST/BLCC/xsl/cust.xsl | 264 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 1 deletion(-) diff --git a/CUST/BLCC/xsl/cust.xsl b/CUST/BLCC/xsl/cust.xsl index c5e6ee12c4..9314d7c0b1 100644 --- a/CUST/BLCC/xsl/cust.xsl +++ b/CUST/BLCC/xsl/cust.xsl @@ -6,7 +6,7 @@ - MLDAFM + ORDUPD