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

LOGC#75020 Bijlagen knop weer even terug bij notities, tot 2023.3

Browse Source 
svn path=/Website/trunk/; revision=60576
This commit is contained in:
Koen Reefman
2023-06-01 06:52:04 +00:00
parent 63e9a25b29
commit 4f28b1b68a
8 changed files with 226 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
APPL/CNT/cnt_show_note2.asp
View File

@@ -35,7 +35,45 @@ var cnt_info = cnt.cnt_contract_info(cnt_key);
// Afgehandeld: 1=Gesloten.
var afgehandeld = cnt_info.contract_status == 1;
notes.show_note2("CNT", cnt_key, this_cnt, afgehandeld);
var kenmerk_key = -1;
if (cnt_key > 0)
{
// Is er een bijlage kenmerk?
var sql = "SELECT k.cnt_kenmerk_key"
+ " FROM cnt_srtkenmerk t"
+ " , cnt_kenmerk k"
+ " , cnt_contract c"
+ " WHERE c.ins_discipline_key = k.cnt_srtcontract_key"
+ " AND k.cnt_kenmerk_niveau IN ('C', 'S')"
+ " AND k.cnt_srtkenmerk_key = t.cnt_srtkenmerk_key"
+ " AND k.cnt_kenmerk_verwijder IS NULL"
+ " AND t.cnt_srtkenmerk_verwijder IS NULL"
+ " AND c.cnt_contract_key = " + cnt_key
// Als ik canReadNotes heb dan heb ik canUSEread en/of canMANread rechten.
+ (!this_cnt.canMANread
? " AND k.cnt_kenmerk_volgnummer >= 100"
: "")
+ (!this_cnt.canUSEread
? " AND k.cnt_kenmerk_volgnummer <= 100"
: "")
+ " AND (k.cnt_kenmerk_verplicht IS NULL"
+ " OR k.cnt_kenmerk_verplicht = 0)"
+ " AND t.cnt_srtkenmerk_kenmerktype = 'M'"
+ " AND cnt_kenmerk_toonbaar IS NULL"
+ " ORDER BY cnt_kenmerk_volgnummer"
+ " , k.cnt_kenmerk_niveau";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
kenmerk_key = oRs("cnt_kenmerk_key").Value;
}
oRs.Close();
var upload_url = protectQS.create("../Shared/BijlagenForm.asp?module=CNT&multi=1&key=" + cnt_key + "&kenmerk_key=" + kenmerk_key);
}
notes.show_note2("CNT", cnt_key, kenmerk_key, this_cnt, afgehandeld, upload_url);
%>
<% ASPPAGE_END(); %>

25
APPL/FIN/fin_show_note2.asp
View File

@@ -35,7 +35,30 @@ var fin_info = fin.factuur_info(fin_key);
// Afgehandeld: 7=Verwerkt.
var afgehandeld = fin_info.fin_status_key == 7;
notes.show_note2("FIN", fin_key, this_fin, afgehandeld);
var kenmerk_key = -1;
if (fin_key > 0)
{
// Is er een bijlage kenmerk?
var sql = "SELECT k.fin_kenmerk_key"
+ " FROM fin_kenmerk k"
+ " WHERE k.fin_kenmerk_verwijder IS NULL"
+ " AND (k.fin_kenmerk_verplicht IS NULL OR k.fin_kenmerk_verplicht = 0)"
+ " AND k.fin_kenmerk_kenmerktype = 'M'"
+ " AND k.fin_kenmerk_type = 'F'"
+ " AND fin_kenmerk_toonbaar IS NULL"
+ " ORDER BY k.fin_kenmerk_volgnr";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
kenmerk_key = oRs("fin_kenmerk_key").Value;
}
oRs.Close();
var upload_url = protectQS.create("../Shared/BijlagenForm.asp?module=FIN&multi=1&key=" + fin_key + "&kenmerk_key=" + kenmerk_key);
}
notes.show_note2("FIN", fin_key, kenmerk_key, this_fin, afgehandeld, upload_url);
%>
<% ASPPAGE_END(); %>

34
APPL/INS/ins_show_note2.asp
View File

@@ -41,7 +41,39 @@ if (oRs("ins_deel_vervaldatum").Value != null)
afgehandeld = new Date(oRs("ins_deel_vervaldatum").Value) < new Date();
oRs.Close();
notes.show_note2("INS", ins_key, this_ins, afgehandeld);
var kenmerk_key = -1;
if (ins_key > 0)
{
// Is er een bijlage kenmerk?
var sql = "SELECT km.ins_kenmerk_key"
+ " FROM ins_srtkenmerk sk"
+ " , ins_kenmerk km"
+ " , ins_srtdeel sd"
+ " , ins_srtgroep gr"
+ " , ins_deel d"
+ " WHERE km.ins_srtkenmerk_key = sk.ins_srtkenmerk_key"
+ " AND gr.ins_srtgroep_key = sd.ins_srtgroep_key"
+ " AND km.ins_kenmerk_verwijder IS NULL"
+ " AND sk.ins_srtkenmerk_verwijder IS NULL"
+ " AND ((km.ins_srtinstallatie_key = sd.ins_srtdeel_key AND km.ins_kenmerk_niveau = 'S')"
+ " OR (km.ins_srtinstallatie_key = sd.ins_srtgroep_key AND km.ins_kenmerk_niveau = 'G')"
+ " OR (km.ins_srtinstallatie_key = gr.ins_discipline_key AND km.ins_kenmerk_niveau = 'D'))"
//+ " AND km.ins_kenmerk_volgnummer >= 900"
+ " AND d.ins_srtdeel_key = sd.ins_srtdeel_key"
+ " AND sk.ins_srtkenmerk_kenmerktype = 'M'"
+ " AND d.ins_deel_key = " + ins_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
kenmerk_key = oRs("ins_kenmerk_key").Value;
}
oRs.Close();
var upload_url = protectQS.create("../Shared/BijlagenForm.asp?module=INS&multi=1&key=" + ins_key + "&kenmerk_key=" + kenmerk_key);
}
notes.show_note2("INS", ins_key, kenmerk_key, this_ins, afgehandeld, upload_url);
%>
<% ASPPAGE_END(); %>

13
APPL/Localscripts/notes.js
View File

@@ -497,6 +497,19 @@ function doPrint(pkey, pmodule, urole)
FcltMgr.windowopen("./" + pmodule.toLowerCase() + "_show_note.asp?" + pmodule.toLowerCase() + "_key=" + pkey + "&outputmode=1" + (urole? "&urole=" + urole : "") + "&tracking=" + tracking);
}
function Upload(purl)
{
var params = {callback: UploadCallback};
FcltMgr.openModalDetail(purl, L("lcl_appendixes"), params );
}
function UploadCallback()
{
var params = {};
if ($("#note").val() != "")
params.appendurl = "tmp_note=" + encodeURIComponent($("#note").val()) + "&parent_reload=1";
FcltMgr.reload(params);
}
function persoonDetails(evt, perslid_key)
{
FcltMgr.stopPropagation(evt);

10
APPL/MLD/mld_edit_note.asp
View File

@@ -104,6 +104,12 @@ FCLTHeader.Requires({ plugins: [] });
FcltMgr.closeDetail(window, { cancel: true } );
}
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") );
}
$(function()
{
$('textarea').resize(function () { FcltMgr.resized(window) } );
@@ -126,6 +132,10 @@ FCLTHeader.Requires({ plugins: [] });
<form name="u2" method="post" action="mld_edit_note_save.asp?mld_key=<%=mld_key%>&urole=<%=urole%>&note_key=<%=note_key%>">
<%
var buttons = [];
if (kenmerk_key > 0){
buttons.push({title: L("lcl_appendixes"), icon: "fa-folder-open", action: "Upload()", id: "bupl_mld_note" });
}
buttons.push({title: L("lcl_submit"), icon: "fa-fclt-save", action:"mld_notesubmit()" });
buttons.push({title: L("lcl_cancel"), icon: "fa-fclt-cancel", action:"mld_notecancel()" });

63
APPL/MLD/mld_show_note2.asp
View File

@@ -30,6 +30,7 @@ var urole = getQParamSafe("urole", "fe");
var outputmode = getQParamInt("outputmode", 0);
var tracking = getQParamInt("tracking", (urole=="fe" && S("mld_hide_fe_tracking") ? 0 : 1)) == 1; // tracking erbij tonen? Onderdrukken met 0
var tmp_note = getQParam("tmp_note", "");
var parent_reload = getQParamInt("parent_reload", 0);
var note_key = getQParamInt("note_key", -1);
@@ -49,6 +50,37 @@ var hasFOBOMIread = mfe.canFOread || mfe.canBOread || mfe.canMIread;
var actiebijaanvrager = (mld_info.actiecode & 2);
var eigenMelding = user.isCollega(mld_info.melder_key);
var canDeleteNoteAttachment = (mld_info.mld_status == 6? 0 : 1);
var kenmerk_key_arr = [];
var srtkenm_oms_arr = [];
var multipleBijlagenTypes = false;
if (mld_key > 0)
{
// Zijn er een bijlage kenmerken?
var sql = mld.getMldKenmerk_sql(mld_key, {wheres: ["mkm.mld_kenmerk_volgnummer < 800",
"mkm.mld_kenmerk_volgnummer >= 0",
"msk.mld_srtkenmerk_kenmerktype = 'M'",
"(mkm.mld_kenmerk_toonbaar = 0 OR mkm.mld_kenmerk_toonbaar IS NULL)"]}
);
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
kenmerk_key_arr.push(oRs("mld_kenmerk_key").Value);
srtkenm_oms_arr.push(oRs("mld_kenmerk_omschrijving").Value);
oRs.moveNext();
if (!multipleBijlagenTypes && !oRs.eof)
multipleBijlagenTypes = true;
}
oRs.Close();
var upload_url = [];
for (var i = 0; i < kenmerk_key_arr.length; i++)
{
upload_url[i] = protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&candelete=" + canDeleteNoteAttachment + "&key=" + mld_key + "&kenmerk_key=" + kenmerk_key_arr[i]);
}
}
%>
<html>
@@ -103,6 +135,14 @@ var eigenMelding = user.isCollega(mld_info.melder_key);
}
}
function toggleDropdown()
{
$("li#printhamburger").find("> .fa-times").toggleClass("fa-bars fa-times");
$("li.byHamburger").toggleClass("hidden", true);
$("li.byDropdown").toggleClass("hidden");
FcltMgr.resized();
}
$(function ()
{
<% if (getQParamInt("startacceptdialog", 0 )== 1)
@@ -115,6 +155,11 @@ var eigenMelding = user.isCollega(mld_info.melder_key);
<% } %>
init_note(<%=note_key%>);
<% if (multipleBijlagenTypes)
{ %>
$("div.hambdropdown.bijlagen").appendTo($("#appendixes").parent("ul"));
<% } %>
});
</script>
</head>
@@ -128,6 +173,11 @@ var eigenMelding = user.isCollega(mld_info.melder_key);
if (urole=="fo" || urole=="bo")
buttons.push({ icon: "fa-print", title: L("lcl_print"), action: "doPrint(" + mld_key + ", 'MLD', '" + urole + "')" });
if (kenmerk_key_arr.length == 1)
buttons.push({ icon: "fa-folder-open", title: L("lcl_appendixes"), action: "Upload('" + upload_url[0] + "')", showAlways: true });
else if (kenmerk_key_arr.length > 1)
buttons.push({ id: "appendixes", icon: "fa-chevron-down", title: L("lcl_appendixes"), action: "toggleDropdown()", showAlways: true });
IFRAMER_HEADER(L("lcl_mld_behandeling"), buttons, { inhamburger: true });
BLOCK_START("mldHistorie", L("lcl_mld_frame_notes"), { detailToggle: true, wide: true, nopadding: true, icon: "fa-clipboard-list-check"});
@@ -145,6 +195,7 @@ var eigenMelding = user.isCollega(mld_info.melder_key);
}
var params = { tabel: "mld_melding",
tmp_note: tmp_note,
showNote: ((!mfe.haveOnlyFErights && mfe.canReadAny) || (mfe.haveOnlyFErights && !mfe.parentOfOwnRead && mld_info.fenotes > 0)),
writeNote: mfe.canWriteNotes,
afgehandeld: afgehandeld,
@@ -157,6 +208,18 @@ var eigenMelding = user.isCollega(mld_info.melder_key);
// &1 = Notes van FE
// &2 = Notes van FOBO
// &4 = Notes van Uitvoerder
if (multipleBijlagenTypes)
{
// Create a dropDown div for the multiple bijlagen types
Response.write("<div id=\"buttons\" class=\"hambdropdown bijlagen\"><ul onclick=\"FcltMgr.stopPropagation(event);\">");
for (var i = 0; i < kenmerk_key_arr.length; i++)
{
CreateButton(srtkenm_oms_arr[i], "$('li.byDropdown').toggleClass('hidden');FcltMgr.resized();Upload('" + upload_url[i] + "')", { icon: "fa-folder-open", showIcon: true, xclass: "hidden byDropdown" }, { vertical: true });
}
Response.write("</ul></div>");
}
var selector_sql = "(SELECT fac_note_group_naam"
+ " FROM fac_note_group fng"
+ " WHERE n.fac_note_group_key = fng.fac_note_group_key"

36
APPL/MLD/opdr_show_note2.asp
View File

@@ -29,6 +29,7 @@ FCLTHeader.Requires({js: ["notes.js"]}); // Bestand "../mld/mld_list.js" is niet
var urole = getQParamSafe("urole", "fe");
var outputmode = getQParamInt("outputmode", 0);
var tracking = getQParamInt("tracking", (urole=="fe"?0:1)) == 1; // tracking erbij tonen? Onderdrukken met 0
var tmp_note = getQParam("tmp_note", "");
var parent_reload = getQParamInt("parent_reload", 0);
var note_key = getQParamInt("note_key", -1);
var verynew = getQParamInt("verynew", 0) == 1;
@@ -41,6 +42,37 @@ var mld_opdr = this_opdr.mld_opdr;
var afgehandeld = (mld_opdr.opdr_status == 1 || mld_opdr.opdr_status == 6 || mld_opdr.opdr_status == 7 || mld_opdr.opdr_status == 9);
lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
var kenmerk_key = -1;
if (opdr_key > 0)
{ // Is er een bijlage kenmerk?
var where = " AND k.mld_kenmerk_volgnummer < 800"
+ " AND (k.mld_kenmerk_verplicht IS NULL OR k.mld_kenmerk_verplicht=0)"
+ " AND t.mld_srtkenmerk_kenmerktype = 'M'"
+ " AND mld_kenmerk_toonbaar IS NULL";
var sql = "SELECT k.mld_kenmerk_key"
+ " FROM mld_srtkenmerk t"
+ " , mld_kenmerk k"
+ " , mld_opdr o"
+ " WHERE (o.mld_typeopdr_key = k.mld_typeopdr_key OR k.mld_typeopdr_key IS NULL)"
+ " AND k.mld_kenmerk_niveau IN ('P', 'O')"
+ " AND k.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
+ " AND k.mld_kenmerk_verwijder IS NULL"
+ " AND t.mld_srtkenmerk_verwijder IS NULL"
+ " AND o.mld_opdr_key = " + opdr_key
+ where
+ " ORDER BY mld_kenmerk_volgnummer"
+ " , DECODE (k.mld_kenmerk_niveau, 'P', 0, 'O', 1)";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
kenmerk_key = oRs("mld_kenmerk_key").Value;
}
oRs.Close();
var upload_url = protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=O&multi=1&key=" + opdr_key + "&kenmerk_key=" + kenmerk_key);
}
%>
<html>
<head>
@@ -75,6 +107,9 @@ lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
if (urole=="fo" || urole=="bo")
buttons.push({ icon: "fa-print", title: L("lcl_print"), action: "doPrint(" + opdr_key + ", 'OPDR', '" + urole + "')" });
if (kenmerk_key != -1)
buttons.push({ icon: "fa-folder-open", title: L("lcl_appendixes"), action: "Upload('" + upload_url + "')", showAlways: true});
IFRAMER_HEADER(L("lcl_mld_behandeling"), buttons, { inhamburger: true });
BLOCK_START("opdrHistorie", L("lcl_opdr_frame_notes"), { detailToggle: true, wide: true, nopadding: true, icon: "fa-clipboard-list-check" });
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
@@ -92,6 +127,7 @@ lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
}
var params = { tabel: "mld_opdr",
tmp_note: tmp_note,
showNote: this_opdr.canShowOpdrNote,
writeNote: this_opdr.canEditOpdrNote,
afgehandeld: afgehandeld,

9
APPL/Shared/notes.inc
View File

@@ -540,6 +540,9 @@ notes =
oRs.Close();
}
// Voeg eventueel weer toe wat er voor de reload als gevolg van upload bijlage stond.
note_oms = (params.tmp_note != "" ? params.tmp_note : note_oms);
if (pmodule == 'MLD' && tracking) // Voor nu alleen voor MLD
{
var sql = "SELECT fac_srtnotificatie_code,"
@@ -858,9 +861,10 @@ notes =
return note_key;
},
show_note2: function (pmodule, pkey, pthis_mod, pafgehandeld)
show_note2: function (pmodule, pkey, pkenmerk_key, pthis_mod, pafgehandeld, pupload_url)
{
var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderdrukken met 0
var tmp_note = getQParam("tmp_note", "");
var parent_reload = getQParamInt("parent_reload", 0);
var note_key = getQParamInt("note_key", -1);
var verynew = getQParamInt("verynew", 0) == 1;
@@ -904,12 +908,15 @@ notes =
var buttons = [];
buttons.push({ icon: "fa-fclt-refresh", title: L("lcl_refresh"), action: "FcltMgr.stopEdit(window);FcltMgr.reload()"});
buttons.push({ icon: "fa-print", title: L("lcl_print"), action: "doPrint(" + pkey + ", '" + mod_prefix + "')" });
if (pkenmerk_key != -1)
buttons.push({ icon: "fa-folder-open", title: L("lcl_appendixes"), action: "Upload('" + pupload_url + "')", showAlways: true });
IFRAMER_HEADER(L("lcl_" + mod_prefix + "_behandeling"), buttons, { inhamburger: true });
BLOCK_START(mod_prefix + "Historie", (tracking? L("lcl_" + mod_prefix + "_behandeling") : L("lcl_" + mod_prefix + "_frame_notes")),
{ detailToggle: true, wide: true, nopadding: true, icon: "fa-clipboard-list-check" });
var params = { tabel: mod_table_prefix,
tmp_note: tmp_note,
showNote: pthis_mod.canReadNotes,
afgehandeld: pafgehandeld }