src/components/Project/Infrastructure/TaskModel.jsx

@@ -111,7 +111,8 @@ const TaskModel = ({
     setIsSubmitting(true);
     await onSubmit(data);
     setValue("plannedWork", 0);
-    setValue( "completedWork", 0 );
+    setValue("completedWork", 0);
+    dispatch(changeMaster("Activity"));
     setIsSubmitting(false);
   };
 
@@ -126,7 +127,7 @@ const TaskModel = ({
 
   useEffect(() => {
     if (activities && activities.length > 0) {
-      setActivityData( activities );
+      setActivityData(activities);
     }
   }, [activities]);
   return (
@@ -212,6 +213,7 @@ const TaskModel = ({
                 </div>
               )}
 
+              {/* Select Work Area */}
               {selectedFloor && (
                 <div className="col-12 col-md-12">
                   <label className="form-label" htmlFor="workAreaId">
@@ -245,6 +247,7 @@ const TaskModel = ({
                 </div>
               )}
 
+              {/* Select Activity */}
               {selectedWorkArea && (
                 <div className="col-12 col-md-12">
                   <label className="form-label" htmlFor="activityID">
@@ -267,9 +270,9 @@ const TaskModel = ({
                         })
                         ?.map((activity) => (
                           <option key={activity.id} value={activity.id}>
-                            {
+                            {activity.name ||
                               activity.activityName ||
-                             
+                              activity.title ||
                               `Unnamed (id: ${activity.id})`}
                           </option>
                         ))