Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
<tr style="border-bottom: 1px solid #efefef">
|
||||
<td class="vat">
|
||||
<button class="delete"
|
||||
title="verwijder"
|
||||
data-bind="click: $parent.fDeleteGroep, visible: $parent.writer()"></button></td>
|
||||
<td class="vat" data-bind="text: naam"></td>
|
||||
<td class="vat" style="text-align:right" data-bind="text: totaantal"></td>
|
||||
@@ -134,10 +135,12 @@
|
||||
<tr data-bind="visible: !$parent.geopend2() && nivo==2 && !archief()" >
|
||||
<td >
|
||||
<button class="delete"
|
||||
title="verwijder"
|
||||
data-bind="click: $root.fDeleteOS, visible: orgid > 0 && !gebruikt && $root.writer()">
|
||||
</button>
|
||||
<i class="fa fa-archive"
|
||||
data-bind="click: $root.fArchiveOS, visible: orgid > 0 && gebruikt && $root.writer()">
|
||||
title="archief"
|
||||
data-bind="click: $root.fArchiveOS, visible: orgid > 0 && gebruikt && $root.writer()">
|
||||
</i>
|
||||
</td>
|
||||
<td ><input style="width:100%"
|
||||
@@ -181,7 +184,7 @@
|
||||
|
||||
<tr style="background-color: #f1f1f1;" data-bind="visible: !$parent.geopend2() && $parent.archief2() && nivo==2 && orgid > 0 && archief() && $root.writer()">
|
||||
<td >
|
||||
<button class="activeer" data-bind="click: $root.fActivateOS, ">
|
||||
<button class="activeer" title="activeer" data-bind="click: $root.fActivateOS, ">
|
||||
</button>
|
||||
</td>
|
||||
<td colspan=2 data-bind="text: naam"></td>
|
||||
@@ -209,8 +212,8 @@
|
||||
<!-- ko foreach: ondersteuningsvormen -->
|
||||
<tr data-bind="visible: !$parent.geopend3() && nivo==3 && !archief() " >
|
||||
<td >
|
||||
<button class="delete" data-bind="click: $root.fDeleteOS, visible: orgid > 0 && !gebruikt && $root.writer()"></button>
|
||||
<i class="fa fa-archive" data-bind="click: $root.fArchiveOS, visible: orgid> 0 && gebruikt && $root.writer()"></i>
|
||||
<button class="delete" title="verwijder" data-bind="click: $root.fDeleteOS, visible: orgid > 0 && !gebruikt && $root.writer()"></button>
|
||||
<i class="fa fa-archive" title="archief" data-bind="click: $root.fArchiveOS, visible: orgid > 0 && gebruikt && $root.writer()"></i>
|
||||
</td>
|
||||
<td ><input style="width:100%"
|
||||
data-bind="textInput: naam,
|
||||
@@ -241,7 +244,7 @@
|
||||
|
||||
<tr style="background-color: #f1f1f1;" data-bind="visible: !$parent.geopend3() && $parent.archief3() && nivo==3 && orgid > 0 && archief() && $root.writer()">
|
||||
<td >
|
||||
<button class="activeer" data-bind="click: $root.fActivateOS "></button>
|
||||
<button class="activeer" title="activeer" data-bind="click: $root.fActivateOS "></button>
|
||||
</td>
|
||||
<td colspan=2 data-bind="text: naam"></td>
|
||||
</tr>
|
||||
@@ -265,8 +268,8 @@
|
||||
<!-- ko foreach: ondersteuningsvormen -->
|
||||
<tr data-bind="visible: !$parent.geopend4() && nivo==4 && !archief()">
|
||||
<td >
|
||||
<button class="delete" data-bind="click: $root.fDeleteOS, visible: orgid > 0 && ! gebruikt && $root.writer()"></button>
|
||||
<i class="fa fa-archive" data-bind="click: $root.fArchiveOS, visible: orgid> 0 && gebruikt && $root.writer()"></i>
|
||||
<button class="delete" title="verwijder" data-bind="click: $root.fDeleteOS, visible: orgid > 0 && !gebruikt && $root.writer()"></button>
|
||||
<i class="fa fa-archive" title="archief" data-bind="click: $root.fArchiveOS, visible: orgid > 0 && gebruikt && $root.writer()"></i>
|
||||
</td>
|
||||
<td ><input style="width:100%"
|
||||
data-bind="textInput: naam,
|
||||
@@ -297,7 +300,7 @@
|
||||
|
||||
<tr style="background-color: #f1f1f1;" data-bind="visible: !$parent.geopend4() && $parent.archief4() && nivo==4 && orgid > 0 && archief() && $root.writer()">
|
||||
<td >
|
||||
<button class="activeer" data-bind="click: $root.fActivateOS "></button>
|
||||
<button class="activeer" title="activeer" data-bind="click: $root.fActivateOS "></button>
|
||||
</td>
|
||||
<td colspan=2 data-bind="text: naam"></td>
|
||||
</tr>
|
||||
|
||||
@@ -52,46 +52,66 @@
|
||||
<div style="width: 100%"
|
||||
data-bind="visible: selectedOrg(), with: selectedOrg">
|
||||
<h4 style="margin-top:0px"><span data-bind="text: fnaam"></span> : Budgetten</h4>
|
||||
<table class="lstable" style="width:100%; font-size: 0.8em">
|
||||
<table class="lstable" style="width:100%; font-size: 0.8em; vertical-align: text-top">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:12%; text-align:center">Kalenderjaar</th>
|
||||
<th style="width:30%; text-align:center">Basis ondersteuning</th>
|
||||
<th style="width:30%; text-align:center">Extra ondersteuning</th>
|
||||
<th style="width:10%; text-align:center"></th>
|
||||
<th style="text-align:center">Kalenderjaar</th>
|
||||
<th style="text-align:center">Basis ondersteuning</th>
|
||||
<th style="text-align:center">Extra ondersteuning</th>
|
||||
<th style="text-align:center"></th>
|
||||
<th >Deelbudgetten</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody data-bind= "foreach: $parent.bedragen">
|
||||
<tr>
|
||||
<td data-bind="text: kalenderjaar"></td>
|
||||
<td><input class="decimal"
|
||||
<tr >
|
||||
<td style="vertical-align: text-top; height: 23px" data-bind="text: kalenderjaar"></td>
|
||||
<td style="height: 23px"><input class="decimal"
|
||||
style="max-width: 100%;width:100%"
|
||||
data-bind="textInput: basis,
|
||||
event:{change: $root.fUpdatebedrag.bind($data,1)},
|
||||
visible: !jaarclosed() && (vastgelegd() ==0 || vastgelegd()==null ),
|
||||
enable:$root.magwijzig()" /></td>
|
||||
<td><input class="decimal"
|
||||
<td style="height: 23px"><input class="decimal"
|
||||
style="max-width: 100%;width:100%"
|
||||
data-bind="textInput: extra,
|
||||
event:{change: $root.fUpdatebedrag.bind($data,2)},
|
||||
visible: !jaarclosed() && (vastgelegd() ==0 || vastgelegd()==null ),
|
||||
enable:$root.magwijzig()" /></td>
|
||||
|
||||
<td ><button data-bind="click: $root.fLegVast,
|
||||
<td style="height: 23px"><button style="vertical-align: text-top; " data-bind="click: $root.fLegVast,
|
||||
visible: (vastgelegd() == 0 || vastgelegd() == null) && !jaarclosed()
|
||||
&& $root.magwijzig()">leg vast</button>
|
||||
</td>
|
||||
<td style="height: 23px">
|
||||
<!-- ko if: deelbudgetten()-->
|
||||
<span >met deelbudgetten</span>
|
||||
<!--/ko-->
|
||||
|
||||
<!-- ko if: ! deelbudgetten() -->
|
||||
<span >zonder deelbudgetten </span>
|
||||
<!--/ko-->
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="border-bottom:1px solid #dbdbdb">
|
||||
<td>geformatteerd</td>
|
||||
<td style="text-align: right" data-bind="text: screenbasis"></td>
|
||||
<td style="text-align: right" data-bind="text: screenextra"></td>
|
||||
<td colspan =2>
|
||||
<tr style="border-bottom:1px solid #dbdbdb; ">
|
||||
<td style="height: 23px">geformatteerd</td>
|
||||
<td style="text-align: right; height: 23px" data-bind="text: screenbasis"></td>
|
||||
<td style="text-align: right; height: 23px" data-bind="text: screenextra"></td>
|
||||
<td style="height: 23px">
|
||||
<button style="width: 100%; margin-top: 5px; margin-bottom: 5px;"
|
||||
data-bind="click: $root.fJaarAfsluiten, visible: ! jaarclosed() && $root.selectedOrg().soort ==1 && $root.magwijzig()">
|
||||
jaar afsluiten
|
||||
</button>
|
||||
</td>
|
||||
</td>
|
||||
<td style="height: 23px">
|
||||
<!-- ko if: deelbudgetten()-->
|
||||
<button style=" vertical-align: text-top; padding-top: 0; " data-bind="click: $root.fToggleDeelbudget">verberg
|
||||
</button>
|
||||
<!--/ko-->
|
||||
<!-- ko if: ! deelbudgetten() -->
|
||||
<button style=" vertical-align: text-top; padding-top: 0; " data-bind="click: $root.fToggleDeelbudget " >voeg toe
|
||||
</button>
|
||||
<!--/ko-->
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -21,17 +21,21 @@
|
||||
Basisondersteuning
|
||||
</h4>
|
||||
<div data-bind="visible: basisgeopend()">
|
||||
<table class="lstable" style="width : 100%; font-size:0.9em; position: relative">
|
||||
<table class="lstable" style="width : 100%; font-size:0.9em;border-top: none; position: relative">
|
||||
<thead style="position: sticky; top: 0" >
|
||||
<tr>
|
||||
<th style="width:29%"></th>
|
||||
<th style="width:5%"></th>
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width:11%"></th>
|
||||
<th style="width:11%"></th>
|
||||
<th style="width:30%"></th>
|
||||
<th ></th>
|
||||
<th ></th>
|
||||
<th ></th>
|
||||
<th ></th>
|
||||
<th ></th>
|
||||
|
||||
|
||||
<!-- ko if: deelbudgetten()-->
|
||||
<th ></th>
|
||||
<!--/ko-->
|
||||
<th ></th>
|
||||
</tr>
|
||||
<tr class="blokheader" >
|
||||
<th colspan="2" style="background-color: #968026; border: none; " >
|
||||
@@ -41,6 +45,7 @@
|
||||
<span data-bind="text: code == 'TOTAAL' ? code : code == 'SCHOLING' ? 'SUBTOTALEN' : ' ' "></span>
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
<!-- ko if: deelbudgetten()-->
|
||||
<th class="blokheader"
|
||||
style="text-align: right;
|
||||
padding-right: 5px;
|
||||
@@ -51,6 +56,7 @@
|
||||
<span >Restant
|
||||
</span>
|
||||
</th>
|
||||
<!--/ko-->
|
||||
<th class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; background-color: #968026;">
|
||||
<span>Percentage</span>
|
||||
<i class="fa fa-info-circle"
|
||||
@@ -65,14 +71,15 @@
|
||||
|
||||
<!-- ko foreach: $root.uitgavetypes -->
|
||||
<th style="text-align:right; border-right: 2px solid #ffffff; background-color: #968026;padding-right: 5px;"
|
||||
data-bind="style: {'borderTop' : code != 'TOTAAL' ? '2px solid #ffffff' : 'none', }">
|
||||
data-bind="style: {'borderTop' : code != 'TOTAAL' ? '2px solid #ffffff' : 'none', } " >
|
||||
<span data-bind="text: code != 'TOTAAL' ? code : ' ' ">
|
||||
</span>
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
|
||||
<!-- ko if: deelbudgetten()-->
|
||||
<th class="blokheader2" style="border-right: 2px solid #ffffff; border-top: none; background-color: #968026;">
|
||||
</th>
|
||||
<!--/ko-->
|
||||
<th class="blokheader2" style="background-color: #968026; border-top: none;">
|
||||
</th>
|
||||
</tr>
|
||||
@@ -82,11 +89,16 @@
|
||||
<tbody data-bind="foreach: basissoorten">
|
||||
|
||||
<tr class="blokheader">
|
||||
<td class="blokheader" colspan="8" data-bind="text: naam" style="text-align: left; border: 2px solid #ffffff"></td>
|
||||
<td class="blokheader"
|
||||
data-bind="text: naam,
|
||||
attr: {colspan: $parent.deelbudgetten() ? 8 : 7 },
|
||||
"
|
||||
style="text-align: left; border: 2px solid #ffffff"></td>
|
||||
</tr>
|
||||
|
||||
<!-- ko foreach:subsoorten -->
|
||||
<tr>
|
||||
<!-- ko if: $root.deelbudgetten() -->
|
||||
<tr >
|
||||
<td data-bind="text: naam"></td>
|
||||
<td style="text-align: left; color: #008028 ">budget</td>
|
||||
<!-- ko foreach: uitgavetypes() -->
|
||||
@@ -120,37 +132,49 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!--/ko-->
|
||||
<tr >
|
||||
<td ></td>
|
||||
<td >
|
||||
<!-- ko if: !$root.deelbudgetten() -->
|
||||
<span data-bind="text: naam "></span>
|
||||
<!--/ko-->
|
||||
</td>
|
||||
<td style="text-align: left; color:#003e80; ">uitgaven</td>
|
||||
<!-- ko foreach: uitgavetypes() -->
|
||||
<!-- ko if: $root.deelbudgetten() || code != 'RESTANT'-->
|
||||
<td style="text-align: right; padding-bottom: 10px;">
|
||||
<!-- ko if: code != 'RESTANT' && code != 'TOTAAL'-->
|
||||
<input class="decimal"
|
||||
style="width: 145px; max-width:98%; background-color: #e6f2ff"
|
||||
data-bind="textInput: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) ? '#ff0000' : '#000000' },
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000' },
|
||||
event: {change:$root.fSaveBedrag.bind($data, $parent.subsoortID, 'BASIS' )} ,
|
||||
enable: ! $root.jaarclosed()" />
|
||||
<!-- /ko -->
|
||||
<!-- ko if: code == 'RESTANT' || code == 'TOTAAL'-->
|
||||
<!-- ko if: code == 'RESTANT' -->
|
||||
<span class="decimal"
|
||||
style="width: 145px; max-width:98%; "
|
||||
data-bind="text: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000'} ">
|
||||
</span>
|
||||
<!-- /ko -->
|
||||
<!-- ko if: code == 'TOTAAL'-->
|
||||
<span class="decimal"
|
||||
style="width: 145px; max-width:98%"
|
||||
data-bind="text: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) ? '#ff0000' : '#000000',
|
||||
fontSize : code == 'TOTAAL' ? 'small' : 'normal' },
|
||||
">
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000'} ">
|
||||
</span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<!-- /ko -->
|
||||
<!-- /ko -->
|
||||
|
||||
<td style="padding: 0; vertical-align: top">
|
||||
<div style="width: 98%;height: 24px; color:#003e80;
|
||||
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
|
||||
padding-bottom: 2px; margin: 0; text-align: right; padding-right: 3px;">
|
||||
<span data-bind="text: bedragpctFormat,
|
||||
visible: ! $root.jaarclosed()">
|
||||
<span data-bind="text: bedragpctFormat,
|
||||
visible: ! $root.jaarclosed()">
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
@@ -171,12 +195,14 @@
|
||||
<span data-bind="text: totbasispct() == '0,0' ? '' : '(' + totbasispct() + '% van het totaalbudget)' ">
|
||||
</span>
|
||||
<br>
|
||||
<!-- ko if: deelbudgetten() -->
|
||||
<span style="display:inline-block; width: 250px" >Gebudgeteerd per kostenpost</span>
|
||||
<span style="display:inline-block; width: 100px; text-align:right"
|
||||
data-bind="text: gebudgetbasis ">
|
||||
</span>
|
||||
<span data-bind= "text: gebudgetbasispct()== '0,0' ? '' : '(' + gebudgetbasispct() + '% van het totaalbudget)' "></span>
|
||||
<br>
|
||||
<!--/ko -->
|
||||
<span style="display:inline-block; width: 250px" >Totaalbudget</span>
|
||||
<span style="display:inline-block; width: 100px; text-align:right"
|
||||
data-bind="text: jaartoewijzing() ? jaartoewijzing().basis : '' ">
|
||||
@@ -197,7 +223,9 @@
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width: 11%"></th>
|
||||
<th style="width:11%"></th>
|
||||
<!-- ko if: $root.deelbudgetten()-->
|
||||
<th style="width:11%"></th>
|
||||
<!--/ko-->
|
||||
<th style="width:11%"></th>
|
||||
</tr>
|
||||
<tr class="blokheader" style=" text-align:left; padding-left:5px; ">
|
||||
@@ -209,6 +237,7 @@
|
||||
<span data-bind="text: code == 'TOTAAL' ? code : code == 'SCHOLING' ? 'SUBTOTALEN' : ' ' "></span>
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
<!-- ko if: $root.deelbudgetten()-->
|
||||
<th class="blokheader"
|
||||
style="text-align: right;
|
||||
padding-right: 5px;
|
||||
@@ -218,6 +247,7 @@
|
||||
border-right: 2px solid #ffffff;">
|
||||
Restant
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
<th class="blokheader" style="text-align: right; padding-right:5px; padding-bottom: 5px; background-color: #968026">
|
||||
<span >Percentage</span>
|
||||
<i class="fa fa-info-circle"
|
||||
@@ -235,8 +265,10 @@
|
||||
<span data-bind="text: code != 'TOTAAL' ? code : ' ' "></span>
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
<!-- ko if: $root.deelbudgetten()-->
|
||||
<th class="blokheader2" style="border-right: 2px solid #ffffff; background-color: background-color: #968026; border-top: none;">
|
||||
</th>
|
||||
<!-- /ko -->
|
||||
<th class="blokheader2" style="background-color: background-color: #968026; border-top: none;">
|
||||
</th>
|
||||
</tr>
|
||||
@@ -245,9 +277,15 @@
|
||||
<tbody data-bind="foreach: extrasoorten">
|
||||
|
||||
<tr class="blokheader">
|
||||
<td class="blokheader" colspan="8" data-bind="text: naam" style="text-align: left; border: 2px solid #ffffff"></td>
|
||||
<td class="blokheader"
|
||||
data-bind="text: naam,
|
||||
attr: {colspan: $parent.deelbudgetten() ? 8 : 7 },"
|
||||
|
||||
style="text-align: left; border: 2px solid #ffffff"></td>
|
||||
</tr>
|
||||
<!-- ko foreach:subsoorten -->
|
||||
|
||||
<!--ko if: $root.deelbudgetten()-->
|
||||
<tr>
|
||||
<td data-bind="text: naam"></td>
|
||||
<td style="text-align: left; color: #008028 ">budget</td>
|
||||
@@ -279,27 +317,41 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!--/ko-->
|
||||
<tr >
|
||||
<td ></td>
|
||||
<td >
|
||||
<!-- ko if: !$root.deelbudgetten() -->
|
||||
<span data-bind="text: naam "></span>
|
||||
<!--/ko-->
|
||||
|
||||
</td>
|
||||
<td style="text-align: left; color:#003e80; ">uitgaven</td>
|
||||
<!-- ko foreach: uitgavetypes() -->
|
||||
<!-- ko if: $root.deelbudgetten() || code != 'RESTANT'-->
|
||||
<td style="text-align: right; padding-top: 1px; vertical-align: top ">
|
||||
<!-- ko if: code != 'RESTANT' && code != 'TOTAAL'-->
|
||||
<input class="decimal"
|
||||
style="width: 145px; max-width:98%; background-color: #e6f2ff"
|
||||
data-bind="textInput: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) ? '#ff0000' : '#000000'},
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000'},
|
||||
event: {change:$root.fSaveBedrag.bind($data, $parent.subsoortID, 'BASIS' )} ,
|
||||
enable: ! $root.jaarclosed()" />
|
||||
<!-- /ko -->
|
||||
<!-- ko if: code == 'RESTANT' || code == 'TOTAAL'-->
|
||||
<!-- ko if: code == 'RESTANT' -->
|
||||
<span class="decimal"
|
||||
data-bind="text: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) ? '#ff0000' : '#000000'}" >
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000'}" >
|
||||
</span>
|
||||
<!-- /ko -->
|
||||
<!-- ko if: code == 'TOTAAL'-->
|
||||
<span class="decimal"
|
||||
data-bind="text: bedragFormat,
|
||||
style: { color : Number(budget()) < Number(bedrag()) && $root.deelbudgetten() ? '#ff0000' : '#000000'}" >
|
||||
</span>
|
||||
<!-- /ko -->
|
||||
</td>
|
||||
<!-- /ko -->
|
||||
<!-- /ko -->
|
||||
<td style="padding: 0; vertical-align: top">
|
||||
<div style="width: 98%;height: 24px;
|
||||
font-size: 0.9em; font-family: sans-serif, verdana; padding-left: 2px; padding-top: 2px;
|
||||
@@ -326,6 +378,7 @@
|
||||
</span>
|
||||
<span data-bind="text: totextrapct() =='0,0' ? '' : '(' + totextrapct() + '% van het totaalbudget)'"></span>
|
||||
<br>
|
||||
<!-- ko if: deelbudgetten() -->
|
||||
<span style="display:inline-block; width: 250px" >Gebudgeteerd per kostenpost</span>
|
||||
<span style="display:inline-block; width: 100px; text-align:right"
|
||||
data-bind="text: gebudgetextra() ">
|
||||
@@ -333,6 +386,7 @@
|
||||
<span data-bind="text: gebudgetextrapct() =='0,0' ? '' : '(' + gebudgetextrapct() + '% van het totaalbudget)' "></span>
|
||||
|
||||
<br>
|
||||
<!-- /ko -->
|
||||
<span style="display:inline-block; width: 250px" >Totaalbudget</span>
|
||||
<span style="display:inline-block; width: 100px; text-align:right"
|
||||
data-bind="text: jaartoewijzing() ? jaartoewijzing().extra : '' ">
|
||||
|
||||
Reference in New Issue
Block a user