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

KFSG#77696 savepoint, flexexpressies OVERAL ! (ook mobile)

Browse Source 
svn path=/Website/trunk/; revision=59935
This commit is contained in:
Koen Reefman
2023-04-07 15:10:13 +00:00
parent 583be6e5e3
commit 3dcc62fd14
12 changed files with 39 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/FAC/fac_edit_faq.asp
View File

@@ -129,14 +129,7 @@ var authparams = user.checkAutorisation(authFuncs);
{
var s = "load_kenmerk.asp?faq_key=<%=faq_key%>"
+ "&disc_key=" + disc_key;
$.get(s, function (data)
{
$(".flexblock").remove();
var $data = $(data);
$("#faqFlexList").after($data);
$(".initTriggerChange:first", $data).change();
FcltMgr.resized();
});
$.get(s, flexReloaded);
}
$(function()
@@ -258,7 +251,7 @@ var authparams = user.checkAutorisation(authFuncs);
});
BLOCK_END();
%> <div id="faqFlexList"></div><% // Flex-marker div voor dynamisch herladen
%> <flex-marker></flex-marker><% // Flex-marker div voor dynamisch herladen
IFACE.FORM_END();
%>
</form>

11
APPL/INS/ins_deel_free.asp
View File

@@ -323,12 +323,7 @@ else
+ "&reado=0"
+ "&lendout=1"
+ "&srtdeel_arr=";
$.get(s, function (data)
{
$(".flexblock").remove();
$("#insFlexList").after(data);
FcltMgr.resized(window);
});
$.get(s, flexReloaded);
}
function onChangeGebouw()
@@ -692,9 +687,7 @@ else
</script>
<% }
// Einde clientside code voor het bovenstaande block.
%>
<div id="insFlexList"></div>
<%
if (ingesloten.length <= 1)
{ %>
<%

2
APPL/INS/ins_edit_deel.asp
View File

@@ -1042,8 +1042,6 @@ var ins_deel_aantal = 1;
if (urole != "fo" || uitleen_flex_present) // FO ziet ze alleen als er uitleen flex zijn?
{
%><div id='insFlexList'></div><% // Wrapper div voor dynamisch herladen
generateFlexKenmerkBlock({urole: urole,
ins_key: copy? ins_copy_key : ins_key,
srtdeelkey_array: srtdeel_key > 0? [srtdeel_key] : [],

10
APPL/INS/ins_edit_deel.js
View File

@@ -114,15 +114,7 @@ function loadKenmerk()
+ "&urole=" + urole
+ "&bewerkniveau=D";
$.get(s, function (data)
{
$(".flexblock").remove();
var $data = $(data);
$("#insFlexList").after($data);
// initial trigger after load
$(".initTriggerChange:first", $data).change();
FcltMgr.resized();
});
$.get(s, flexReloaded);
}
function onChangeDept(p_key)

4
APPL/INS/load_kenmerksrtcontrole.asp
View File

@@ -21,13 +21,13 @@ var DOCTYPE_Disable = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../pda/iface.inc" -->
<!-- #include file="ins_flexkenmerksrtcontrole.inc" -->
<%
var deelsrtcont_key = getQParamInt("deelsrtcont_key", -1);
var srtcont_key = getQParamInt("srtcont_key", -1);
var ismobile = getQParamInt("mobile", 0) == 1;
var ismobile = getQParamInt("mobile", 0) == 1;
if (!ismobile)
{ // In mobile mogen geen tabel tags voorkomen

11
APPL/MLD/mld_2faq.asp
View File

@@ -37,14 +37,7 @@ var authparams = user.checkAutorisation("WEB_FAQFOF");
{
var s = "../fac/load_kenmerk.asp?faq_key=-1"
+ "&disc_key=" + disc_key;
$.get(s, function (data)
{
$(".flexblock").remove();
var $data = $(data);
$("#faqFlexList").after($data);
$(".initTriggerChange:first", $data).change();
FcltMgr.resized();
});
$.get(s, flexReloaded);
}
async function faq_save()
@@ -112,7 +105,7 @@ var authparams = user.checkAutorisation("WEB_FAQFOF");
);
CHECKBOXTR(L("lcl_faq_stdmelding"), "", "fac_link", 1, {});
MODAL_BLOCK_END();
%> <div id="faqFlexList"></div><% // Flex-marker div voor dynamisch herladen.
%> <flex-marker></flex-marker><% // Flex-marker div voor dynamisch herladen.
var buttons = [ {title: L("lcl_submit"), icon: "fa-fclt-save", action: "faq_save()", importance: 1 },
{title: L("lcl_cancel"), icon: "fa-fclt-cancel", action: "faq_cancel()", importance: 3 } ];

5
APPL/MLD/mld_edit_melding.asp
View File

@@ -1688,10 +1688,7 @@ SUBFRAME_START();
BLOCK_END();
} // \mldOmschrijving
else if (id == "mldFlex")
{ %>
<div id='mldFlexList' class='flexlist'></div><!--mldFlexList-->
<% // Marker div voor dynamisch herladen
{
var flexParams = {stdm_arr: mld_melding.stdm_key > 0?[mld_melding.stdm_key]:[],
mld_key: mld_copy_key > 0 ? mld_copy_key : mld_key,
copy: mld_copy_key > 0 ? 1 : null,

18
APPL/MLD/mld_edit_melding.js
View File

@@ -176,22 +176,8 @@ function loadKenmerk()
+ (copy? "&copy=1" : "")
+ (mld_key > 0 && !canFlexChange? "&reado=1" : "")
+ "&prs_key=" + prs_key;
$.get(s, function (data)
{
$(".flexblock").remove();
$("#mldFlexList").after(data);
FcltMgr.resized ();
var $change_event_field = $(".initTriggerChange[onchange]:first");
// first field is -not- a suggest, trigger change()
if ($change_event_field.length > 0)
{
$change_event_field.change();
}
// first field is a suggest, trigger blur()
else
{
$(".initTriggerChange[onblur]:first").blur();
}
$.get(s, data => {
flexReloaded(data);
if (copy)
make_attachments_readonly();
});

14
APPL/MLD/mld_forward.asp
View File

@@ -177,15 +177,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
+ "&prs_key=" + user_key
+ "&act_key=-1"
+ "&forward=1";
$.get(s, function (data)
{
$(".flexblock").remove();
var $data = $(data);
$("#mldFlexList").after($data);
// initial trigger after .load
$(".initTriggerChange:first", $data).change();
FcltMgr.resized();
});
$.get(s, flexReloaded);
}
function onChangeStdMelding(stdmelding_key)
@@ -421,9 +413,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
MODAL_BLOCK_END() %>
<div id="mldFlexList">
<% /* Wrapper div voor dynamisch herladen */ %>
</div>
<flex-marker></flex-marker><% /* Hier komen de kenmerken */ %>
<% MODAL_BLOCK_START("mldBehandel", L("lcl_mld_note"), { icon: "fa-clipboard-list-check" });
RWTEXTAREATR("opmerk",

7
APPL/PDA/ins_inspect.asp
View File

@@ -495,10 +495,7 @@ else
function onChangeSrtControle()
{
var s = "../ins/load_kenmerksrtcontrole.asp?srtcont_key=" + $("#srtcont_key_arr").val() + "&mobile=1";
$("#insFlexList").load(s, function(data)
{
FcltMgr.resized(window);
});
$.get(s, function (data) { flexReloaded(data, true); });
}
<%
if (qrc && submit && nested == 1 && this_ins.canInspFinish)
@@ -602,12 +599,10 @@ else
RWFIELD("opmerk", L("lcl_remark"), ins_deelsrtcontrole_opmerking, {multi: true});
%> <div id="insFlexList"><% // Wrapper div voor dynamisch herladen
generateFlexKenmerkBlock({deelsrtcontrole_key: deelsrtcont_key,
srtcontrole_key: srtcontrole_key,
mobile: true
});
%> </div><%
}
CONTROLGROUP_START();

16
APPL/Shared/kenmerk_common.inc
View File

@@ -1904,7 +1904,8 @@ function mobileBijlagen (tpfield, tpprops, tpparams)
tkv += ' <span class="' + (tpfield.kkenmerktype == 'M' ? '' : 'single ') + 'add_attachment">';
tkv += BUTTON_HTML(L("lcl_select_file_mobile") + (tpfield.kdimensie ? " (" + safe.html(tpfield.kdimensie) + ")" : ""), {
"id": tpprops.nameprefix + tpfield.idCounter + "val",
"cls": (tpfield.isSqlExpr ? " flexsql" : "") + (tpfield.isExpression ? " expression " + (tpfield.isShowExpr ? "flexshow" : "flexexpr") : ""),
"cls": (tpfield.isSqlExpr ? " flexsql" : "") + (tpfield.isExpression ? " expression " + (tpfield.isShowExpr ? "flexshow" : "flexexpr") : "")
+ " ui-link ui-btn ui-btn-b ui-icon-" + btn_icon + " ui-btn-icon-left ui-shadow ui-corner-all ui-mini", /* Dynamsch herladen voegt deze classes niet in */
"dataicon": btn_icon,
"click": "FcltMgr.stopPropagation(); $('#attachments"+tpfield.kkey+"').trigger('click')"
});
@@ -2132,6 +2133,9 @@ function listKenmerk(sql, module, pkey, props)
if (props.kenmerk_search)
kenmerk_write("<table class='fcltblocktab'>");
else if (!props.reado) { // Leave a marker for dynamic (re)loading of kenmerken
kenmerk_write("<flex-marker></flex-marker>"); // Custom elementje
}
var hasfilter_cnt = 0;
for (i = 1; hasAnyKenmerk && !oRs.eof; i++)
@@ -2760,11 +2764,6 @@ function listKenmerk(sql, module, pkey, props)
kenmerk_write('\n</tr>');
}
if (__insideblock > 0) {
kenmerk_write(BLOCK_END_HTML());
__insideblock = 0;
}
// Wat 'globale' data voor calculateFlexExpressions()
if (hasAnyFlexExpr) { %>
<input type="hidden" id="<%=props.nameprefix%>_data"
@@ -2775,6 +2774,11 @@ function listKenmerk(sql, module, pkey, props)
data-extraserie="<%=props.extraserie ? props.extraserie : 0%>">
<% }
if (__insideblock > 0) {
kenmerk_write(BLOCK_END_HTML());
__insideblock = 0;
}
// Eventuele scripts moeten buiten de </table>
if (anyCollapsible && !props.mobile && !props.kenmerk_search)
{

15
APPL/Shared/kenmerk_js.asp
View File

@@ -326,6 +326,19 @@ function xmlNodeDetails(key, xmlnode)
FcltMgr.openDetail(url, L("lcl_bes_srtprod"), {callback: FcltMgr.reload});
}
async function flexReloaded(data, mobile) {
if (mobile) {
$("[id^=flx_]").remove();
} else {
$(".flexblock").remove();
}
$("flex-marker").replaceWith(data);
let fld = $("flex-marker").parent().find("[id$=_data][data-module]")[0]; // #k_data
if (fld) { // Dit veld is er alleen als er expressies aanwezig zijn
await calculateFlexExpressions(fld);
}
}
var fvalid; // definition of fvalid in case a HTML element uses its value without declaring first
$(function() {
calculateFlexExpressions(undefined, true);
@@ -469,7 +482,7 @@ function calculateFlexExpressions(field, showOnly)
$forms = $("form");
} else {
$forms = $(field.form);
var nameprefix = field.id.replace(/^Suggest/, '').replace(/\d+(_show|val)$/, '');
var nameprefix = field.id.replace(/^Suggest/, '').replace(/(_data|\d+(_show|val))$/, '');
}
$forms.each((index, form) => { // Dit moet toch per formulier gebeuren, ook al is het er maar 1, nu zijn we future-proof