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

Merge 2015.1 Gold B patches

Browse Source 
svn path=/Website/trunk/; revision=25229
This commit is contained in:
Jos Groot Lipman
2015-05-19 11:36:23 +00:00
parent 92807e1f85
commit 7d2b547596
52 changed files with 332 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API/api_SOAP.asp
View File

@@ -305,7 +305,6 @@ try
sql = "BEGIN xml.make_view_xml(" + sql_params + "); END;";
Oracle.Execute(sql);
var xml_content = get_fac_xml('$AspSession$');
__Log("XML is {0} karakters. Opgehaald in {1} chunks.".format(xml_content.length, xml_content_arr.length));
}
if (API.apidata.loglevel) __Log2File(xml_content, APIname + "_DATA");

1
APPL/API/api_opdrsoap.asp
View File

@@ -634,7 +634,6 @@ for (i=0; i < opdrachten.length; i++)
__Log("Start saving: " + params.AttachPath + SafeName);
CreateFullPath(params.AttachPath);
encodedString2File(params.AttachPath + SafeName, Attachment, "bin.hex");
VB_SaveFile(params.AttachPath + SafeName, Attachment)
__Log("Done saving: " + params.AttachPath + SafeName);
}
}

10
APPL/API2/api2.inc
View File

@@ -394,8 +394,7 @@ api2 = {
var safe_val = parseInt(filterval, 10);
if (isNaN(safe_val))
{
Response.Status = "404 Not Found";
Response.End;
return ["0=1"];
}
}
break;
@@ -423,6 +422,10 @@ api2 = {
break;
case "number":
var safe_val = parseInt(filterval, 10);
if (isNaN(safe_val))
{
return ["0=1"]; // niets gevonden
}
if (filter == "range")
{
if (filterval1) {
@@ -447,8 +450,7 @@ api2 = {
var safe_val = parseInt(filterval, 10);
if (isNaN(safe_val))
{
Response.Status = "404 Not Found";
Response.End;
return ["0=1"]; // niets gevonden
}
break;
case "varchar": // Als fld.match(/^fclt_d_/) dan is het een old-style rapport filterveld

5
APPL/API2/model_reportcolumns.inc
View File

@@ -65,6 +65,11 @@ function model_reportcolumns(usrrap_key, params)
this.fields.datatype.readonly = true;
this.fields.filter.LOV = L("lcl_rap_filterLOV"); // die mag alle filters
break;
case "html":
this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");
this.fields.datatype.readonly = true;
this.fields.filter.LOV = L("lcl_rap_filterLOV");
break;
case "float":
case "number":
case "currency":

81
APPL/API2/model_reports.inc
View File

@@ -80,18 +80,21 @@ function model_reports_template()
break;
case "S":
field.sql = "SUM(" + field.dbs + ")";
field.label = L("lcl_usrrap_label_SUM").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_SUM").format(field.label);
field.total = true;
break;
case "C":
field.sql = "COUNT(" + field.dbs + ")";
field.label = L("lcl_usrrap_label_CNT").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_CNT").format(field.label);
field.newtyp = "number";
field.total = true;
break;
case "A":
field.sql = "AVG(" + field.dbs + ")";
field.label = L("lcl_usrrap_label_AVG").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_AVG").format(field.label);
field.newtyp = "float";
break;
case "H":
@@ -101,37 +104,43 @@ function model_reports_template()
field.sql = "TO_CHAR(" + field.dbs + ", 'HH24')||':00'";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_HOUR").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_HOUR").format(field.label);
break;
case "D":
field.sql = "TRUNC(" + field.dbs + ", 'DD')";
field.newtyp = "date";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_DAY").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_DAY").format(field.label);
break;
case "W":
field.sql = "TO_CHAR(" + field.dbs + ", 'YYYY-IW')";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_WEEK").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_WEEK").format(field.label);
break;
case "M":
field.sql = "TO_CHAR(" + field.dbs + ", 'YYYY-MM')";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_MONTH").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_MONTH").format(field.label);
break;
case "Q":
field.sql = "TO_CHAR(" + field.dbs + ", 'YYYY-Q')";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_QUARTER").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_QUARTER").format(field.label);
break;
case "Y":
field.sql = "TO_CHAR(" + field.dbs + ", 'YYYY')";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = L("lcl_usrrap_label_YEAR").format(field.label);
if (!field.fixedlabel)
field.label = L("lcl_usrrap_label_YEAR").format(field.label);
break;
}
}
@@ -149,12 +158,11 @@ function model_reports_template()
var query = api2.sqlfields(params, this);
params.filter.fclt_3d_user_key = user_key; // Die is gemakkelijk
this.addfixedfilters(params.filter);
var wheres = api2.sqlfilter(params, this);
query.wheres = query.wheres.concat(wheres);
this.add3d(wheres);
this.add3d(query.wheres);
query.wheres = query.wheres.concat(wheres);
var sql = "SELECT " + query.selects.join(", ")
+ " FROM " + query.tables.join(", ")
@@ -185,6 +193,31 @@ function model_reports_template()
this.REST_DELETE = false;
// Let op: wordt ook vanuit fac/fac_report.asp gebruikt voor xml-styled rapporten
// Ook: de bevroren filtervelden er bij
this.addfixedfilters = function _addfixedfilters(filter)
{
filter.fclt_3d_user_key = user_key; // Die is gemakkelijk
for (var fld in this.fields)
{
var field = this.fields[fld];
if (field.filterdefault && field.filterdefault.substr(0,2) == ':!') // Filter/fixed?
{
var defs = scf.parseDefault(field.filterdefault, field);
if (field.filter == 'like' || field.filter == 'exact' || !("filter" in field))
{
filter[fld] = defs.vmin;
}
else if (field.filter == "range")
{
filter["start_" + fld] = defs.vmin;
filter["end_" + fld] = defs.vmax;
}
}
}
};
// Let op: wordt ook vanuit fac/fac_report.asp gebruikt voor xml-styled rapporten
// Deze zijn complexer en red ik niet via addfixedfilters
this.add3d = function _add3d(wheres)
{
if (this.autfunction)
@@ -249,15 +282,16 @@ function model_reports_template()
var authparams = user.checkAutorisation("WEB_PRSSYS", true);
if (!authparams)
{
query.wheres.push("(fac_functie_key IN"
+ " (SELECT w.fac_functie_key"
+ " FROM fac_v_webgebruiker W"
+ " WHERE w.prs_perslid_key = " + user_key
+ " ) OR fac_functie_key IS NULL)");
wheres.push("(fac_functie_key IN"
+ " (SELECT w.fac_functie_key"
+ " FROM fac_v_webgebruiker W"
+ " WHERE w.prs_perslid_key = " + user_key
+ " ) OR fac_functie_key IS NULL)");
}
}
};
this.search = { title: L("lcl_usrrap_report"),
filters: [] }
}
@@ -308,14 +342,23 @@ function model_reports(fac_usrrap_key)
var label = safe.html(usrrap.columns[i].caption); // (lcl) Labels worden altijd geacht html-safe te zijn
label = label.replace(/\\n/g, "<br/>"); // Voor overulen van gewone LCL's ligt de verantwoordelijkheid
// bij een beheerder maar rapportages wordt misschien wel fe
var fixedlabel = false;
if (label && label.substr(0,1) == "!") // Als een label begint met een ! wordt hij niet aangepast bij groepperen
{
fixedlabel = true;
label = label.substr(1);
}
var field = { dbs: usrrap.columns[i].name,
label: label,
fixedlabel: fixedlabel,
typ: usrrap.columns[i].datatype.id,
group: usrrap.columns[i].group,
visible: usrrap.columns[i].visible.id
};
if (field.typ == "number" && field.dbs.match(/_key$/i)) // Vooral de FCLT_3D filters
field.typ = "key";
if (field.typ == "currency")
field.total = true;
if (field.visible == 'H' && field.dbs != keyfield) // Keyfield willen we eigenlijk altijd wel indien mogelijk
field.hidden = true;
@@ -326,7 +369,7 @@ function model_reports(fac_usrrap_key)
field.filter = { "date": "range",
"datetime": "range",
"time": "range",
"varchar": "like"
"varchar": "exact"
}[ field.typ ] || "exact";
}
else

8
APPL/BES/bes_edit_bestelling_save.asp
View File

@@ -473,9 +473,11 @@ if (status == 1 || status == 2|| status == 3 || status == 4 || status == 5)
// Nu kan daadwerkelijk de juiste status gezet worden.
if (approver_key == -1) // No fin-approval required
{
// Als orgineel nog gefiatteerd moet worden door BO (status is 3) dan zeker eerst fiatteren
if (oldStatus == 3 || ((staffel_info.totaalbedrag > bes_disc_info.disc_params_bestellimiet) &&
(isNew || bes.herfiatteren(bes_bestelling, bes_disc_info, staffel_info.totaalbedrag)))) // should BO approve?
// Als orgineel nog gefiatteerd moet worden door BO (status is 3) dan zeker eerst fiatteren.
// Tenzij het bedrag is verlaagd tot onder het approved bedrag of eerste bestellimiet bedrag. Dan kan naar de volgende status worden gegaan.
if ((oldStatus == 3 && staffel_info.totaalbedrag > bes_bestelling.approved && staffel_info.totaalbedrag > bes_disc_info.disc_params_bestellimiet) ||
((staffel_info.totaalbedrag > bes_disc_info.disc_params_bestellimiet) &&
(isNew || bes.herfiatteren(bes_bestelling, bes_disc_info, staffel_info.totaalbedrag)))) // should BO approve?
{
bes.setbestellingstatus(bes_key, 3, L("lcl_bes_fiatbyrules")); // finanicieel gefiatteerd, BO moet nog wel
// Bij wijzigen i.v.m herfiattering/heraccepteren het approved bedrag op null zetten zodat het accepteren opnieuw kan beginnen.

4
APPL/CNT/cnt_search_list_xd.asp
View File

@@ -58,7 +58,7 @@ FCLTHeader.Title(L("lcl_xd_contracts"));
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/cnt/cnt_contract.asp?cnt_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl +"appl/cnt/cnt_contract.asp?cnt_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -72,7 +72,7 @@ var gottenitems = [];
var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/contracts.json?x=1";
url = xd.SecundaryDomains[cid].apiurl + "api2/contracts.json?x=1";
// Condities toevoegen (komen van cnt_search.asp)
if (cntnum) url += "&name="+ safe.url(cntnum);

7
APPL/FAC/fac_bookmark_list.asp
View File

@@ -82,8 +82,10 @@ var showall = getQParamInt("showall", 0) == 1;
buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" });
}
var flags = 2; // Zichtbaar voor FE
if (hasPRSSYS)
flags += 1; // of zichbaar PRSSSY
var userbm = getQParamInt("userbm", 1) == 1; // Ook user-bookmarks?
var systembm = getQParamInt("systembm", 1) == 1; // Ook systeem-bookmarks?
if (hasPRSSYS && systembm)
flags += 1; // of zichtbaar PRSSYS
var sql = "SELECT fac_bookmark_id"
+ " , fac_bookmark_path"
@@ -94,6 +96,7 @@ var showall = getQParamInt("showall", 0) == 1;
+ " WHERE (fac_bookmark_expire IS NULL OR fac_bookmark_expire > SYSDATE)"
+ " AND (fac_bookmark_query NOT LIKE 'session=%' OR fac_bookmark_query IS NULL)"
+ " AND BITAND(fac_bookmark_flags, " + flags + ") <> 0"
+ (!userbm?" AND BITAND(fac_bookmark_flags, 2) = 0":"")
+ " AND fac_bookmark_xmlnode IS NULL" // die zijn van ons zelf en worden niet geacht beheerd te worden.
+ " ORDER BY fac_bookmark_naam";

4
APPL/FAC/fac_fiattering_list_xd.asp
View File

@@ -53,7 +53,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"] });
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/mld/mld_melding.asp?mld_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl +"appl/mld/mld_melding.asp?mld_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -67,7 +67,7 @@ var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/approvals.json?x=1";
url = xd.SecundaryDomains[cid].apiurl + "api2/approvals.json?x=1";
//lokaal testen: url = "http://<cust>.sgf12/facilitor5iwork/appl/api2/approvals.html
// Condities toevoegen (komen van fac_fiattering_search.asp)

64
APPL/FAC/fac_fiattering_search.asp
View File

@@ -35,7 +35,7 @@ var getClosed = getQParamInt("close", 0) == 1;
var getRejected = getQParamInt("reject", 0) == 1;
if (!getOpen && !getClosed && !getRejected)
getOpen = true;
var betreft = getQParam("betreft", ""); // Betreft module BES, CNT, FIN, MLDOF of MLDOP.
var betreft = getQParamArray("betreft", []); // Betreft module BES, CNT, FIN, MLDOF of MLDOP.
%>
<html>
@@ -113,33 +113,41 @@ var betreft = getQParam("betreft", ""); // Betreft module BES, CNT, FIN, MLDOF o
<td class="searchkolom2">
<table><!-- x rijen, 2 kolommen: label + veld -->
<!-- Opdrachttype -->
<% sql = "SELECT 'BES'"
+ ", " + safe.quoted_sql(L("lcl_fin_bestellingen")) + " FROM DUAL"
+ " UNION"
+ " SELECT 'CNT'"
+ ", " + safe.quoted_sql(L("lcl_fin_contracten"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'FIN'"
+ ", " + safe.quoted_sql(L("lcl_fin_invoices"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'MLDOF'"
+ ", " + safe.quoted_sql(L("lcl_fin_offertes"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'MLDOP'"
+ ", " + safe.quoted_sql(L("lcl_fin_opdrachten"))
+ " FROM DUAL"
+ " ORDER BY 2";
FCLTselector("betreft",
sql,
{ initKey: betreft,
label: L("lcl_fac_betreft"),
trclass: "primsearch",
emptyOption: L("lcl_all"),
emptyKey: ""
});
<%
if (betreft.length > 1)
{
%><input type='hidden' name='betreft' value='<%=safe.htmlattr(betreft.join(","))%>'><%
}
else
{
sql = "SELECT 'BES'"
+ ", " + safe.quoted_sql(L("lcl_fin_bestellingen")) + " FROM DUAL"
+ " UNION"
+ " SELECT 'CNT'"
+ ", " + safe.quoted_sql(L("lcl_fin_contracten"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'FIN'"
+ ", " + safe.quoted_sql(L("lcl_fin_invoices"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'MLDOF'"
+ ", " + safe.quoted_sql(L("lcl_fin_offertes"))
+ " FROM DUAL"
+ " UNION"
+ " SELECT 'MLDOP'"
+ ", " + safe.quoted_sql(L("lcl_fin_opdrachten"))
+ " FROM DUAL"
+ " ORDER BY 2";
FCLTselector("betreft",
sql,
{ initKey: betreft.length?betreft[0]:null,
label: L("lcl_fac_betreft"),
trclass: "primsearch",
emptyOption: L("lcl_all"),
emptyKey: ""
});
}
sql = "SELECT mld_typeopdr_key"
+ ", mld_typeopdr_omschrijving"
+ " FROM mld_typeopdr"

3
APPL/FAC/fac_report.asp
View File

@@ -56,7 +56,8 @@
scaffolding_list = function _styled_report_scaffolding_list(model, scf_params)
{
var xxx_params = { filter : scf_params.filter || api2.qs2json() };
xxx_params.filter.fclt_3d_user_key = user_key; // Die is gemakkelijk
rapport.addfixedfilters(xxx_params.filter);
var wheres = api2.sqlfilter(xxx_params, rapport);
rapport.add3d(wheres);

1
APPL/FAC/fac_report_worker.asp
View File

@@ -17,6 +17,7 @@ JSON_Result = true;
<!-- #include file="../api2/api2.inc" -->
<!-- #include file="../api2/model_reports.inc" -->
<!-- #include file="../api2/model_reportsx.inc" -->
<!-- #include file="../scf/scaffolding_common.inc" -->
<%
var usrrap_key = getQParamInt("usrrap_key");
var rapport = model_reports(usrrap_key);

4
APPL/FAC/prodsearch.asp
View File

@@ -61,7 +61,9 @@ if (filter.s.val.match(/^#+/)) // objecten
if (filter.s.val.replace("&amp;", "&") == L("lcl_search_product").replace("&amp;", "&")) filter.s.val = "";
var counter_key = shared.registeraction("search", { info: filter.s.val });
var counter_key = -1;
if (filter.s.val)
counter_key = shared.registeraction("search", { info: filter.s.val });
supper = filter.s.val.toUpperCase();
var showall = getQParamInt("showall", 0) == 1;

4
APPL/FIN/fin_search_list_xd.asp
View File

@@ -55,7 +55,7 @@ var sd = <%=JSON.stringify(xd.SecundaryDomains)%>;
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/fin/fin_factuur.asp?fin_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl +"appl/fin/fin_factuur.asp?fin_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -68,7 +68,7 @@ if (!myAPIKEY) shared.simpel_page(L("lcl_xd_crossdomain_noapikey"));
var gottenitems = [];
var url = "";
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/invoices.json?scope="+urole;
url = xd.SecundaryDomains[cid].apiurl + "api2/invoices.json?scope="+urole;
// Condities toevoegen (komen van fin_search.asp)
if (finnum) url += "&name="+ finnum;

4
APPL/INS/ins_search_list_xd.asp
View File

@@ -65,7 +65,7 @@ FCLTHeader.Title(L("lcl_xd_objects"));
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/ins/ins_deel.asp?ins_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl +"appl/ins/ins_deel.asp?ins_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -80,7 +80,7 @@ var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/objects.json?scope="+urole;
url = xd.SecundaryDomains[cid].apiurl + "api2/objects.json?scope="+urole;
//lokaal testen: url = "http://<cust>.sgf12/facilitor5iwork/appl/" + "api2/objects.json?scope="+urole;
// Condities toevoegen (komen van mld_search.asp)

6
APPL/Localscripts/num2curr.js
View File

@@ -10,7 +10,7 @@ function num2curr(s) {
return s;
}
// Altijd punt als decimaalscheider. HTML5 achtige browsers doen anders moeilijk
// Met eventueel gewenste decimaalscheider (punt of komma) maar
// nooit 1000-scheiders
function num2currEditable(fnum, decimals)
{
@@ -20,6 +20,10 @@ function num2currEditable(fnum, decimals)
if (typeof decimals == "undefined")
decimals = 2;
fnum = fnum.toFixed(decimals);
var waarde2 = (1.5).toLocaleString(); // Eventueel gewenste komma.
fnum = fnum.substring(0, fnum.length - decimals - 1) + waarde2.substring(2, 1) + fnum.substring(fnum.length - decimals);
return fnum;
}

3
APPL/MLD/mld_accept_confirm.asp
View File

@@ -65,6 +65,9 @@ for (var i = 0; i < mld_key_arr.length; i++)
}
}
user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel en enkele niet
var mld_melding = mld.mld_melding_info(ingesloten[0]); // Neem voor informatie de eerste melding.
lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
%>
<html>
<head>

14
APPL/MLD/mld_close_confirm.asp
View File

@@ -218,19 +218,19 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var _imgstr2 = '';
BLOCK_START("mldClose", txt + L("lcl_mld_finish_close") + (ingesloten.length == 1? " " + prefix + ingesloten[0]: "") + _imgstr2);
sql = "SELECT *"
+ " FROM mld_afmeldtekst"
+ " WHERE mld_stdmelding_key IS NULL"
+ " OR mld_stdmelding_key IN (" + stdmld_arr.join(",") + ")";
var sql_from = " FROM mld_afmeldtekst"
+ " WHERE (mld_stdmelding_key IN (" + stdmld_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IN (" + disc_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IS NULL)";
var sql = "SELECT 1"
+ sql_from;
oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
sql = "SELECT mld_afmeldtekst_key"
+ " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key')
+ " , " + lcl.xsql('mld_afmeldtekst_omschrijving', 'mld_afmeldtekst_key') + " afmeldtekstoms"
+ " FROM mld_afmeldtekst"
+ " WHERE mld_stdmelding_key IS NULL"
+ " OR mld_stdmelding_key IN (" + stdmld_arr.join(",") + ")"
+ sql_from
+ " ORDER BY 2";
FCLTselector("stdopmerk",
sql,

7
APPL/MLD/mld_search_list_xd.asp
View File

@@ -75,7 +75,7 @@ FCLTHeader.Title(L("lcl_xd_issues"));
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url + "appl/mld/mld_melding.asp?mld_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl + "appl/mld/mld_melding.asp?mld_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -90,7 +90,7 @@ var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/issues.json?scope="+urole;
url = xd.SecundaryDomains[cid].apiurl + "api2/issues.json?scope="+urole;
//lokaal testen: url = "http://<cust>.sgf12/facilitor5iwork/appl/" + "api2/issues.json?scope="+urole;
// Condities toevoegen (komen van mld_search.asp)
@@ -115,7 +115,8 @@ for (var cid in xd.SecundaryDomains) {
if ((frontend && st_Busy) || (fronto && st_Busy) || (backo && st_Self)) statussen.push (4, 7);
if ((frontend && st_Done) || (fronto && st_Afm) || (backo && st_Afm)) statussen.push (5);
if ((frontend && st_Done) || (fronto && st_Ver) || (backo && st_Ver)) statussen.push (6);
}
if ((frontend && st_Busy) || (fronto && st_Busy) || (backo && st_New)) statussen.push (99);
}
if (statussen.length > 0)
url += "&status="+statussen.join(',');

59
APPL/MLD/mld_show_melding.asp
View File

@@ -72,37 +72,40 @@ var urlMail = "../shared/queuemail.asp?pcode=MLDMAI&defemail_key=" + mld_melding
// Startdatum, Einddatum, Melding voor (persoon), Vakgroep en Melding (stdmelding) worden door enkele constraint op de mld_melding tabel al afgedwongen.
// Om een melding te forwarden moeten namelijk alle verplichte gegevens zijn ingevuld. Dat kan het geval zijn bij extern aangemaakte meldingen.
var emptyRequiredFields = false;
// Plaatsgegevens.
if (mld_melding.show_alg)
{
switch (mld_melding.alg_onrgoed_niveau)
// Alleen als ik de melding door kan sturen de verplichte velden checken. Niet bij het corrigeren van de vakgroep/melding (canFixMelding) vanuit de status "Afgemeld(5)".
if (this_mld.canForward)
{ // Plaatsgegevens.
if (mld_melding.show_alg)
{
case "R": emptyRequiredFields = (mld_melding.room_key == -1);
break;
case "V": emptyRequiredFields = (mld_melding.flr_key == -1);
break;
case "G": emptyRequiredFields = (mld_melding.bld_key == -1);
break;
case "L": emptyRequiredFields = (mld_melding.loc_key == -1);
break;
switch (mld_melding.alg_onrgoed_niveau)
{
case "R": emptyRequiredFields = (mld_melding.room_key == -1);
break;
case "V": emptyRequiredFields = (mld_melding.flr_key == -1);
break;
case "G": emptyRequiredFields = (mld_melding.bld_key == -1);
break;
case "L": emptyRequiredFields = (mld_melding.loc_key == -1);
break;
}
}
// Dan de velden kostenplaats, afleveradres en objecten ook maar testen of ze, als ze verplicht zijn, zijn ingevuld.
// Kostenplaats.
emptyRequiredFields = emptyRequiredFields || (mld_melding.kpnverplicht && mld_melding.kostenpl_key == -1);
// Afleveradres.
emptyRequiredFields = emptyRequiredFields || (mld_melding.show_bes && !mld_melding.deladdress);
// Objecten.
if (mld_melding.show_ins && mld_melding.srtinst_verplicht)
{ // Verplicht een objecten te selecteren.
var sql = "SELECT COUNT(*) aantal FROM mld_melding_object WHERE mld_melding_key = " + mld_key;
oRs = Oracle.Execute(sql);
var noObjSelected = oRs("aantal").Value == 0;
oRs.close();
emptyRequiredFields = emptyRequiredFields || noObjSelected;
}
// Omschrijving melding.
emptyRequiredFields = emptyRequiredFields || (mld_melding.freetext == 2 && !mld_melding.mld_omschr);
}
// Dan de velden kostenplaats, afleveradres en objecten ook maar testen of ze, als ze verplicht zijn, zijn ingevuld.
// Kostenplaats.
emptyRequiredFields = emptyRequiredFields || (mld_melding.kpnverplicht && mld_melding.kostenpl_key == -1);
// Afleveradres.
emptyRequiredFields = emptyRequiredFields || (mld_melding.show_bes && !mld_melding.deladdress);
// Objecten.
if (mld_melding.show_ins && mld_melding.srtinst_verplicht)
{ // Verplicht een objecten te selecteren.
var sql = "SELECT COUNT(*) aantal FROM mld_melding_object WHERE mld_melding_key = " + mld_key;
oRs = Oracle.Execute(sql);
var noObjSelected = oRs("aantal").Value == 0;
oRs.close();
emptyRequiredFields = emptyRequiredFields || noObjSelected;
}
// Omschrijving melding.
emptyRequiredFields = emptyRequiredFields || (mld_melding.freetext == 2 && !mld_melding.mld_omschr);
%>
<html>

3
APPL/MLD/opdr_cancel_confirm.asp
View File

@@ -29,6 +29,9 @@ user.auth_required_or_abort(opdr_key > 0); // Hebben we een opdracht key gekrege
var this_opdr = mld.func_enabled_opdracht(opdr_key); // wat mag ik zoal op deze opdracht
user.auth_required_or_abort(this_opdr.canCancel); // Mag ik deze opdracht annuleren
var mld_opdr = mld.mld_opdr_info(opdr_key);
lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
var reqStatusEmptyOpdr = [];
// Zijn bij deze opdracht alle verplichte kenmerken ingevuld?
reqStatusEmptyOpdr = mld.getReqStatusEmptyOpdr(reqStatusEmptyOpdr, opdr_key, 1); // Opdracht status "Afgewezen(1)"

2
APPL/MLD/opdr_close_save.asp
View File

@@ -129,7 +129,7 @@ else
var opdr_kosten = mld_opdr.t_cost;
// Zijn bij deze opdracht alle verplichte kenmerken ingevuld?
reqStatusEmptyOpdr = mld.getReqStatusEmptyOpdr(reqStatusEmptyOpdr, opdr_key, 6); // Opdracht status "Technisch Voltooid(6)"
reqStatusEmptyOpdr = mld.getReqStatusEmptyOpdr(reqStatusEmptyOpdr, opdr_key_arr[i], 6); // Opdracht status "Technisch Voltooid(6)"
// Als Setting S("mld_ord_afmeld_future") niet is gezet (0): Opdrachten waarvan de einddatum in de toekomst ligt mogen niet worden afgemeld.
if ((S("mld_ord_afmeld_future") == 1 || (oRs("mld_opdr_einddatum").Value < new Date())) &&

4
APPL/MLD/opdr_search_list_xd.asp
View File

@@ -59,7 +59,7 @@ FCLTHeader.Title(L("lcl_xd_orders"));
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/mld/mld_opdr.asp?opdr_key==" + lKey + "<%=S("xd_add2deeplinkurl")%>";
url = sd[lData.custid].deeplinkurl +"appl/mld/mld_opdr.asp?opdr_key==" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -74,7 +74,7 @@ var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/orders.json?scope="+urole;
url = xd.SecundaryDomains[cid].apiurl + "api2/orders.json?scope="+urole;
// Condities toevoegen (komen van opdr_search.asp)
if (opdr_id) url += "&name="+ safe.url(opdr_id);

1
APPL/PDA/melding_new.asp
View File

@@ -17,6 +17,7 @@
*/ %>
<% REGISTERMENU_Disable = true; %>
<!-- #include file="../shared/common.inc" -->
<!-- #include file="./resultset_table.inc" -->
<!-- #include file="./mobile.inc" -->

8
APPL/PDA/mld_list.asp
View File

@@ -160,7 +160,8 @@ var authparams = user.checkAutorisation(autfunction);
}
}
// apply 3D authorization to the locations and to the organisations (both ALG and PRS)
sqln = discx3d (sqln,
sqln = "("
+ discx3d (sqln,
"md.ins_discipline_key",
"di.alg_regio_key",
"l.alg_district_key",
@@ -173,7 +174,7 @@ var authparams = user.checkAutorisation(autfunction);
autfunction[0],
"",
2)
+ " UNION "
+ ") UNION ("
+ discx3d (sqln,
"md.ins_discipline_key",
"di.alg_regio_key",
@@ -186,7 +187,8 @@ var authparams = user.checkAutorisation(autfunction);
"b.prs_afdeling_key",
autfunction[1],
"",
2);
2)
+ ")";
// Alleen groepering toepassen indien er 3 of meer vakgroepen zijn en meer dan 10 meldingen.
// Bepaal aantal vakgroepen en aantal meldingen.

1
APPL/PDA/order_new.asp
View File

@@ -8,6 +8,7 @@
Parameters: mld_key
*/ %>
<% REGISTERMENU_Disable = true; %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../mld/mld.inc" -->
<!-- #include file="../Shared/Suggest/stdmeldingFilter.inc" -->

3
APPL/PDA/reservering_new.asp
View File

@@ -8,10 +8,11 @@
Parameters: rsv_ruimte_key voor bestaande deelreservering
rsv_ruimte_key=-1 voor nieuwe (deel)reservering
Note: DRAFT - TODO
Note:
*/ %>
<% REGISTERMENU_Disable = true; %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!-- #include file="../Shared/selector.inc" -->

6
APPL/PRS/kpn_overview.asp
View File

@@ -69,14 +69,16 @@ var kp_key = getQParamInt("kp_key", -1);
{ label : L("lcl_period_from"),
datum: date_from,
trclass:"primsearch",
volgnr: 1
volgnr: 1,
required: true
});
// <!-- Datum tot -->
FCLTcalendar("date_to",
{ label: L("lcl_period_to"),
datum: date_to,
trclass:"primsearch",
volgnr: 2
volgnr: 2,
required: true
});
%>

4
APPL/PRS/prs_bedrijf.asp
View File

@@ -81,6 +81,10 @@ var dienstauthparams = user.checkAutorisation("WEB_PRSMSU", true);
<% }
else
{ /* Bestaand bedrijf bewerkt, switch naar show-mode */ %>
if (params.close)
{
FcltMgr.closeDetail(window, { close: true})
}
if (!params.keepForm)
$("#prsFrame")[0].src = "prs_show_bedrijf.asp?bedrijf_key=<%=bedrijf_key%>";
<% } %>

4
APPL/PRS/prs_bedrijf_search_list_xd.asp
View File

@@ -59,7 +59,7 @@ FCLTHeader.Title(L("lcl_xd_issues"));
$(row).addClass('dirty');
var lKey = row.getAttribute("ROWKEY");
var lData = eval("(" + row.getAttribute("ROWDATA") + ")");
url = sd[lData.custid].url +"appl/prs/prs_bedrijf.asp?bedrijf_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
var url = sd[lData.custid].deeplinkurl +"appl/prs/prs_bedrijf.asp?bedrijf_key=" + lKey + "<%=S("xd_add2deeplinkurl")%>";
FcltMgr.openDetail(url, { reuse: true });
}
</script>
@@ -74,7 +74,7 @@ var url = "";
// Execute the API2 request for all domains
for (var cid in xd.SecundaryDomains) {
url = xd.SecundaryDomains[cid].url + "api2/companies.json?x=1";
url = xd.SecundaryDomains[cid].apiurl + "api2/companies.json?x=1";
// Condities toevoegen (komen van prs_bedrijf_search.asp)
if (companyName != "") url += "&name="+ safe.url(companyName);

4
APPL/PRS/prs_contactpersoon_list.inc
View File

@@ -97,7 +97,7 @@ function contactpersoon_list (params)
<%
var sql = "SELECT n.prs_contactpersoon_locatie_key"
+ " , b.prs_bedrijf_naam"
+ " , " + S("prs_contactpers_string") + " prs_contactpersoon_naam"
+ " , "+ S("prs_contactpers_string") +" prs_contactpersoon_naam"
+ " , l.alg_locatie_omschrijving"
+ " , cp.prs_contactpersoon_telefoon_1"
+ " , cp.prs_contactpersoon_telefoon_2"
@@ -133,7 +133,7 @@ function contactpersoon_list (params)
}
if (contact_name)
sql += " AND UPPER(cp.prs_contactpersoon_naam) LIKE " + safe.quoted_sql_wild(contact_name + "%");
sql += " AND UPPER("+ S("prs_contactpers_string") +") LIKE " + safe.quoted_sql_wild("%" + contact_name + "%");
if (locatiekey > 0)
sql += " AND l.alg_locatie_key = " + locatiekey;

3
APPL/PRS/prs_edit_bedrijfadres.asp
View File

@@ -55,6 +55,9 @@ else
+ " WHERE b.prs_bedrijf_key = a.prs_bedrijf_key"
+ " AND prs_bedrijfadres_key = " + badr_key
oRs = Oracle.Execute(sql);
if (oRs.Eof)
shared.record_not_found();
var prs_bdrkey = oRs("prs_bedrijf_key").value;
var prs_bdrnaam = oRs("prs_bedrijf_naam").value;
var prs_type = oRs("prs_bedrijfadres_type").value;

101
APPL/PRS/prs_edit_bedrijfadres_save.asp
View File

@@ -23,63 +23,70 @@ var autfunction = 'WEB_PRSMGT';
var authparams = user.checkAutorisation(autfunction);
user.auth_required_or_abort(authparams && authparams.PRSwritelevel < 9);
var typeopdr = -1;
if (kanaal == "O")
typeopdr = getFParamInt("prs_typeopdr", -1);
var isNew = (badr_key < 0);
var fso = new ActiveXObject("Scripting.FileSystemObject");
var xsl = getFParam("prs_xsl", "");
if (xsl && !fso.FileExists(Server.MapPath(custpath + "/" + xsl))) // Zo doet puo_xmltools/ SafeLoadFileXSL dat
abort_with_warning(xsl + " not found");
var protocol = getFParam("protocol");
var url = getFParam("prs_url");
var fields = [ { dbs: "prs_bedrijfadres_type", typ: "varchar", frm: "prs_type" }
, { dbs: "mld_typeopdr_key", typ: "key", val: typeopdr }
, { dbs: "prs_bedrijfadres_url", typ: "varchar", val: protocol + url}
, { dbs: "prs_bedrijfadres_username", typ: "varchar", frm: "prs_username" }
, { dbs: "prs_bedrijfadres_password", typ: "varchar", frm: "prs_password" }
, { dbs: "prs_bedrijfadres_ordermode", typ: "number", frm: "prs_ordermode" }
, { dbs: "prs_bedrijfadres_certificate", typ: "varchar", frm: "prs_cert" }
, { dbs: "prs_bedrijfadres_xsl", typ: "varchar", frm: "prs_xsl" }
, { dbs: "prs_bedrijfadres_ext", typ: "varchar", frm: "prs_ext" }
, { dbs: "prs_bedrijfadres_attachfile", typ: "varchar", frm: "bijlage" }
, { dbs: "prs_bedrijfadres_flexfiles" , typ: "number", frm: "flexfiles" }
];
var isDeleted = false;
var warning = "";
if (badr_key > 0)
if ((badr_key > 0) && (kanaal == "X"))
{
if (kanaal == "X")
{
sql = "DELETE FROM prs_bedrijfadres"
+ " WHERE prs_bedrijf_key = " + bedrijf_key
+ " AND prs_bedrijfadres_key = " + badr_key;
isDeleted = true;
}
else
{
sql = buildUpdate("prs_bedrijfadres", fields)
+ " prs_bedrijfadres_key = " + badr_key;
}
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
else
{
fields.push( { dbs: "prs_bedrijf_key", typ: "key", val: bedrijf_key } );
fields.push( { dbs: "prs_bedrijfadres_key", typ: "key", seq: "prs_s_prs_bedrijfadres_key" });
var regIns = buildInsert("prs_bedrijfadres", fields);
var badr_key = regIns.sequences["prs_bedrijfadres_key"];
sql = regIns.sql;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
var typeopdr = -1;
if (kanaal == "O")
typeopdr = getFParamInt("prs_typeopdr", -1);
var isNew = (badr_key < 0);
var fso = new ActiveXObject("Scripting.FileSystemObject");
var xsl = getFParam("prs_xsl", "");
if (xsl && !fso.FileExists(Server.MapPath(custpath + "/" + xsl))) // Zo doet puo_xmltools/ SafeLoadFileXSL dat
abort_with_warning(xsl + " not found");
var protocol = getFParam("protocol");
var url = getFParam("prs_url");
var fields = [ { dbs: "prs_bedrijfadres_type", typ: "varchar", frm: "prs_type" }
, { dbs: "mld_typeopdr_key", typ: "key", val: typeopdr }
, { dbs: "prs_bedrijfadres_url", typ: "varchar", val: protocol + url}
, { dbs: "prs_bedrijfadres_username", typ: "varchar", frm: "prs_username" }
, { dbs: "prs_bedrijfadres_password", typ: "varchar", frm: "prs_password" }
, { dbs: "prs_bedrijfadres_ordermode", typ: "number", frm: "prs_ordermode" }
, { dbs: "prs_bedrijfadres_certificate", typ: "varchar", frm: "prs_cert" }
, { dbs: "prs_bedrijfadres_xsl", typ: "varchar", frm: "prs_xsl" }
, { dbs: "prs_bedrijfadres_ext", typ: "varchar", frm: "prs_ext" }
, { dbs: "prs_bedrijfadres_attachfile", typ: "varchar", frm: "bijlage" }
, { dbs: "prs_bedrijfadres_flexfiles" , typ: "number", frm: "flexfiles" }
];
var isDeleted = false;
if (badr_key > 0)
{
sql = buildUpdate("prs_bedrijfadres", fields)
+ " prs_bedrijfadres_key = " + badr_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
else
{
fields.push( { dbs: "prs_bedrijf_key", typ: "key", val: bedrijf_key } );
fields.push( { dbs: "prs_bedrijfadres_key", typ: "key", seq: "prs_s_prs_bedrijfadres_key" });
var regIns = buildInsert("prs_bedrijfadres", fields);
var badr_key = regIns.sequences["prs_bedrijfadres_key"];
sql = regIns.sql;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
}
result = { success: true

4
APPL/PRS/prs_show_bedrijfadres.asp
View File

@@ -55,6 +55,8 @@ FCLTHeader.Requires({plugins:["jQuery"]})
+ " AND a.mld_typeopdr_key = t.mld_typeopdr_key(+)"
+ " AND prs_bedrijfadres_key = " + badr_key;
oRs = Oracle.Execute(sql);
if (oRs.Eof)
shared.record_not_found();
var prs_bdrkey = oRs("prs_bedrijf_key").value;
var prs_bdrnaam = oRs("prs_bedrijf_naam").value;
@@ -121,7 +123,7 @@ FCLTHeader.Requires({plugins:["jQuery"]})
ROFIELDTR("fld", L("lcl_mld_typeopdr"), prs_typeopdr_oms, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_url"), prs_url, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_username"), username, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_password"), password, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_wachtwoord"), password, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_order_mode"), prs_ordermode, {suppressEmpty:(prs_ordermode==0?false:true)});
ROFIELDTR("fld", L("lcl_prs_companies_order_certificate"), prs_cert, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_xsl"), prs_xsl, {suppressEmpty:true});

BIN
APPL/Pictures/welcomebg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 109 KiB

2
APPL/QVW/Qlikview.asp
View File

@@ -45,7 +45,7 @@ if (S("qv_ticket_auth")) // http://qv.dijkoraad.local/QvAjaxZfc/FcltGetTicket.as
%>
<div id="result">
<iframe style="min-height:600px; width:100%"
<iframe style="min-height:640px; width:100%"
src="<%= safe.htmlattr(scmd) %>"
name="workFrame" id="workFrame"
onload="FcltMgr.iframeLoaded(this)"

4
APPL/RES/res.inc
View File

@@ -490,8 +490,9 @@ res = {
// Voor restype=="R" wordt ook de discipline van de RES_RUIMTE bekeken
// We kijken pessimistisch: je moet rechten hebben voor alle disciplines
// Optioneel pdisc_key: controleer alleen voor deze discipline
func_enabled: function res_func_enabled(rsv_ruimte_key, pdisc_key)
func_enabled: function res_func_enabled(rsv_ruimte_key, pdisc_key, params)
{
var params = params || {};
// Wat informatie om rechten te kunnen bepalen
var sql = "SELECT r.res_ruimte_opstel_key,"
+ " r.alg_ruimte_key,"
@@ -701,6 +702,7 @@ res = {
, { ins_discipline_key: disc_key_arr.join(",")
, alg_key: alg_ruimte_key
, prs_key: roRs("res_rsv_ruimte_contact_key").Value
, isOptional: (params.isOptional? params.isOptional : false)
}
);
roRs.Close();

7
APPL/RES/res_edit_multi.asp
View File

@@ -128,9 +128,10 @@ var rsv_ruimte_key = getQParamInt("rsv_ruimte_key");
<select id="deelreserveringen" name="deelreserveringen" size="15" multiple>
<% while (!oRs.eof)
{
rKey = oRs("res_rsv_ruimte_key").value;
var this_res2 = res.func_enabled(rKey); // Wat mag ik op deze deelreservering
// niet enorm efficient maar wel robuust
var rKey = oRs("res_rsv_ruimte_key").value;
var rDisc; // Nodig als parameter, zonder waarde.
var this_res2 = res.func_enabled(rKey, rDisc, {isOptional: true}); // Wat mag ik op deze deelreservering
// niet enorm efficient maar wel robuust
if (this_res2.canChange)
{
d1Key = new Date(oRs("res_rsv_ruimte_van").value);

2
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -689,7 +689,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
// Bij initialisatie alleen als er een ruimte (res_ruimte_key) is meegegeven.
if (frontend && (!data.init || (data.init && <%=res_ruimte_key||-1%> > 0)) && roomChanged)
{
$("#status_fo").val(data.status_fo_key > 0? data.status_fo_key : 2);
$("#status_fo").val(data.status_fo_key > 0? data.status_fo_key : <%=S("res_default_fe_status_key")%>); // Overruling default fe status key door status_fo_key van de res_ruimte?
$("#status_fo_ro").val(data.status_fo_key > 0? data.status_fo_string : "<%=safe.jsstring(res.getfostatustext(S("res_default_fe_status_key")))%>");
}

8
APPL/SCF/scaffolding_list.inc
View File

@@ -42,6 +42,7 @@ function scaffolding_list(model, scf_params)
var showAll = getQParamInt("showall", 0) == 1;
var outputmode = getQParamInt("outputmode", 0)
var nobuttons = getQParamInt("nobuttons", 0) == 1;
var default_url = model.list.default_url;
if (!default_url && model["REST_PUT"])
@@ -99,7 +100,8 @@ function scaffolding_list(model, scf_params)
<body id="listbody">
<%
buttons = [];
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
if (!nobuttons)
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
if (model["REST_POST"] && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9)
{
var addurl = scf_params.this_path + "?mode=wrap" + transit;
@@ -124,8 +126,10 @@ function scaffolding_list(model, scf_params)
ID: model.table,
title: model.records_title,
showAll: showAll,
canCSV: model.list.canCSV,
canCSV: !nobuttons && model.list.canCSV,
outputmode: outputmode,
noPrint: nobuttons,
noExcel: nobuttons,
buttons: buttons
});

4
APPL/SCF/scaffolding_search.inc
View File

@@ -43,7 +43,7 @@ function scaffolding_search(model, scf_params)
$(function ()
{
$("#scfcolpicker table tbody" ).not('thead tr').sortable({ axis: "y" });
$("#scfcolpicker table tbody" ).not('thead tr').sortable({ axis: "y", distance: 10 });
$("#chkall").click(function () // Allemaal aan of uit
{
$("#scfcolpicker tr").find("input[type=checkbox]").prop("checked", $(this).prop("checked"))
@@ -173,7 +173,7 @@ function scaffolding_search(model, scf_params)
var on = inArray(fld, scf_params.list.columns);
Response.Write("<tr id='" + fld + "'><td><label><input type='checkbox'" + (on?" checked='1'":"") + ">"
+ safe.html(field.label || ("<"+field.dbs+">")) + "</label></td>");
if (model.list && model.list.canGroup && field.typ != "varchar" && !field.dbs.match(/_key$/i))
if (model.list && model.list.canGroup && field.typ != "varchar" && field.typ != "html" && !field.dbs.match(/_key$/i))
{
if (field.typ == "date" || field.typ == "datetime")
grp = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,D,W,M,Q,Y,H");

10
APPL/Shared/Common.inc
View File

@@ -248,11 +248,15 @@ if (user_key < 0 && typeof ANONYMOUS_Allowed == "undefined")
Response.Redirect(url);
}
var from_menu_key = getQParamInt("from_menu_key", -1);
if (from_menu_key > 0)
if (typeof REGISTERMENU_Disable == "undefined")
{
shared.registeraction("menu", {refkey: from_menu_key, daily: true});
var from_menu_key = getQParamInt("from_menu_key", -1);
if (from_menu_key > 0)
{
shared.registeraction("menu", {refkey: from_menu_key, daily: true});
}
}
var from_search_key = getQParamInt("from_search_key", -1);
if (from_search_key > 0)
{

3
APPL/Shared/Shared.inc
View File

@@ -724,10 +724,9 @@ safe = {
// Editable willen we er echt geen duizend-scheiders in hebben
// Die zijn namelijk heel moeilijk terug te converteren naar number
// Te gebruiken voor bewerkbare velden met bedragen
// Altijd punt als decimaalscheider. HTML5 achtige browsers doen anders moeilijk
editablefloat: function(fnum, decimals)
{
return safe.displayfloat(fnum, decimals).replace(",","."); // die heeft toch geen duizend-scheiders
return safe.displayfloat(fnum, decimals); // die heeft toch geen duizend-scheiders
},
curreditable: function (waarde)
{

2
APPL/Shared/Suggest/SuggestKostenplaats.asp
View File

@@ -75,7 +75,7 @@ var sql = "SELECT k.prs_kostenplaats_key kpkey"
+ " AND k.prs_kostenplaatsgrp_key = kg.prs_kostenplaatsgrp_key(+)"
+ " AND (k.prs_perslid_key = " + prs_key + " OR kg.prs_perslid_key = " + prs_key + ")"
: "")
+ filtClause.orderby;
+ " ORDER BY 4";
WriteResult(sql, bAll, "kpstring", "kpkey", "descr", "extra", false, false, checkExist);
%>

8
APPL/Shared/Suggest/kostenplaatsFilter.inc
View File

@@ -13,7 +13,7 @@
<%
function getFiltClauseKostenplaats(pfiltcode, params)
{
var lfiltClause = {from: "", where: "", orderby: ""};
var lfiltClause = {from: "", where: ""};
var AAfilter = "";
if (pfiltcode == "AA") // All active
@@ -44,15 +44,12 @@ function getFiltClauseKostenplaats(pfiltcode, params)
+ (pfiltcode == "C"
? " AND k.prs_kostenplaats_key IN (SELECT c.prs_kostenplaats_key FROM cnt_v_aanwezigcontract c)" // Alle kostenplaatsen die bij een aanwezigcontract voorkomen
: "");
lfiltClause.orderby = " ORDER BY 4";
break;
case 'B': // Waar ik kostenplaatsverantwoordelijke ben
lfiltClause.where += " AND k.prs_perslid_key = " + user_key;
lfiltClause.orderby = " ORDER BY 4";
break;
case 'G': // Gebouwkostenplaatsen
lfiltClause.where += " AND k.prs_kostenplaats_module = 'ALG'";
lfiltClause.orderby = " ORDER BY 4";
break;
case 'AA':
default: // waar ik op mag boeken
@@ -83,9 +80,6 @@ function getFiltClauseKostenplaats(pfiltcode, params)
+ " AND a.prs_kostenplaats_key = k.prs_kostenplaats_key"
+ AAfilter
: "");
lfiltClause.orderby = (S("prs_dep_default_kpn") == 1 || params.showeigenkp == 1
? " ORDER BY 4"
: "");
break;
}
}

2
APPL/Shared/default.inc
View File

@@ -9,7 +9,7 @@
Note: Sinds 5.2.2 zitten de settings in de database
*/
var FCLTVersion="2015.1a";
var FCLTVersion="2015.1b";
var FCLTMinDatabaseSchema="25";
var custpath = rooturl + "/cust/" + customerId; // path to customer files

3
APPL/Shared/iface.inc
View File

@@ -346,6 +346,9 @@ function isBadInput()
return true;
if (agent.indexOf("Firefox")>=0)
return true;
if (agent.indexOf("Safari")>=0 && device.test(device.isDesktop))
return true;
return false;
}

2
APPL/Shared/status_info.asp
View File

@@ -18,7 +18,7 @@
<!--#include file="../Shared/status.inc"-->
<!--#include file="../Shared/resultset_table_v2.inc" -->
<%
protectQS.verify({ allowparams: ["outputmode", "showall"]}); // tamper check
protectQS.verify({ allowparams: ["outputmode", "showall", "autosortby"]}); // tamper check
var outputmode = getQParamInt("outputmode", 0);
%>
<html>

17
APPL/Shared/xd.inc
View File

@@ -13,8 +13,19 @@
%>
<%
// Splits de oude url: variant in een apiurl en deeplinkurl
function _xdparseUrl(domains)
{
for (var cid in domains)
{
var dom = domains[cid];
dom.apiurl = dom.apiurl || dom.url;
dom.deeplinkurl = dom.deeplinkurl || dom.url;
delete dom["url"];
}
return domains;
}
// TODO-bezig: omzetten naar een xd-object natuurlijk, en dan de rest aanpassen, dit is een beginnetje
xd = {
// Globals
@@ -22,7 +33,7 @@ xd = {
//{ "uwva":{"name": "UWV", "url": "http://uwva.sgf12/facilitor5iwork/"},
// "ivet":{"name": "Intervet", "url": "http://ivet.sgf12/facilitor5iwork/"}
SecundaryDomains: S("xd_secundarydomains"),
SecundaryDomains: _xdparseUrl(S("xd_secundarydomains")),
enabled :
function ()
@@ -67,7 +78,7 @@ xd = {
{
var mldkey = oRs.Fields("id").Value;
var flagkey = oRs.Fields("flag").Value || 0;
var displ = flagkey||"";
if (!excel) // maak er dan nog leuke plaatjes van
{

1
APPL/Shared/xml_converter.inc
View File

@@ -117,7 +117,6 @@ function make_xml(params)
var sql = "BEGIN xml.make_xml(" + sql_params + "); END;";
Oracle.Execute(sql);
var xml_content = get_fac_xml('$AspSession$');
__Log("XML is {0} karakters. Opgehaald in {1} chunks.".format(xml_content.length, xml_content_arr.length));
}
if (Session("logging")&1)
__Log2File(xml_content, params.xmlnode + params.key);

14
APPL/facmgtVB/res_ruimterecord.asp
View File

@@ -136,6 +136,7 @@ Sub ResRuimteRecordAction(sAction)
Dim fldRES_RUIMTE_GROEP : fldRES_RUIMTE_GROEP = ""
Dim fldBEZ_ACTIE_KEY : fldBEZ_ACTIE_KEY = ""
Dim fldRES_STATUS_FO_KEY : fldRES_STATUS_FO_KEY = ""
Dim fldRES_RUIMTE_FRIENDLYNAME : fldRES_RUIMTE_FRIENDLYNAME = ""
'-------------------------------
'-------------------------------
@@ -197,6 +198,7 @@ Sub ResRuimteRecordAction(sAction)
fldRES_RUIMTE_GROEP = GetParam("RES_RUIMTE_GROEP")
fldBEZ_ACTIE_KEY = GetParam("BEZ_ACTIE_KEY")
fldRES_STATUS_FO_KEY = GetParam("RES_STATUS_FO_KEY")
fldRES_RUIMTE_FRIENDLYNAME = GetParam("RES_RUIMTE_FRIENDLYNAME")
'-------------------------------
' Validate fields
@@ -304,7 +306,8 @@ fldRES_RUIMTE_INTPRIJS_DAG = SafeToDouble(fldRES_RUIMTE_INTPRIJS_DAG )
"RES_RUIMTE_IMAGE," & _
"RES_RUIMTE_GROEP," & _
"BEZ_ACTIE_KEY," & _
"RES_STATUS_FO_KEY)" & _
"RES_STATUS_FO_KEY," & _
"RES_RUIMTE_FRIENDLYNAME)" & _
" values (" & _
ToSQL(fldRES_RUIMTE_NR, "Text") & "," & _
ToSQL(fldRES_RUIMTE_OMSCHRIJVING, "Text") & "," & _
@@ -326,7 +329,8 @@ fldRES_RUIMTE_INTPRIJS_DAG = SafeToDouble(fldRES_RUIMTE_INTPRIJS_DAG )
ToSQL(fldRES_RUIMTE_IMAGE, "Text") & "," & _
ToSQL(fldRES_RUIMTE_GROEP, "Text") & "," & _
ToSQL(fldBEZ_ACTIE_KEY, "Number") & "," & _
ToSQL(fldRES_STATUS_FO_KEY, "Number") & _
ToSQL(fldRES_STATUS_FO_KEY, "Number") & "," & _
ToSQL(fldRES_RUIMTE_FRIENDLYNAME, "Text") & _
")"
case "update"
'-------------------------------
@@ -354,7 +358,8 @@ fldRES_RUIMTE_INTPRIJS_DAG = SafeToDouble(fldRES_RUIMTE_INTPRIJS_DAG )
",RES_RUIMTE_IMAGE=" & ToSQL(fldRES_RUIMTE_IMAGE, "Text") & _
",RES_RUIMTE_GROEP=" & ToSQL(fldRES_RUIMTE_GROEP, "Text") & _
",BEZ_ACTIE_KEY=" & ToSQL(fldBEZ_ACTIE_KEY, "Number") & _
",RES_STATUS_FO_KEY=" & ToSQL(fldRES_STATUS_FO_KEY, "Number")
",RES_STATUS_FO_KEY=" & ToSQL(fldRES_STATUS_FO_KEY, "Number") & _
",RES_RUIMTE_FRIENDLYNAME=" & ToSQL(fldRES_RUIMTE_FRIENDLYNAME, "Text")
sSQL = sSQL & " where " & sWhere
case "delete"
'-------------------------------
@@ -443,6 +448,7 @@ Sub ResRuimteRecord_Show()
fldRES_RUIMTE_GROEP = GetParam("RES_RUIMTE_GROEP")
fldBEZ_ACTIE_KEY = GetParam("BEZ_ACTIE_KEY")
fldRES_STATUS_FO_KEY = GetParam("RES_STATUS_FO_KEY")
fldRES_RUIMTE_FRIENDLYNAME = GetParam("RES_RUIMTE_FRIENDLYNAME")
fldRES_RUIMTE_KEY = GetParam("Trn_RES_RUIMTE_KEY")
SetVar "Trn_RES_RUIMTE_KEY", GetParam("Trn_RES_RUIMTE_KEY")
SetVar "Trn_RES_RUIMTE_UPPER", GetParam("Trn_RES_RUIMTE_UPPER")
@@ -519,6 +525,7 @@ proturl = protectQS(url)
fldRES_RUIMTE_GROEP = GetValue(rs, "RES_RUIMTE_GROEP")
fldBEZ_ACTIE_KEY = GetValue(rs, "BEZ_ACTIE_KEY")
fldRES_STATUS_FO_KEY = GetValue(rs, "RES_STATUS_FO_KEY")
fldRES_RUIMTE_FRIENDLYNAME = GetValue(rs, "RES_RUIMTE_FRIENDLYNAME")
end if
SetVar "ResRuimteRecordInsert", ""
Parse "ResRuimteRecordEdit", False
@@ -701,6 +708,7 @@ fldRES_RUIMTE_EINDTIJD = replace(cstr(fldRES_RUIMTE_EINDTIJD), ",", ".") ' Force
next
end if
SetVar "RES_RUIMTE_FRIENDLYNAME", ToHTML(fldRES_RUIMTE_FRIENDLYNAME)
Parse "FormResRuimteRecord", False
'-------------------------------

5
APPL/facmgtVB/res_ruimterecord.html
View File

@@ -161,6 +161,11 @@
<td class="DataTD"><select name="RES_STATUS_FO_KEY"><!--BeginResRuimteRecordLBRES_STATUS_FO_KEY--><option value="{ID}" {Selected}>{Value}</option><!--EndResRuimteRecordLBRES_STATUS_FO_KEY--></select></td>
</tr>
<tr>
<td class="FieldCaptionTD"><font class="FieldCaptionFONT">Alternatieve naam</font></td>
<td class="DataTD"><input type="text" name="RES_RUIMTE_FRIENDLYNAME" maxlength="40" value="{RES_RUIMTE_FRIENDLYNAME}" size="40"></td>
</tr>
<tr>
<td colspan="2" align="right">