admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#35228 Bijlagen kunnen toevoegen nadat een melding is ingezien/geaccepteerd

Browse Source 
svn path=/Website/trunk/; revision=29979
This commit is contained in:
Erik Groener
2016-07-07 11:26:10 +00:00
parent 3dd23230c1
commit 847ca71f6f
1 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
APPL/MLD/mld_show_note.asp
View File

@@ -36,6 +36,69 @@ var outputmode = getQParamInt("outputmode", 0);
var showall = getQParamInt("showall", 0) == 1;
var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderdrukken met 0
var kenmerk_key = -1;
if (mld_key > 0)
{
// Is er een bijlage kenmerk?
var sql = "SELECT mkm.mld_kenmerk_key"
+ " , mkm.mld_kenmerk_niveau"
+ " , mkm.mld_kenmerk_volgnummer"
+ " , msk.mld_srtkenmerk_omschrijving"
+ " , msk.mld_srtkenmerk_kenmerktype"
+ " , mkm.mld_srtkenmerk_key"
+ " FROM mld_kenmerk mkm"
+ " , mld_srtkenmerk msk"
+ " , mld_melding mm"
+ " , mld_stdmelding sm"
+ " , mld_discipline md"
+ " , (SELECT 'S' mld_kenmerk_niveau"
+ " , mld_stdmelding_key ref_mld_stdmelding_key"
+ " , mld_stdmelding_key"
+ " , ins_discipline_key"
+ " , m2.ins_srtdiscipline_key"
+ " FROM mld_stdmelding md"
+ " , mld_discipline m2"
+ " WHERE md.mld_ins_discipline_key = m2.ins_discipline_key"
+ " UNION ALL"
+ " SELECT 'D' mld_kenmerk_niveau"
+ " , ins_discipline_key ref_mld_stdmelding_key"
+ " , NULL mld_stdmelding_key"
+ " , ins_discipline_key ins_discipline_key"
+ " , ins_srtdiscipline_key"
+ " FROM mld_discipline m2"
+ " UNION ALL"
+ " SELECT 'T' mld_kenmerk_niveau"
+ " , ins_srtdiscipline_key ref_mld_stdmelding_key"
+ " , NULL mld_stdmelding_key"
+ " , NULL ins_discipline_key"
+ " , ins_srtdiscipline_key"
+ " FROM ins_srtdiscipline m2"
+ " ) s"
+ " WHERE mkm.mld_kenmerk_verwijder IS NULL"
+ " AND mkm.mld_stdmelding_key = s.ref_mld_stdmelding_key"
+ " AND mkm.mld_kenmerk_niveau = s.mld_kenmerk_niveau"
+ " AND mkm.mld_srtkenmerk_key = msk.mld_srtkenmerk_key"
+ " AND mm.mld_stdmelding_key = sm.mld_stdmelding_key"
+ " AND md.ins_discipline_key = sm.mld_ins_discipline_key"
+ " AND ( (s.ins_discipline_key = sm.mld_ins_discipline_key)"
+ " OR ('T' = mkm.mld_kenmerk_niveau AND s.ins_srtdiscipline_key = md.ins_srtdiscipline_key)"
+ " )"
+ " AND ( (s.mld_stdmelding_key = sm.mld_stdmelding_key)"
+ " OR ('D' = mkm.mld_kenmerk_niveau AND s.ins_discipline_key = sm.mld_ins_discipline_key)"
+ " OR ('T' = mkm.mld_kenmerk_niveau AND s.ins_srtdiscipline_key = md.ins_srtdiscipline_key)"
+ " )"
+ " AND mkm.mld_kenmerk_volgnummer <= 900"
+ " AND msk.mld_srtkenmerk_kenmerktype = 'M'"
+ " AND mm.mld_melding_key = " + mld_key
+ " ORDER BY mkm.mld_kenmerk_volgnummer DESC";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
kenmerk_key = oRs("mld_kenmerk_key").Value;
}
oRs.Close();
}
%>
<html>
<head>
@@ -61,6 +124,23 @@ var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderd
FcltMgr.openDetail(url, L("lcl_mld_complain") + ' ' + mld_key);
}
<% } %>
function Upload()
{
var url = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&key=" + mld_key + "&kenmerk_key=" + kenmerk_key)%>";
FcltMgr.openModalDetail(url, L("lcl_appendixes"),
{ callback: editBijlageCallback } );
}
function editBijlageCallback(data)
{
// tracking van toegevoegde bijlage wordt gedaan door het bijlagen scherm.
// refresh melding scherm
window.parent.location.reload(true);
}
</script>
</head>
@@ -142,6 +222,11 @@ var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderd
buttons.push({title: L("lcl_add"), icon: "plus.png", action:"mld_notechange()", id:"bchange_mld_note" });
}
if (kenmerk_key > 0)
{
buttons.push({title: L("lcl_appendixes"), icon: "attach.png", action: "Upload()", id: "bupl_mld_note" });
}
// Zelfde query in mld_edit_note.asp
sql = "SELECT n.mld_melding_note_aanmaak"
+ ", n.mld_melding_note_key"