job list page filtered to display only jobs with job mode of general

Merge branch 'assign-btn-disable' of WrenchBoard/Users-Wrench into master
disabled assign btn after task is assigned
2024-05-21 16:32:59 +01:00 · 2024-05-21 09:24:18 +00:00 · 2024-05-21 09:35:04 +01:00 · 2024-05-21 01:25:26 +00:00 · 2024-05-20 20:59:32 +01:00 · 2024-05-20 16:57:50 +00:00
4 changed files with 15 additions and 11 deletions
@@ -230,9 +230,9 @@ export default function AssignPrevNewTask({
                      ) : (
                        <button
                          type="button"
-                          disabled={requestStatus.loading}
+                          disabled={requestStatus.loading || requestStatus.status}
                          onClick={assignFamilyTask}
-                          className="custom-btn btn-gradient text-white"
+                          className={`custom-btn btn-gradient text-white ${requestStatus.status && 'opacity-50'}`}
                        >
                          Assign
                        </button>
@@ -104,7 +104,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
      );
  };

-  const currentJobList = filterJobList();
+  const currentJobList = filterJobList()?.filter(item => item?.job_mode == 'GENERAL'); // Show only jobs with job mode of GENERAL

  // Handling Filter Pagination
  const filteredCurrentJobList = currentJobList?.slice(
@@ -358,13 +358,14 @@ function myJobTableFeatures(
            {MyJobList?.data?.result_list?.length > 0 ? (
              filteredCurrentJobList.length > 0 ? (
                filteredCurrentJobList.map((value, index) => (
-                  <JobListItem
-                    key={index}
-                    index={index}
-                    value={value}
-                    image_server={MyJobList.data.session_image_server}
-                  />
-                ))
+                      <JobListItem
+                        key={index}
+                        index={index}
+                        value={value}
+                        image_server={MyJobList.data.session_image_server}
+                      />
+                    )
+                )
              ) : (
                <NoJobsRow text="No Jobs Available In This Category!" />
              )
@@ -560,7 +560,7 @@ const JobFieldInput = ({
              <Field
                component="select"
                name={inputName}
-                className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
+                className={`options-default`}
                value={value}
              >
                {/* <option value="">{optionText}</option> */}
@@ -194,6 +194,9 @@
  .logout-btn {
    @apply px-4 min-w-[80px] h-[52px] flex justify-center items-center text-xl font-bold rounded-full cursor-pointer
  }
+  .options-default {
+    @apply px-2 placeholder:text-sm w-full h-full bg-white outline-none text-sm text-slate-900 dark:text-white
+  }
 }

 /* =====================  EXTRA ===================== */
Author	SHA1	Message	Date
victorAnumudu	2cc30d6c47	job list page filtered to display only jobs with job mode of general	2024-05-21 16:32:59 +01:00
ameye	cd68861dfa	Merge branch 'assign-btn-disable' of WrenchBoard/Users-Wrench into master	2024-05-21 09:24:18 +00:00
victorAnumudu	9fb0a65e46	disabled assign btn after task is assigned	2024-05-21 09:35:04 +01:00
ameye	15fce205a6	Merge branch 'font-match' of WrenchBoard/Users-Wrench into master	2024-05-21 01:25:26 +00:00
victorAnumudu	dddf6af401	select option tag font changed	2024-05-20 20:59:32 +01:00
ameye	1a86361fbb	Merge branch 'blog-page-display' of WrenchBoard/Users-Wrench into master	2024-05-20 16:57:50 +00:00