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

UWVA#85040 Vraag over kennisbankitem 73376 en locatie/gebouw koppeling in Betaomgeving

Browse Source 
svn path=/Website/branches/v2024.2/; revision=65973
This commit is contained in:
Erik Groener
2024-08-21 09:46:07 +00:00
parent 65a1dbfe90
commit 482a6c315d
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/BEZ/bez.inc
View File

@@ -941,9 +941,6 @@ bez =
var canFAQUSEread = user.checkAutorisation("WEB_FAQUSE", true);
var canFAQFOFread = user.checkAutorisation("WEB_FAQFOF", true);
var zonder_plaats = "NOT EXISTS (SELECT ''"
+ " FROM alg_algfaq af"
+ " WHERE af.fac_faq_key = ff.fac_faq_key)";
if (has.loc || has.alg)
{
var sql_select = " , 1 rank"
@@ -954,7 +951,7 @@ bez =
+ " , fac_faq_displaymode displaymode";
var sql_from = " , alg_algfaq af"
+ " , alg_v_onroerendgoed og";
var plaats_filter_arr = [];
var plaats_filter_arr = ["af.alg_algfaq_key IS NULL"]; // Voor plaats-scope-loze items: altijd.
if (has.loc)
plaats_filter_arr.push(" (af.alg_locatie_key = " + loc_key + " AND af.alg_onroerendgoed_keys IS NULL)");
if (has.alg)
@@ -963,10 +960,9 @@ bez =
? " AND BITAND(ff.fac_faq_displaymode, 32) <> 0" // Minstens 32 (pop-up BEZ)
: " AND ff.fac_faq_displaymode <> 0" // Minstens iets;
)
+ " AND ff.fac_faq_key = af.fac_faq_key"
+ " AND ff.fac_faq_key = af.fac_faq_key(+)"
+ " AND af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)"
+ " AND ( (" + plaats_filter_arr.join(" OR ") + ")"
+ " OR (" + zonder_plaats + ")"
+ " )";
}
else
@@ -978,8 +974,7 @@ bez =
var sql_where = ( is_popup
? " AND BITAND(ff.fac_faq_displaymode, 32) <> 0" // Minstens 32 (pop-up BEZ)
: " AND ff.fac_faq_displaymode <> 0" // Minstens iets;
)
+ " AND "+ zonder_plaats;
);
}
if ((has.loc || has.alg) && (!is_popup || showall || changed >= 2))

2
APPL/BEZ/bez_edit_afspraak.js
View File

@@ -739,7 +739,7 @@ function callback_faq_info_once(data)
if (!window.cleared || window.cleared == 3) {
url += "&showall=1";
}
FcltMgr.openModalDetail(url, L("lcl_bez_faq_stdmanswers"), { height: 200, width: 700, callback: bez_faq_list_callback } );
FcltMgr.openModalDetail(url, L("lcl_mld_faq_stdmanswers"), { height: 200, width: 700, callback: bez_faq_list_callback } );
}
show_fixed_faq("bezFaq", data.changed, data.fixed_faq, faq_max_results_bez);

7
APPL/FAC/fac_faq_list.asp
View File

@@ -135,6 +135,12 @@ function make_faq_list (searchtext, ororand)
+ " , (SELECT itd.ins_discipline_omschrijving"
+ " FROM ins_tab_discipline itd"
+ " WHERE itd.ins_discipline_key = f.faq_ins_discipline_key) discipline_omschrijving"
+ " , 'M:' || CASE WHEN BITAND(f.fac_faq_displaymode, 1)=0 THEN '-' ELSE 'A' END" // zichtbaar in kb-info blok
+ " || CASE WHEN BITAND(f.fac_faq_displaymode, 2)=0 THEN '-' ELSE 'P' END ||' '||" // zichtbaar in pop-up
+ " 'O:' || CASE WHEN BITAND(f.fac_faq_displaymode, 4)=0 THEN '-' ELSE 'A' END"
+ " || CASE WHEN BITAND(f.fac_faq_displaymode, 8)=0 THEN '-' ELSE 'P' END ||' '||"
+ " 'A:' || CASE WHEN BITAND(f.fac_faq_displaymode,16)=0 THEN '-' ELSE 'A' END"
+ " || CASE WHEN BITAND(f.fac_faq_displaymode,23)=0 THEN '-' ELSE 'P' END zichtbaar_voor"
+ " FROM fac_faq f"
+ " WHERE 1 = 1"
+ (!faq_terminated
@@ -452,6 +458,7 @@ function make_faq_list (searchtext, ororand)
rst.addColumn(new Column({caption: L("lcl_faq_ingevoerd"), content: "aangepastdoor"}));
}
rst.addColumn(new Column({caption: L("lcl_faq_vervaldatum"), content: "fac_faq_vervaldatum", datatype: "date", nowrap: true}));
//rst.addColumn(new Column({caption: "Weergeven bij", content: "zichtbaar_voor", nowrap: true})); // tonen wanneer een kb-item zichtbaar is. hierop kunnen filteren.
rst.addAction({ action: "faq_edit", caption: L("lcl_edit"), isDefault: true } );
var cnt = rst.processResultset();