KIBE#68014 Delen van meldingsdetails tbv Outlook-agenda (icon voor delen toegevoegd in buttons_in_hamburger)

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

APPL/MLD/get_mld_info_ajax.asp

@@ -345,66 +345,6 @@ switch (req_info)
         oRs.Close();
         break;
     }
-    case "mld_info_delen":
-    {
-        var mld_key = getQParamInt("mld_key", -1);
-        var origin = getQParam("org", "");
-
-        //var params = {xmlnode: "melding", key: mld_key};
-        //var xml_content = make_xml(params)
-        // Hier een xsl gebruiken om een soort van preview van de melding te maken.
-        // De html kan dan van die preview gekopierd worden.
-        // Onderstaande query en table zijn dan niet meer nodig, tenzij dit als een default wordt gebruikt.
-
-        var sql = "SELECT m.mld_melding_omschrijving"
-                + "     , m.mld_melding_opmerking"
-                + "     , sm.mld_stdmelding_omschrijving"
-                + "     , sd.ins_srtdiscipline_prefix"
-                + "  FROM mld_melding m"
-                + "     , mld_stdmelding sm"
-                + "     , mld_discipline d"
-                + "     , ins_srtdiscipline sd"
-                + " WHERE m.mld_stdmelding_key = sm.mld_stdmelding_key"
-                + "   AND d.ins_discipline_key = sm.mld_ins_discipline_key"
-                + "   AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key"
-                + "   AND m.mld_melding_key = " + mld_key;
-        var oRs = Oracle.Execute(sql);
-        var subject = oRs("mld_melding_omschrijving").Value;
-        var remark  = oRs("mld_melding_opmerking").Value;
-        var groep   = oRs("mld_stdmelding_omschrijving").Value;
-        var prefix  = oRs("ins_srtdiscipline_prefix").Value;
-        var link = "";
-        oRs.Close();
-
-        var resp = "<table class='fcltblocktab'>"
-                   + "<tbody>"
-                   + "<tr>"
-                   + "<td class='label'>melding:</td>"
-                   + "<td class='flddisc'>"+prefix+mld_key+"&nbsp;"+groep+"</td>"
-                   + "</tr>"
-                   + ( subject
-                     ? "<tr>"
-                     + "<td class='label'>Omschrijving:</td>"
-                     + "<td class='flddisc'>"+subject+"</td>"
-                     + "</tr>"
-                     : ""
-                     )
-                   + ( remark
-                     ? "<tr>"
-                     + "<td class='label'>Opwerking:</td>"
-                     + "<td class='flddisc'>"+remark+"</td>"
-                     + "</tr>"
-                     : ""
-                     )
-                   + "<tr>"
-                   + "<td colspan='2'><span><a style='text-decoration:none' href='==mld_link=='>Klik of tik om de koppeling te volgen</a></span></td>"
-                   + "</tr>"
-                   + "</tbody>"
-                   + "</table>";
-        result = { info: resp };
-        break;
-    }
-
 }
 
 Response.Write(JSON.stringify(result));

APPL/MLD/mld_show_melding.asp

@@ -304,6 +304,7 @@ function parentButton()
         FcltMgr.setTitle("<%=safe.jsstring(S("mld_num_prefix_mode") == 1?"":L("lcl_complain") + " ")%> <%= (mld_melding.prefix||"") + mld_key%>", {hot:false});
         $('textarea').resize(function () { FcltMgr.resized(window) } );
         $('textarea').autogrow();
+        $("div#mld_info_delen").hide();
 <%
       if (mld_melding.show_alg && S("mld_edit_layout") == 0)
       { %>
@@ -336,47 +337,60 @@ function parentButton()
 
       function mld_delen()
       {
-        function mldDelenCallback(data)
-        {
-            var newTop = $("#layoutfixer")[0].offsetTop;
-            var newLeft = 0;
-            $div = $('<div id="mld_info_delen" class=""></div>');
-            var v_html = data.info.replace("==mld_link==", window.location.origin + "?u=melding&k=<%=mld_key%>");
-            $div.appendTo('body')
-                .html(""
-                    + "<div class='' style='list-style:none'>"
-                    + v_html
-                    + "</div>"
-                     )
-                .dialog({
-                    modal: true,
-                    title: L("lcl_mld_delen"),
-                    zIndex: 10000,
-                    autoOpen: true,
-                    width: "auto",
-                    resizable: false,
-                    close: function(event, ui) {
-                        $(this).remove();
-                        },
-                        create: FcltMgr.fnCreateCloseButton($div)
-                    });
-            $("#mld_info_delen").closest(".ui-dialog").css("top", newTop);
-            $("#mld_info_delen").closest(".ui-dialog").css("left", newLeft);
-        }
-
-        $.getJSON( "../mld/get_mld_info_ajax.asp"
-                 , { req_info: "mld_info_delen"
-                   , mld_key: <%=mld_key%>
-                   , org: "==mld_link=="
-                   }
-                 , mldDelenCallback
-                 );
+          var params = { title: "<%=safe.jsstring(L("lcl_mld_delen"))%>"
+                       , modal: true
+                       , width: "auto"
+                       , resizable: false
+                       , position: { my: "center", at: "center", of: window }
+                       , close: function(event, ui) { $(this).hide(); }
+                       , create: FcltMgr.fnCreateCloseButton("div#mld_info_delen")
+                       };
+        $("div#mld_info_delen").dialog(params).dialog("open");
       }
 
     </script>
   </head>
 
   <body class="showmode<%= mld_melding.parent_key ? ' child' : '' %><%=noteonly ? ' logboek' : ''%>">
+
+      <!-- modal scherm voor het kopieren van gegevens -->
+      <div id="mld_info_delen" class="">
+        <table class='fcltblocktab'>
+          <tbody>
+            <tr>
+              <td class="label"><%=safe.jsstring(mld_melding.srtdisc_oms)%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_melding.prefix+mld_key+" "+mld_melding.mld_stdmelding_omschrijving)%></td>
+            </tr>
+            <% if (mld_melding.mld_onderwerp) { %>
+            <tr>
+              <td class="label"><%=safe.jsstring(L("lcl_mld_inf_Onderwerp"))%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_melding.mld_onderwerp)%></td>
+            </tr>
+            <% } %>
+            <% if (mld_melding.mld_omschr) { %>
+            <tr>
+              <td class="label"><%=safe.jsstring(L("lcl_mld_inf_Omschrijving"))%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_melding.mld_omschr)%></td>
+            </tr>
+            <% } %>
+            <% if (mld_melding.remark) { %>
+            <tr>
+              <td class="label"><%=safe.jsstring(L("lcl_mld_inf_Opmerking"))%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_melding.remark)%></td>
+            </tr>
+            <% } %>
+            <tr>
+              <td colspan="2">
+                <span>
+                  <a style="text-decoration:none" href="<%=HTTP.urlzelf()+"?u=melding&k="+mld_key%>"><%=safe.jsstring(L("lcl_mld_inf_volg_link"))%></a>
+                </span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <!-- einde modal scherm -->
+
 <%
     SUBFRAME_START();
 
@@ -461,7 +475,7 @@ function parentButton()
     }
     buttons.push({ icon: "fa-print", title: L("lcl_print"),          action: 'mld_print()' });
     buttons.push({ icon: "fa-envelope", title: L("lcl_noti_mld_email"), action: 'mld_mail()' });
-    buttons.push({ icon: "fa-share-alt", title: L("lcl_mld_delen"), action: 'mld_delen()'});
+    buttons.push({ icon: "fa-share-square", title: L("lcl_mld_delen"), action: 'mld_delen()'});
 
 
     // UNDER DESIGN

APPL/MLD/mld_show_opdr.asp

@@ -236,6 +236,7 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
         FcltMgr.setTitle("<%=L("lcl_opdr_info") + " " +(prefix||"") + mld_opdr.mld_key + "/" + mld_opdr.volgnr%>", {hot:false});
         $('textarea').resize(function() { FcltMgr.resized(window) });
         $('textarea').autogrow();
+        $("div#opdr_info_delen").hide();
       });
 
       function opdr_mail()
@@ -244,11 +245,24 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
         var url = "<%=safe.jsstring(protectQS.create(urlMail))%>";
         FcltMgr.openModalDetail(url, L("lcl_mld_noti_opdr_email"), { callback: opdrMailCallback });
       }
+
+      function opdr_delen()
+      {
+        var params = { title: "<%=safe.jsstring(L("lcl_mld_delen"))%>"
+                     , modal: true
+                     , width: "auto"
+                     , resizable: false
+                     , position: { my: "center", at: "center", of: window }
+                     , close: function(event, ui) { $(this).hide(); }
+                     , create: FcltMgr.fnCreateCloseButton("div#opdr_info_delen")
+                     };
+        $("div#opdr_info_delen").dialog(params).dialog("open");
+      }
+
       function fin_verkoopfactuur ()
       {
           var url = "appl/fin/fin_verkoopfactuur.asp?mode=list&fin_verkoopfactuur_refkey=<%=opdr_key%>" + "&fin_verkoopfactuur_xmlnode=opdracht";
           FcltMgr.openDetail(url, L("lcl_verkoopfacturen"));
-
       }
 
       function mld_show_goedkeurmodal()
@@ -273,6 +287,37 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
   </head>
 
   <body class="showmode">
+
+      <!-- modal scherm voor het kopieren van gegevens -->
+      <div id="opdr_info_delen" class="">
+        <table class='fcltblocktab'>
+          <tbody>
+            <tr>
+              <td class="label"><%=safe.jsstring(L("lcl_opdr_info"))%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_opdr.srtdiscprefix + mld_opdr.mld_key +"/"+mld_opdr.volgnr+" "+mld_opdr.opdr_type_omschr)%></td>
+            </tr>
+            <tr>
+              <td ><%=safe.jsstring(L("lcl_complain"))%>:</td>
+              <td ><%=safe.jsstring(mld_opdr.vakgroep +"/"+ stdm)%></td>
+            </tr>
+            <% if (mld_opdr.opdr_omschr) { %>
+            <tr>
+              <td class="label"><%=safe.jsstring(L("lcl_mld_opdr_description"))%>:</td>
+              <td class="flddisc"><%=safe.jsstring(mld_opdr.opdr_omschr)%></td>
+            </tr>
+            <% } %>
+            <tr>
+              <td colspan="2">
+                <span>
+                  <a style="text-decoration:none" href="<%=HTTP.urlzelf()+"?u=opdracht&k="+opdr_key%>"><%=safe.jsstring(L("lcl_mld_inf_volg_link"))%></a>
+                </span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <!-- einde modal scherm -->
+
 <% /*todo pngs vervangen */
 
     function gen_afhandeling()
@@ -345,6 +390,8 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
 
     buttons.push({ title: L("lcl_print"),      icon: "fa-print",    action: "opdr_print()" });
     buttons.push({ title: L("lcl_noti_email"), icon: "fa-envelope",    action: "opdr_mail()" });
+    buttons.push({ title: L("lcl_mld_delen"),  icon: "fa-share-square", action: "opdr_delen()" });
+
     IFRAMER_HEADER((mld_opdr.act_key > 0? L("lcl_opdr_frame_algemeen_actie") : L("lcl_opdr_frame_algemeen")), buttons);
       if (mld_opdr.recentgewijzigd)
       {