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

Fix/tech name order
90TechSAS · May 5, 2022 · d21e126 · d21e126
2 parents 6428366 + e994753
commit d21e126
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 Version numbers correspond to `bower.json` version
 
+# 1.10.9
+
+## Fixes
+
+- Fix technician intervention desorder
+
 # 1.10.8
 
 ## Fixes

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

diff --git a/src/directives/planning-left-column/planning-left-column.html b/src/directives/planning-left-column/planning-left-column.html
@@ -23,9 +23,9 @@ <h4>
         </div>
         <div class="days-body" ng-switch-when="day">
             <div class="dayName row8 b-b animate"
-                 ng-repeat="col in planningLeftColumn.column">
+                 ng-repeat="tech in planningLeftColumn.column">
                 <h4>
-                    {{planning.getName(col)}}
+                    {{tech.fullname || ''}}
                 </h4>
             </div>
         </div>

diff --git a/src/directives/planning-left-column/planning-left-column.js b/src/directives/planning-left-column/planning-left-column.js
@@ -12,7 +12,7 @@
 
     self.$onInit = function () {
       $scope.$watchCollection(function () {
-        return [self.events, self.position, self.mode, self.dayStart, self.dayEnd, self.usableDays]
+        return [self.events, self.position, self.mode, self.dayStart, self.dayEnd, self.usableDays, self.entitiesName]
       }, init)
     }
 
@@ -44,11 +44,7 @@
           });
         }
       } else if (self.mode === 'day' && self.dayField) {
-        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())
-        }
+        self.column = self.entitiesName
       }
     }
 

diff --git a/src/directives/planning/planning.js b/src/directives/planning/planning.js
@@ -391,23 +391,10 @@
         case 'week-advanced':
         case 'day':
         case '3day':
-          /* 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) {
+            return self.entitiesName.map(e => e._id)
           }
-          if(self.entitiesName && self.entitiesName.length > 0) {
-            self.entitiesName.forEach(e => {
-              if (!(/\s/).test(e._id)) {
-                orderedTech.push(e._id)
-              }
-            })
-          }
-          return orderedTech
+          return []
       }
     }