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

test #1863

Merged
juan merged 12 commits from test into dev 2023-11-27 12:17:11 +00:00
Conversation 0 Commits 12 Files Changed 16 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 461cb3d2ba - Show all commits

3
modules/worker/front/calendar/index.html
View File

@ -70,7 +70,8 @@
fields="['started', 'ended']" fields="['started', 'ended']"
ng-model="$ctrl.businessId" ng-model="$ctrl.businessId"
search-function="{businessFk: $search}" search-function="{businessFk: $search}"
value-field="businessFk" show-field="businessFk"
value-field="businessId"
order="businessFk DESC" order="businessFk DESC"
limit="5"> limit="5">
<tpl-item> <tpl-item>

2
modules/worker/front/time-control/index.js
View File

@ -111,11 +111,9 @@ class Controller extends Section {
dayIndex.setDate(dayIndex.getDate() + 1); dayIndex.setDate(dayIndex.getDate() + 1);
} }
if (this.worker) {
this.fetchHours(); this.fetchHours();
this.getWeekData(); this.getWeekData();
} }
}
set weekTotalHours(totalHours) { set weekTotalHours(totalHours) {
this._weekTotalHours = this.formatHours(totalHours); this._weekTotalHours = this.formatHours(totalHours);