AKZA#37253 MLD/CAD: plattegrond-popup middels icoon/knop

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

APPL/Shared/Suggest/Suggest.inc

@@ -48,6 +48,8 @@ function WriteResult2(sql, params)
   }
   var cnt = 1;
   var lijst = [];
+  if (params.firstOption)
+    lijst.push(params.firstOption);
   while (!oRs.eof && cnt < (params.bAll? maxFull : maxNormal))
   {
     cnt++;

APPL/Shared/Suggest/SuggestRuimte.asp

@@ -27,6 +27,7 @@ JSON_Result = true;
 var chars = getQParam("k", "");
 var autlevel = getQParamInt("autlevel", -1);
 var bAll = getQParamInt("SuggestAll", 0) == 1;
+var bCAD = getQParamInt("cad", 0) == 1;
 var regkey = getQParamInt("regkey", -1);
 var diskey = getQParamInt("diskey", -1);
 var lockey = getQParamInt("lockey", -1);
@@ -117,5 +118,29 @@ if (chars != "%")
        + "      OR UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%"+chars + "%") + ")";
 sql += filtClause.where
      + " ORDER BY g.alg_gebouw_code, v.alg_verdieping_volgnr, alg_ruimte_nr";  // volgnummer of verdiepingcode?
- WriteResult(sql, bAll, "code", "alg_ruimte_key", "naam", "alg_ruimte_nr");
+
+var firstOption = null;
+if (bCAD && verkey > 0)
+{
+    var sqlv = "SELECT 1"
+             + "  FROM cad_tekening ct"
+             + " WHERE ct.alg_verdieping_key = " + verkey;
+    var oRs = Oracle.Execute(sqlv);
+    if (!oRs.Eof)
+    {
+        firstOption = { txt: "<i class='fa fa-2x fa-map-marker'></i>&nbsp;" + L('lcl_room_cad'),
+                        key: -1,
+                        desc: L('lcl_room_choose_cad'),
+                        isHTML: true
+                      };
+    }
+    oRs.Close();
+}
+WriteResult2(sql, { bAll: bAll,
+                    fldName: "code",
+                    fldKey: "alg_ruimte_key",
+                    fldDesc: "naam",
+                    fldExtraParam: "alg_ruimte_nr",
+                    firstOption: firstOption
+                   });
 %>

APPL/Shared/Suggest/suggest.js

@@ -800,7 +800,9 @@ function Suggest(inParams)
         var lsq = latestServerQuery;
         if (lsq && lsq.charAt(0) == "*") lsq = lsq.substring(1);
         ll = resultsObj.result[i].txt.toLowerCase().indexOf(lsq);
-        if (ll >= 0 && lsq.length)
+        if (resultsObj.result[i].isHTML)
+          xSpan.innerHTML = resultsObj.result[i].txt;
+        else if (ll >= 0 && lsq.length)
         {
           if (ll > 0)
             xSpan.appendChild(thisdoc.createTextNode(resultsObj.result[i].txt.substring(0, ll)));

APPL/Shared/plaatsselector.inc

@@ -667,14 +667,19 @@ function FCLTplaatsselector(alglevel, params)
         </td>
       </tr>
 <%  }
-    if (params.readonlylevel<5) { %>
+    if (params.readonlylevel<5) {
+        var queryUrl = rooturl + "/appl/shared/suggest/SuggestRuimte.asp?autlevel=" + plevel
+                               + (params.filtercode? '&filtcode=' + params.filtercode : '');
+        if (params.cadSelect && user.has("WEB_CADUSE"))
+            queryUrl += "&cad=1";
+        %>
       <script type="text/javascript">
         jQuery(document).ready( function()
             {
               sgRoom<%=idadd%> = new Suggest(
                      { objectName: "sgRoom<%=idadd%>",
                         queryField: $("#ruimte<%=idadd%>")[0],
-                        queryUrl: "<%=rooturl%>/appl/shared/suggest/SuggestRuimte.asp?autlevel=<%=plevel%><%=params.filtercode? '&filtcode=' + params.filtercode : ''%>",
+                        queryUrl: "<%=queryUrl%>",
                         <%= _getUrlAdd(5) %>
                         initKey: <%=pkey%>,
                         extraParamField: $("#alg_ruimte_nr")[0],
@@ -683,43 +688,37 @@ function FCLTplaatsselector(alglevel, params)
                       });
               psObject[<%=idadd? idadd : 0%>].sgRoom = sgRoom<%=idadd%>;
               plaatsselector.checkReadonlyRui(<%=idadd? idadd : ""%>);
-<% if (params.cadSelect)
-{
-   if (user.has("WEB_CADUSE"))
-   {
-        %>
-         $("label[for=ruimte]").click(select_room)
-            .addClass("cadselect").html($("label[for=ruimte]").html() + "<i class='fa fa-fw fa-map-marker'></i>")
-            .attr('title', L('lcl_room_choose_cad'));
-         function select_room()
-            {
-                var vkey=$('#verdiepingkey<%=idadd%>')[0].value;
-                if (vkey == -1)
-                    return;
-
-                var url = "../cad/selectRoom.asp?ver_key=" + vkey;
-                <%  if (params.cadShowdiscfn) { %>
-                  url += "&discs=" + cadShowdiscfn();
-                <% } %>
-                FcltMgr.openModalDetail(url,
-                          "<%=safe.jsstring(L("lcl_select_ruimte"))%>",
-                          {
-                            callback: function (data)
-                                      {
-                                        if (data.rui_key > 0)
-                                          sgRoom<%=idadd%>.setValue(data.rui_key, data.rui_txt, true);
-                                      }
-                          });
-            }
-<% }
-} %>
             })
         function onChangeRui<%=idadd%>(key)
         {
-          plaatsselector.ruiChanged(key<%=idadd != ""? ", " + idadd : ""%>);
-          <% if (params.onRuiChange) { %>
-              <%=params.onRuiChange%>;
-          <% } %>
+          if (key == -1) // Kies in ruimte
+          {
+              sgRoom<%=idadd%>.setValue(-1, '*', false)
+              var vkey=$('#verdiepingkey<%=idadd%>')[0].value;
+              if (vkey == -1)
+                  return;
+
+              var url = "../cad/selectRoom.asp?ver_key=" + vkey;
+              <%  if (params.cadShowdiscfn) { %>
+                url += "&discs=" + cadShowdiscfn();
+              <% } %>
+              FcltMgr.openModalDetail(url,
+                        "<%=safe.jsstring(L("lcl_select_ruimte"))%>",
+                        {
+                          callback: function (data)
+                                    {
+                                      if (data.rui_key > 0)
+                                        sgRoom<%=idadd%>.setValue(data.rui_key, data.rui_txt, true);
+                                    }
+                        });
+          }
+          else
+          {
+              plaatsselector.ruiChanged(key<%=idadd != ""? ", " + idadd : ""%>);
+              <% if (params.onRuiChange) { %>
+                  <%=params.onRuiChange%>;
+              <% } %>
+          }
         }
       </script>
 <%  }