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

DJIN#37690 conflicting function names & removed flag filtering from opdr list's called from melding screens

Browse Source 
svn path=/Website/trunk/; revision=34588
This commit is contained in:
Koen Reefman
2017-07-11 08:31:05 +00:00
parent 7b67044212
commit 753560d8bc
7 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/mld_list.inc
View File

@@ -626,7 +626,7 @@ function mld_list (pautfunction, params)
else
var flagimg = "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa fa-circle mldflag"+flagkey+"'>";
// Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleFlag(event, "+ mldkey +");'":"")
displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleMldFlag(event, "+ mldkey +");'":"")
+ " title='"+safe.htmlattr(ttl)+"'>"
+ flagimg
+ "<span style='display:none'>"+(flagkey||999)+"</span></div>";

6
APPL/MLD/mld_list.js
View File

@@ -175,7 +175,7 @@ function mld_terugzet(rowArray, isMulti)
});
}
function toggleFlag(evt, mld_key)
function toggleMldFlag(evt, mld_key)
{
FcltMgr.stopPropagation(evt);
@@ -186,12 +186,12 @@ function toggleFlag(evt, mld_key)
protectRequest.dataToken(data);
$.post("../mld/mld_flag.asp"
, data
, FcltCallbackAndThen(setFlag)
, FcltCallbackAndThen(setMldFlag)
, "json"
);
}
function setFlag(data)
function setMldFlag(data)
{ // Zet de flag en het volgnummer van de flag.
var mld_key = data.mld_key;
var flagkey = data.newflag;

3
APPL/MLD/mld_search_list.asp
View File

@@ -18,8 +18,8 @@
<!--#include file="../Shared/common.inc" -->
<!--#include file="mld_list.inc" -->
<!--#include file="mld_groep_list.inc" -->
<!--#include file="opdr_list.inc" -->
<!--#include file="mld_groep_list.inc" -->
<%
// ROLE and ACTION parameters
@@ -278,6 +278,7 @@ else
// Er zijn geen intern/extern vinkjes aanwezig. Dan zowel interne als ezterne tonen.
params.internuit = true;
params.externuit = true;
params.flags = {}; // DJIN#37690 temporarily until opdr flag-filters are implemented in mld screens
opdr_list ( params );
}
%>

2
APPL/MLD/opdr_list.inc
View File

@@ -523,7 +523,7 @@ function opdr_list(params)
{
var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
// Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
displ = "<div" + ((urole == "bo" || urole == "fo") ? " onclick='toggleFlag(event, "+ opdrkey +");'":"")
displ = "<div" + ((urole == "bo" || urole == "fo") ? " onclick='toggleOpdrFlag(event, "+ opdrkey +");'":"")
+ " title='"+safe.htmlattr(ttl)+"'>"
+ "<i id='opdrflag"+opdrkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" opdrflag"+flagkey+"'></i>"
+ "<span style='display:none'>"+(flagkey||999)+"</span></div>";

10
APPL/MLD/opdr_list.js
View File

@@ -93,7 +93,7 @@ function opdr_list_invoice(row)
}
}
function toggleFlag(evt, opdr_key)
function toggleOpdrFlag(evt, opdr_key)
{
FcltMgr.stopPropagation(evt);
@@ -104,20 +104,20 @@ function toggleFlag(evt, opdr_key)
protectRequest.dataToken(data);
$.post("../mld/opdr_flag.asp"
, data
, FcltCallbackAndThen(setFlag)
, FcltCallbackAndThen(setOpdrFlag)
, "json"
);
}
function setFlag(data)
function setOpdrFlag(data)
{ // Zet de flag en het volgnummer van de flag.
var opdr_key = data.opdr_key;
var flagkey = data.newflag;
var flagClass = "fa fa-circle opdrflag"+flagkey;
$("#opdrflag"+opdr_key).attr("flagkey", flagkey)
.attr("class", flagClass)
.parent().attr("title", L("lcl_opdr_flag"+flagkey));
.attr("class", flagClass)
.parent().attr("title", L("lcl_opdr_flag"+flagkey));
$("#opdrflag"+opdr_key).next().text(flagkey||999); // Hidden span voor sorteren
$("#opdrtable th").removeClass("sorttable_sorted sorttable_sorted_reverse"); // sortable cache't namelijk
}

10
APPL/RES/res_list.inc
View File

@@ -246,7 +246,7 @@ function res_list (pautfunction, params)
else
var flagimg = "<i id='resflagimg"+reskey+"' flagkey='"+flagkey+"' class='fa fa-circle resflag"+flagkey+"'>";
// Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleFlag(event, "+ reskey +");'":"")
displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleResFlag(event, "+ reskey +");'":"")
+ " title='"+safe.htmlattr(ttl)+"'>"
+ flagimg
+ "<span style='display:none'>"+(flagkey||999)+"</span></div>";
@@ -963,7 +963,7 @@ function res_list (pautfunction, params)
{ // verwijderd
rowclass = "deleted";
}
if (oRs("verval").Value == 0 || oRs("dirtlevel").Value != 0)
{ // dirty!
if (frontend)
@@ -974,7 +974,7 @@ function res_list (pautfunction, params)
{
rowclass += " res_fatal";
}
}
}
var res_recent = new Date(oRs("recentdatum").Value);
if (res_recent > recent)
@@ -999,10 +999,10 @@ function res_list (pautfunction, params)
function fncolStatus(oRs) {
var foStatKey = oRs("res_status_fo_key").value;
if (oRs("dirtlevel").Value != 0 && frontend)
foStatKey = -1;
return res.getfostatustext(foStatKey);
}

6
APPL/RES/res_list.js
View File

@@ -145,7 +145,7 @@ function insAdapt(row)
L("lcl_ins_adapt"));
}
function toggleFlag(evt, resRsvRuimteKey)
function toggleResFlag(evt, resRsvRuimteKey)
{
FcltMgr.stopPropagation(evt);
@@ -156,12 +156,12 @@ function toggleFlag(evt, resRsvRuimteKey)
protectRequest.dataToken(data);
$.post("../res/res_flag.asp"
, data
, FcltCallbackAndThen(setFlag)
, FcltCallbackAndThen(setResFlag)
, "json"
);
}
function setFlag(data)
function setResFlag(data)
{ // Zet de flag en het volgnummer van de flag.
var rsv_ruimte_key = data.rsv_ruimte_key;
var flagkey = data.newflag;