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

Merge branch 'feature/budgetmonfin' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2023-09-25 17:03:51 +02:00
parent dacaa93f35 18b363af71
commit 4934f35619
6 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/monfin2/overorgs.php
+27 -10
View File
@@ -20,23 +20,31 @@
</tr>
</tbody>
<tr style="background-color: #e7e2e5 ; font-style:italic" data-bind="with: subTot">
<td>Subtotaal</td>
<!-- data-bind verwijderen als alles goed staat en wijzigen in subtotaal-->
<td data-bind="text: $root.selectedOrg().soort > 2 ? 'Subtotaal' : '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: $root.selectedOrg().soort"></td>-->
</tr>
<tr data-bind="with:targetOrg">
<td data-bind="text:naamkort"></td>
<td style="text-align:right; " data-bind="text: bestemmingen.formBasis"></td>
<td style="text-align:right;" data-bind="text: bestemmingen.formExtra"></td>
<td style="border-left:1px solid #777777;text-align:right;" data-bind="text: bestemmingen.formSom"></td>
<td style="text-align:right;" data-bind="text:budgetten.totaal">Totaal budget</td>
<td style="text-align:right; " data-bind="text: budgetten.verschil">Verschil</td>
<tr data-bind="with: targetOrg">
<td data-bind="text: soort == 3 ? naamkort : ''"></td>
<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 ? budgetten.verschil: ''"></td>
</tr>
<tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
<!-- ko if: targetOrg-->
<!-- ko if: targetOrg().soort -->
<!-- ko if: targetOrg().soort == 3 -->
<tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
<td >Totaal</td>
<td style="text-align:right; " data-bind="text: basis"></td>
<td style="text-align:right;" data-bind="text: extra"></td>
@@ -44,4 +52,13 @@
<td style="text-align:right;" data-bind="text: budget"></td>
<td style="text-align:right; " data-bind="text: verschil"></td>
</tr>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</table>
application/views/monpas/pages/monfin2/overzicht.php
+7 -3
View File
@@ -335,7 +335,7 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.budgetten() ? $root.schooltotaal().budget : '0,00'">
<td style="text-align:right" data-bind="text: $root.schooltotaal().budget">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,
@@ -350,8 +350,12 @@
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() ? $root.budgetten().totbudgetpct: '0,00' ">
<td
style="text-align:right"
data-bind="text: $root.budgetten().totbudgetpct "
>
</td>
</tr>