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

KFNS#40765 added important class to items with displaymode = 0, added kennisbankitems to show-mode and fixed a bug

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34146
This commit is contained in:
Koen Reefman
2017-06-07 08:57:25 +00:00
parent d9170d6528
commit ec70110d29
4 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/MLD/get_mld_info_ajax.asp
View File

@@ -106,12 +106,6 @@ switch (req_info)
var result = mld.faq_info(loc_key, alg_key_arr, ins_disc_key, stdm_key, changed);
result.ins_disc_key = ins_disc_key;
result.stdm_key = stdm_key;
result.loc_key = loc_key;
result.alg_key_arr = alg_key_arr;
result.changed = changed;
break;
}
case "alg_algfaq_info":

26
APPL/MLD/mld.inc
View File

@@ -2732,7 +2732,8 @@ mld = {setmeldingstatus:
+ " NULL, DECODE (af.alg_locatie_key,"
+ " NULL, 'X', 'L'),"
+ " og.alg_type) alg_type "
+ " , 1 displaymode ";
+ " , 1 displayPopup "
+ " , fac_faq_displaymode displayMode ";
var filtFROM = " , alg_algfaq af"
+ " , mld_stdmeldingfaq sf"
@@ -2773,7 +2774,8 @@ mld = {setmeldingstatus:
var filtSELECT = " , 'X' stdm_type"
+ " , DECODE (og.alg_onroerendgoed_keys,"
+ " NULL, 'L', og.alg_type) alg_type "
+ " , 1 displaymode ";
+ " , 1 displayPopup "
+ " , fac_faq_displaymode displayMode ";
var filtFROM = " , alg_algfaq af"
+ " , alg_v_onroerendgoed og";
@@ -2807,7 +2809,8 @@ mld = {setmeldingstatus:
+ " NULL, 'X', 'I'),"
+ " 'S') stdm_type"
+ " , 'X' alg_type "
+ " , fac_faq_displaymode displaymode ";
+ " , fac_faq_displaymode displayPopup "
+ " , fac_faq_displaymode displayMode ";
var filtFROM = " , mld_stdmeldingfaq sf";
@@ -2839,24 +2842,29 @@ mld = {setmeldingstatus:
var oRs = Oracle.Execute(sql);
var result = { fixed_faq: [],
popup_faq: false };
popup_faq: false,
loc_key: loc_key,
alg_key_arr: alg_key_arr,
stdm_key: stdm_key,
ins_disc_key: ins_disc_key,
changed: changed
};
while (!oRs.EOF)
{
// KFNS#38663 -> always 'inline'
var data = { faq_key: oRs("fac_faq_key").Value,
question: oRs("fac_faq_question").Value,
answer: safe.fclthtml(oRs("fac_faq_answer").Value),
displaymode: oRs("displaymode").Value };
answer: safe.fclthtml(oRs("fac_faq_answer").Value) };
var displaymode = oRs("displaymode").Value;
if (displaymode == 0) // Popup
if (oRs("displayPopup").Value == 0) // Popup
{
if ( ((S("faq_kennisbank_popup") & 1) && canFAQUSEread) // Voor FE
|| ((S("faq_kennisbank_popup") & 2) && canFAQFOFread)) // Voor FO
result.popup_faq = true;
data.extraClass = " important";
}
if (oRs("displayMode").Value == 0)
data.extraClass = " important"; // leading space behouden
data.faq_type = "faq_" + oRs("stdm_type") + oRs("alg_type");

16
APPL/MLD/mld_edit_melding.asp
View File

@@ -185,6 +185,13 @@ if (lBestaandeMelding)
+ " AND md.ins_srtdiscipline_key = " + mld_melding.srtdisc;
oRs = Oracle.Execute(sql);
var disc_with_startdatum = oRs("startdatum").Value == 1;
var alg_key_arr = [];
if (mld_melding.bld_key && mld_melding.bld_key != -1) alg_key_arr.push(mld_melding.bld_key);
if (mld_melding.flr_key && mld_melding.flr_key != -1) alg_key_arr.push(mld_melding.flr_key);
if (mld_melding.room_key && mld_melding.room_key != -1) alg_key_arr.push(mld_melding.room_key);
var faq_info = mld.faq_info(mld_melding.loc_key, alg_key_arr, mld_melding.disc, mld_melding.stdm, -1);
}
else
{ // ================================ Nieuwe melding ==============================================
@@ -778,10 +785,15 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
<script type="text/javascript">
jQuery(document).ready(function()
{
var JSONdata = '(<%=safe.jsstring(JSON.stringify(stdm_info))%>)';
var JSONdataStdm = '(<%=safe.jsstring(JSON.stringify(stdm_info))%>)';
var JSONdataFaq = '(<%=safe.jsstring(JSON.stringify(faq_info?faq_info.fixed_faq:null))%>)';
// FSN#20381: Moet gedefinieerd worden na definitie FCLTkostenplaatsselector zodat sgAccount (ook jQuery(document).ready()) gedefinieerd is
if (mld_key > 0) // Alleen voor bestaande meldingen uitvoeren. Voor nieuwe meldingen zorgt initOnChange van de stdmeldingselector voor de aanroep.
process_stdm_info(eval('(' + JSONdata + ')'), false); // Tweede parameter stdmChanged voorkomt einddatum aanpassing bij bestaande meldingen
{
process_stdm_info(eval('(' + JSONdataStdm + ')'), false); // Tweede parameter stdmChanged voorkomt einddatum aanpassing bij bestaande meldingen
show_fixed_faq(-1, eval('(' + JSONdataFaq + ')'));
}
});
</script>
<%

4
APPL/MLD/mld_show_melding.js
View File

@@ -300,7 +300,9 @@ function mld_show_kennisbank(data)
for (var i = 0; i < data.fixed_faq.length; i++)
{
var safequestion = $("<span>").text(data.fixed_faq[i].question).html().replace(/\n/g, "<br>");
var $newrow = $("<tr class='trlabel flexlabel flexcollapsable flexcollapsed "+data.fixed_faq[i].faq_type+"'><td class='fixedfaqquestion lhint'>" + safequestion + "</td></tr>")
var $newrow = $("<tr class='trlabel flexlabel flexssable flexcollapsed "
+data.fixed_faq[i].faq_type+(data.fixed_faq[i].extraClass?data.fixed_faq[i].extraClass:"")
+"'><td class='fixedfaqquestion lhint'>" + safequestion + "</td></tr>")
.click(function () {
$(this).next().toggle();
$(this).toggleClass('flexcollapsed');