Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
a6ebd01ebd
|
@ -20,9 +20,6 @@
|
|||
},
|
||||
"stateFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"userFk": {
|
||||
"type": "number"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
|
|
|
@ -23,9 +23,9 @@
|
|||
<vn-td>{{::tracking.state.name}}</vn-td>
|
||||
<vn-td expand>
|
||||
<span
|
||||
ng-class="{'link': tracking.worker.id}"
|
||||
ng-click="workerDescriptor.show($event, tracking.worker.user.id)">
|
||||
{{::tracking.worker.user.name || 'System' | translate}}
|
||||
ng-class="{'link': tracking.user.id}"
|
||||
ng-click="workerDescriptor.show($event, tracking.user.id)">
|
||||
{{::tracking.user.name || 'System' | translate}}
|
||||
</span>
|
||||
</vn-td>
|
||||
<vn-td shrink-datetime>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
|
||||
|
|
|
@ -39,6 +39,7 @@ module.exports = Self => {
|
|||
started.setFullYear(year);
|
||||
started.setMonth(0);
|
||||
started.setDate(1);
|
||||
started.setHours(0, 0, 0, 0);
|
||||
|
||||
const ended = Date.vnNew();
|
||||
ended.setFullYear(year);
|
||||
|
|
Loading…
Reference in New Issue