Merge pull request archeun#4 from ArunaTebel/master

improvements to the estimate progress screen
ArunaTebel · Nov 9, 2019 · 8de3236 · 8de3236
2 parents a1a521a + cf014f2
commit 8de3236
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/components/ArchestEstimateProgressComponent.js b/src/components/ArchestEstimateProgressComponent.js
@@ -70,10 +70,11 @@ class ArchestEstimateProgressComponent extends Component {
         }
 
         ArchestHttp.GET(url, {}).then((response) => {
+            activityOrSubActivity.status_name = type === ACTIVITY ? response.data.results.activity.status_name : response.data.results.sub_activity.status_name
             this.setState({
                 workEntriesModalProps: {
                     show: true,
-                    workEntries: response.data.results,
+                    workEntries: response.data.results.work_entries,
                     activityOrSubActivity: activityOrSubActivity,
                     onCancel: () => {
                         this.setState({

diff --git a/src/components/ArchestEstimateWorkEntriesModalComponent.js b/src/components/ArchestEstimateWorkEntriesModalComponent.js
@@ -10,11 +10,6 @@ class ArchestEstimateWorkEntriesModalComponent extends Component {
 
     constructor(props) {
         super(props);
-        this.state = {
-            phaseResources: [],
-            dataLoaded: false,
-            resourceSharingOptions: []
-        };
         this.onCancel = this.onCancel.bind(this);
     }