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

AAIT#37456 0 waarde toestaan als (verplicht) opdrachtbedrag

Browse Source 
svn path=/Website/trunk/; revision=32069
This commit is contained in:
Erik Groener
2016-12-21 13:43:12 +00:00
parent a4d88e9fe8
commit 988c7239f1
2 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
APPL/MLD/mld.inc
View File

@@ -1985,16 +1985,26 @@ mld = {setmeldingstatus:
// Numeric values are used (only) here to calculate corr_cost.
var hours = (oRs("mld_opdr_uren").Value || 0);
var hours_refiat = (oRs("mld_opdr_uren_refiat").Value || 0);
var m_cost = parseFloat((oRs("mld_opdr_materiaal").Value || 0).toFixed(2));
var m_cost_refiat = parseFloat((oRs("mld_opdr_materiaal_refiat").Value || 0).toFixed(2));
var t_cost = parseFloat((oRs("mld_opdr_kosten").Value || 0).toFixed(2));
var t_cost_refiat = parseFloat((oRs("mld_opdr_kosten_refiat").Value || 0).toFixed(2));
var h_rate = parseFloat((oRs("mld_opdr_uurloon").Value || 0).toFixed(2));
var h_rate_refiat = parseFloat((oRs("mld_opdr_uurloon_refiat").Value || 0).toFixed(2));
var corr_cost = (t_cost - m_cost - parseFloat((h_rate * hours).toFixed(2)));
var corr_cost_refiat = (t_cost_refiat - m_cost_refiat - parseFloat((h_rate_refiat * hours_refiat).toFixed(2)));
var hours = oRs("mld_opdr_uren").Value;
var hours_refiat = oRs("mld_opdr_uren_refiat").Value;
var m_cost = oRs("mld_opdr_materiaal").Value;
var m_cost_refiat = oRs("mld_opdr_materiaal_refiat").Value;
var t_cost = oRs("mld_opdr_kosten").Value;
var t_cost_refiat = oRs("mld_opdr_kosten_refiat").Value;
var h_rate = oRs("mld_opdr_uurloon").Value;
var h_rate_refiat = oRs("mld_opdr_uurloon_refiat").Value;
var corr_cost = null;
if (t_cost != null || m_cost != null || ( (h_rate != null) && (hours != null) ))
{
corr_cost = ((t_cost || 0) - (m_cost || 0) - ((h_rate || 0) * (hours || 0)));
corr_cost = (corr_cost == 0 ? null : corr_cost);
}
var corr_cost_refiat = null;
if (t_cost_refiat != null || m_cost_refiat != null || ( (h_rate_refiat != null) && (hours_refiat != null) ))
{
corr_cost_refiat = ((t_cost_refiat || 0) - (m_cost_refiat || 0) - ((h_rate_refiat || 0) * (hours_refiat || 0)));
corr_cost_refiat = (corr_cost_refiat == 0 ? null : corr_cost_refiat);
}
var result = { opdr_key: opdr_key,
mld_opdr_datumbegin: new Date(oRs("mld_opdr_datumbegin").Value),
@@ -2259,7 +2269,6 @@ mld = {setmeldingstatus:
result.uitvoertijd = mld.getmeldinguitvoertijd(mld_key);
}
__Log(result);
return result;
},
@@ -3266,9 +3275,9 @@ __Log(result);
myBO2Change = myBO2Change && mresult.iamBedrijfContact
else if (myBO2Change && !uitv_intern && afmelden_extern < 2 && !mresult.iamBedrijfContact)
myBO2Change = false;
var myBO2FieldChange = (myBO2Change && !mresult.iamBedrijfContact);
var myBO2FieldChange = (myBO2Change && !mresult.iamBedrijfContact);
__Log("myBO2Change: " + myBO2Change);
switch (opdr_status)

46
APPL/MLD/mld_edit_opdr.js
View File

@@ -65,6 +65,11 @@ function calcTotal()
if (typeopdr_matchtype == 5) return;
if (mld_ord_show_cost && typeopdr_matchtype != 3 && typeopdr_matchtype != 4)
{
var valid_mat_kosten = false;
var valid_corr_kosten = false;
var valid_uren = false;
var valid_uurtarief = false;
var uren = parseFloat($("#uren").val().replace(',', '.'));
var uurtarief = parseFloat($("#uurtarief").val().replace(',', '.'));
var mat_kosten = parseFloat($("#mat_kosten").val().replace(',', '.'));
@@ -72,23 +77,33 @@ function calcTotal()
var tot_kosten = (isNaN(uren)? 0 : uren) * (isNaN(uurtarief)? 0 : uurtarief)
+ (isNaN(mat_kosten)? 0 : mat_kosten) + (isNaN(corr_kosten)? 0 : corr_kosten);
if ($("#uurtarief").val() != '' && !isNaN(uurtarief))
$("#uurtarief").val(num2currEditable(uurtarief));
if ($("#mat_kosten").val() != '' && !isNaN(mat_kosten))
$("#mat_kosten").val(num2currEditable(mat_kosten));
if ($("#corr_kosten").val() != '' && !isNaN(corr_kosten))
$("#corr_kosten").val(num2currEditable(corr_kosten));
if ($("#mat_kosten").val() != '' && !isNaN(mat_kosten) ||
$("#corr_kosten").val() != '' && !isNaN(corr_kosten) ||
$("#uren").val() != '' && !isNaN(uren)
)
if ($("#uren").val() != '' && !isNaN(uren))
{
$("#tot_kosten").val(num2currEditable(tot_kosten));
valid_uren = true;
}
if ($("#uurtarief").val() != '' && !isNaN(uurtarief))
{
$("#uurtarief").val(num2currEditable(uurtarief));
valid_uurtarief = true;
}
if ($("#mat_kosten").val() != '' && !isNaN(mat_kosten))
{
$("#mat_kosten").val(num2currEditable(mat_kosten));
valid_mat_kosten = true;
}
if ($("#corr_kosten").val() != '' && !isNaN(corr_kosten))
{
$("#corr_kosten").val(num2currEditable(corr_kosten));
valid_corr_kosten = true;
}
if (!valid_mat_kosten && !valid_corr_kosten && (!valid_uren || !valid_uurtarief))
{
$("#tot_kosten").val(null);
}
else
{
$("#tot_kosten").val(null);
$("#tot_kosten").val(num2currEditable(tot_kosten));
}
}
else
@@ -289,6 +304,11 @@ function mld_submit(json)
// Formulier specifieke checks
checkInput();
// Er moet minimaal 0 voor een van de kostenvelden zin ingevuld.
if ( $("#tot_kosten").hasClass("required") )
if ( $("#mat_kosten").val() == "" && $("#uren").val() == "" )
return false;
var autoConf = opdr_key < 0 &&
!copy &&
typeopdr_isofferte == 0 &&