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

Merge branch 'fouten/printknop' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-01-24 12:14:52 +01:00
parent 58707c730a b8b071f338
commit ef3fe83b6e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/monpas/pages/monitor.php
+4 -4
View File
@@ -13,10 +13,10 @@
value : selectedOrgversion, value : selectedOrgversion,
event : {change: fChangeVersion}"> event : {change: fChangeVersion}">
</select> </select>
<span style="display: inline-block; float:right" <!-- <span style="display: inline-block; float:right"-->
class="glyphicon glyphicon-print" <!-- class="glyphicon glyphicon-print"-->
data-bind="click: fPrint"> <!-- data-bind="click: fPrint">-->
</span> <!-- </span>-->
</h4> </h4>
<div class="row"> <div class="row">
public/js/monpas/models/monfin2/bestemmingen.js
+2 -2
View File
@@ -103,8 +103,8 @@ ls.initBestemmingenModel = function(){
if (!self.selectedKalenderjaar()) return; if (!self.selectedKalenderjaar()) return;
var sd ={jaarnr:self.selectedKalenderjaar().jaarnr} var sd ={jaarnr:self.selectedKalenderjaar().jaarnr}
$.post("index.php/monfin2/bestemmingen/getBestemmingen", sd, function(data){ $.post("index.php/monfin2/bestemmingen/getBestemmingen", sd, function(data){
if (Number(data.jaartoewijzing.som) > 0){ if (data.jaartoewijzing){
self.jaartoewijzing(true); self.jaartoewijzing(data.jaartoewijzing);
} }
else {self.jaartoewijzing(false);} else {self.jaartoewijzing(false);}
self.jaarclosed(data.jaarclosed); self.jaarclosed(data.jaarclosed);