Merge branch 'develop' into task_modal

bcgov · Oct 31, 2023 · 1caa20f · 1caa20f
2 parents e5eb00c + 027c63b
commit 1caa20f
Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/epictrack-api/src/api/services/task.py b/epictrack-api/src/api/services/task.py
@@ -141,7 +141,7 @@ def create_task_events_from_template(
     @classmethod
     def _prepare_task_event_object(cls, data: dict) -> dict:
         """Prepare a task event object"""
-        exclude = ["assignee_ids"]
+        exclude = ["responsibility_ids", "assignee_ids"]
         return {key: data[key] for key in data.keys() if key not in exclude}
 
     @classmethod

diff --git a/epictrack-web/src/components/indigenousNation/IndigneousNationForm.tsx b/epictrack-web/src/components/indigenousNation/IndigneousNationForm.tsx
@@ -162,20 +162,20 @@ export default function IndigenousNationForm({ ...props }) {
             <ETFormLabel>PIP URL</ETFormLabel>
             <TextField fullWidth {...register("pip_link")} />
           </Grid>
-          <Grid item xs={12}>
-            <ETFormLabel>Notes</ETFormLabel>
-            <RichTextEditor
-              handleEditorStateChange={setNotes}
-              initialRawEditorState={(ctx.item as FirstNation)?.notes}
-            />
-          </Grid>
           <Grid item xs={6} sx={{ paddingTop: "30px !important" }}>
             <ControlledSwitch
               defaultChecked={(ctx.item as FirstNation)?.is_active}
               {...register("is_active")}
             />
             <ETFormLabel id="active">Active</ETFormLabel>
           </Grid>
+          <Grid item xs={12}>
+            <ETFormLabel>Notes</ETFormLabel>
+            <RichTextEditor
+              handleEditorStateChange={setNotes}
+              initialRawEditorState={(ctx.item as FirstNation)?.notes}
+            />
+          </Grid>
         </Grid>
       </FormProvider>
     </>

diff --git a/epictrack-web/src/components/workPlan/event/EventListTable.tsx b/epictrack-web/src/components/workPlan/event/EventListTable.tsx
@@ -453,6 +453,7 @@ const EventListTable = ({
 
   return (
     <MasterTrackTable
+      enableSorting={false}
       enableRowSelection={(row) => row.original.type !== "Milestone"}
       enableSelectAll
       enablePagination