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

MNNL#73376 Kennisbank-items (gebouwafhankelijk) bij bezoekersafspraak tonen

Browse Source 
svn path=/Website/trunk/; revision=64991
This commit is contained in:
Erik Groener
2024-06-05 12:10:36 +00:00
parent e280492bf3
commit 964c4f4343
4 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
APPL/BEZ/bez.inc
View File

@@ -933,7 +933,7 @@ bez =
faq_info: function _faq_info(loc_key, alg_key_arr, changed, is_popup, showall)
{
var has = { loc: loc_key && loc_key != -1
, alg: alg_key_arr.length && alg_key_arr.length > 0
, alg: alg_key_arr && alg_key_arr.length && alg_key_arr.length > 0
};
var result = { fixed_faq: []
, popup_faq: false
@@ -941,6 +941,9 @@ 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"
@@ -959,12 +962,14 @@ bez =
if (has.alg)
plaats_filter_arr.push(" (af.alg_onroerendgoed_keys IN (" + alg_key_arr + "))");
var sql_where = ( is_popup
? " AND BITAND(ff.fac_faq_displaymode, 32) = 32" // Minstens 2 (pop-up 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 af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)"
+ " AND (" + plaats_filter_arr.join(" OR ") + ")";
+ " AND ( (" + plaats_filter_arr.join(" OR ") + ")"
+ " OR (" + zonder_plaats + ")"
+ " )";
}
else
{
@@ -975,18 +980,15 @@ bez =
+ " , fac_faq_displaymode displaymode";
var sql_from = "";
var sql_where = ( is_popup
? " AND BITAND(ff.fac_faq_displaymode, 32) = 32" // Minstens 2 (pop-up BEZ)
? " AND BITAND(ff.fac_faq_displaymode, 32) <> 0" // Minstens 32 (pop-up BEZ)
: " AND ff.fac_faq_displaymode <> 0" // Minstens iets;
)
+ " AND NOT EXISTS (SELECT ''"
+ " FROM alg_algfaq af"
+ " WHERE af.fac_faq_key = ff.fac_faq_key)";
+ " AND "+ zonder_plaats;
}
if ((has.loc || has.alg) && (!is_popup || showall || changed >= 2))
{
var sql_bez = faq.getkennisbank_sql(sql_select, sql_from, sql_where);
var sql = sql_bez
+ " ORDER BY fac_faq_rank DESC NULLS LAST"
+ " , fac_faq_datum DESC"
@@ -1003,36 +1005,33 @@ bez =
|| ((S("faq_kennisbank_popup") & 2) && canFAQFOFread) // Voor FO
)
{
var has = { loc: loc_key && loc_key != -1
, alg: alg_key_arr.length && alg_key_arr.length > 0
};
result.popup_faq = true;
}
}
if ((displaymode & (is_popup? 32 : 16)) == (is_popup? 32 : 16))
if ((displaymode & (is_popup? 32 : 16)) == (is_popup? 32 : 16))
{
var data = { faq_key: oRs("fac_faq_key").Value
, has_kenm: oRs("aantal_kenm").Value > 0
, question: oRs("fac_faq_question").Value
, answer: oRs("fac_faq_answer").Value
, answer2: oRs("fac_faq_answer2").Value
, displaymode: oRs("displaymode").Value
, faq_type: "faq_" + oRs("stdm_type").Value + oRs("alg_type").Value
};
var fac_url = oRs("fac_faq_url").value;
if (fac_url)
{
var data = { faq_key: oRs("fac_faq_key").Value
, has_kenm: oRs("aantal_kenm").Value > 0
, question: oRs("fac_faq_question").Value
, answer: oRs("fac_faq_answer").Value
, answer2: oRs("fac_faq_answer2").Value
, displaymode: oRs("displaymode").Value
, faq_type: "faq_" + oRs("stdm_type").Value + oRs("alg_type").Value
};
var fac_url = oRs("fac_faq_url").value;
if (fac_url)
{
var arr = fac_url.split("|");
var hurl = arr[0];
data.hlnk = arr.length>1?arr[1]:hurl;
var arr = fac_url.split("|");
var hurl = arr[0];
data.hlnk = arr.length>1?arr[1]:hurl;
if (hurl.slice(0,4) == "http") // extern
data.hurl = hurl;
else // in cust subdir
data.hurl = custpath + "/" + hurl;
}
result.fixed_faq.push(data);
if (hurl.slice(0,4) == "http") // extern
data.hurl = hurl;
else // in cust subdir
data.hurl = custpath + "/" + hurl;
}
result.fixed_faq.push(data);
}
oRs.MoveNext();
}

1
APPL/BEZ/bez_edit_afspraak.asp
View File

@@ -213,6 +213,7 @@ else
$('textarea').resize(function () { FcltMgr.resized(window) } );
$('textarea').autogrow();
$("#prktype").on("changed", showRequireAll); // trigger showRequireAll when parking info has changed
onChangeLocatie();
get_freeprk_info(1);
});

8
APPL/BEZ/bez_edit_afspraak.js
View File

@@ -731,10 +731,10 @@ function callback_faq_info(data)
function callback_faq_info_once(data)
{
var filledlevel = findFilledLevel();
/*
if (data.changed < 5 || requiredlevel <= filledlevel)
{
var url = "../fac/fac_faq.asp"
var url = "../bez/bez_faq.asp"
+ "?loc_key=" + data.loc_key
+ "&alg_key_arr=" + data.alg_key_arr.join(",")
+ "&changed=" + data.changed;
@@ -745,9 +745,9 @@ function callback_faq_info_once(data)
}
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_mld);
// window.cleared = null;
window.cleared = null;
}
function bez_faq_list_callback(data)

29
APPL/FAC/faq_increment_rank.asp Normal file
View File

@@ -0,0 +1,29 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
Increment the rank of a FAQ (kennisbankitem)
*/ %>
<%
var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->
<%
protectRequest.validateToken();
var faq_key = getFParamInt("faq_key");
var autfunction = ["WEB_FAQUSE", "WEB_FAQFOF"];
var authparams = user.checkAutorisation(autfunction);
sql = "UPDATE fac_faq"
+ " SET fac_faq_rank = COALESCE(fac_faq_rank, 0) + 1"
+ " WHERE fac_faq_key = " + faq_key;
Oracle.Execute(sql);
var result = { key: faq_key, success: true, accept: true };
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>