From c7f6bbf842651f25ebecaf96f45c8a3de28cd8e8 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Mon, 15 Jan 2024 08:12:11 +0100 Subject: [PATCH] prints monfin, jaartal 2023 --- .../monpas/pages/monfin2/bestemmingen.php | 10 +- .../views/monpas/pages/monfin2/overzicht.php | 91 ++++++++++-------- .../views/monpas/reports/financien.php | 30 +++++- public/css/monpas/main.css | 5 + public/images/logos/xLBc6QAJOaf9UWS.jpg | Bin 0 -> 13397 bytes public/js/monpas/models/monfin/bestedingen.js | 3 + .../js/monpas/models/monfin2/bestemmingen.js | 10 +- .../monpas/models/monfin2/monfinoverzicht2.js | 5 +- 8 files changed, 99 insertions(+), 55 deletions(-) create mode 100644 public/images/logos/xLBc6QAJOaf9UWS.jpg diff --git a/application/views/monpas/pages/monfin2/bestemmingen.php b/application/views/monpas/pages/monfin2/bestemmingen.php index 5a7029c..8f7db48 100644 --- a/application/views/monpas/pages/monfin2/bestemmingen.php +++ b/application/views/monpas/pages/monfin2/bestemmingen.php @@ -9,9 +9,7 @@ -
-

Er zijn nog geen budgetgegevens voor dit kalenderjaar

-
+
@@ -345,6 +343,8 @@
-
- + +
+

Er zijn nog geen budgetgegevens voor dit kalenderjaar

+
diff --git a/application/views/monpas/pages/monfin2/overzicht.php b/application/views/monpas/pages/monfin2/overzicht.php index 77cb25c..1d3ba7e 100644 --- a/application/views/monpas/pages/monfin2/overzicht.php +++ b/application/views/monpas/pages/monfin2/overzicht.php @@ -69,38 +69,41 @@
- + + +
- - - - - - - - + - + @@ -120,7 +123,7 @@ - + @@ -129,13 +132,13 @@ - + - @@ -150,7 +153,7 @@ - + - - + - - - - - - - + @@ -279,7 +282,7 @@ - + @@ -346,21 +349,26 @@ data-bind="text: $root.schooltotaal() && $root.schooltotaal().verschil ? $root.schooltotaal().verschil : '0,00', style : {color: $root.schooltotaal() && Number($root.schooltotaal().verschil) < 0 ? 'red' : 'black' }"> - - + + + + + + + + + + + + +
Basisondersteuning + Basisondersteuning + som budget + som budget + verschil + verschil % uitgaven + % uitgaven % budget + % budget @@ -108,11 +111,11 @@
Totaal basisTotaal basis 0,00 0,000,00
Extra ondersteuning + + som budget + + verschil + % uitgaven + % budget @@ -233,7 +236,7 @@
+
Totaal - - 100,0100,0
+ + +

Opmerkingen

@@ -377,9 +385,10 @@ load->view("monpas/modals/findetails_modal"); ?> -
+
+
- +
@@ -423,7 +432,7 @@

Selecteer eerst een organisatie

-

Kalenderjaar +

Kalenderjaar

+
diff --git a/application/views/monpas/reports/financien.php b/application/views/monpas/reports/financien.php index 4db030a..c61c7b7 100644 --- a/application/views/monpas/reports/financien.php +++ b/application/views/monpas/reports/financien.php @@ -6,27 +6,47 @@ - +

Jaar:
Vanuit organisatie:

diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 76d876b..53db3aa 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -135,6 +135,11 @@ a.email:before { padding-top:5px; margin-top:2px; } +.pdfmonfin{ + padding: 3px; +} + + .holder{ margin : 3px; } diff --git a/public/images/logos/xLBc6QAJOaf9UWS.jpg b/public/images/logos/xLBc6QAJOaf9UWS.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6522b30a8e60aab64de6937093a362f774a1ef01 GIT binary patch literal 13397 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 literal 0 HcmV?d00001 diff --git a/public/js/monpas/models/monfin/bestedingen.js b/public/js/monpas/models/monfin/bestedingen.js index aee3920..ef04e49 100644 --- a/public/js/monpas/models/monfin/bestedingen.js +++ b/public/js/monpas/models/monfin/bestedingen.js @@ -57,6 +57,7 @@ ls.initBestedingenModel = function(){ jaarclosed : ko.observable(true), initBindings :function(){ + console.log('in init bindings') var self = ls.BestedingenModel; if (!ko.dataFor(document.getElementById('pagmonfinbestedingen')) ) { @@ -68,7 +69,9 @@ ls.initBestedingenModel = function(){ $.each(result.kalenderjaren, function(i,p){ self.kalenderjaren.push(new fAddKalenderjaar(p)); }); // each + self.selectedKalenderjaar(self.kalenderjaren()[0]); + }; self.bestemmingslabels(result.labels); },'json'); diff --git a/public/js/monpas/models/monfin2/bestemmingen.js b/public/js/monpas/models/monfin2/bestemmingen.js index 8267f8d..c69842d 100644 --- a/public/js/monpas/models/monfin2/bestemmingen.js +++ b/public/js/monpas/models/monfin2/bestemmingen.js @@ -107,7 +107,6 @@ ls.initBestemmingenModel = function(){ selectedKalenderjaar : ko.observable(), jaartoewijzing : ko.observable(), erIsBudget : ko.observable(false), - targetjaar : ko.observable(2017), //het jaar waarin met moet werken uitgavetypes : ko.observableArray(), basissoorten : ko.observableArray(), extrasoorten : ko.observableArray(), @@ -142,8 +141,12 @@ ls.initBestemmingenModel = function(){ self.kalenderjaren.push(new fAddKalenderjaar(p)); }); // each - self.selectedKalenderjaar(self.kalenderjaren()[0]); - self.targetjaar(result.targetjaar); + let datum = new Date(); + let maand = datum.getMonth() + if(maand < 5)self.selectedKalenderjaar(self.kalenderjaren()[1]); + else self.selectedKalenderjaar(self.kalenderjaren()[0]); + self.fGetBestemmingen(); + }; },'json'); $.post("index.php/monfin2/bestemmingen/getUitgavetypes", function(result){ @@ -155,6 +158,7 @@ ls.initBestemmingenModel = function(){ initModel: function(){ var self = ls.BestemmingenModel; + }, fGetAllBestemmingen: function(){ var self = ls.BestemmingenModel; diff --git a/public/js/monpas/models/monfin2/monfinoverzicht2.js b/public/js/monpas/models/monfin2/monfinoverzicht2.js index 75ae32b..9c96d62 100644 --- a/public/js/monpas/models/monfin2/monfinoverzicht2.js +++ b/public/js/monpas/models/monfin2/monfinoverzicht2.js @@ -85,7 +85,10 @@ ls.initMonfinOverzicht2Model = function(){ $.each(data, function(j,k){ self.kalenderjaren.push(new fAddKalenderjaar(k)); }); // each - self.selectedKalenderjaar(self.kalenderjaren()[0]); + let datum = new Date(); + let maand = datum.getMonth() + if(maand < 5)self.selectedKalenderjaar(self.kalenderjaren()[1]); + else self.selectedKalenderjaar(self.kalenderjaren()[0]); } $.post("index.php/monpas/monfinbeheer/getorgs", function(result){ self.orgs.removeAll();