From 71614ecd1d68caf257636cbc24b035dc4f4267dc Mon Sep 17 00:00:00 2001
From: Koen Reefman <koen.reefman@aareon.nl>
Date: Wed, 17 May 2017 10:08:36 +0000
Subject: [PATCH] FSN#40482 Enkele patches, zie log voor details

svn path=/Website/trunk/; revision=33895
---
 APPL/CNT/cnt_show_contract.asp |  2 +-
 APPL/FAC/fac_faq_list.asp      |  4 ++--
 APPL/RES/res.css               |  4 ++--
 APPL/Shared/BijlagenForm.asp   |  2 +-
 APPL/Shared/kenmerk_common.inc | 19 ++++++++++---------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/APPL/CNT/cnt_show_contract.asp b/APPL/CNT/cnt_show_contract.asp
index 52b1f82747..0397a5ef0f 100644
--- a/APPL/CNT/cnt_show_contract.asp
+++ b/APPL/CNT/cnt_show_contract.asp
@@ -209,7 +209,7 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
       if (this_cnt.canChange)
         buttons.push({title: L("lcl_change"),     icon: "wijzigen.png", action:"cnt_change()" });
       if (this_cnt.canCopy)
-        buttons.push({title: L("lcl_copy"), icon: "fa-copy", action: "cnt_copy()"});
+        buttons.push({title: L("lcl_cnt_copy"), icon: "fa-copy", action: "cnt_copy()"});
       if (false && this_cnt.canOrder)
       { // Aanzet tot CONN#17536, maar nog rudimentair
         // TODO: heb ik MLD_ORDBOF rechten voor deze cnt_discipline en
diff --git a/APPL/FAC/fac_faq_list.asp b/APPL/FAC/fac_faq_list.asp
index 19d5c7332a..ea7d125283 100644
--- a/APPL/FAC/fac_faq_list.asp
+++ b/APPL/FAC/fac_faq_list.asp
@@ -88,12 +88,12 @@ function make_faq_list (searchtext, ororand)
                   + "   ) vakgroep"
                   + " , (SELECT MIN(NVL(o.alg_type, 'L'))"
                   + "      FROM alg_v_allonroerendgoed o, alg_algfaq af"
-                  + "     WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys"
+                  + "     WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys(+)"
                   + "       AND af.fac_faq_key = f.fac_faq_key) scope"
                   + " , (SELECT MIN(l.alg_locatie_code || "
                   + "           DECODE(o.alg_plaatsaanduiding, NULL, NULL, '-' || o.alg_plaatsaanduiding))"
                   + "      FROM alg_v_aanweziglocatie l, alg_v_onroerendgoed_gegevens o, alg_algfaq af"
-                  + "     WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys"
+                  + "     WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys(+)"
                   + "       AND af.alg_locatie_key = l.alg_locatie_key"
                   + "       AND af.fac_faq_key = f.fac_faq_key) plaats"
               + "     , fac_faq_hint"
diff --git a/APPL/RES/res.css b/APPL/RES/res.css
index b7360b1e00..149dd24623 100644
--- a/APPL/RES/res.css
+++ b/APPL/RES/res.css
@@ -61,7 +61,7 @@ table.planbord td.capaciteit { width: 55px;
 div.res_remark {  display: none;
                   float: right;
                   position:absolute;
-                  z-index:1;
+                  z-index:15; /* floatingHeader = 10, hambDropDown = 11 */
                   width:200px;
                   left:450px;
                   padding: 5px;
@@ -302,7 +302,7 @@ input[type=text].button.required.res_fatal
     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; }
   }
diff --git a/APPL/Shared/BijlagenForm.asp b/APPL/Shared/BijlagenForm.asp
index 140d7cf003..208def3234 100644
--- a/APPL/Shared/BijlagenForm.asp
+++ b/APPL/Shared/BijlagenForm.asp
@@ -247,7 +247,7 @@ if (fso.FolderExists(params.AttachPath))
       {
         for (i=0; i<uploaded_files.length; i++)
         {
-          FcltMgr.topmanager().window.$.toast({ text: L("lcl_appendix_added").format(uploaded_files[i]), icon: "success", position : 'top-center'});
+          FcltMgr.topmanager().window.$.toast({ loaderBg: "#fff", text: L("lcl_appendix_added").format(uploaded_files[i]), icon: "success", position : 'top-center'});
         }
         window.location = "<%=protectQS.create("BijlagenForm.asp?x=x"+transitParam)%>";
       }
diff --git a/APPL/Shared/kenmerk_common.inc b/APPL/Shared/kenmerk_common.inc
index 6fa745d80f..d176ca6184 100644
--- a/APPL/Shared/kenmerk_common.inc
+++ b/APPL/Shared/kenmerk_common.inc
@@ -130,7 +130,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
                                            + "&key=" + pKey
                                            + (pNiveau != ""? "&niveau=" + pNiveau : "")
                                            + "&kenmerk_key=" + pKenmerk_key
-                                           + (params.kenmerk_module != ""? "&kenmerk_module=" + params.kenmerk_module : "");
+                                           + (!!params.kenmerk_module && params.kenmerk_module != "" ? "&kenmerk_module=" + params.kenmerk_module : "");
         if (pKey < 0)
         {
           url += "&tmpfolder=" + tmpfolder;
@@ -140,7 +140,8 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
         url += "&multi=1";
         if (kdim) url += "&extFilter=" + escape(kdim);
         if (pregexp) url += "&pregexp=" + escape(pregexp); // P800x600 voor foto van 800x600
-        if (params.kenmerk_module != "")
+
+        if (!!params.kenmerk_module && params.kenmerk_module != "")
           url += "&kenmerk_module=" + params.kenmerk_module;
         var blg = "onBijlagen('" + safe.jsstring(protectQS.create(url)) + "'"
              + ",''" // geen saveUrl
@@ -544,7 +545,7 @@ function listKenmerk(sql, module, key, props)
       if (ktype == 'C')
       {
           if (flexExprIncluded && !isExpression)
-            onchangeExp = ";if (valid) calculateFlexExpressions(this"
+            onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
                                                  + ", \"" + module + "\""
                                                  + ", " + key
                                                  + ", \"" + (props.kenmerk_module || "") + "\""
@@ -572,7 +573,7 @@ function listKenmerk(sql, module, key, props)
                 anyTextarea = true; // straks autogrow code
                 kv = "<textarea "
                     + (kregexp ? " regexp='" + kregexp + "' " : "")
-                    + " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+                    + " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
                       + onchangeExp
                       + "'"
                     + " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'"
@@ -609,7 +610,7 @@ function listKenmerk(sql, module, key, props)
             {
                 kv = "<input type='text'"
                    + (kregexp ? " regexp='" + kregexp + "' " : "")
-                   + " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+                   + " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
                      + onchangeExp
                      + "'"
                    + " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'"
@@ -927,7 +928,7 @@ function listKenmerk(sql, module, key, props)
                  + (niveau != ""? "&niveau=" + niveau : "")
                  + "&kenmerk_key=" + kkey
                  + "&mobile=" + (formobile ? 1 : 0)
-                 + (props.kenmerk_module != ""? "&kenmerk_module=" + props.kenmerk_module : "");
+                 + (!!props.kenmerk_module && props.kenmerk_module != ""? "&kenmerk_module=" + props.kenmerk_module : "");
         // nooit if (pReadonly) url += "&reado=1";
         // nooit url += "&multi=1";
         if (kdim) url += "&extFilter=" + escape(kdim);
@@ -950,7 +951,7 @@ function listKenmerk(sql, module, key, props)
               saveUrl += "?module="+module;
           saveUrl += "&parentKey="+props.parentKey;
           saveUrl += "&kenmerkKey=" + kkey;
-          if (props.kenmerk_module!="")
+          if (!!props.kenmerk_module && props.kenmerk_module != "")
             saveUrl += "&kenmerk_module="+props.kenmerk_module;
         };
 
@@ -1077,7 +1078,7 @@ function listKenmerk(sql, module, key, props)
       { // Ook lege folders met bestanden en een enkele bestandsnaam krijgen we via de query mee. Maar deze niet tonen.
         // Ooit meer HTML-types toepassen (number, float)
         if (flexExprIncluded && (ktype == "N" || ktype == "D" || ktype == "S") && !isExpression)
-          onchangeExp = ";if (valid) calculateFlexExpressions(this"
+          onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
                                                + ", \"" + module + "\""
                                                + ", " + key
                                                + ", \"" + (props.kenmerk_module || "") + "\""
@@ -1087,7 +1088,7 @@ function listKenmerk(sql, module, key, props)
         kv = "<input type='text'"
            + (!readonlyfield && kregexp ? " regexp='" + kregexp + "' " : "")
            + (!readonlyfield
-             ? " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+             ? " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
                + onchangeExp
                + "' "
              : "")