@@ -32,7 +32,8 @@ import {
3232 assignToTask ,
3333 getAssignedTasks ,
3434 removeUserFromTask ,
35- dragTask
35+ dragTask ,
36+ movedTask
3637} from '../../../../ducks/reducers/projectViewReducer' ;
3738
3839const cardSource = {
@@ -48,10 +49,23 @@ const cardSource = {
4849 const dropResult = monitor . getDropResult ( )
4950
5051 if ( dropResult ) {
51- props . dragTask ( item . id , dropResult . id ) . then ( ( ) => {
52+
53+ let selectedTask = props . tasks . filter ( task => item . id === task . task_id )
54+ if ( selectedTask [ 0 ] . parent_card_id !== dropResult . id ) {
55+
56+ let updatedTask = Object . assign ( { } , selectedTask [ 0 ] , { parent_card_id : dropResult . id } )
5257
53- props . getTasks ( props . match . params . id )
54- } )
58+ let taskProps = props . tasks
59+ let updatedTaskIndex = taskProps . findIndex ( task => task . task_id === selectedTask [ 0 ] . task_id )
60+ taskProps . splice ( updatedTaskIndex , 1 , updatedTask )
61+ props . movedTask ( taskProps )
62+
63+ props . dragTask ( item . id , dropResult . id ) . then ( ( ) => {
64+
65+ // props.getTasks(props.match.params.id)
66+ } )
67+ }
68+
5569 }
5670 }
5771}
@@ -185,9 +199,9 @@ class Task extends Component {
185199
186200 const { isDragging, connectDragSource, name } = this . props
187201 const opacity = isDragging ? 0.4 : 1 ;
188- const complete = this . props . task . completed ? 'green ' : 'rgba(242, 242, 242, 0.906)'
202+ const complete = this . props . task . completed ? 'blue ' : 'rgba(242, 242, 242, 0.906)'
189203 const userTasks = this . props . assignedTasks ? this . props . assignedTasks . filter ( task => task . task_id === this . props . task . task_id ) : [ ]
190- console . log ( "Here are the user tasks" , userTasks , this . props . localUserID )
204+
191205 const style = { opacity : opacity , background : complete } ;
192206 const userFreeMembers = this . props . members ? this . props . members . filter ( member => member . id !== this . props . userID ) : [ ]
193207
@@ -229,35 +243,35 @@ console.log("Here are the user tasks", userTasks, this.props.localUserID)
229243 { this . state . assignModel === true &&
230244 < div style = { { width : '100%' } } >
231245 { this . props . assignedTasks . length === 0 &&
232- < h4 style = { userTasks . find ( me => me . user_id === this . props . localUserID ) ? { background : 'white' } : { background : 'blue ' } }
246+ < h4 className = 'collaberators' style = { userTasks . find ( me => me . user_id === this . props . localUserID ) ? { background : 'white' } : { background : '#5c5c8a' , color : 'white '} }
233247 onClick = {
234248 userTasks . find ( me => me . user_id === this . props . localUserID ) ?
235249 ( ) => this . removeFromTasks ( this . props . localUserID , this . props . task . task_id ) :
236250 ( ) => this . assigningOfTasks ( this . props . task . task_id , this . props . localUserID , this . props . match . params . id ) }
237- > Assign Self</ h4 > }
251+ > { userTasks . find ( me => me . user_id === this . props . localUserID ) ? 'You Got This' : ' Assign Self' } </ h4 > }
238252
239253 { this . props . assignedTasks . length > 0 &&
240- < h4 style = {
241- userTasks . find ( currentID => currentID . user_id === this . props . localUserID ) ? { background : 'white' } : { background : 'blue ' }
254+ < h4 className = 'collaberators' style = {
255+ userTasks . find ( currentID => currentID . user_id === this . props . localUserID ) ? { background : 'white' } : { background : '#5c5c8a' , color : 'white '}
242256 }
243257 onClick = {
244258 userTasks . find ( me => me . user_id === this . props . localUserID ) ?
245259 ( ) => this . removeFromTasks ( this . props . localUserID , this . props . task . task_id ) :
246260 ( ) => this . assigningOfTasks ( this . props . task . task_id , this . props . localUserID , this . props . match . params . id ) } >
247- Assign Self</ h4 >
248- } { console . log ( ) }
261+ { userTasks . find ( me => me . user_id === this . props . localUserID ) ? 'You Got This' : ' Assign Self' } </ h4 >
262+ }
249263 { this . props . members && userFreeMembers . map ( ( member , index ) => {
250264 const assignedUser = this . props . assignedTasks . filter ( task => task . task_id === this . props . task . task_id )
251265
252266 return (
253267
254- < h4 key = { index } className = "teamMembers "
255- style = { assignedUser . find ( currentID => currentID . user_id === member . id ) ? { background : 'white' } : { background : 'blue ' } }
268+ < h4 key = { index } className = "collaberators "
269+ style = { assignedUser . find ( currentID => currentID . user_id === member . id ) ? { background : 'white' } : { background : '#5c5c8a' , color : 'white '} }
256270 onClick = {
257271 assignedUser . find ( currentID => currentID . user_id === member . id ) ?
258272 ( ) => this . removeFromTasks ( member . id , this . props . task . task_id ) :
259273 ( ) => this . assigningOfTasks ( this . props . task . task_id , member . id , this . props . match . params . id ) } >
260- { member . display_name } { console . log ( member , "heres the member" ) } </ h4 > )
274+ { member . display_name } { assignedUser . find ( currentID => currentID . user_id === member . id ) ? ' is on it!' : '' } </ h4 > )
261275
262276 } ) }
263277 </ div >
@@ -283,5 +297,5 @@ const mapStateToProps = state => {
283297Task = DragSource ( ItemTypes . CARD , cardSource , collect ) ( Task )
284298
285299 export default withRouter (
286- connect ( mapStateToProps , { addToList, removeFromList, addCard, cardInput, addTask, taskInput, openInput, getCards, openEditTask, changeEditTask, sendEditTask, deleteTask, getCards2, getTasks, assignToTask, getAssignedTasks, removeUserFromTask, dragTask} ) ( Task )
300+ connect ( mapStateToProps , { addToList, removeFromList, addCard, cardInput, addTask, taskInput, openInput, getCards, openEditTask, changeEditTask, sendEditTask, deleteTask, getCards2, getTasks, assignToTask, getAssignedTasks, removeUserFromTask, dragTask, movedTask } ) ( Task )
287301 ) ;
0 commit comments