Manage shift modified. fixes button actions

employeemanagement/src/components/dashboard/Dashboard.js

@@ -19,7 +19,7 @@ class Dashboard extends Component {
 
         const todayList = list && list.length ? (
             list.filter(l => {
-              return l.Date === moment().format('MM/DD/YYYY')
+              return l.date === moment().format('MM/DD/YYYY')
             })
         ) : null
 

employeemanagement/src/components/layout/ManageShift.js

@@ -14,9 +14,7 @@ class ManageShift extends Component {
         endShift: '',
         stateSet: false
     }
-    componentDidMount() {
-        //console.log(this.props.todayList)
-    }
+
     UNSAFE_componentWillReceiveProps() {
         if (this.props.todayList && !this.state.stateSet) {
             this.setState(this.props.todayList[0], () => {
@@ -46,52 +44,53 @@ class ManageShift extends Component {
         }
     }
     render() {
-        return (
+        const worklist = this.props.todayList && this.props.todayList.length ? (
+            this.props.todayList && this.props.todayList.map(w => {
+                const startWork = w.startShift !== '' ? (
+                    <button disabled type="button" className="btn btn-success btn-sm btn-special">Start Work</button>
+                ) : (
+                    <button onClick={this.handleCreatEvent} id="startShift" type="button" className="btn btn-success btn-sm btn-special">Start Work</button>
+                )
+
+                const startBreak = w.startBreak !== '' ? (
+                    <button disabled type="button" className="btn btn-success btn-sm btn-special">Start Lunch Break</button>
+                ) : (
+                    <button onClick={this.handleUpdateEvent} id="startBreak" type="button" className="btn btn-success btn-sm btn-special">Start Lunch Break</button>
+                )
+
+                const endBreak = w.endBreak !== '' ? (
+                    <button disabled type="button" className="btn btn-success btn-sm btn-special">Lunch Break Finish</button>
+                ) : (
+                    <button onClick={this.handleUpdateEvent} id="endBreak" type="button" className="btn btn-success btn-sm btn-special">Lunch Break Finish</button>
+                )
+
+                const endWork = w.endShift !== '' ? (
+                    <button disabled type="button" className="btn btn-success btn-sm btn-special">Close Work</button>
+                ) : (
+                    <button onClick={this.handleUpdateEvent} id="endShift" type="button" className="btn btn-success btn-sm btn-special">Close Work</button>
+                )
+
+                return(
+                    <div className="row" key={ w.id }>
+                        <div className="col-3 text-center">{ startWork }</div>
+                        <div className="col-3 text-center">{ startBreak }</div>
+                        <div className="col-3 text-center">{ endBreak }</div>
+                        <div className="col-3 text-center">{ endWork }</div>
+                    </div>
+                )
+            })
+        ):(       
             <div className="row">
-                <div className="col-3 text-center">
-                    <button
-                        onClick={this.handleCreatEvent}
-                        disabled={this.state.startShift + "" != ""}
-                        id="startShift"
-                        type="button"
-                        className="btn btn-success btn-sm btn-special">
-                        Start Work
-                    </button>
-                </div>
-                <div className="col-3 text-center">
-                    <button
-                        type="button"
-                        className="btn btn-success btn-sm btn-special"
-                        disabled={this.state.startShift + "" == "" || this.state.startBreak + "" != ""}
-                        onClick={this.handleUpdateEvent}
-                        id="startBreak">
-                        Start Lunch Break
-                    </button>
-                </div>
-                <div className="col-3 text-center">
-                    <button
-                        disabled={this.state.startShift + "" == "" || this.state.startBreak + "" == "" || this.state.endBreak + "" != ""}
-                        type="button"
-                        className="btn btn-success btn-sm btn-special"
-                        onClick={this.handleUpdateEvent}
-                        id="endBreak">
-                        Lunch Break Finish 
-                        {this.state.endBreak == ""}
-                    </button>
-                </div>
-                <div className="col-3 text-center">
-                    <button
-                        disabled={this.state.startShift + "" == "" || this.state.startBreak + "" == "" || this.state.endBreak + "" == "" || this.state.endShift + "" != ""}
-                        type="button"
-                        onClick={this.handleUpdateEvent}
-                        className="btn btn-success btn-sm btn-special"
-                        id="endShift">
-                        Close Work  
-                        {this.state.endShift == ""}
-                    </button>
-                </div>
+                <div className="col-3 text-center"><button onClick={this.handleCreatEvent} id="startShift" type="button" className="btn btn-success btn-sm btn-special">Start Work</button></div>
+                <div className="col-3 text-center"><button disabled type="button" className="btn btn-success btn-sm btn-special">Start Lunch Break</button></div>
+                <div className="col-3 text-center"><button disabled type="button" className="btn btn-success btn-sm btn-special">Lunch Break Finish</button></div>
+                <div className="col-3 text-center"><button disabled type="button" className="btn btn-success btn-sm btn-special">Close Work</button></div>
             </div>
-        );
+        )
+
+        return (
+            <div className="container"> { worklist }</div>
+        )
     }
 }
 const mapStateToProps = (dispatc) => {