Merge pull request #65 from 90TechSAS/FIX/entitiesPause

fix entitiesPause
90TechSAS · Sep 28, 2023 · 0541cef · 0541cef
2 parents 24ac05f + d28a247
commit 0541cef
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Version numbers correspond to `bower.json` version
 # 1.10.12
 ## FIXES
+- fixe show entitiesPause for all day
+# 1.10.12
+## FIXES
 - More display issues fixes
 
 # 1.10.11

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "zl-planning",
-  "version": "1.10.12",
+  "version": "1.10.13",
   "authors": [
     "Florent Gouget <[email protected]>"
   ],

diff --git a/dist/planning.css b/dist/planning.css
diff --git a/dist/planning.css.map b/dist/planning.css.map
diff --git a/dist/planning.js b/dist/planning.js
diff --git a/dist/planning.js.map b/dist/planning.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "",
   "name": "zl-planning",
-  "version": "1.10.12",
+  "version": "1.10.13",
   "description": "",
   "homepage": "",
   "dependencies": {},

diff --git a/src/directives/planning/planning.html b/src/directives/planning/planning.html
@@ -26,7 +26,7 @@
                         day-start="planning._dayStart" day-end="planning._dayEnd"
                         ng-repeat="i in planning.keys(planning.sortedEvents)" class="day b-b"
                         ng-class="{today: planning.isToday(i)}" events="planning.getEvents(i)"
-                        pauses="planning.entitiesPauses[i]" holidays="planning.holidays"
+                        pauses="planning.entitiesPauses[i][0]" holidays="planning.holidays"
                         drop-callback="planning.dropEvent({h: $hour, m: $minutes, d: i, entity: i, $data: $data, $event: $event})"
                         click-callback="planning.clickCallbackWrapper({h: $hour, m: $minutes, d: i, entity: i})"></zl-planning-line>
 
@@ -69,7 +69,7 @@
                             day-start="planning._dayStart" day-end="planning._dayEnd"
                             ng-repeat="i in planning.keys(day.value) track by $index" class="day b-b"
                             events="day.value[i]"
-                            pauses="planning.entitiesPauses[i]"
+                            pauses="planning.entitiesPauses[i][$parent.$index]"
                             holidays="planning.holidays"
                             drop-callback="planning.dropEvent({h: $hour, m: $minutes, d: i, entity: i, $data: $data, $event: $event, day: day.key})"
                             click-callback="planning.clickCallbackWrapper({h: $hour, m: $minutes, d: i, entity: i})"></zl-planning-line>
@@ -104,7 +104,7 @@
                     drop-callback="planning.dropEvent({h: $hour, m: $minutes, d:day, entity: name, $data: $data, $event: $event})"
                     day-start="planning._dayStart" day-end="planning._dayEnd"
                     events=" planning.getEvents(name)[day]"
-                    pauses="planning.entitiesPauses[name]"
+                    pauses="planning.entitiesPauses[name][$index]"
                     absences="planning.absences[name]"
                     holidays="planning.holidays"
                     click-callback="planning.clickCallbackWrapper({h: $hour, m: $minutes, d: day, entity: name})">