From 1480cd5a2f82d86e1ea4211fd371ba5c66f42e5f Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Mon, 26 Jun 2023 13:32:47 +0200 Subject: [PATCH] als restant 0 is leeg veld --- application/core/MY_Controller.php | 2 +- public/js/monpas/models/monfin2/bestemmingen.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 1fd7213..d16812e 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -84,7 +84,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.19.06';// monfin met budgetten // public $version = '1.20.03';// monfin met budgetten // public $version = '1.20.04';// monfin met budgetten update - public $version = '1.20.05';// monfin met budgetten update + public $version = '1.20.06';// monfin met budgetten update public $partituurid; public $globProfielVersieID = 1; public $userid; //id of the user that is logged in diff --git a/public/js/monpas/models/monfin2/bestemmingen.js b/public/js/monpas/models/monfin2/bestemmingen.js index c52a460..8267f8d 100644 --- a/public/js/monpas/models/monfin2/bestemmingen.js +++ b/public/js/monpas/models/monfin2/bestemmingen.js @@ -518,6 +518,8 @@ ls.initBestemmingenModel = function(){ dit.budget(invoer); stuurMelding = false; totaalgebudget = Number(totaalgebudget) + Number(s.uitgavetypes()[0].budget()) + + console.log(subbudget , 'subbudget bij wijzigen scholing') } break; @@ -536,7 +538,7 @@ ls.initBestemmingenModel = function(){ else dit.budgetFormat(''); var restant = Number(s.uitgavetypes()[0].budget()) - subbudget; s.uitgavetypes()[4].budget(restant); - if(restant > 0 ) s.uitgavetypes()[4].budgetFormat(parseFloat(restant).format(2, 3, '.', ',')); + Number(restant) === 0 ? s.uitgavetypes()[4].budgetFormat(''): s.uitgavetypes()[4].budgetFormat(parseFloat(restant).format(2, 3, '.', ',')); } } @@ -550,6 +552,8 @@ ls.initBestemmingenModel = function(){ }) }) + + if(stuurMelding) return; if (parseFloat(totaalgebudget) > 0) { totaalgebudgetForm = parseFloat(totaalgebudget).format(2, 3, '.', ',');