last working version

Author: dinesh-aot

epictrack-api/src/api/services/event.py

@@ -21,7 +21,7 @@
 from api.exceptions import ResourceNotFoundError, UnprocessableEntityError
 from api.models import (PRIMARY_CATEGORIES, CalendarEvent, Event,
                         EventCategoryEnum, EventConfiguration, EventTypeEnum,
-                        WorkCalendarEvent, WorkPhase, db)
+                        WorkCalendarEvent, WorkPhase, Work, WorkStateEnum, db)
 from api.models.action import Action, ActionEnum
 from api.models.action_configuration import ActionConfiguration
 from api.models.event_template import EventPositionEnum
@@ -115,13 +115,23 @@ def _process_events(
         current_event_old_index: int = None,
     ) -> None:
         """Process the event date logic"""
+        cls._end_event_anticipated_change_rule(event, event_old)
+        all_work_events = cls._find_events(
+                current_work_phase.work_id, None, PRIMARY_CATEGORIES
+        )
+        all_work_events = sorted(
+                all_work_events, key=lambda x: x.actual_date or x.anticipated_date
+               )
+        cls._previous_event_acutal_date_rule(all_work_events, event, current_event_old_index)
         all_work_event_configurations = EventConfigurationService.find_configurations(
             event.work_id, _all=True
         )
         cls._handle_child_events(all_work_event_configurations, event)
         number_of_days_to_be_pushed = cls._get_number_of_days_to_be_pushed(
             event, event_old, current_work_phase
         )
+        if event.actual_date and event.event_configuration.event_position == EventPositionEnum.END:
+            cls._complete_work_phase(current_work_phase)
         if (
             event.event_configuration.event_type_id == EventTypeEnum.TIME_LIMIT_SUSPENSION.value
             and event.actual_date
@@ -139,15 +149,7 @@ def _process_events(
             current_work_phase.update(current_work_phase.as_dict(recursive=False), commit=False)
 
         if number_of_days_to_be_pushed != 0:
-            cls._end_event_anticipated_change_rule(event, event_old)
 
-            all_work_events = cls._find_events(
-                current_work_phase.work_id, None, PRIMARY_CATEGORIES
-            )
-            all_work_events = sorted(
-                all_work_events, key=lambda x: x.actual_date or x.anticipated_date
-            )
-            cls._previous_event_acutal_date_rule(all_work_events, event)
             all_work_phases = WorkPhase.find_by_params(
                 {"work_id": current_work_phase.work_id}
             )
@@ -222,6 +224,25 @@ def _process_events(
                     current_event_old_index,
                 )
 
+    @classmethod
+    def _complete_work_phase(cls, current_work_phase: WorkPhase) -> None:
+        """Mark the current work phase complete and set the next work phase as the current one in the work"""
+        all_work_phases = WorkPhase.find_by_params(
+                {"work_id": current_work_phase.work_id}
+        )
+        current_work_phase.is_completed = True
+        current_work_phase.update(current_work_phase.as_dict(recursive=False), commit= False)
+
+        current_work_phase_index = util.find_index_in_array(
+                all_work_phases, current_work_phase
+            )
+        work: Work = Work.find_by_id(current_work_phase.work_id)
+        if current_work_phase_index == len(all_work_phases) - 1:
+            work.work_state = WorkStateEnum.COMPLETED
+        else:
+            work.current_phase_id = all_work_phases[ current_work_phase_index + 1].id
+        work.update(work.as_dict(recursive=False), commit=False)
+
     @classmethod
     def _get_number_of_days_to_be_pushed(cls,
                                          event: Event,
@@ -357,7 +378,7 @@ def _end_event_anticipated_change_rule(cls, event: Event, event_old: Event) -> N
 
     @classmethod
     def _previous_event_acutal_date_rule(
-        cls, all_work_events: [Event], event: Event
+        cls, all_work_events: [Event], event: Event, current_event_old_index: int
     ) -> None:
         """Check to see if the previous event has actual date present
 

epictrack-api/src/api/services/event_template.py

@@ -14,6 +14,7 @@
 """Service to manage Event Template."""
 import copy
 from typing import IO, Dict
+import json
 
 import pandas as pd
 from api.exceptions import BadRequestError
@@ -298,7 +299,7 @@ def _handle_outcomes(
                     ),
                     None,
                 )
-                action["additional_params"] = action["additional_params"]
+                action["additional_params"] = json.loads(action["additional_params"])
                 action_obj = req.ActionTemplateBodyParameterSchema().load(action)
                 if selected_action:
                     action_result = selected_action.update(action_obj, commit=False)

epictrack-web/src/components/workPlan/event/EventForm.tsx

@@ -253,12 +253,6 @@ const EventForm = ({
 
   const onSubmitHandler = async (submittedData: MilestoneEvent) => {
     try {
-      submittedData.anticipated_date = Moment(
-        submittedData.anticipated_date
-      ).format();
-      if (!!submittedData.actual_date) {
-        submittedData.actual_date = Moment(submittedData.actual_date).format();
-      }
       submittedData.notes = notes;
       // setSubmittedEvent(data);
       const showConfirmDialog =
@@ -327,6 +321,14 @@ const EventForm = ({
   const handleSaveEvent = async (data?: MilestoneEvent) => {
     try {
       const dataToBeSubmitted = data ?? getValues();
+      dataToBeSubmitted.anticipated_date = Moment(
+        dataToBeSubmitted.anticipated_date
+      ).format();
+      if (!!dataToBeSubmitted.actual_date) {
+        dataToBeSubmitted.actual_date = Moment(
+          dataToBeSubmitted.actual_date
+        ).format();
+      }
       await saveEvent(dataToBeSubmitted);
       onSave();
     } catch (e) {