CAPG#29596 voorzieningen waarschuwing groter

svn path=/Website/branches/v5.2.3/; revision=21650

APPL/CAD/FGII.inc

@@ -3,16 +3,22 @@
 var MODE_IN = 0;
 var MODE_OUT = 1;
 
-function FindDWF(drawing, scenario_key, concept)
+// dwfmode afwezig/0=normaal, 1=conceptfolder, 2=vluchtplan mode
+function FindDWF(drawing, scenario_key, dwfmode)
 {
     // Strip eventuele DWG en DWF van filenaam
-    var fname = drawing.replace(/.dwg/g,'');
-    var fname = fname.replace(/.dwf/g,'');
-    if (concept == 1) {
-        var fullname = S("fg_dwf_path_concept") + fname + ".dwf";
-    } else {
-        var fullname = S("fg_dwf_path") + fname + ".dwf";
+    var fname = drawing.replace(/.dwg$/ig,'');
+    var fname = fname.replace(/.dwf$/ig,'');
+    switch (dwfmode)
+    {
+        case 1: var fullpath = S("fg_dwf_path_concept");
+                break;
+        case 2: var fullpath = S("fg_vlucht_path");
+                break;
+        default: var fullpath = S("fg_dwf_path");
     }
+    var fullname = fullpath + fname + ".dwf"
+
     var fullnameScenario = S("fg_dwf_path_prj") + scenario_key + "\\" + fname + ".dwf";
     __Log("fullnameScenario: " + fullnameScenario);
     var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -39,7 +45,7 @@ function FindDWF(drawing, scenario_key, concept)
 
 // Momenteel gebruiken we dezelfde DWF voor plan en voor cont
 // Result: dwfPath als gevonden, false/error als niet gevonden
-function SetVerdPlanDWF(pvKey, inoutMode, scenario_key, concept)
+function SetVerdPlanDWF(pvKey, inoutMode, scenario_key, dwfmode)
 {
     if (inoutMode == MODE_IN)
     {
@@ -76,10 +82,10 @@ function SetVerdPlanDWF(pvKey, inoutMode, scenario_key, concept)
     else
     {
     	teknaam = oRs("CAD_TEKENING_FILENAAM").value;
-        fname = FindDWF(teknaam, scenario_key, concept);
+        fname = FindDWF(teknaam, scenario_key, dwfmode);
         if( fname == "" )
         {
-            if (concept)
+            if (dwfmode==1)
                 new SLNKDWF({}).Warning(L("lcl_fg_conceptnotfound"));
             else
                 new SLNKDWF({}).Warning(L("lcl_fg_drawingnotfound")+"\n" + teknaam + "\nIn: " + S("fg_dwf_path"));

APPL/CAD/mySlnk2IMGEv.asp

@@ -21,7 +21,7 @@ pvKey     = getQParamInt("vKey", -1);
 
 fg_dwf_path = S("fg_vlucht_path");
 
-dwfPath = SetVerdPlanDWF(pvKey, MODE_IN, 0);
+dwfPath = SetVerdPlanDWF(pvKey, MODE_IN, 0, 2); // 2==vluchtplan mode
 if (dwfPath)
 {
     var mySLNKDWF = new SLNKDWF({ dwfFile      : dwfPath,

APPL/FAC/fac_preview_xsl.asp

@@ -25,10 +25,19 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jQuery-ui.js"]
 var autfunction = "WEB_PRSSYS";
 var authparams = user.checkAutorisation(autfunction);
 
+try
+{
 FCLT2XMLResponse({xmlnode: getQParamSafe("xmlnode"),
                   key: getQParamInt("key", -1),
                   mode: getQParam("mode", "email"),
                   srtnotificatie: getQParam("srtnoti"),
                   concept: true });
-
+}
+catch(e)
+{
+    if (String(e.description).indexOf("ORA-01403")>=0)
+        shared.simpel_page("Geen gegevens gevonden. Niet bestaand nummer gebruikt?");
+    else
+        shared.simpel_page("Kan geen preview genereren:<p><blockquote>{0}</blockquote>".format(safe.html(e.description)));
+}
 %>

APPL/FAC/job_edit_job.asp

@@ -312,7 +312,6 @@ if (job_key > -1)   {
             { perslidKey: person,
               label: L("lcl_requestor"),
               fieldNameKey: "person",
-              filtercode: "M",
               required: true,
               readonly: false
             });

APPL/MLD/mld.inc

@@ -674,26 +674,15 @@ mld = {setmeldingstatus:
                          + " AND mo.mld_melding_object_verwijder IS NULL)";
              }
 
-             sql_to_late_accept = "CASE"
-                                + " WHEN fac.gettrackingdate('MLDACP', m.mld_melding_key) IS NULL"
-                                + " THEN CASE"
-                                     + " WHEN fac.gettrackingdate('MLDREJ', m.mld_melding_key) IS NULL"
-                                       + " THEN CASE SIGN(mld_melding_acceptdatum_std - SYSDATE)"
-                                          + " WHEN -1"
-                                          + " THEN 1"
-                                          + " ELSE 0"
-                                          + " END"
-                                     + " ELSE CASE SIGN(mld_melding_acceptdatum_std - fac.gettrackingdate('MLDREJ', m.mld_melding_key))"
-                                          + " WHEN -1"
-                                          + " THEN 1"
-                                          + " ELSE 0"
-                                          + " END"
-                                     + " END"
-                                + " ELSE CASE SIGN(mld_melding_acceptdatum_std - fac.gettrackingdate('MLDACP', m.mld_melding_key))"
-                                     + " WHEN -1"
-                                     + " THEN 1"
-                                     + " ELSE 0"
-                                     + " END"
+             // Meldingen worden soms niet geaccepteerd maar direct afgewezen of afgemeld.
+             // Als dit binnen de acceptatietijd gebeurd dan is die melding niet te laat geaccepteerd.
+             sql_to_late_accept = " CASE SIGN (mld_melding_acceptdatum_std - COALESCE(fac.gettrackingdate ('MLDACP', m.mld_melding_key)," // Geaccepteerde meldingen
+                                                                                  + " fac.gettrackingdate ('MLDREJ', m.mld_melding_key)," // Direct afgewezen meldingen
+                                                                                  + " fac.gettrackingdate ('MLDAFM', m.mld_melding_key)," // Direct afgemelde meldingen
+                                                                                  + " SYSDATE))"
+                                + " WHEN -1"
+                                + " THEN 1"
+                                + " ELSE 0"
                                 + " END";
 
              sql_to_late_run = " CASE"

APPL/PDA/melding.asp

@@ -155,7 +155,7 @@ if ( mld_key > -1)
         + " WHERE g.alg_onroerendgoed_keys = " + plaats_key
         + "   AND g.alg_locatie_key = l.alg_locatie_key";
     var oRs = Oracle.Execute(sql);
-    var plaats_string = oRs("plaats").value;
+    var plaats_string = !oRs.Eof ? oRs("plaats").value : "";
 
 
     sql = "SELECT"

APPL/Shared/kenmerk_common.inc

@@ -1465,14 +1465,23 @@ function _saveFlexKenmerken(parentKey, params) // TODO: support multiMode!
         if (vold != vnew)
         {
             var oRsk = Oracle.Execute(params.allKenmerkenSQL + kk);
-            var label = oRsk("kenmerk_omschrijving");
-            var srt_key = oRsk("srtkenmerk_key"); // voor kenmerkendomein nodig
+            var label = oRsk("kenmerk_omschrijving").Value;
+            var srt_key = oRsk("srtkenmerk_key").Value; // voor kenmerkendomein nodig
+            oRsk.close();
             if (kt == "S" || kt == "R")
             {
                 if (vold != "")
-                    vold = Oracle.Execute("SELECT fac.getrefwaarde('" + params.module + "', " + srt_key + ", " + vold + ") FROM DUAL")(0).value;
+                {
+                    var oRs = Oracle.Execute("SELECT fac.getrefwaarde('" + params.module + "', " + srt_key + ", " + vold + ") FROM DUAL");
+                    vold = oRs(0).value;
+                    oRs.Close();
+                }
                 if (vnew != "")
-                    vnew = Oracle.Execute("SELECT fac.getrefwaarde('" + params.module + "', " + srt_key + ", " + vnew + ") FROM DUAL")(0).value;
+                {
+                    var oRs = Oracle.Execute("SELECT fac.getrefwaarde('" + params.module + "', " + srt_key + ", " + vnew + ") FROM DUAL");
+                    vnew = oRs(0).value;
+                    oRs.Close();
+                }
             }
             trackarray.push(label + ": " + buildTrackText("varchar", vold, vnew));
         }

APPL/Shared/resultset_table_v2.inc

@@ -1084,25 +1084,28 @@ function __rsMakeTableRow(oRs, oRsFlex, cnt, anyMultiActions, noFlexResult)
               else
                   OddRowClass += "suppressRow ";
 
-            if (rowClass)
-              appender_part = " class='" + OddRowClass + rowClass(oRs) + "' ";
-            else
-              if (trClassName != null)
-                appender_part = " class='" + OddRowClass + trClassName + "' ";
+            if (!isExcel)
+            {
+                if (rowClass)
+                  appender_part = " class='" + OddRowClass + rowClass(oRs) + "' ";
+                else
+                  if (trClassName != null)
+                    appender_part = " class='" + OddRowClass + trClassName + "' ";
+            }
 
             appender += appender_part;
 
-            if (rowBehavior != null)
+            if (rowBehavior != null && !isPrinting && !isExcel)
               appender += " STYLE='behavior: url(" + rowBehavior + ");' ";
 
             var rowID = "";
-            if (keyColumn != null)
+            if (keyColumn != null && !isPrinting && !isExcel)
             {
               rowID = "row" + ( keyColumn instanceof Function ?  keyColumn(oRs) : safe.htmlattr(oRs(keyColumn).Value) );
               appender += " id='" + safe.htmlattr(rowID) + "'";               // give unique id to tr line
               appender += " ROWKEY='" + ( keyColumn instanceof Function ? keyColumn(oRs) : safe.htmlattr(oRs(keyColumn).Value) ) + "'";
             }
-            if (!isPrinting && rowData != null)
+            if (!isPrinting && !isExcel && rowData != null)
               appender += " ROWDATA='" + safe.htmlattr(rowData(oRs)) + "'";
             if (!isPrinting && dblClick != null)
               appender += " onDblClick='" + safe.htmlattr(dblClick) + "'";

CUST/AARW/import/import_catering.bat

@@ -0,0 +1,4 @@
+
+
+cscript ..\..\..\utils\gen_import\gen_import.wsf AARW CATERING >>genimport.log 2>>&1
+

CUST/CAPG/cust.css

@@ -35,3 +35,9 @@ div.fcltframeheader {
 #editbody .fcltblockhead {
     background-color:#D0D0D0;
 }
+
+.warning {
+	height: 70px;
+	line-height: 70px; 
+    font-size: 1.7em;
+}

CUST/IVET/cust.css

@@ -116,4 +116,24 @@ div#MgtFAC ul li {
 /* IVET#19606: Label-wrapping aan (per 5.0.11 standaard uit)! */
 label {
   white-space: normal;
+}
+
+#portalbody
+{
+    background-color: white;
+}
+#portalmenu table tr td
+{
+    background-color: white;
+}
+#portalmenu span.menukop {
+  width:200px;
+  color: #00877C;
+}
+#portalmenu h2 {
+  color: #ffffff;
+  background-color: #00877C;
+}
+#portalmenu span.menuimg {
+  width:200px;
 }