verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

fixed bugs in recovery

This commit is contained in:
gerard 2018-05-24 16:02:54 +02:00
parent c512faf45c
commit fe27f0e44f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/client/src/recovery/create/index.html
View File

@ -13,14 +13,14 @@
vn-one vn-one
label="Since" label="Since"
model="$ctrl.recovery.started" model="$ctrl.recovery.started"
ini-options="{dateFormat: 'd-m-Y'}" vn-focus
vn-focus> ini-options="{enableTime: true}">
</vn-date-picker> </vn-date-picker>
<vn-date-picker <vn-date-picker
vn-one vn-one
label="To" label="To"
model="$ctrl.recovery.finished" model="$ctrl.recovery.finished"
ini-options="{dateFormat: 'd-m-Y'}"> ini-options="{enableTime: true}">
</vn-date-picker> </vn-date-picker>
<vn-textfield <vn-textfield
vn-one vn-one

2
client/client/src/recovery/create/index.js
View File

@ -5,7 +5,7 @@ class Controller {
this.$ = $scope; this.$ = $scope;
this.$state = $state; this.$state = $state;
this.recovery = { this.recovery = {
started: $filter('date')(new Date(), 'yyyy-MM-dd HH:mm') started: new Date()
}; };
} }
onSubmit() { onSubmit() {

4
client/client/src/recovery/index/index.html
View File

@ -14,14 +14,14 @@
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="recovery in index.model.instances track by $index"> ng-repeat="recovery in index.model.instances track by $index">
<vn-none pad-medium-h style="color:#FFA410;"> <vn-none pad-medium-h orange>
<i class="material-icons pointer" <i class="material-icons pointer"
vn-tooltip="Finish that recovery period" vn-tooltip="Finish that recovery period"
ng-if="!recovery.finished" ng-if="!recovery.finished"
ng-click="$ctrl.setFinished(recovery)">lock</i> ng-click="$ctrl.setFinished(recovery)">lock</i>
</vn-none> </vn-none>
<vn-one pad-medium-h>{{::recovery.started | date:'dd/MM/yyyy' }}</vn-one> <vn-one pad-medium-h>{{::recovery.started | date:'dd/MM/yyyy' }}</vn-one>
<vn-one pad-medium-h>{{recovery.finished | date:'dd/MM/yyyy' }}</vn-one> <vn-one pad-medium-h>{{::recovery.finished | date:'dd/MM/yyyy' }}</vn-one>
<vn-one pad-medium-h>{{::recovery.amount | currency:'€':0}}</vn-one> <vn-one pad-medium-h>{{::recovery.amount | currency:'€':0}}</vn-one>
<vn-one pad-medium-h>{{::recovery.period}}</vn-one> <vn-one pad-medium-h>{{::recovery.period}}</vn-one>
</vn-horizontal> </vn-horizontal>