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

Tech by id

CHANGELOG.md

@@ -1,4 +1,10 @@
 Version numbers correspond to `bower.json` version
+# 1.10.7
+
+## Feature
+
+- Tech by id
+
 # 1.10.6
 
 ## Fixes

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "zl-planning",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "authors": [
     "Florent Gouget <[email protected]>"
   ],

package.json

@@ -1,7 +1,7 @@
 {
   "author": "",
   "name": "zl-planning",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "description": "",
   "homepage": "",
   "dependencies": {},

src/directives/planning-left-column/planning-left-column.html

@@ -19,16 +19,16 @@ <h4>
                     </div>
                 </div>
             </div>
-            
+
         </div>
         <div class="days-body" ng-switch-when="day">
             <div class="dayName row8 b-b animate"
                  ng-repeat="col in planningLeftColumn.column">
                 <h4>
-                    {{col}}
+                    {{planning.getName(col)}}
                 </h4>
             </div>
         </div>
     </div>
     <div style="height:10px"><!-- compensate for scrollbar --></div>
-</div>
+</div>

src/directives/planning-left-column/planning-left-column.js

@@ -59,6 +59,7 @@
       controllerAs: 'planningLeftColumn',
       bindToController: {
         events: '=',
+        entitiesName: '=',
         position: '=',
         mode: '=',
         dayField: '=',

src/directives/planning-line/planning-line.js

@@ -63,13 +63,13 @@
           self._absences.forEach(absence => {
             let index = self._absences.indexOf(absence)
             if (
-              (moment(absence.start).isBefore(moment(self.dayOfWeek).startOf('day')) && (moment(absence.end).isAfter(moment(self.dayOfWeek).endOf('day')))) || 
+              (moment(absence.start).isBefore(moment(self.dayOfWeek).startOf('day')) && (moment(absence.end).isAfter(moment(self.dayOfWeek).endOf('day')))) ||
               (moment(absence.end).isSame(moment(self.dayOfWeek).endOf('day')) && moment(absence.start).isBefore(moment(self.dayOfWeek).startOf('hour'))) ||
               ((moment(absence.start).isSame(moment(self.dayOfWeek).startOf('day')) && (moment(absence.end).isAfter(moment(self.dayOfWeek).endOf('day')))))){
               absence.start = moment(self.dayOfWeek).startOf('day')
               absence.end = moment(self.dayOfWeek).endOf('day')
             }
-            
+
             absence.style = {
               left: (moment(absence.start).hours() - self.dayStart.h) * BASE_SIZE * self.zoom + moment(absence.start).minutes() * BASE_SIZE * self.zoom / 60 + 'px',
               width: self.zoom * self.SLIDER_WIDTH * (moment.range(absence.start, absence.end).valueOf()) / self.SECONDS_BY_DAY / 1000 + 'px',

src/directives/planning-vertical-line/planning-vertical-line.js

@@ -46,7 +46,7 @@
             } else {
               abs.style.height = tempHeight + 'px'
               abs.style.top = tempTop + 'px'
-            }            
+            }
 
             abs.range = moment.range(abs.start, abs.end)
             abs.class = 'planning-absence-' + abs.confirmation.state
@@ -136,7 +136,7 @@
       } else {
         self.dropCallback({ $data: data, $event: event, $hour: hour, $minutes: minutes})
       }
-    
+
     }
 
     function hoverAbsence() {

src/directives/planning/planning.html

@@ -1,12 +1,13 @@
 <div ng-if="planning.mode ==='day' || planning.mode === 'week'" style="height: 100%;">
-    <zl-planning-left-column 
-        mode="planning.mode" 
-        position="planning.position" 
-        day-field="planning.dayField" 
+    <zl-planning-left-column
+        mode="planning.mode"
+        position="planning.position"
+        day-field="planning.dayField"
+        entities-name="planning.entitiesName",
         usable-days="planning.allowedDays"
         show-absences-callback="planning.showAbsencesCallBackWrapper({absences: absences, day: day})"
         events="planning.sortedEvents"
-        absences="planning.absences" 
+        absences="planning.absences"
         is-ferie="planning.isFerie(planning.position)">
     </zl-planning-left-column>
     <div class="" style="height:100%">
@@ -48,7 +49,7 @@
 </div>
 
 <div ng-if="planning.mode === '3day'" style="height: 100%;">
-    <zl-planning-left-column mode="'day'" position="planning.position" day-field="planning.dayField" usable-days="planning.allowedDays"
+    <zl-planning-left-column mode="'day'" position="planning.position" entities-name="planning.entitiesName"  day-field="planning.dayField" usable-days="planning.allowedDays"
                              events="planning.sortedEvents"></zl-planning-left-column>
     <div style="height: 100%; display: flex; flex-flow: row nowrap;" zl-horizontal-scroll>
         <div style="height:100%;" ng-repeat="day in planning.groupedEvents track by $index">
@@ -93,7 +94,7 @@
     <div class="advanced-week-container"
          ng-repeat="name in planning.keys(planning.sortedEvents)">
         <div class="left-column-advanced">
-            <span style="margin:auto">{{name}}</span>
+            <span style="margin:auto">{{planning.getName(name)}}</span>
         </div>
         <div ng-repeat="day in planning.allowedDays"
              class="day-advanced">

src/directives/planning/planning.js

@@ -26,7 +26,8 @@
         clickWeekEvent: clickWeekEvent,
         dropEvent: dropEvent,
         isFerie: isFerie,
-        hasAbsence: hasAbsence
+        hasAbsence: hasAbsence,
+        getName: getName
       })
 
       init()
@@ -209,6 +210,10 @@
       }
     }
 
+    function getName(id) {
+      return self.entitiesName.find((el) => el._id === id).fullname
+    }
+
     function split (event) {
       // Event starts and ends the same day
       event = angular.copy(event)
@@ -513,6 +518,7 @@
         zoom: '=',
         events: '=',
         entities: '=',
+        entitiesName: '=',
         entitiesPauses: '=?',
         absences: '=?',
         position: '=',