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
2024-02-22 14:02:14 +01:00
parent 0c1f892b36 fd30dbb827
commit 5d46c8f998
4 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+3 -1
View File
@@ -92,7 +92,9 @@ class MY_Controller extends CI_Controller{
// public $version = '1.20.15';// layout koppen prints monfin, jaartal tot juni op t jaar ervoor
// public $version = '1.20.16';// optie niet van toepassing in lijst type 4 nergens meetellen
// public $version = '1.20.17';// verversen bestemmingen ging niet goed
public $version = '1.20.21';// tussenstand vormgeving ijkpunten
// public $version = '1.20.21';// tussenstand vormgeving ijkpunten
public $version = '1.20.22';// tussenstand vormgeving ijkpunten
public $partituurid;
public $globProfielVersieID = 1;
application/views/monpas/pages/monfin2/overzicht.php
+11 -11
View File
@@ -328,9 +328,12 @@
<td></td>
<td style="text-align:left">Totaal</td>
<!-- ko if: totsomperuitgavetype() -->
<!-- ko foreach: totsomperuitgavetype-->
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<!-- ko foreach: totsomperuitgavetype-->
<td style="text-align:right" data-bind="text: som"></td>
<!-- /ko -->
<td style="text-align:right" data-bind="text: $root.schooltotaal().budget">
</td>
<!-- /ko -->
<!-- ko if: ! totsomperuitgavetype() -->
<!-- ko foreach: uitgavetypes-->
@@ -338,8 +341,6 @@
<!-- /ko -->
<td style="text-align:right" >0,00</td>
<!-- /ko -->
<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,
click: $root.fOpenDetails.bind($data, 'TOTAAL') ">
@@ -360,15 +361,14 @@
<!---->
<!-- >-->
<!-- </td>-->
<td style="padding: 3px; text-align: right">100,0</td>
<td style="padding: 3px; text-align: right">100,0</td>
<td style="padding: 3px; text-align: right" >100</td>
<td style="padding: 3px; text-align: right" data-bind="text: $root.budgetten() ? $root.budgetten().totbudgetpct : '0,0' "></td>
</tr>
</tbody>
</table>
<div data-bind="visible: opmerking()" style="margin-top: 20px">
<p>Opmerkingen</p>
<p data-bind="text: opmerking"></p>
@@ -442,7 +442,7 @@
</h4>
<p>
<div style="float:right; margin-right: 40px" data-bind="visible: (selectedOrg() &&selectedOrg().soort !=4)">
<div style="float:right; margin-right: 40px" data-bind="visible: (selectedOrg() && selectedOrg().soort !=4)">
<input type='radio'
name='zelfjn' value='1'
data-bind="checked: zelfjanee, click: fGetBedragen" /> details eigen org.
@@ -725,7 +725,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.budgetten() ? $root.schooltotaal().gebudget : '0,00'">
</td>
<td ><i class="fa fa-info-circle"
data-bind="visible: $root.schooltotaal().budget > 0,