FCLT#84119 AiAi op UDR rapport op meldingen

svn path=/Website/trunk/; revision=65072
This commit is contained in:
Jos Groot Lipman
2024-06-11 08:28:44 +00:00
parent dfc9e64811
commit 67d3ab7fcd

View File

@@ -813,10 +813,29 @@ function report_GET(params)
if (inselect && field.sorting) // is er niet voor scf_count/scf_ratio
autosorting = autosorting && (field.sorting.id == 3)
}
// CLOB (mld_melding_omschrijving) mag niet in de ORDER BY genoemd worden
// TODO: in de toekomst misschien explicieter rapport kolom type 'memo' onderkennen?
var sqlc = "SELECT column_name, data_type"
+ " FROM user_tab_columns"
+ " WHERE table_name = " + safe.quoted_sql_upper(query.tables[0]);
var oRs = Oracle.Execute(sqlc);
var isclob = {};
while (!oRs.EOF)
{
isclob[oRs("column_name").Value] = (oRs("data_type") == 'CLOB');
oRs.MoveNext();
}
oRs.Close()
if (autosorting)
{
for (var i=0; i < query.selects.length; i++)
order.push(i+1);
{
var colname = query.selects[i].split(".").pop().toUpperCase(); // achterste stuk
if (!isclob[colname])
order.push(i+1);
}
}
else
{
@@ -832,7 +851,7 @@ function report_GET(params)
if (found && (!params.filter.distinct || (params.filter.distinct && (fld == params.filter.distinct))))
{
var field = this.fields[fld];
if (field.sorting)
if (field.sorting && !isclob[field.dbs.toUpperCase()])
{
// Sortering op x-as of y-as gebeurt nu verder op.
// TODO: case 1 en 2 kunnen nu samen genomen worden.