Merge branch 'develop'

# Conflicts: # package.json # src/components/utils/tableau.vue
abes-esr · May 28, 2020 · 282a64a · 282a64a
2 parents c04b289 + d960dc4
commit 282a64a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "item-ui",
-  "version": "2.0.4",
+  "version": "2.0.5-SNAPSHOT",
   "private": true,
-  "description": "Front-end Item",
+  "description": "Front-end Kopya",
   "scripts": {
     "serve": "vue-cli-service serve --port 3000",
     "lint": "vue-cli-service lint",

diff --git a/src/components/utils/tableau.vue b/src/components/utils/tableau.vue
@@ -339,7 +339,7 @@ export default {
   name: 'tableauComponent',
   data() {
     return {
-      sortBy: 'dateModificationBrute',
+      sortBy: 'dateModification',
       descending: true,
       pagination: {
         sortBy: 'name',
@@ -428,10 +428,6 @@ export default {
 
     // Couleur de l'icone de commentaire
     this.getCommentColor();
-
-    // Tri par défaut sur les numéros demandes
-    this.customSort('num');
-    this.pagination.descending = true;
   },
   beforeDestroy() {
     clearInterval(this.polling);
@@ -883,8 +879,7 @@ export default {
           return (b.zoneSousZone).localeCompare(a.zoneSousZone);
         }
         // TODO ulterieurement le traitement en modification pour le tri a faire
-        // eslint-disable-next-line no-restricted-globals
-        if (!(isNaN(a[index[0]]))) {
+        if (!(Number.isNaN(a[index[0]]))) {
           if (!isDesc[0]) {
             return (a[index[0]] - b[index[0]]);
           }