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-28 13:59:48 +02:00
parent fac8099373 702c565674
commit 8d46c0f2bc
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+2 -1
View File
@@ -82,7 +82,8 @@ class MY_Controller extends CI_Controller{
// public $version = '1.19.01';// compactdiv met orgid ipv globorg // public $version = '1.19.01';// compactdiv met orgid ipv globorg
// public $version = '1.19.05';// ambities per org incl kamerversies // public $version = '1.19.05';// ambities per org incl kamerversies
// public $version = '1.19.06';// monfin met budgetten // public $version = '1.19.06';// monfin met budgetten
public $version = '1.20.03';// monfin met budgetten // public $version = '1.20.03';// monfin met budgetten
public $version = '1.20.04';// monfin met budgetten update
public $partituurid; public $partituurid;
public $globProfielVersieID = 1; public $globProfielVersieID = 1;
public $userid; //id of the user that is logged in public $userid; //id of the user that is logged in
application/views/monpas/pages/monfin2/overzicht.php
+2 -2
View File
@@ -82,12 +82,12 @@
</i> </i>
</th> </th>
<!-- /ko --> <!-- /ko -->
<th style="writing-mode: vertical-rl; width: 8%; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>uitgavensom</span> <th style="writing-mode: vertical-rl; width: 8%; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>som uitgaven</span>
<i class="fa fa-info-circle" <i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'SOM')"> data-bind="click: fToelichting.bind($data, 'SOM')">
</i> </i>
</th> </th>
<th style="width: 8%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>budgetsom</span> <th style="width: 8%; writing-mode: vertical-rl; padding: 3px; vertical-align:text-top;text-align:right; background-color: #968026;"><span>som budget</span>
<i class="fa fa-info-circle" <i class="fa fa-info-circle"
data-bind="click: fToelichting.bind($data, 'BUDGET')"> data-bind="click: fToelichting.bind($data, 'BUDGET')">
</i> </i>
public/js/monpas/models/monfin2/bestemmingen.js
+1 -1
View File
@@ -538,7 +538,7 @@ ls.initBestemmingenModel = function(){
fToelichting: function(){ fToelichting: function(){
apprise( '<p>De tweede kolom geeft de som van resp. het budget/de uitgaven als percentage van het totaalbudget weer.</p>' + apprise(
'<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">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>' ' <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>'
) )