Merge pull request #49 from 90TechSAS/fix/tech-name-order

Fix/tech name order

CHANGELOG.md

@@ -1,4 +1,10 @@
 Version numbers correspond to `bower.json` version
+
+# 1.10.8
+
+## Fixes
+
+- Fix technician name reordering
 # 1.10.7
 
 ## Feature

bower.json

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

package.json

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

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

@@ -44,11 +44,14 @@
           });
         }
       } else if (self.mode === 'day' && self.dayField) {
-        self.column = Object.keys(self.events).sort()
+        self.column = Object.keys(self.events)
+        // check if displayNoTechnician to move it to the first place of column array
+        if ((/\s/).test(self.column[self.column.length -1])) {
+          self.column.unshift(self.column.pop())
+        }
       }
     }
 
-
   }
 
   function PlanningDirective () {

src/directives/planning/planning.js

@@ -391,7 +391,23 @@
         case 'week-advanced':
         case 'day':
         case '3day':
-          return Object.keys(sortedEvents).sort()
+          /* reorder sortedEvents (which are technician ids)
+           * to be at the same order as entitiesName which 
+           * are technician fullnames (sorted alphabitically by default) 
+          */
+          const orderedTech = []
+          const eventKeys = Object.keys(sortedEvents)
+          if (eventKeys.includes(' Sans technicien')) {
+            orderedTech.push(eventKeys[eventKeys.length -1])
+          }
+          if(self.entitiesName && self.entitiesName.length > 0) {
+            self.entitiesName.forEach(e => {
+              if (!(/\s/).test(e._id)) {
+                orderedTech.push(e._id)
+              }
+            })
+          }
+          return orderedTech
       }
     }