Merge pull request #51 from 90TechSAS/tech-by-id

fix id
90TechSAS · May 17, 2022 · defc94a · defc94a
2 parents d21e126 + 3915e94
commit defc94a
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 Version numbers correspond to `bower.json` version
+# 1.10.10
+
+## FIXES
+
+- Fix id in absence tooltip
 
 # 1.10.9
 
@@ -11,6 +16,7 @@ Version numbers correspond to `bower.json` version
 ## Fixes
 
 - Fix technician name reordering
+- 
 # 1.10.7
 
 ## Feature

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "zl-planning",
-  "version": "1.10.9",
+  "version": "1.10.10",
   "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.9",
+  "version": "1.10.10",
   "description": "",
   "homepage": "",
   "dependencies": {},

diff --git a/src/directives/planning-day-block/planning-day.js b/src/directives/planning-day-block/planning-day.js
@@ -28,6 +28,7 @@
     self.$onInit = function () {
       _.extend(self, {
         dropEvent: dropEvent,
+        getName,
         absents: []
       })
 
@@ -54,7 +55,7 @@
             }
             return acc
           }, [])
-          self.absentsString = '<div>' + self.absents.join('<br>') + '</div>'
+          self.absentsString = '<div>' + self.getName(self.absents).join('<br>') + '</div>'
         } else {
           self.absentsString = ''
           self.absents = []
@@ -74,9 +75,13 @@
       self.dropCallback({ $data: data, $event: event})
     }
 
-    // function overlaps (range1, range2) {
-    //   return moment.range(range1.start, range1.end).overlaps(moment.range(range2.start, range2.end))
-    // }
+    function getName(ids) {
+      const array = []
+      ids.forEach((id) => {
+        array.push(self.entities.find((el) => el._id === id).fullname)
+      })
+      return array
+    }
   }
 
   /**
@@ -93,6 +98,7 @@
         day: '=',
         events: '=',
         clickCallback: '&',
+        entities: '=?',
         dropCallback: '&',
         absences: '=?',
         holidays: "="

diff --git a/src/directives/planning/planning.html b/src/directives/planning/planning.html
@@ -125,6 +125,7 @@
     <div class="month-container">
         <zl-planning-day ng-repeat="day in planning.days" day="day" events="planning._events" absences="planning.absences"
                          drop-callback="planning.dropEvent({$data: $data, $event: $event, moment: day.date})"
+                         entities="planning.entitiesName"
                          ng-dblclick="planning.clickWeekEvent(day, $event)" holidays="planning.holidays"></zl-planning-day>
         <zl-planning-week-line ng-repeat="(week, events) in planning.multipleDaysEvents" events="events" week="week"
                                one-day-events="planning.oneDayEvents[week]"