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

FCLT#56754 Tot slot nog een toggle voor de hidden notes

Browse Source 
svn path=/Website/trunk/; revision=41398
This commit is contained in:
Peter Feij
2019-03-07 17:56:11 +00:00
parent 386abac572
commit 490a04a420
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
APPL/MLD/mld_show_note2.asp
View File

@@ -43,6 +43,7 @@ lcl.set_dialect(mld_info.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var mfe = mld.func_enabled_melding (mld_key);
// Heb ik rechten om notities te zien
user.auth_required_or_abort(mfe.canReadNotes);
var hasFOBOMIread = mfe.canFOread || mfe.canBOread || mfe.canMIread;
var eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key);
var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_info.mld_status == 6);
@@ -335,10 +336,10 @@ if (mld_key > 0)
});
}
var init = 0;
var hasTracking = <%= hasTracking ? 1 : 0 %>;
var hasNoteToggle = $("span.notetoggler").length ? 1 : 0;
if (hasTracking || hasNoteToggle) // Anders valt er niets te togglen
var hasHiddenNotes = <%=(hasFOBOMIread ? 1 : 0)%> && $(".note_fe_hidden").length ? 1 : 0;
if (hasTracking || hasNoteToggle || hasHiddenNotes) // Anders valt er niets te togglen
{
if (hasTracking)
$(".btn-group").append("<button id='0' class='selected' title='<%=L("fac_tracking")%>'><i class='fa fa-history'>&nbsp;</i></button>");
@@ -348,11 +349,26 @@ if (mld_key > 0)
var hasOneOpenNote = $("span.notetoggler").length == $("span.notetoggler.lastOpen").length; // == 1
$(".btn-group").append("<button id='1' title='<%=L("lcl_rs_trunc_both")%>'" + (hasOneOpenNote ? " class='selected'" : "") + "><i class='fa fa-ellipsis-h'>&nbsp;</i></button>");
}
if (hasHiddenNotes)
{
$(".btn-group").append("<button id='2' title='<%=L("lcl_mld_verborgen_FE")%>' class='selected'><i class='fa fa-lock'>&nbsp;</i></button>");
var divMinHeight = parseInt($("div#mldHistorieList").find("tr > td.note_fe_hidden > div").eq(0).css("minHeight"), 10);
var divHeight;
// Replace minHeight properties with height properties
$("div#mldHistorieList").find("tr > td.note_fe_hidden > div").each(function() {
divHeight = parseInt($(this).css("height"), 10);
if (divHeight == divMinHeight)
$(this).css("height", divHeight + "px");
$(this).css("minHeight", "0px");
});
}
/* Detailniveaus
0: toggle tracking, indien tracking = 1
1: toggle ...minder/...meer
1: toggle ...Meer/...minder
2: toggle hidden notes
*/
@@ -381,6 +397,10 @@ if (mld_key > 0)
else
$noteDiv.find("span.notetoggler.open").trigger("click", true);
break;
case 2: $(this).find("> i.fa").toggleClass("fa-unlock-alt fa-lock");
$noteDiv.find("tr:has(td.note_fe_hidden)").add($noteDiv.find("tr:has(td.note_fe_hidden) > td")).animate({ paddingTop: "toggle", paddingBottom: "toggle" }, ANIMATION_DURATION);
$noteDiv.find("tr:has(td.note_fe_hidden) > td > div").animate({ height: "toggle" }, ANIMATION_DURATION);
break;
}
setTimeout(function() {
@@ -686,7 +706,7 @@ if (mld_key > 0)
}
// De MoveNext hebben we al eerder gehad
}
oRs.Close()
oRs.Close();
if (S("mld_note_sort_ascending") != 0) { note_field(); }