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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Monique
2024-03-04 18:12:43 +01:00
parent e345399e03 ad37ca50f2
commit d66dadd11f
6 changed files with 169 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/monfin2/overorgs.php
+9 -13
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' ) ? gebudgetForm : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof formVerschil != 'undefined' ) ? verschilGebForm : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? budgetForm : '' "></td>
<td style="text-align: right; " data-bind="text: (typeof budget != 'undefined' ) ? formVerschil : '' "></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: gebudget"></td>
<td style="text-align:right; " data-bind="text: verschilGeb"></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: $root.selectedOrg().soort"></td>-->
</tr>
@@ -35,8 +35,8 @@
<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 ? $root.grandTot().gebudget: ''"></td>
<td style="text-align:right; " data-bind="text: soort == 3 ? budgetten.verschil: ''"></td>
<td style="text-align:right;" data-bind="text: soort == 3 ? budgetten.formSom: ''"></td>
<td style="text-align:right; " data-bind="text: soort == 3 ? verschil: ''"></td>
</tr>
@@ -45,20 +45,16 @@
<!-- ko if: targetOrg().soort == 3 -->
<tr style="background-color: #ded0d7; font-weight: 600" >
<td >Totaal</td>
<td >Totaal </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>
<td style="text-align:right;" data-bind="text: grandTot() ? grandTot().budget : '' "></td>
<td style="text-align:right; " data-bind="text: grandTot() ? grandTot().verschil: ''"></td>
</tr>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</table>
application/views/monpas/pages/monfin2/overzicht.php
+23 -26
View File
@@ -103,11 +103,11 @@
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</th>
<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>
</th>
<!-- <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>-->
<!-- </th>-->
</tr>
</thead>
<tbody >
@@ -143,15 +143,13 @@
<!-- /ko -->
<!-- <td style="text-align:right"-->
<!-- data-bind="text : sombasisperuitgavetype() ? sombasisperuitgavetype()[0].budgetrestant: '0,00',-->
<!-- ">-->
<!-- 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',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' }">
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00' ">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisbudgetpct : '0,00' "></td>
<!-- <td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisbudgetpct : '0,00' "></td>-->
</tr>
<!-- ko foreach: basis -->
@@ -190,7 +188,7 @@
<td style="text-align:right;" data-bind="text: uitgavetypes[0].bedragpct,
style: {color: Number(uitgavetypes[0].verschil.form)< 0 ? 'red': 'black'}">
</td>
<td style="text-align:right;" data-bind="text: Number(uitgavetypes[0].budgetform) > 0 ? uitgavetypes[0].budgetpct : '' "></td>
<!-- <td style="text-align:right;" data-bind="text: Number(uitgavetypes[0].budgetform) > 0 ? uitgavetypes[0].budgetpct : '' "></td>-->
</tr>
@@ -231,12 +229,12 @@
data-bind="click: fToelichting.bind($data, '%UITGAVEN')">
</i>
</td>
<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')">
</i>
</td>
<!-- <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')">-->
<!-- </i>-->
<!-- </td>-->
</tr>
</tbody>
<tbody>
@@ -277,9 +275,9 @@
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabedragpct : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().extraverschil) < 0 ? 'red' : 'black' }">
">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().extrabudgetpct : '0,00' "></td>
<!-- <td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().extrabudgetpct : '0,00' "></td>-->
</tr>
@@ -318,7 +316,7 @@
<td style="text-align:right;" data-bind="text: uitgavetypes[0].bedragpct,
style: {color: Number(uitgavetypes[0].verschilform)< 0 ? 'red': 'black'}">
</td>
<td style="text-align:right;" data-bind="text: Number(uitgavetypes[0].budgetform) > 0 ? uitgavetypes[0].budgetpct : '' "></td>
<!-- <td style="text-align:right;" data-bind="text: Number(uitgavetypes[0].budgetform) > 0 ? uitgavetypes[0].budgetpct : '' "></td>-->
</tr>
@@ -336,7 +334,7 @@
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.schooltotaal().gebudget">
<td style="text-align:right" data-bind="text: $root.budgetten().totaal">
</td>
<!-- /ko -->
<!-- ko if: ! totsomperuitgavetype() -->
@@ -367,7 +365,7 @@
<!-- </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>
<!-- <td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbudgetpct : '0,0' "></td>-->
</tr>
</tbody>
@@ -534,7 +532,7 @@
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().basisbedragpct : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().basisverschil) < 0 ? 'red' : 'black' }">
">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().basisbudgetpct : '0,00' "></td>
@@ -659,12 +657,11 @@
</td>
<td style="text-align:right"
data-bind="text : $root.budgetten() ?$root.budgetten().extraverschil : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().extraverschil) < 0 ? 'red' : 'black' } ">
">
</td>
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabedragpct : '0,00',
style : {color: $root.budgetten() && Number($root.budgetten().extraverschil) < 0 ? 'red' : 'black' }">
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.budgetten().extrabedragpct : '0,00',">
</td>
<td style="text-align:right" data-bind="text : $root.budgetten() ?$root.budgetten().extrabudgetpct : '0,00' "></td>