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

FSN#38395 Ook aantal en eenheid in de lijst indien mogelijk relevant

Browse Source 
svn path=/Website/trunk/; revision=33196
This commit is contained in:
Peter Feij
2017-03-20 17:24:05 +00:00
parent 755dd14f09
commit c65ce945c9
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/INS/ins.inc
View File

@@ -1303,6 +1303,8 @@ ins = {checkAutLevel:
+ (!mobile
? ", s.ins_srtdeel_code"
+ ", i.ins_deel_opmerking"
+ ", i.ins_deel_aantal"
+ ", s.ins_srtdeel_eenheid"
+ ", s.ins_srtdeel_key"
+ ", s.ins_srtdeel_upper"
+ ", i.ins_deel_getekend"
@@ -1491,6 +1493,8 @@ ins = {checkAutLevel:
+ (!mobile
? ", s.ins_srtdeel_code"
+ ", i.ins_deel_opmerking"
+ ", i.ins_deel_aantal"
+ ", s.ins_srtdeel_eenheid"
+ ", s.ins_srtdeel_key"
+ ", s.ins_srtdeel_upper"
+ ", i.ins_deel_getekend"

20
APPL/INS/ins_list.inc
View File

@@ -380,6 +380,7 @@ function ins_list (pautfunction, params)
var ErisReserveerbaar = false;
var hasDrawings = false;
var hasAantal = false;
var sqlu ="SELECT COUNT (*) FROM ins_srtdeel WHERE ins_srtdeel_uitleenbaar = 1 AND ins_srtdeel_verwijder IS NULL";
var oRsu = Oracle.Execute(sqlu);
@@ -390,13 +391,21 @@ function ins_list (pautfunction, params)
ErisReserveerbaar = oRsu(0).value >0
oRsu.close();
var sqlu = "SELECT 1"
+ " FROM cad_tekening"
+ " WHERE cad_tekening_verwijder IS NULL AND ROWNUM = 1";
var sqlu = "SELECT 1"
+ " FROM cad_tekening"
+ " WHERE cad_tekening_verwijder IS NULL AND ROWNUM = 1";
oRsu = Oracle.Execute(sqlu);
hasDrawings = !oRsu.eof;
oRsu.close();
// als het altijd 1 is wil ik geen aantal-kolom
var sqlu = "SELECT 1"
+ " FROM ins_deel"
+ " WHERE ins_deel_verwijder IS NULL AND COALESCE(ins_deel_aantal, 1) <> 1 AND ROWNUM = 1";
oRsu = Oracle.Execute(sqlu);
hasAantal = !oRsu.eof;
oRsu.close();
// Start building the query to fetch all objects satisfying
var sql = ins.getobjectinspect_sql(pautfunction, params);
// ========== now 'sql' holds the main SQL-statement to fetch all object info
@@ -799,6 +808,11 @@ function ins_list (pautfunction, params)
if (inspect && ctrdisc_key == -1)
rst.addColumn(new Column({caption: L("ctr_discipline"), content: "ctr_disc_oms"}));
rst.addColumn(new Column({caption: L("lcl_obj_identification"), content: "ins_deel_omschrijving"}));
if (hasAantal)
{
rst.addColumn(new Column({caption: L("lcl_count"), content: "ins_deel_aantal", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
}
rst.addColumn(new Column({caption: L("lcl_ins_opmerking"), content: "ins_deel_opmerking", combine: inspect}));
}