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

Merge pull request 'hotfix-undefinedContract' (!1859) from hotfix-undefinedContract into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1859
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2023-11-24 08:06:41 +00:00
parent bf7c67dbde 5d18c211a0
commit 461cb3d2ba
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>

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

@ -111,10 +111,8 @@ 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) {