Merge 2016.2 Gold C changes

svn path=/Website/trunk/; revision=31738

CUST/ARAI/xsl/cust.xsl

@@ -1568,7 +1568,7 @@ Amsterdam RAI
         
    <xsl:if test="@view = 'ARAI_V_INS_QRC' or @view = 'ARAI_V_INS_QRC_MLD'">
    <xsl:variable name="p_rows" select="6"/>
-   <xsl:variable name="p_cols" select="2"/>
+   <xsl:variable name="p_cols" select="4"/>
 
    <xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
    <xsl:sort select="FCLT_F_IDENTIFICATIE"/>
@@ -1592,28 +1592,6 @@ Amsterdam RAI
    </xsl:for-each>
    </xsl:if>        
 		</xsl:template>
-
-<xsl:template match="data_row" mode="qrc">
-        <td style="text-align: center; vertical-align: top; margin:0;padding:0">
-          <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"/>%26k%3D<xsl:value-of select="INS_DEEL_KEY"/>
-            </xsl:attribute>
-          </xsl:element>
-        </td>
-        <td style="text-align:left; vertical-align: top; margin:0;padding:0; font-size: 11pt; font-weight: bold">
-          <xsl:element name="img">
-            <xsl:attribute name="style">width: 5.2cm; margin: 0.5cm 0.65cm 0.2cm 0</xsl:attribute>
-            <xsl:attribute name="src">
-              ../../cust/akza/akzonobel.gif
-            </xsl:attribute>
-          </xsl:element>
-          <br/>&#160;&#160;&#160;<xsl:value-of select="FCLT_F_IDENTIFICATIE"/><br/>
-          &#160;&#160;&#160;<sub><xsl:value-of select="ALG_GEBOUW_CODE"/> - <xsl:value-of select="ALG_VERDIEPING_CODE"/></sub>
-
-        </td>
-      </xsl:template>
       
   <xsl:template name="qrc_ins_new_page">
     <xsl:param name="p_page"/>

CUST/HOUT/Export/gen_export_MI.bat

@@ -2,7 +2,7 @@ REM GEN_EXPORT_MI.BAT
 REM
 REM HOUT
 REM
-REM Exporteert 2-tal MI-bestanden als CSV (HOUT#37759).
+REM Exporteert 5-tal MI-bestanden als CSV (HOUT#37759).
 REM
 REM Context : roep deze file aan indien nodig, of schedule deze
 REM Vereist : de randvoorwaarde voor het gebruik van gen_export
@@ -16,4 +16,12 @@ REM
 REM ================================================== create exportfile(s)
 CALL ..\..\..\utils\gen_export\gen_export.bat ICT_MLD
 
+CALL ..\..\..\utils\gen_export\gen_export.bat ICT_MLDTRK
+
+CALL ..\..\..\utils\gen_export\gen_export.bat ICT_MLDNOT
+
 CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORD
+
+CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORDTRK
+
+CALL ..\..\..\utils\gen_export\gen_export.bat ICT_ORDNOT

CUST/PNBR/SAML/default.asp

@@ -16,27 +16,10 @@
 <!-- #include file="../../../appl/Shared/common.inc" -->
 <!-- #include file="../../../appl/shared/login.inc" -->
 <%
-//    for (i=1; i <= Request.ServerVariables.Count; i++)
-//    {
-//        __DoLog(Request.ServerVariables.key(i) + ": " + Request.ServerVariables(i));
-//    }
+    var uname = "";
+    var email = String(Request.ServerVariables("HTTP_FCLTUPN"));
 
-    var uname = String(Request.ServerVariables("UPN"));
-//    __DoLog("uname: " + uname);
-    Response.Write("SAML user detected as: " + uname);
-    var sql = "SELECT prs_perslid_oslogin"
-            + "  FROM prs_perslid pp"
-            + "     , prs_kenmerklink pkl"
-            + " WHERE pp.prs_perslid_key = pkl.prs_link_key"
-            + "   AND pkl.prs_kenmerklink_niveau = 'P'"
-            + "   AND pkl.prs_kenmerk_key = 1000" // IID
-            + "   AND pkl.prs_kenmerklink_waarde = " + safe.quoted_sql(uname)
-    var oRs = Oracle.Execute(sql);
-    if (!oRs.Eof)
-    {
-        uname = oRs("prs_perslid_oslogin").Value;
-       __Log("IID vertaald naar: " + uname);
-    }
+    settings.overrule_setting("login_use_email", 1);
 
     var newUrl = rooturl + "/";
     if (Session("SSO_URL")) // binnen via sso=1 route
@@ -56,13 +39,13 @@
             newUrl += "?" + sso_qs;
     }
 
-    if (tryLogin(uname, null))
+    if (tryLogin(email, null))
     {
         //Response.Write("Hoera: je bent user: " + user_key);
     }
     else
     {   // Automatisch naar het inlogscherm
-        __DoLog("SAML login not found in Facilitor: " + uname);
+        __DoLog("SAML inlog niet gelukt (Email:" + email);
     }
     Response.Redirect(newUrl);
 %>

CUST/VLKC/tasks/gen_notify.bat

@@ -1,4 +1,4 @@
 @echo off
 REM Moet gescheduled worden (normaliter 1 keer per uur) om door de applicatiebeheerder
 REM ingeregelde notificaties te genereren.
-cscript ..\..\..\utils\gen_notify\gen_notify.js ../oracle.udl KEMP
+cscript ..\..\..\utils\gen_notify\gen_notify.js ../oracle.udl VLKC