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

Grote UNION's af en toe een \n ervoor geven. Is prettiger in de logging

Browse Source 
svn path=/Website/trunk/; revision=32547
This commit is contained in:
Jos Groot Lipman
2017-01-25 10:56:47 +00:00
parent 92c75023f8
commit 0a6ab9ad0e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/RES/res_list.inc
View File

@@ -782,7 +782,7 @@ function res_list (pautfunction, params)
}
}
var sqlinside = "WITH " + thePerslid + "," + theResrsv + " " + sqlR + " UNION ALL " + sqlDe + " UNION ALL " + sqlA;
var sqlinside = "WITH " + thePerslid + "," + theResrsv + " " + sqlR + " \nUNION ALL\n " + sqlDe + " \nUNION ALL\n " + sqlA;
// Indien verschillende dirtlevels bij dirty reservering, neem dan het maximum om dubbele regels te voorkomen
// Geld hier alleen voor fronto en frontend
var sql_rec2 = " SELECT res_reservering_key"
@@ -1569,14 +1569,14 @@ function res_list (pautfunction, params)
{
sql_from_total += sql_from_room_part;
if (res_key || objcat || artcat)
sql_from_total += " UNION ALL "
sql_from_total += " \nUNION ALL\n "
}
if (res_key || objcat)
{
sql_from_total += sql_from_obj_part;
if (res_key || artcat)
sql_from_total += " UNION ALL "
sql_from_total += " \nUNION ALL\n "
}
if (res_key || artcat)

4
APPL/RES/res_multi_create_save.asp
View File

@@ -90,11 +90,11 @@ for (var i = 1; i <= form_dates.Count; i++)
}
if (ispool) // Hele reservering
{
sql += " new_key := res.res_copy_res(" + reservering_key + "," + datum.toSQL() + "," + user_key + ");";
sql += "\n new_key := res.res_copy_res(" + reservering_key + "," + datum.toSQL() + "," + user_key + ");";
}
else // Gewone
{
sql += " new_key := res.res_copy_deelres(" + rsv_ruimte_key + "," + datum.toSQL() + "," + user_key + (isnewres?",0,"+newres_key+","+i:"") + ");";
sql += "\n new_key := res.res_copy_deelres(" + rsv_ruimte_key + "," + datum.toSQL() + "," + user_key + (isnewres?",0,"+newres_key+","+i:"") + ");";
if (S("res_fe_allow_dirty") != 1 && urole == 'fe')
{
sql += " IF res.dirty_level_all(new_key) <> 0 THEN"

4
APPL/Shared/discx3d.inc
View File

@@ -60,7 +60,7 @@ function algxprs(psql, oRsPArr,
}
fullSQL += (fullSQL == ""
? ""
: (psql_group_by? psql_group_by : "") + " UNION ALL ")
: (psql_group_by? psql_group_by : "") + " \nUNION ALL\n ")
+ psql + " AND " + pdiscipline_column_3d + " IN (" + discsOfThisLevel + ")";
__Log(pautfunction+' for disciplines ' + discsOfThisLevel + ' authorized at PRS level ' + thisLevel);
@@ -277,7 +277,7 @@ function discx3d(psql,
{
fullSQL += (fullSQL == ""
? ""
: " UNION ALL ")
: " \nUNION ALL\n ")
+ ((palgprs == 2)
? algxprs(pfullSQL, oRsPArr, pdiscipline_column_3d,
pbedrijf_column_3d, pafdeling_column_3d,

2
APPL/Shared/discxalg3d.inc
View File

@@ -141,6 +141,6 @@ function discxalg3d (
oRs.close();
// we return the extended version of psql, or, if NO discipline was read authorized we prohibit the selection
return (allSQL.length ? allSQL.join("UNION ") : psql+" AND 1=0");
return (allSQL.length ? allSQL.join("\nUNION\n ") : psql+" AND 1=0");
}
%>