diff --git a/src/components/ArchestEstimateProgressComponent.js b/src/components/ArchestEstimateProgressComponent.js index 93e3ccb..ba0914d 100644 --- 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 index 9993397..6ed7955 100644 --- 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); }