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=30021
This commit is contained in:
Erik Groener
2016-07-12 12:15:41 +00:00
parent 3d0c496cec
commit 35d7a52f43
1 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
APPL/MLD/mld_show_note2.asp
View File

@@ -40,6 +40,69 @@ var eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.me
var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_info.mld_status == 6);
var timestamp_notes = new Date();
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 <= 800"
+ " 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>
@@ -69,12 +132,25 @@ var timestamp_notes = new Date();
function note_submit_callback(json)
{
window.location.href = "mld_show_note2.asp?urole=<%=urole%>&mld_key=<%=mld_key%>&tracking=<%=tracking?1:0%>";
window.parent.FcltMgr.reload();
}
function doPrint()
{
window.open("./mld_show_note.asp?urole=<%=urole%>&mld_key=<%=mld_key%>&outputmode=1");
}
function Upload()
{
var url = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&key=" + mld_key + "&kenmerk_key=" + kenmerk_key)%>";
var params = {callback: UploadCallback};
FcltMgr.openModalDetail(url, L("lcl_appendixes"), params );
}
function UploadCallback()
{
// window.parent.FcltMgr.reload();
}
$(function () {
$('textarea').autogrow();
// Let op: scrollen is complexer dan je denkt. Ons huidige document heeft
@@ -145,7 +221,8 @@ var timestamp_notes = new Date();
return html;
}
var refresher = '<img class="details blockrefresh" id="refresh" src="../Pictures/page_refresh.png" title="' + L("lcl_refresh") + '" onclick="FcltMgr.reload()">';
var refresher = '<img class="details blockrefresh" id="refresh" src="../Pictures/page_refresh.png" title="' + L("lcl_refresh") + '" onclick="FcltMgr.reload()">'
+ '<img class="details blockrefresh" id="upload" src="../Pictures/attach.png" title="' + L("lcl_appendixes") + '" onclick="Upload()">';
if (urole=="fo" || urole=="bo")
refresher += '<img class="details blockrefresh" id="printen" src="../Pictures/print.png" title="' + L("lcl_print_table") + '" onclick="doPrint()">';
BLOCK_START("mldHistorie", (tracking?L("lcl_status_details"):L("lcl_mld_frame_notes")) + refresher);