Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fouten/monfinprint' into develop

Browse Source
This commit is contained in:
Monique
2024-01-15 08:12:47 +01:00
parent a45f80f5a4 c7f6bbf842
commit e5df1aff04
9 changed files with 105 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monfin2/Monfin2overzicht.php
+6 -1
View File
@@ -528,6 +528,9 @@ class Monfin2overzicht extends MY_Controller{
$level3 = array();
$idarray = array();
$idarray[] =$orgid;
$soort = $this->Organisaties_model->get_fieldvalue(['id'=>$orgid], 'soort');
$organisaties = $this->Organisaties_model->getorgsonder($orgid);
if ($organisaties){
foreach($organisaties as $organisatie){
@@ -543,7 +546,9 @@ class Monfin2overzicht extends MY_Controller{
$idarray[]=$l2->id;
}
}; // if level2
$idarray[] = $organisatie->id;
$idarray[] = $organisatie->id;
}
}; // if organisaties
return implode(',', $idarray);
application/views/monpas/pages/monfin2/bestemmingen.php
+5 -5
View File
@@ -9,9 +9,7 @@
<span style="margin-right: 20px;"
data-bind="text: 'Dit jaar is financieel afgesloten', visible: jaarclosed()"><span>
</h4>
<div data-bind="visible: ! jaartoewijzing()">
<p>Er zijn nog geen budgetgegevens voor dit kalenderjaar</p>
</div>
</div>
<div class = "col-sm-12" data-bind="visible: jaartoewijzing()">
<div data-bind="visible: jaartoewijzing() && jaartoewijzing().basisextra == 0">
@@ -345,6 +343,8 @@
<textarea style="width:100%"
data-bind="textInput: opmerking, event:{input: fSaveOpmerking}"></textarea>
</div> <!-- als onderscheid tussen basis en extra is gemaakt bij budgetten, maar dat moet vanaf nu-->
</div> <!-- col sm 12 als jaartoewijzing-->
</div> <!-- col sm 12 als jaartoewijzing-->
<div data-bind="visible: ! jaartoewijzing()">
<p>Er zijn nog geen budgetgegevens voor dit kalenderjaar</p>
</div>
</div>
application/views/monpas/pages/monfin2/overzicht.php
+50 -41
View File
@@ -69,38 +69,41 @@
<div id="finoverzichtpage">
<div data-bind="visible: zelfjanee() == 1 || zelfjanee() == 3 ">
<table style=" font-size: 13px; width:100%">
<table style=" width: 100%; font-size: 13px;">
<thead class="blokheader">
<tr class="blokheader">
<th style="background-color: #968026; width: 2%;"></th>
<th class="naam2"
style="padding: 3px; width: 22%; vertical-align:bottom; background-color: #968026;">Basisondersteuning
<th
class="naam2 pdfmonfin"
style="padding: 3px;vertical-align: bottom!important; background-color: #968026;">Basisondersteuning
</th>
<!-- ko foreach: uitgavetypes-->
<th style="writing-mode: vertical-rl; padding: 3px; width: 9%; vertical-align:text-top; text-align: right; font-size:0.9em; background-color: #968026;" ><span data-bind="text: naam == 'Totaal' ? 'SOM UITGAVEN' : naam "></span>
<th class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px; width: 9%; vertical-align:text-bottom; text-align: right; font-size:0.9em; background-color: #968026;" ><span data-bind="text: naam == 'Totaal' ? 'SOM UITGAVEN' : naam "></span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting.bind($data, 'KOSTEN')">
</i>
</th>
<!--/ko -->
<th style="width: 9%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>som budget</span>
<th class="pdfmonfin" style="width: 9%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;font-size:0.9em;text-align:right; background-color: #968026;"><span >som budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i>
</th>
<th style="text-align:right; background-color: #968026; width: 2%">
<th class="pdfmonfin" style="text-align:right; background-color: #968026; width: 2%">
</th>
<th style="writing-mode: vertical-rl; padding: 3px; width: 9%; vertical-align:text-top; text-align:right; background-color: #968026;"><span>verschil</span>
<th class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px;font-size:0.9em; width: 9%; vertical-align:text-top; text-align:right; background-color: #968026;"><span >verschil</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'VERSCHIL')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:9%; background-color: #968026; font-size: 12px;"><span>% uitgaven</span>
<th class="pdfmonfin" style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:9%; background-color: #968026;white-space: nowrap; font-size:0.9em"><span >% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</th>
<th style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:9%; background-color: #968026; font-size: 12px;"><span>% budget</span>
<th class="pdfmonfin" style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; width:9%; background-color: #968026; white-space: nowrap; font-size:0.9em"><span >% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
</i>
@@ -108,11 +111,11 @@
</tr>
</thead>
<tbody >
<tr style="background-color:#ded0d7">
<tr class="fontsizepdfmonfin "style="background-color:#ded0d7">
<td class="glyphicon"
data-bind="css:{'glyphicon-chevron-right': !basisgeopend(), 'glyphicon-chevron-down': basisgeopend()},click: fToggle.bind($data,'BASIS')">
</td>
<td class="naam2" style="text-align:left;">Totaal basis</td>
<td style="text-align:left;">Totaal basis</td>
<!--ko if: sombasisperuitgavetype() -->
<!-- ko foreach: sombasisperuitgavetype-->
<td style="text-align:right" data-bind="text: som"></td>
@@ -120,7 +123,7 @@
<!-- ko foreach: sombasisperuitgavetype()-->
<!-- ko if: $index() ==0 -->
<td style="text-align:right" data-bind="text: budgetsom"></td>
<td style="text-align:right" data-bind="text: budgetsom"></td>
<!-- /ko -->
<!-- /ko -->
@@ -129,13 +132,13 @@
<!-- ko foreach: uitgavetypes-->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
click: $root.fOpenDetails.bind($data, 'BASIS') "
></i></td>
<td style="text-align:right"
<td style="text-align:right"
data-bind="text : $root.budgetten() ?$root.budgetten().basisverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' } ">
</td>
@@ -150,7 +153,7 @@
<!-- ko foreach: basis -->
<!-- ko if: $root.basisgeopend() -->
<!-- ko foreach: subsoorten -->
<tr style="border-bottom:1px solid #ebebeb">
<tr class="fontsizepdfmonfin " style="border-bottom:1px solid #ebebeb">
<td></td>
<td data-bind="text:naam" class="naam" style="padding:0;" > </td>
<td data-bind="text: uitgavetypes[0].bedragform ,
@@ -193,38 +196,38 @@
</tbody>
<tbody class="blokheader">
<tr class="blokheader">
<td style="background-color: #968026;"></td>
<td class="naam2"
<td class="pdfmonfin"style="background-color: #968026;"></td>
<td class=" naam2 pdfmonfin "
style="padding: 3px; vertical-align:bottom; background-color: #968026;">Extra ondersteuning</td>
<!-- ko foreach: uitgavetypes-->
<td style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; text-align: right; background-color: #968026;" >
<td class="pdfmonfin" style="writing-mode: vertical-rl; font-size:0.9em; padding: 3px; vertical-align:text-top; text-align: right; background-color: #968026;" >
<span data-bind="text: naam == 'Totaal' ? 'SOM UITGAVEN' : naam "></span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting.bind($data, 'KOSTEN')">
</i>
</td>
<!-- /ko -->
<td style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;">
<td class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px; font-size:0.9em;vertical-align:text-top;text-align:right; background-color: #968026;">
<span>som budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i>
</td>
<td style="text-align:right; background-color: #968026;">
<td class="pdfmonfin" style="text-align:right; font-size:0.9em; background-color: #968026;">
</td>
<td style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; text-align:right; background-color: #968026;">
<td class="pdfmonfin" style="writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;font-size:0.9em; text-align:right; background-color: #968026;">
<span>verschil</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'VERSCHIL')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<td class="pdfmonfin" style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; white-space: nowrap; font-size:0.9em">
<span>% uitgaven</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</td>
<td style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; font-size: 12px;">
<td class="pdfmonfin" style="text-align:right; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top; background-color: #968026; white-space: nowrap; font-size:0.9em">
<span>% budget</span>
<i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, '%BUDGET')">
@@ -233,7 +236,7 @@
</tr>
</tbody>
<tbody>
<tr style="background-color:#ded0d7">
<tr class="fontsizepdfmonfin " style="background-color:#ded0d7">
<td class="glyphicon"
data-bind="css:{'glyphicon-chevron-right': !extrageopend(), 'glyphicon-chevron-down': extrageopend()},click: fToggle.bind($data,'EXTRA')">
</td>
@@ -279,7 +282,7 @@
<!-- ko foreach: extra -->
<!-- ko if: $root.extrageopend() -->
<!-- ko foreach: subsoorten -->
<tr style="border-bottom:1px solid #ebebeb">
<tr class="fontsizepdfmonfin " style="border-bottom:1px solid #ebebeb">
<td></td>
<td data-bind="text:naam" class="naam" style="padding:0;" > </td>
<td data-bind="text : uitgavetypes[0].bedragform,
@@ -321,7 +324,7 @@
</tbody>
<tbody>
<tr style="background-color:#f8f8f8">
<tr class="fontsizepdfmonfin "style="background-color:#f8f8f8">
<td></td>
<td style="text-align:left">Totaal</td>
<!-- ko if: totsomperuitgavetype() -->
@@ -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' }">
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,
style: {color: parseFloat($root.budgetten().totbedragbudgetkaal) > 100 ? 'red' : 'black'}" >
</td>
<td
style="text-align:right"
data-bind="text: $root.budgetten().totbudgetpct "
>
</td>
<!-- <td style="text-align:right"-->
<!-- data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,-->
<!-- style: {color: parseFloat($root.budgetten().totbedragbudgetkaal) > 100 ? 'red' : 'black'}" >-->
<!-- </td>-->
<!-- <td-->
<!---->
<!-- style="text-align:right"-->
<!-- data-bind="text: $root.budgetten().totbudgetpct "-->
<!---->
<!-- >-->
<!-- </td>-->
<td style="padding: 3px; text-align: right">100,0</td>
<td style="padding: 3px; text-align: right">100,0</td>
</tr>
</tbody>
</table>
<div data-bind="visible: opmerking()" style="margin-top: 20px">
<p>Opmerkingen</p>
<p data-bind="text: opmerking"></p>
@@ -377,9 +385,10 @@
<?php $this->load->view("monpas/modals/findetails_modal"); ?>
</div><div class="col-sm-12 mainpagina" id ="pagmonfinoverzicht2">
</div>
<div class="col-sm-12 mainpagina" id ="pagmonfinoverzicht2">
<div class="col-sm-3" style="padding:0px">
<table class="lstable" style="width:100%;">
<table class="lstable familymonfin" style="width:100%;">
<colgroup>
<col span='4' style="width: 18px">
<col style="width: 220px">
@@ -423,7 +432,7 @@
</div>
<div class="col-sm-9" >
<p data-bind= "visible: !selectedOrg() ">Selecteer eerst een organisatie</p>
<h4 style="margin-top:0px;"> Kalenderjaar
<h4 style="margin-top:0;"> Kalenderjaar
<select data-bind="options: kalenderjaren,
optionsText: 'naam',
value: selectedKalenderjaar,
@@ -448,7 +457,7 @@
<div id="finoverzichtpage">
<div data-bind="visible: zelfjanee() == 1 || zelfjanee() == 3 ">
<table style=" font-size: 13px; width:100%">
<table class="familymonfin " style=" font-size: 13px; width:100%">
<thead class="blokheader">
<tr class="blokheader">
<th style="background-color: #968026; width: 2%;"></th>
application/views/monpas/reports/financien.php
+25 -5
View File
@@ -6,27 +6,47 @@
<style>
table { border-collapse: collapse;
border-spacing: 0;
line-height: 20px:
font-size: 9px;
line-height: 15px;
/*font-size: 11px;*/
font-family: 'lato',sans-serif, verdana;
table-layout:fixed;}
.blokheader{
border-radius:3px;
text-transform:uppercase;
background-color:#968026;
width:99%;
height:20px;
font-size: 10px;
height:15px;
text-align:center;
margin-left:0.5%;
color:#ffffff;
padding-top: 5px;
margin-top:2px;
vertical-align: bottom !important;
/*transform: rotate(90deg)!important;*/
}
.naam {width: 223px !important }
.naam2 {width: 200px !important}
.pdfmonfin{
vertical-align: bottom !important;
text-transform: lowercase !important;
padding-bottom: 3px !important;
font-size:10px;
font-weight: bold;
text-align: left;
}
.fontsizepdfmonfin{
font-size: 10px;
}
.familymonfon{
font-family: 'lato',sans-serif, verdana;
}
</style>
</head>
</html>
<body style="font-size:12px; font-family: OpenSans, Sans ">
<body style="font-size:12px; font-family: 'lato',sans-serif, verdana; ">
<h4><?=$titel?></h4>
<p> Jaar: <?=$jaar?> <br>
Vanuit organisatie: <?=$org?></p>
public/css/monpas/main.css
+5
View File
@@ -135,6 +135,11 @@ a.email:before {
padding-top:5px;
margin-top:2px;
}
.pdfmonfin{
padding: 3px;
}
.holder{
margin : 3px;
}
public/images/logos/xLBc6QAJOaf9UWS.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

public/js/monpas/models/monfin/bestedingen.js
+3
View File
@@ -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');
public/js/monpas/models/monfin2/bestemmingen.js
+7 -3
View File
@@ -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;
public/js/monpas/models/monfin2/monfinoverzicht2.js
+4 -1
View File
@@ -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();