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

Merge branch 'feature/budgetmonfin' into develop

Browse Source
This commit is contained in:
Monique
2023-04-25 19:23:38 +02:00
parent 60b577f279 747142a441
commit 857b43f236
3 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+1 -1
View File
@@ -82,7 +82,7 @@ class MY_Controller extends CI_Controller{
// public $version = '1.19.01';// compactdiv met orgid ipv globorg
// public $version = '1.19.05';// ambities per org incl kamerversies
// public $version = '1.19.06';// monfin met budgetten
public $version = '1.20.01';// monfin met budgetten
public $version = '1.20.02';// monfin met budgetten
public $partituurid;
public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in
application/views/monpas/pages/monfin2/bestemmingen.php
+44 -44
View File
@@ -32,8 +32,8 @@
<th style="width: 14%"></th>
<th style="width: 14%"></th>
<th style="width:14%"></th>
<th style="width:7%"></th>
<th style="width:7%"></th>
<th style="width:14%"></th>
<!-- <th style="width:7%"></th>-->
</tr>
</thead>
<tbody data-bind="foreach: basissoorten">
@@ -57,7 +57,7 @@
<td class="blokheader" style="text-align: right; padding-right: 5px;padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Som</span>
</td>
<td colspan="2" class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<td class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Percentage</span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting,
@@ -91,17 +91,17 @@
</span>
</div>
</td>
<!-- <td style="padding: 0; padding-top: 1px; vertical-align: top">-->
<!-- <div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;-->
<!-- font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;-->
<!-- padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">-->
<!-- <span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',-->
<!-- visible: ! $root.jaarclosed()">-->
<!-- </span>-->
<!-- </div>-->
<!-- </td>-->
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
<div style="width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? budgetprocent() : ' ' ,
@@ -135,7 +135,7 @@
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
<div style="width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: procent,
@@ -143,15 +143,15 @@
</span>
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind=" text: totaalbudgetprocent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<!-- <td style="padding: 0; vertical-align: top">-->
<!-- <div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;-->
<!-- font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;-->
<!-- padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">-->
<!-- <span data-bind=" text: totaalbudgetprocent,-->
<!-- visible: ! $root.jaarclosed()">-->
<!-- </span>-->
<!-- </div>-->
<!-- </td>-->
</tr>
@@ -196,8 +196,8 @@
<th style="width: 14%"></th>
<th style="width: 14%"></th>
<th style="width:14%"></th>
<th style="width:7%"></th>
<th style="width:7%"></th>
<th style="width:14%"></th>
<!-- <th style="width:7%"></th>-->
</tr>
</thead>
@@ -222,7 +222,7 @@
<td class="blokheader" style="text-align: right; padding-right: 5px;padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Som</span>
</td>
<td colspan="2" class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<td class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; border-radius: 0">
<span data-bind="visible: $index() ==0">Percentage</span>
<i class="fa fa-info-circle"
data-bind="click: $parent.fToelichting,
@@ -256,15 +256,15 @@
</span>
</div>
</td>
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<!-- <td style="padding: 0; padding-top: 1px; vertical-align: top">-->
<!-- <div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;-->
<!-- font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;-->
<!-- padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">-->
<!-- <span data-bind="text: subbudgetform() != '' ? gebudgetprocent(): '',-->
<!-- visible: ! $root.jaarclosed()">-->
<!-- </span>-->
<!-- </div>-->
<!-- </td>-->
<td style="padding: 0; padding-top: 1px; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6ffee; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
@@ -308,15 +308,15 @@
</span>
</div>
</td>
<td style="padding: 0; vertical-align: top">
<div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
<span data-bind=" text: totaalbudgetprocent,
visible: ! $root.jaarclosed()">
</span>
</div>
</td>
<!-- <td style="padding: 0; vertical-align: top">-->
<!-- <div style="width:72px; max-width: 98%;height: 24px; background-color: #e6f2ff; border-radius: 3px;border: 1px solid #a07b8e;-->
<!-- font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;-->
<!-- padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">-->
<!-- <span data-bind=" text: totaalbudgetprocent,-->
<!-- visible: ! $root.jaarclosed()">-->
<!-- </span>-->
<!-- </div>-->
<!-- </td>-->
</tr>
public/js/monpas/models/monfin2/bestemmingen.js
+5 -6
View File
@@ -42,7 +42,7 @@ ls.initBestemmingenModel = function(){
this.subbudgetform = ko.observable('');
this.subbudgetformReserve = ko.observable('');
this.budgetprocent = ko.observable(0);
this.gebudgetprocent = ko.observable(0);
// this.gebudgetprocent = ko.observable(0);
if (b.uitgavetypes) {
$.each(b.uitgavetypes, function (i, k) {
@@ -95,8 +95,6 @@ ls.initBestemmingenModel = function(){
}
else dit.procent('');
}
}
@@ -540,9 +538,10 @@ ls.initBestemmingenModel = function(){
fToelichting: function(){
apprise('<p>De eerste kolom geeft de som weer van het budget als percentage van het totaal gebudgetteerde bedrag (rij budget). ' +
'De tweede rij (uitgaven) geeft de som van de uitgaven als percentage van de totale uitgaven.</p>' +
'<p>De tweede kolom geeft de som van resp. het budget/de uitgaven als percentage van het totaalbudget weer.</p>' )
apprise( '<p>De tweede kolom geeft de som van resp. het budget/de uitgaven als percentage van het totaalbudget weer.</p>' +
'<p><span>In de rijen </span><span style="font-style: italic">budget </span><span>geeft het</span> <span style="font-weight: bold">percentage </span><span>het gebugeteerde bedrag in de rij weer in verhouding tot het toaalbudget.</span></p>'+
' <p><span>In de rijen </span><span style="font-style: italic">uitgaven </span><span>geeft het</span> <span style="font-weight: bold">percentage </span><span>de uitgaven weer in de rij in verhouding tot de totale uitgaven.</span></p>'
)
},
fSaveOpmerking: function(){