From b889f521c292cffbc5c55299d76c9898125de513 Mon Sep 17 00:00:00 2001 From: Monique Date: Tue, 4 Jan 2022 12:03:39 +0100 Subject: [PATCH 1/3] versie --- application/core/MY_Controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 78cc3d8..f47b00d 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -60,7 +60,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.79'; // fout matrixfunctie // public $version = '1.17.83'; // sophomepage // public $version = '1.17.84'; // zichtbaarheid paginas afhankelijk van orgsoort - public $version = '1.17.85'; // fouten divmeter po 2203 in compact +// public $version = '1.17.85'; // fouten divmeter po 2203 in compact + public $version = '1.17.86'; // titels en headers sop public $partituurid; public $globProfielVersieID = 1; From 87646b31dbbfb2c468c938949abebff5103d5a38 Mon Sep 17 00:00:00 2001 From: Liesbeth ter Schure Date: Fri, 14 Jan 2022 15:39:41 +0100 Subject: [PATCH 2/3] jaartoewijzing direct uit db inlezen --- public/js/monpas/models/monfin2/bestemmingen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/monpas/models/monfin2/bestemmingen.js b/public/js/monpas/models/monfin2/bestemmingen.js index 5ef6a15..274ba18 100644 --- a/public/js/monpas/models/monfin2/bestemmingen.js +++ b/public/js/monpas/models/monfin2/bestemmingen.js @@ -103,8 +103,8 @@ ls.initBestemmingenModel = function(){ if (!self.selectedKalenderjaar()) return; var sd ={jaarnr:self.selectedKalenderjaar().jaarnr} $.post("index.php/monfin2/bestemmingen/getBestemmingen", sd, function(data){ - if (Number(data.jaartoewijzing.som) > 0){ - self.jaartoewijzing(true); + if (data.jaartoewijzing){ + self.jaartoewijzing(data.jaartoewijzing); } else {self.jaartoewijzing(false);} self.jaarclosed(data.jaarclosed); From b8b071f338f7a4e2eb55e9ff969170574d71f6c9 Mon Sep 17 00:00:00 2001 From: Monique Date: Mon, 24 Jan 2022 12:14:00 +0100 Subject: [PATCH 3/3] printknop tijdelijk uit --- application/views/monpas/pages/monitor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/monpas/pages/monitor.php b/application/views/monpas/pages/monitor.php index 1651793..443adc8 100644 --- a/application/views/monpas/pages/monitor.php +++ b/application/views/monpas/pages/monitor.php @@ -13,10 +13,10 @@ value : selectedOrgversion, event : {change: fChangeVersion}"> - - + + + +