From 55a7faff43d36d251fa4243f2082d4b8e69609fb Mon Sep 17 00:00:00 2001
From: Peter Feij <peter.feij@aareon.nl>
Date: Tue, 27 Sep 2016 17:22:58 +0000
Subject: [PATCH] FSN#37849 b. melding_onderwerp ook tonen

svn path=/Website/trunk/; revision=30887
---
 APPL/PDA/melding.asp  | 8 ++++----
 APPL/PDA/mld_list.asp | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/APPL/PDA/melding.asp b/APPL/PDA/melding.asp
index 1c564a7234..7655128fcd 100644
--- a/APPL/PDA/melding.asp
+++ b/APPL/PDA/melding.asp
@@ -464,7 +464,7 @@ if (action != "forward")
 
         if (mld_key > -1)   // bestaande
         {
-            BLOCK_START({collapsed: true, title: L("lcl_mld_frame_algemeen")});
+            BLOCK_START({collapsed: true, title: (mld_info.mld_onderwerp == null ? L("lcl_mld_frame_algemeen") : mld_info.mld_onderwerp)});
                 var prs_melder = new Perslid(mld_info.melder_key);
                 ROFIELD("fld", L("lcl_caller")         , prs_melder.naam(), { moreinfo: "tel:"+(prs_melder.prs_perslid_mobiel()||prs_melder.prs_perslid_telefoonnr()) });
                 ROFIELD("fld", L("lcl_mld_date_time")  , toDateTimeString(mld_info.melddatum));
@@ -472,7 +472,7 @@ if (action != "forward")
             BLOCK_END();
         }
 
-        if (mld_info.show_ins && stdm_info.alg_onrgoed_obj_niveau)
+       if (mld_info.show_ins && stdm_info.alg_onrgoed_obj_niveau)
         {
             if (ins_key > 0 && mld_key < 0)
             { // Nieuwe melding waarbij het object bekend is: via qrc-code
@@ -503,7 +503,7 @@ if (action != "forward")
                                   , required: mld_info.srtinst_verplicht
                                   }
                                 );
-                 }             
+                 }
             }
             else if (ins_name_arr.length)
                 ROFIELD("fld", L("lcl_gerelateerdeobjecten"), ins_name_arr.join("\n"), {multi: ins_name_arr.length > 1});
@@ -522,7 +522,7 @@ if (action != "forward")
                                        required: true
                                      });
         }
-      else 
+      else
         {
 %>         <input type="hidden" name="account" id="sgAccount" value="<%=mld_info.kostenpl_key || -1 %>">
         <%}
diff --git a/APPL/PDA/mld_list.asp b/APPL/PDA/mld_list.asp
index cd3e90d72c..954fa18f45 100644
--- a/APPL/PDA/mld_list.asp
+++ b/APPL/PDA/mld_list.asp
@@ -146,6 +146,7 @@ var authparams = user.checkAutorisation(autfunction);
              + "     , mld_melding_status"
              + "     , mld_melding_spoed"
              + "     , mld_melding_omschrijving"
+             + "     , mld_melding_onderwerp"
              + "     , v.alg_gebouw_code ||"
                + "     NVL2(v.alg_verdieping_code, '-' || v.alg_verdieping_code, '') ||"
                + "     NVL2(v.alg_ruimte_nr, '-' || v.alg_ruimte_nr, '') ||"
@@ -302,7 +303,8 @@ var authparams = user.checkAutorisation(autfunction);
 
     function fncolSubHeader(oRs)
     {
-      return "<div class='listbodykop'>" +(oRs("plaatsmelding").Value? safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+      return (oRs("mld_melding_onderwerp").Value != null ? oRs("mld_melding_onderwerp").Value + "<br>" : "")
+           + "<div class='listbodykop'>" + (oRs("plaatsmelding").Value? safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
            + L("lcl_mld_enddate") + ": " + toDateTimeString(oRs("mld_melding_einddatum").Value, false, false, true) + "</div>"
            + (oRs("mld_melding_omschrijving").Value? "<div class='listbodytext'>" + safe.html(shorttxt(oRs("mld_melding_omschrijving").Value, S("rs_mobile_maxchar"))) + "</div>" : "");
     };