Merge pull request #44 from CMP26Projects/assign-captain

CMP26Projects · Dec 27, 2023 · 6ce535b · 6ce535b
2 parents 0c60ab3 + 47cacd4
commit 6ce535b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/src/components/assign-captain-page/AssignSector.jsx b/client/src/components/assign-captain-page/AssignSector.jsx
@@ -58,7 +58,7 @@ export default function AssignSector() {
       toast.success("تم تعيين القائد بنجاح");
     } catch (err) {
       toast.error("حدث خطأ أثناء تعيين القائد");
-      console.log(err);
+      console.log(JSON.stringify(err));
       toast.error(JSON.stringify(err));
     }
   };
@@ -114,7 +114,7 @@ export default function AssignSector() {
           setChosenCaptainId(e.target.value);
         }}
       />
-      {isFetchingCaptains && (
+      {(isFetchingCaptains || isLoadingAssignRegularCaptain) && (
         <p
           style={{
             direction: "rtl",

diff --git a/client/src/components/assign-captain-page/UnitAssignSector.jsx b/client/src/components/assign-captain-page/UnitAssignSector.jsx
@@ -58,7 +58,7 @@ export default function UnitAssignSector() {
       toast.success("تم تعيين القائد بنجاح");
     } catch (err) {
       toast.error("حدث خطأ أثناء تعيين القائد");
-      console.log(err);
+      console.log(JSON.stringify(err));
       toast.error(JSON.stringify(err));
     }
   };

diff --git a/client/src/redux/slices/sectorApiSlice.js b/client/src/redux/slices/sectorApiSlice.js
@@ -29,7 +29,7 @@ export const captainsApi = apiSlice.injectEndpoints({
     }),
     UpdateSectorRegularCaptain: builder.mutation({
       query: (sector) => ({
-        url: `${SECTOR_URL}/${sector.baseName}/${sector.suffixName}`,
+        url: `${SECTOR_URL}/captain/${sector.baseName}/${sector.suffixName}`,
         method: "PATCH",
         body: sector,
       }),