From 6b07ee4eb1913294468af4e4202c9d768c1ff716 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 Nov 2023 18:35:14 +0100
Subject: [PATCH 1/4] hotfix workerhours

---
 modules/worker/front/time-control/index.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index a60c71589..f8a94be52 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -111,10 +111,8 @@ class Controller extends Section {
             dayIndex.setDate(dayIndex.getDate() + 1);
         }
 
-        if (this.worker) {
-            this.fetchHours();
-            this.getWeekData();
-        }
+        this.fetchHours();
+        this.getWeekData();
     }
 
     set weekTotalHours(totalHours) {
@@ -404,7 +402,7 @@ class Controller extends Section {
         });
     }
 
-    changeState(state, reason) {
+    state(state, reason) {
         this.state = state;
         this.reason = reason;
         this.repaint();
-- 
2.40.1


From ebe467f721c659ab7cfaa12230fc6771e3d2b73c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 Nov 2023 07:04:55 +0100
Subject: [PATCH 2/4] refs #6506 hotfix

---
 modules/worker/front/calendar/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index d64c22408..75e892575 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -70,6 +70,7 @@
                 fields="['started', 'ended']"
                 ng-model="$ctrl.businessId"
                 search-function="{businessFk: $search}"
+                show-field="businessFk"
                 value-field="businessFk"
                 order="businessFk DESC"
                 limit="5">
-- 
2.40.1


From 8a568f180a3d9de0f745aa33ff894616fb3eec8a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 Nov 2023 07:47:57 +0100
Subject: [PATCH 3/4] refs #6506 fix e2e, refactor business

---
 modules/worker/front/calendar/index.html   | 2 +-
 modules/worker/front/time-control/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index 75e892575..0e5433dc5 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -71,7 +71,7 @@
                 ng-model="$ctrl.businessId"
                 search-function="{businessFk: $search}"
                 show-field="businessFk"
-                value-field="businessFk"
+                value-field="businessId"
                 order="businessFk DESC"
                 limit="5">
             <tpl-item>
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index f8a94be52..4d5f55d27 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -402,7 +402,7 @@ class Controller extends Section {
         });
     }
 
-    state(state, reason) {
+    changeState(state, reason) {
         this.state = state;
         this.reason = reason;
         this.repaint();
-- 
2.40.1


From 5d18c211a0c9159a39e4f4d02c18d899f4d1b689 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 Nov 2023 08:40:06 +0100
Subject: [PATCH 4/4] refs #6507 state

---
 modules/worker/front/time-control/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 4d5f55d27..f8a94be52 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -402,7 +402,7 @@ class Controller extends Section {
         });
     }
 
-    changeState(state, reason) {
+    state(state, reason) {
         this.state = state;
         this.reason = reason;
         this.repaint();
-- 
2.40.1