fixes

Author: dinesh-aot

epictrack-api/src/api/actions/add_event.py

@@ -36,7 +36,6 @@ def run(self, source_event: Event, params) -> None:
                 event_data, work_phase_id=work_phase_id, push_events=True, commit=False
             )
             set_event_date: SetEventDate = SetEventDate()
-            # param["event_name"] = new_event.event_configuration.name
             # Setting the event date from here cz, otherwise the event won't get pushed
             set_event_date.run(source_event, param)
             source_event = new_event

epictrack-api/src/api/actions/set_phases_status.py

@@ -13,6 +13,7 @@ class SetPhasesStatus(ActionFactory):
     def run(self, source_event: Event, params):
         """Sets all future phases to INACTIVE"""
         from api.services import EventService  # pylint: disable=import-outside-toplevel
+
         work_phase_ids = []
         if isinstance(params, list):
             for phase_des in params:
@@ -23,7 +24,9 @@ def run(self, source_event: Event, params):
             work_phases = (
                 db.session.query(WorkPhase)
                 .filter(
-                    WorkPhase.sort_order > source_event.event_configuration.work_phase.sort_order
+                    WorkPhase.sort_order
+                    > source_event.event_configuration.work_phase.sort_order
+                    and WorkPhase.work_id == source_event.work_id
                 )
                 .all()
             )

epictrack-api/src/api/actions/set_work_decision_maker.py

@@ -1,14 +1,19 @@
 """Disable work start date action handler"""
 
 from api.actions.base import ActionFactory
-from api.models import Work, db
-
+from api.models import Work
 
+# pylint: disable= import-outside-toplevel
 class SetWorkDecisionMaker(ActionFactory):  # pylint: disable=too-few-public-methods
     """Sets the work decision maker"""
 
+
     def run(self, source_event, params: dict) -> None:
         """Performs the required operations"""
-        db.session.query(Work).filter(Work.id == source_event.work_id).update(
-            {Work.decision_maker_position_id: params.get("position_id")}
-        )
+        from api.services.staff import StaffService
+
+        staff = StaffService.find_by_position_id(params.get("position_id"))
+        work = Work.find_by_id(source_event.work_id)
+        work.decision_by_id = staff[0].id
+        work.decision_maker_position_id = params.get("position_id")
+        work.update(work.as_dict(recursive=False), commit=False)

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

@@ -162,17 +162,12 @@ const EventList = () => {
             if (
               eventX.event_configuration?.event_position ===
                 EventPosition.START ||
-              eventY.event_configuration?.event_position === EventPosition.END
+              (eventY.event_configuration?.event_position ===
+                EventPosition.END &&
+                eventY.is_complete)
             ) {
               return -1;
             }
-            if (
-              eventY.event_configuration?.event_position ===
-                EventPosition.START ||
-              eventX.event_configuration?.event_position === EventPosition.END
-            ) {
-              return 1;
-            }
             // Next priorit is for dates, lower dates comes first
             const diff = Moment(eventX.start_date).diff(
               eventY.start_date,
@@ -240,6 +235,7 @@ const EventList = () => {
               }
             }
             return diff;
+            1152;
           });
           setEvents(result);
         }