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

FSN#35094 Opfrissen icon-set: voor prioriteitsicons

Browse Source 
FSN#34663 Extern opdrachtnummer in lijst tonen. Tevens Evident triviale kolommen niet.

svn path=/Website/trunk/; revision=32005
This commit is contained in:
Peter Feij
2016-12-19 08:29:39 +00:00
parent fd5885c6d4
commit c945e4cc36
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
APPL/MLD/opdr_list.inc
View File

@@ -307,6 +307,7 @@ function opdr_list (params)
var whereUs = ""; // straks voor de statussen
sql = "SELECT o.mld_melding_key"
+ " , o.mld_opdr_bedrijfopdr_volgnr"
+ " , o.mld_opdr_id"
+ " , o.mld_opdr_einddatum"
+ " , l.alg_locatie_code "
+ " ||(SELECT DECODE(v.alg_plaatsaanduiding, '', ' ('||l.alg_locatie_omschrijving||')',"
@@ -826,14 +827,15 @@ function opdr_list (params)
function fncolSpoed(oRs) // exacte kopie vanuit mld_list.inc
{
var displ = mld.getpriotext(oRs("mld_melding_spoed").Value);
if (outputmode != 2) { // maak er dan nog leuke plaatjes van
var hprio = "<div style='display:none'>"+oRs("mld_melding_spoed").Value+"</div>"; // for sorting i presume
if (outputmode ==0) { // maak er dan nog leuke plaatjes van
switch (oRs("mld_melding_spoed").Value)
{
case 1: displ = "<span id='urg_kritiek1' title='" + displ+"'>" + L("lcl_mld_urg_kritiek1") + "</span>"; break;
case 2: displ = "<span id='urg_hoog1' title='" + displ+"'>" + L("lcl_mld_urg_hoog1") + "</span>"; break;
case 3: displ = "<span id='urg_normaal1' title='" + displ + "'>" + L("lcl_mld_urg_normaal1") + "</span>"; break;
case 4: displ = "<span id='urg_laag1' title='" + displ+"'>" + L("lcl_mld_urg_laag1") + "</span>"; break;
case 5: displ = "<span id='urg_hold1' title='" + displ+"'>" + L("lcl_mld_urg_hold1") + "</span>"; break;
case 1: displ = "<span class='fa fa-exclamation-triangle fa-lg fa-fw' id='urg_kritiek1' title='" + displ+"'>"+hprio+"</span>"; break;
case 2: displ = "<span class='fa fa-exclamation-triangle fa-lg fa-fw' id='urg_hoog1' title='" + displ+"'>"+hprio+"</span>"; break;
case 3: displ = "<span id='urg_normaal1' title='" + displ + "'>"+hprio+"</span>"; break;
case 4: displ = "<span class='fa fa-arrow-circle-o-down fa-lg fa-fw' id='urg_laag1' title='" + displ+"'>"+hprio+"</span>"; break;
case 5: displ = "<span class='fa fa-pause-circle-o fa-lg fa-fw' id='urg_hold1' title='" + displ+"'>"+hprio+"</span>"; break;
}
}
return displ;
@@ -991,6 +993,19 @@ function opdr_list (params)
return safe.html(cnt_nr);
}
// We really need to suppress columns that are obviously irrelevant for this configuration
// Fast check to see if we have anything to do with geographics
var algsql= "SELECT COUNT(*) FROM ins_srtdiscipline WHERE ins_srtdiscipline_alg > 0 AND ins_srtdiscipline_verwijder IS NULL";
var algoRs = Oracle.Execute(algsql);
var anyalg = algoRs(0).value > 0;
algoRs.close();
// Fast check to see if we have just one opdrachttype
var otsql= "SELECT COUNT(*) FROM mld_typeopdr";
var otoRs = Oracle.Execute(otsql);
var singleOT = otoRs(0).value == 1;
otoRs.close();
var rst = new ResultsetTable({ keyColumn: "mld_opdr_key",
ID: "opdrtable",
rowClass: fnrowClass,
@@ -1016,17 +1031,23 @@ function opdr_list (params)
rst.addColumn(new Column({caption: "!", content: fncolSpoed}));
var nrtooltip = (!tiny ? "mld_typeopdr_omschrijving" : null);
rst.addColumn(new Column({caption: L("lcl_shared_order"), content: fncolKey, tooltip: nrtooltip, hasActions: true }));
rst.addColumn(new Column({caption: L("lcl_mld_typeopdr"), content: "mld_typeopdr_omschrijving", combine:true}));
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsmelding"}));
if (S("mld_print_loc_address") == 1)
rst.addColumn(new Column({caption: L("lcl_location_address"), content: "alg_locatie_adres", purpose: PRINTING_ONLY}));
if (S("mld_print_loc_address") == 2)
rst.addColumn(new Column({caption: L("lcl_opdr_id"), content: "mld_opdr_id", combine:true}));
if (!singleOT)
{
rst.addColumn(new Column({caption: L("lcl_location_address"), content: "alg_locatie_adres", combine: false}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam", combine: true}));
rst.addColumn(new Column({caption: L("lcl_mld_typeopdr"), content: "mld_typeopdr_omschrijving"}));
}
if (anyalg)
{
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsmelding"}));
if (S("mld_print_loc_address") == 1)
rst.addColumn(new Column({caption: L("lcl_location_address"), content: "alg_locatie_adres", purpose: PRINTING_ONLY}));
if (S("mld_print_loc_address") == 2)
{
rst.addColumn(new Column({caption: L("lcl_location_address"), content: "alg_locatie_adres", combine: false}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam", combine: true}));
}
}
if (excel)
{
rst.addColumn(new Column({caption: L("lcl_vakgroup_type"), content: "ins_srtdiscipline_omschrijving"}));