verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-01-03 13:28:23 +01:00
parent 6986ec1f8a f73a447391
commit a6ebd01ebd
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ticket/back/models/ticket-tracking.json
View File

@ -20,9 +20,6 @@
}, },
"stateFk": { "stateFk": {
"type": "number" "type": "number"
},
"userFk": {
"type": "number"
} }
}, },
"relations": { "relations": {

6
modules/ticket/front/tracking/index/index.html
View File

@ -23,9 +23,9 @@
<vn-td>{{::tracking.state.name}}</vn-td> <vn-td>{{::tracking.state.name}}</vn-td>
<vn-td expand> <vn-td expand>
<span <span
ng-class="{'link': tracking.worker.id}" ng-class="{'link': tracking.user.id}"
ng-click="workerDescriptor.show($event, tracking.worker.user.id)"> ng-click="workerDescriptor.show($event, tracking.user.id)">
{{::tracking.worker.user.name || 'System' | translate}} {{::tracking.user.name || 'System' | translate}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink-datetime>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td> <vn-td shrink-datetime>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>

1
modules/worker/back/methods/calendar/absences.js
View File

@ -39,6 +39,7 @@ module.exports = Self => {
started.setFullYear(year); started.setFullYear(year);
started.setMonth(0); started.setMonth(0);
started.setDate(1); started.setDate(1);
started.setHours(0, 0, 0, 0);
const ended = Date.vnNew(); const ended = Date.vnNew();
ended.setFullYear(year); ended.setFullYear(year);