Merge pull request #3155 from OneCommunityGlobal/Koushica_Time_Entry_Task_Hours_Update

Koushica - Fix delay in the hour count update for the individual task

Author: one-community

src/components/TeamMemberTasks/actions.js

@@ -5,6 +5,7 @@ export const fetchTeamMembersTaskSuccess = createAction('FETCH_TEAM_MEMBERS_TASK
 export const fetchTeamMembersTimeEntriesSuccess = createAction('FETCH_TEAM_MEMBERS_TIMEENTRIES_SUCCESS');
 export const updateTeamMembersTimeEntrySuccess = createAction('UPDATE_TEAM_MEMBERS_TIMEENTRY_SUCCESS');
 export const fetchTeamMembersDataError = createAction('FETCH_TEAM_MEMBERS_DATA_ERROR');
+export const updateIndividualTaskTime = createAction('UPDATE_TEAM_MEMBERS_TASK_TIME');
 
 export const createOrUpdateTaskNotificationBegin = createAction(
   'CREATE_OR_UPDATE_TASK_NOTIFICATION_BEGIN',

src/components/TeamMemberTasks/reducer.js

@@ -26,6 +26,27 @@ export const teamMemberTasksReducer = (state = initialState, action) => {
         return timeentry
       })
       return { ...state, usersWithTimeEntries: updatedTimeEntries }
+    case 'UPDATE_TEAM_MEMBERS_TASK_TIME':
+      const {usersWithTasks} = state;
+      const {newTime, taskId, personId} = action.payload;
+      const updatedusersWithTasks = usersWithTasks.map((user,index)=>{
+        if(user.personId === personId){
+          let newTotalTime = Number(newTime.hours) + (Number(newTime.minutes)/60)
+          user.totaltangibletime_hrs += newTotalTime;
+          user.totaltime_hrs += newTotalTime;
+          if(taskId) {
+            let {tasks} = user;
+            tasks = tasks.map((task)=>{
+              if(task._id === taskId){
+                task.hoursLogged += newTotalTime;
+              }
+              return task
+            })
+          }
+        }
+        return user
+      })
+      return {...state, usersWithTasks : updatedusersWithTasks}
     case 'DELETE_TASK_NOTIFICATION_SUCCESS':
       return {
         ...state,

src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx

@@ -27,13 +27,15 @@ import { getUserProfile } from 'actions/userProfile';
 import axios from 'axios';
 import hasPermission from 'utils/permissions';
 import { boxStyle, boxStyleDark } from 'styles';
+import { useDispatch } from 'react-redux';
 import { postTimeEntry, editTimeEntry, getTimeEntriesForWeek } from '../../../actions/timeEntries';
 import AboutModal from './AboutModal';
 import TangibleInfoModal from './TangibleInfoModal';
 import ReminderModal from './ReminderModal';
 import TimeLogConfirmationModal from './TimeLogConfirmationModal';
 import { ENDPOINTS } from '../../../utils/URL';
 import '../../Header/DarkMode.css';
+import { updateIndividualTaskTime } from '../../TeamMemberTasks/actions';
 
 // Images are not allowed in timelog
 const customImageUploadHandler = () =>
@@ -67,6 +69,7 @@ function TimeEntryForm(props) {
   const { from, sendStop, edit, data, toggle, isOpen, tab, darkMode } = props;
   // props from store
   const { authUser } = props;
+  const dispatch = useDispatch();
 
   const viewingUser = JSON.parse(sessionStorage.getItem('viewingUser') ?? '{}');
 
@@ -311,7 +314,7 @@ function TimeEntryForm(props) {
   };
 
   const submitTimeEntry = async () => {
-    const { hours: formHours, minutes: formMinutes } = formValues;
+    const { hours: formHours, minutes: formMinutes, personId, taskId } = formValues;
     const timeEntry = { ...formValues };
     const isTimeModified = edit && (initialHours !== formHours || initialMinutes !== formMinutes);
 
@@ -337,6 +340,13 @@ function TimeEntryForm(props) {
         case 'Timer':
           sendStop();
           clearForm();
+          dispatch(
+            updateIndividualTaskTime({
+              newTime: { hours: formHours, minutes: formMinutes },
+              taskId,
+              personId,
+            }),
+          );
           break;
         case 'TimeLog': {
           const date = moment(formValues.dateOfWork);