template fixes and natsort block removed (bcgov#2026)

jadmsaadaot · Mar 22, 2024 · 3134d5b · 3134d5b
1 parent e1be6a5
commit 3134d5b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 3 deletions.
diff --git a/epictrack-api/requirements.txt b/epictrack-api/requirements.txt
@@ -60,4 +60,4 @@ tzdata==2023.4
 urllib3==2.1.0
 zipp==3.17.0
 matplotlib==3.7.4
-natsort[icu]==8.4.0
+natsort==8.4.0
diff --git a/epictrack-api/requirements/prod.txt b/epictrack-api/requirements/prod.txt
@@ -26,4 +26,4 @@ marshmallow-sqlalchemy==0.29.0
 pandas==2.0.2
 openpyxl==3.0.10
 matplotlib==3.7.4
-natsort[icu]==8.4.0
+natsort==8.4.0
diff --git a/epictrack-api/src/api/actions/lock_work_start_date.py b/epictrack-api/src/api/actions/lock_work_start_date.py
@@ -1,5 +1,6 @@
 """Disable work start date action handler"""
 
+from datetime import timedelta
 from api.actions.base import ActionFactory
 from api.models.work import Work
 
@@ -11,5 +12,6 @@ def run(self, source_event, params) -> None:
         """Set the work start date and mark start date as locked for changes"""
         work = Work.find_by_id(source_event.work_id)
         work.start_date_locked = params.get("start_date_locked")
-        work.start_date = source_event.actual_date
+        start_at = params.get("start_at") if params.get("start_at") else 0
+        work.start_date = source_event.actual_date + timedelta(days=start_at)
         work.update(work.as_dict(recursive=False), commit=False)
diff --git a/...eao_designation/001-CEAO_Designation.xlsx → ...eao_designation/001_CEAO_Designation.xlsx b/...eao_designation/001-CEAO_Designation.xlsx → ...eao_designation/001_CEAO_Designation.xlsx
diff --git a/epictrack-api/src/api/templates/event_templates/ceao_designation/002_CEAO_Designation.xlsx b/epictrack-api/src/api/templates/event_templates/ceao_designation/002_CEAO_Designation.xlsx
diff --git a/epictrack-api/src/api/templates/event_templates/exemption_request/002_Exemption_Request.xlsx b/epictrack-api/src/api/templates/event_templates/exemption_request/002_Exemption_Request.xlsx
diff --git a/...-api/src/api/templates/event_templates/minister_designation/002_Minister_Designation.xlsx b/...-api/src/api/templates/event_templates/minister_designation/002_Minister_Designation.xlsx