Fixed time estimation

shuttle-hq · Feb 24, 2020 · 590ad93 · 590ad93
1 parent a4decca
commit 590ad93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/node-text.js b/src/components/node-text.js
@@ -18,6 +18,7 @@
 import * as React from 'react';
 import GraphUtils from '../utilities/graph-util';
 import { type INode } from './node';
+import {Status} from '../components/node';
 
 type INodeTextProps = {
   data: INode,
@@ -37,10 +38,10 @@ class NodeText extends React.Component<INodeTextProps> {
     }
   }
 
-  completionDateIn(days) {
+  completionDateIn(days, status) {
     let today = new Date();
     let endDate = "",  count = 0;
-    if(days === 0) return today;
+    if(days === 0 || status === Status.done) return today;
     while(count < days) {
       endDate = new Date(today.setDate(today.getDate() + 1));
       if (endDate.getDay() !== 0 && endDate.getDay() !== 6) {
@@ -57,7 +58,7 @@ class NodeText extends React.Component<INodeTextProps> {
     const title = data.title;
     const description = data.description;
     const timeEstimate = data.timeEstimate;
-    const completionDate = this.completionDateIn(data.totalTimeEstimate);
+    const completionDate = this.completionDateIn(data.totalTimeEstimate, data.status);
     let formatted_date = completionDate.getFullYear() + "-" + (completionDate.getMonth() + 1) + "-" + completionDate.getDate()
 
     const className = GraphUtils.classNames('node-text', {

diff --git a/src/examples/graph.js b/src/examples/graph.js
@@ -23,7 +23,7 @@ import * as React from 'react';
 
 import {GraphView, type IEdgeType as IEdge, type INodeType as INode, type LayoutEngineType,} from '../';
 import GraphConfig, {EMPTY_EDGE_TYPE, EMPTY_TYPE, NODE_KEY,} from './graph-config';
-import Node, {Status} from '../components/node';
+import {Status} from '../components/node';
 
 
 type IGraph = {
@@ -207,6 +207,8 @@ class Graph extends React.Component<IGraphProps, IGraphState> {
         this.setState({graph, selected: null}, this.redrawAndSave());
     };
 
+
+
     calculateDateEstimates() {
         // We estimate the predicted time of completion of root nodes,
         // By summing the time of their dependencies recursively.
@@ -257,7 +259,7 @@ class Graph extends React.Component<IGraphProps, IGraphState> {
     }
 
     updateTotalTimeEstimate(node, graph) {
-        if (node === undefined || node.status === 'Done') return 0;
+        if (node === undefined || node.status === Status.done) return 0;
         // Update the total time estimates for a node recursively
         node.totalTimeEstimate = parseFloat(node.timeEstimate);
 
@@ -390,6 +392,7 @@ class Graph extends React.Component<IGraphProps, IGraphState> {
         this.forceUpdate();
     };
 
+
     redrawAndSave = () => {
         this.calculateDateEstimates();