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

Merge branch 'fouten/monfin' into develop

Browse Source
This commit is contained in:
Monique
2024-03-04 09:32:20 +01:00
parent 5d46c8f998 ee398549b1
commit e345399e03
9 changed files with 153 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/monfin/overzicht.php
+4 -4
View File
@@ -133,7 +133,7 @@
<th style="text-align: right">Overig</th>
<th style="text-align: right">Totaal bestemd</th>
<th style="text-align: right">Totaal budget</th>
<th style="text-align: right">Verschil</th>
<th style="text-align: right">is het deze?</th>
</tr>
</thead>
<tbody data-bind="foreach: borganisaties">
@@ -144,7 +144,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
@@ -156,7 +156,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
@@ -180,7 +180,7 @@
<td style="text-align: right" data-bind="text: besom, visible: !$parent.basisextra() "></td>
<td style="text-align: right" data-bind="text: overig"></td>
<td style="text-align: right" data-bind="text: totaal"></td>
<td style="text-align: right" data-bind="text: totaalbudget"></td>
<td style="text-align: right" data-bind="text: schooltotaal().gebudget"></td>
<td style="text-align: right" data-bind="text: verschil"></td>
</tr>
</tbody>
application/views/monpas/pages/monfin2/overorgs.php
+11 -11
View File
@@ -15,8 +15,8 @@
<td style="text-align:right" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formBasis : '' "></td>
<td style="text-align:right" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formExtra : '' "></td>
<td style="text-align:right;border-left:1px solid #777777;" data-bind="text: (typeof bestemmingen != 'undefined' ) ? bestemmingen.formSom : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? budget.formTotaal : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof formVerschil != 'undefined' ) ? formVerschil : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? gebudgetForm : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof formVerschil != 'undefined' ) ? verschilGebForm : '' "></td>
</tr>
</tbody>
<tr style="background-color: #e7e2e5 ; font-style:italic" data-bind="with: subTot">
@@ -25,8 +25,8 @@
<td style="text-align:right; " data-bind="text: basis"></td>
<td style="text-align:right; " data-bind="text: extra"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: som"></td>
<td style="text-align:right; " data-bind="text: budget"></td>
<td style="text-align:right; " data-bind="text: verschil"></td>
<td style="text-align:right; " data-bind="text: gebudget"></td>
<td style="text-align:right; " data-bind="text: verschilGeb"></td>
<!-- <td style="text-align:right; " data-bind="text: $root.selectedOrg().soort"></td>-->
</tr>
@@ -35,7 +35,7 @@
<td style="text-align:right; " data-bind="text: soort == 3 ?bestemmingen.formBasis : '' "></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formExtra: '' "></td>
<td style="border-left:1px solid #777777;text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formSom: '' "></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? budgetten.totaal: ''"></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? $root.grandTot().gebudget: ''"></td>
<td style="text-align:right; " data-bind="text: soort == 3 ? budgetten.verschil: ''"></td>
</tr>
@@ -44,13 +44,13 @@
<!-- ko if: targetOrg().soort -->
<!-- ko if: targetOrg().soort == 3 -->
<tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
<tr style="background-color: #ded0d7; font-weight: 600" >
<td >Totaal</td>
<td style="text-align:right; " data-bind="text: basis"></td>
<td style="text-align:right;" data-bind="text: extra"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: som"></td>
<td style="text-align:right;" data-bind="text: budget"></td>
<td style="text-align:right; " data-bind="text: verschil"></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().basis: '' "></td>
<td style="text-align:right;" data-bind="text: grandTot() ? grandTot().extra: ''"></td>
<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: grandTot() ? grandTot().som : '' "></td>
<td style="text-align:right;" data-bind="text: grandTot() ? grandTot().gebudget : '' "></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().verschilGeb: ''"></td>
</tr>
<!-- /ko -->
application/views/monpas/pages/monfin2/overzicht.php
+20 -16
View File
@@ -124,6 +124,11 @@
<!-- ko if: $index() ==0 -->
<td style="text-align:right" data-bind="text: budgetsom"></td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.budgetten(),
click: $root.fOpenDetails.bind($data, 'BASIS') "
></i></td>
<td style="text-align:right" data-bind="text: budgetrestant" ></td>
<!-- /ko -->
<!-- /ko -->
@@ -133,15 +138,14 @@
<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>
<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"
data-bind="text : $root.budgetten() ?$root.budgetten().basisverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' } ">
</td>
<!-- <td style="text-align:right"-->
<!-- data-bind="text : sombasisperuitgavetype() ? sombasisperuitgavetype()[0].budgetrestant: '0,00',-->
<!-- ">-->
<!-- </td>-->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00',
@@ -332,7 +336,7 @@
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.schooltotaal().budget">
<td style="text-align:right" data-bind="text: $root.schooltotaal().gebudget">
</td>
<!-- /ko -->
<!-- ko if: ! totsomperuitgavetype() -->
@@ -342,13 +346,13 @@
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
data-bind="visible: $root.budgetten().totaal > 0,
click: $root.fOpenDetails.bind($data, 'TOTAAL') ">
</i>
</td>
<td style="text-align:right"
data-bind="text: $root.schooltotaal() && $root.schooltotaal().verschil ? $root.schooltotaal().verschil : '0,00',
style : {color: $root.schooltotaal() && Number($root.schooltotaal().verschil) < 0 ? 'red' : 'black' }">
data-bind="text: $root.budgetten() && $root.budgetten().totaalverschil ? $root.budgetten().totaalverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().totaalverschil) < 0 ? 'red' : 'black' }">
</td>
<!-- <td style="text-align:right"-->
<!-- data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,-->
@@ -362,7 +366,7 @@
<!-- >-->
<!-- </td>-->
<td style="padding: 3px; text-align: right" >100</td>
<td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbedragpct : '0,0' "></td>
<td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbudgetpct : '0,0' "></td>
</tr>
@@ -725,7 +729,7 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.schooltotaal().gebudget : '0,00'">
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten(0.basis : '0,00'">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
@@ -733,8 +737,8 @@
</i>
</td>
<td style="text-align:right"
data-bind="text: $root.schooltotaal() && $root.schooltotaal().verschil ? $root.schooltotaal().verschil : '0,00',
style : {color: $root.schooltotaal() && Number($root.schooltotaal().verschil) < 0 ? 'red' : 'black' }">
data-bind="text: $root.budgetten() && $root.budgetten().totaalverschil ? $root.budgetten().totaalverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().totaalverschil) < 0 ? 'red' : 'black' }">
</td>
<td style="text-align:right"
data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,