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

FSN#40101: MJOB: Het veld ins_deel_aantal kan geen decimalen bevatten.

Browse Source 
svn path=/Website/trunk/; revision=33552
This commit is contained in:
Maykel Geerdink
2017-04-20 08:42:33 +00:00
parent a2c653e1a7
commit 397c095a19
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/INS/ins_xcp.asp
View File

@@ -71,8 +71,11 @@ if (srtcont_key > 0)
+ " , dix.ctr_ismjob"
+ " , dix.ins_srtcontrole_eenheid"
+ " , dix.ins_deel_aantal"
+ " , isd.ins_srtdeel_eenheid"
+ " FROM ins_v_defined_inspect_xcp dix"
+ " WHERE dix.ins_deel_key = " + ins_key
+ " , ins_srtdeel isd"
+ " WHERE dix.ins_srtdeel_key = isd.ins_srtdeel_key"
+ " AND dix.ins_deel_key = " + ins_key
+ " AND dix.ins_srtcontrole_key = " + srtcont_key;
var oRs = Oracle.Execute(sql);
isMJOB = oRs("ctr_ismjob").Value == 1;
@@ -80,6 +83,7 @@ if (srtcont_key > 0)
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
var aantal = oRs("ins_deel_aantal").Value;
var srtdeel_eenheid = oRs("ins_srtdeel_eenheid").Value;
oRs.Close();
switch (xcp_eenheid)
@@ -862,12 +866,12 @@ if (srtcont_key > 0)
<% } %>
<%
if (aantal > 1)
ROFIELDTR("fld", L("lcl_count"), aantal);
ROFIELDTR("fld", L("lcl_amount") + (srtdeel_eenheid? "&nbsp;(" + srtdeel_eenheid + ")" : ""), aantal);
if (ins_xcp_active_cost & 1)
RWFIELDTR("kosten1",
"fldshort",
L("ins_srtcontrole_kosten") + "&nbsp;" + S("currency_pref") + "<span id='stdkosten1'></span>",
L("ins_srtcontrole_kosten") + "&nbsp;(" + (S("currency_pref")).replace(/^\s+|\s+$/gm,'') + ")<span id='stdkosten1'></span>",
xcp_kosten,
{ datatype: "currency",
html: "onBlur='calcKosten(1)'",
@@ -878,7 +882,7 @@ if (srtcont_key > 0)
if (ins_xcp_active_cost & 2)
RWFIELDTR("kosten2",
"fldshort",
L("ins_srtcontrole_kosten2") + "&nbsp;" + S("currency_pref") + "<span id='stdkosten2'></span>",
L("ins_srtcontrole_kosten2") + "&nbsp;(" + S("currency_pref").replace(/^\s+|\s+$/gm,'') + ")<span id='stdkosten2'></span>",
xcp_kosten2,
{ datatype: "currency",
html: "onBlur='calcKosten(2)'",
@@ -889,7 +893,7 @@ if (srtcont_key > 0)
if (ins_xcp_active_cost & 4)
RWFIELDTR("kosten3",
"fldshort",
L("ins_srtcontrole_kosten3") + "&nbsp;" + S("currency_pref") + "<span id='stdkosten3'></span>",
L("ins_srtcontrole_kosten3") + "&nbsp;(" + S("currency_pref").replace(/^\s+|\s+$/gm,'') + ")<span id='stdkosten3'></span>",
xcp_kosten3,
{ datatype: "currency",
html: "onBlur='calcKosten(3)'",
@@ -900,7 +904,7 @@ if (srtcont_key > 0)
if (ins_xcp_active_cost & 8)
RWFIELDTR("materiaal",
"fldshort",
L("ins_srtcontrole_materiaal") + "&nbsp;" + S("currency_pref") + "<span id='stdmateriaal'></span>",
L("ins_srtcontrole_materiaal") + "&nbsp;(" + S("currency_pref").replace(/^\s+|\s+$/gm,'') + ")<span id='stdmateriaal'></span>",
xcp_materiaal,
{ datatype: "currency",
html: "onBlur='calcMateriaal()'",

5
APPL/MJB/mjb_search_list.asp
View File

@@ -504,6 +504,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ " , dg.ins_discipline_omschrijving"
+ " , dg.ins_srtgroep_omschrijving"
+ " , dg.ins_srtdeel_omschrijving"
+ " , (SELECT isd.ins_srtdeel_eenheid FROM ins_srtdeel isd WHERE isd.ins_srtdeel_key = dg.ins_srtdeel_key) ins_srtdeel_eenheid"
+ " , cy.ins_srtcontrole_omschrijving"
+ " , cy.ins_deel_key"
+ " , " + keyColumn + " keyColumn"
@@ -556,6 +557,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ " , cv.ins_discipline_omschrijving"
+ " , cv.ins_srtgroep_omschrijving"
+ " , cv.ins_srtdeel_omschrijving"
+ " , cv.ins_srtdeel_eenheid"
+ " , cv.ins_srtcontrole_omschrijving"
+ " , cv.ins_deel_key"
+ " , cv.keyColumn"
@@ -874,7 +876,8 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
if (groupby > 5)
{
rst.addColumn(new Column({caption: L("lcl_ins_object"), content: fnDeel}));
rst.addColumn(new Column({caption: L("lcl_count"), content: "ins_deel_aantal", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_amount"), content: "ins_deel_aantal", datatype: "float"}));
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
}
if (fulldetails)
{