issues #137 and #136

jsGanttImproved · Jan 10, 2019 · c06b6a9 · c06b6a9
1 parent d37476c
commit c06b6a9
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 26 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -231,6 +231,15 @@ <h2>Current Known Issues:</h3>
       <h2>Changelog:</h3>
         <p>Check the full list of changes on <a href="https://github.com/jsGanttImproved/jsgantt-improved/releases">GitHub
             releases page</a>.</p>
+        <h3>2.1.2:</h3>
+        <ul>
+          <li>Fix for adding custom columns in object</li>
+          <li>IE compatible with dependencies highlight</li>
+        </ul>
+        <h3>2.1.1:</h3>
+        <ul>
+          <li>New way for rendering gantt where it works better scroll</li>
+        </ul>
         <h3>2.0.10:</h3>
         <ul>
           <li>Use complete value from task group from data instead of calculated</li>

diff --git a/docs/index.js b/docs/index.js
@@ -109,15 +109,16 @@ function start(e) {
     //   pName: "Task 1",
     //   pStart: "2018-09-05",
     //   pEnd: "2018-09-11",
-    //   pLink:"",
+    //   pLink: "",
     //   pClass: "gtaskgreen",
     //   pMile: 0,
     //   pComp: 100,
-    //   pGroup: 0, 
-    //   pParent: 0, 
-    //   pOpen: 1, 
+    //   pGroup: 0,
+    //   pParent: 0,
+    //   pOpen: 1,
     //   pNotes: "",
-    //   });
+    //   category: 'test'
+    // });
 
     if (vDebug) {
       bd = new Date();

diff --git a/docs/jsgantt.js b/docs/jsgantt.js
@@ -1274,14 +1274,16 @@ exports.addListenerInputCell = function (vTmpCell, vEventsChange, callback, task
     }
 };
 exports.addListenerDependencies = function () {
-    document.querySelectorAll('.gtaskbarcontainer').forEach(function (taskDiv) {
+    var elements = document.querySelectorAll('.gtaskbarcontainer');
+    for (var i = 0; i < elements.length; i++) {
+        var taskDiv = elements[i];
         taskDiv.addEventListener('mouseover', function (e) {
             toggleDependencies(e);
         });
         taskDiv.addEventListener('mouseout', function (e) {
             toggleDependencies(e);
         });
-    });
+    }
 };
 var toggleDependencies = function (e) {
     var target = e.currentTarget;
@@ -2075,17 +2077,18 @@ exports.includeGetSet = function () {
         for (var i = 0; i < keys.length; i++) {
             var key = keys[i];
             var val = options[key];
-            var ev = void 0;
             if (key === 'vResources') {
-                ev = "this.set" + key.substr(1) + "(val)";
+                // ev = `this.set${key.substr(1)}(val)`;
+                this['set' + key.substr(1)](val);
             }
             else if (val instanceof Array) {
-                ev = "this.set" + key.substr(1) + "(...val)";
+                // ev = `this.set${key.substr(1)}(...val)`;
+                this['set' + key.substr(1)].apply(this, val);
             }
             else {
-                ev = "this.set" + key.substr(1) + "(val)";
+                // ev = `this.set${key.substr(1)}(val)`;
+                this['set' + key.substr(1)](val);
             }
-            eval(ev);
         }
     };
     this.setUseFade = function (pVal) { this.vUseFade = pVal; };
@@ -2256,6 +2259,17 @@ exports.includeGetSet = function () {
 
 },{"./utils":9}],8:[function(require,module,exports){
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 // Function to open/close and hide/show children of specified task
@@ -2391,7 +2405,11 @@ exports.sortTasks = function (pList, pID, pIdx) {
     return sortIdx;
 };
 exports.TaskItemObject = function (object) {
-    return new exports.TaskItem(object.pID, object.pName, object.pStart, object.pEnd, object.pClass, object.pLink, object.pMile, object.pRes, object.pComp, object.pGroup, object.pParent, object.pOpen, object.pDepend, object.pCaption, object.pNotes, object.pGantt, object.pCost, object.pPlanStart, object.pPlanEnd);
+    var pDataObject = __assign({}, object);
+    utils_1.internalProperties.forEach(function (property) {
+        delete pDataObject[property];
+    });
+    return new exports.TaskItem(object.pID, object.pName, object.pStart, object.pEnd, object.pClass, object.pLink, object.pMile, object.pRes, object.pComp, object.pGroup, object.pParent, object.pOpen, object.pDepend, object.pCaption, object.pNotes, object.pGantt, object.pCost, object.pPlanStart, object.pPlanEnd, object);
 };
 exports.TaskItem = function (pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt, pCost, pPlanStart, pPlanEnd, pDataObject) {
     if (pCost === void 0) { pCost = null; }
@@ -2878,6 +2896,8 @@ exports.processRows = function (pList, pID, pRow, pLevel, pOpen, pUseSort, vDebu
 },{"./utils":9}],9:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.internalProperties = ['pID', 'pName', 'pStart', 'pEnd', 'pClass', 'pLink', 'pMile', 'pRes', 'pComp', 'pGroup', 'pParent',
+    'pOpen', 'pDepend', 'pCaption', 'pNotes', 'pGantt', 'pCost', 'pPlanStart', 'pPlanEnd'];
 exports.getMinDate = function (pList, pFormat) {
     var vDate = new Date();
     vDate.setTime(pList[0].getStart().getTime());

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsgantt-improved",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "jsgantt-improved",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/events.ts b/src/events.ts
@@ -173,14 +173,16 @@ export const addListenerInputCell = function (vTmpCell, vEventsChange, callback,
 }
 
 export const addListenerDependencies = function () {
-  document.querySelectorAll('.gtaskbarcontainer').forEach(taskDiv => {
+  const elements = document.querySelectorAll('.gtaskbarcontainer');
+  for (let i = 0; i < elements.length; i++) {
+    const taskDiv = elements[i];
     taskDiv.addEventListener('mouseover', e => {
       toggleDependencies(e);
     });
     taskDiv.addEventListener('mouseout', e => {
       toggleDependencies(e);
     });
-  });
+  }
 }
 
 const toggleDependencies = function (e) {

diff --git a/src/options.ts b/src/options.ts
@@ -11,16 +11,16 @@ export const includeGetSet = function () {
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
       const val = options[key];
-      let ev;
       if (key === 'vResources') {
-        ev = `this.set${key.substr(1)}(val)`;
+        // ev = `this.set${key.substr(1)}(val)`;
+        this['set' + key.substr(1)](val);
       } else if (val instanceof Array) {
-        ev = `this.set${key.substr(1)}(...val)`;
+        // ev = `this.set${key.substr(1)}(...val)`;
+        this['set' + key.substr(1)].apply(this, val);
       } else {
-        ev = `this.set${key.substr(1)}(val)`;
-
+        // ev = `this.set${key.substr(1)}(val)`;
+        this['set' + key.substr(1)](val);
       }
-      eval(ev);
     }
   }
   this.setUseFade = function (pVal) { this.vUseFade = pVal; };
@@ -86,7 +86,7 @@ export const includeGetSet = function () {
     this.vFormat = pFormat;
     this.Draw();
   };
-  this.setWorkingDays = function(workingDays) { this.vWorkingDays = workingDays; };
+  this.setWorkingDays = function (workingDays) { this.vWorkingDays = workingDays; };
   this.setMinGpLen = function (pMinGpLen) { this.vMinGpLen = pMinGpLen; };
   this.setScrollTo = function (pDate) { this.vScrollTo = pDate; };
   this.setHourColWidth = function (pWidth) { this.vHourColWidth = pWidth; };

diff --git a/src/task.ts b/src/task.ts
@@ -1,4 +1,4 @@
-import { parseDateStr, isIE, stripUnwanted, getOffset, formatDateStr, hashKey } from "./utils";
+import { parseDateStr, isIE, stripUnwanted, getOffset, formatDateStr, hashKey, internalProperties } from "./utils";
 
 declare let g: any;
 
@@ -132,8 +132,13 @@ export const sortTasks = function (pList, pID, pIdx) {
   return sortIdx;
 };
 
-
 export const TaskItemObject = function (object) {
+  const pDataObject = { ...object};
+
+  internalProperties.forEach(property=>{
+    delete pDataObject[property];
+  });
+
   return new TaskItem(object.pID,
     object.pName,
     object.pStart,
@@ -152,7 +157,8 @@ export const TaskItemObject = function (object) {
     object.pGantt,
     object.pCost,
     object.pPlanStart,
-    object.pPlanEnd
+    object.pPlanEnd,
+    object
   );
 }
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,7 @@
 
+export const internalProperties = ['pID','pName','pStart','pEnd','pClass','pLink','pMile','pRes','pComp','pGroup','pParent',
+'pOpen','pDepend','pCaption','pNotes','pGantt','pCost','pPlanStart','pPlanEnd'];
+
 export const getMinDate = function (pList, pFormat) {
   let vDate = new Date();
   vDate.setTime(pList[0].getStart().getTime());