fixed small changed like heading, font change

2025-09-30 11:59:16 +05:30 · 2025-09-30 11:59:16 +05:30 · cfd3986479
commit cfd3986479
parent 764b145ad9
5 changed files with 94 additions and 72 deletions
--- a/src/components/Activities/ReportTask.jsx
+++ b/src/components/Activities/ReportTask.jsx
@ -77,7 +77,7 @@ export const ReportTask = ({ report, closeModal }) => {
  return (
    <div className="container  m-0">
      <div className="text-center">
-        <p className="fs-6 fw-semibold">Report Task</p>
+        <p className="fs-5 fw-semibold">Report Task</p>
      </div>
      <div className="mb-1 row text-start">
        <label htmlFor="html5-text-input" className="col-md-4 col-form-label">
@ -101,16 +101,14 @@ export const ReportTask = ({ report, closeModal }) => {
        <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
          Wrok Area :
        </label>
-        <div className="col-md-8 text-start text-wrap">
-          <label className=" col-form-label">
-            {" "}
-            {report?.workItem?.workArea?.floor?.building?.name}{" "}
-            <i className="bx bx-chevron-right"></i>{" "}
-            {report?.workItem?.workArea?.floor?.floorName}{" "}
-            <i className="bx bx-chevron-right"> </i>
-            {report?.workItem?.workArea?.areaName}
-          </label>
-        </div>
+        <div className="col-md-8 text-start">
+  <div className="text-wrap">
+    {report?.workItem?.workArea?.floor?.building?.name} <i className="bx bx-chevron-right"></i>
+    {report?.workItem?.workArea?.floor?.floorName} <i className="bx bx-chevron-right"></i>
+    {report?.workItem?.workArea?.areaName}
+  </div>
+</div>
+
      </div>
      <div className="mb-1 row text-start">
        <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
--- a/src/components/Activities/SubTask.jsx
+++ b/src/components/Activities/SubTask.jsx
@ -4,6 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { string, z } from "zod";
 import {
  useActivitiesMaster,
+  useServices,
  useWorkCategoriesMaster,
 } from "../../hooks/masterHook/useMaster";
 import showToast from "../../services/toastService";
@ -25,6 +26,8 @@ const SubTask = ({ activity, onClose }) => {
  const { activities, loading } = useActivitiesMaster();
  const { categories, categoryLoading } = useWorkCategoriesMaster();
  const { Task, loading: TaskLoading } = useTaskById(activity?.id);
+  const {data,isError,isLoading,error}  = useServices();
+
  const {
    register,
    handleSubmit,
@ -97,8 +100,8 @@ const SubTask = ({ activity, onClose }) => {
  };
  return (
    <div className="container-xxl my-1">
-      <p className="fw-semibold">Create Sub Task</p>
-      <form className="row g-2" onSubmit={handleSubmit(onSubmitForm)}>
+      <p className="fw-semibold fs-5">Create Sub Task</p>
+      <form className="row g-2 text-start" onSubmit={handleSubmit(onSubmitForm)}>
        <div className="col-6">
          <label className="form-label">Building</label>
          <input
@ -128,27 +131,15 @@ const SubTask = ({ activity, onClose }) => {
            disabled
          />
        </div>
-
-        <div className="col-12">
-          <label className="form-label">Work Category</label>
-          <select
-            className="form-select form-select-sm"
-            {...register("workCategoryId")}
-            onChange={handleCategoryChange}
-          >
-            <option value="">
-              {categoryLoading ? "Loading..." : "-- Select Category --"}
-            </option>
-            {categoryData.map((category) => (
-              <option key={category.id} value={category.id}>
-                {category.name}
-              </option>
-            ))}
-          </select>
-          {errors.workCategoryId && (
-            <div className="danger-text">{errors.workCategoryId.message}</div>
-          )}
-        </div>
+          <div className="col-12">
+          <label className="form-label">Service</label>
+          <input
+            type="text"
+            className="form-control form-control-sm"
+            value={activity?.workItem?.activityMaster?.activityGroup?.service?.name || ""}
+            disabled
+          />
+        </div>        
        <div className="col-12">
          <label className="form-label">Select Activity</label>
          <select
@ -172,6 +163,27 @@ const SubTask = ({ activity, onClose }) => {
          )}
        </div>

+        <div className="col-12">
+          <label className="form-label">Work Category</label>
+          <select
+            className="form-select form-select-sm"
+            {...register("workCategoryId")}
+            onChange={handleCategoryChange}
+          >
+            <option value="">
+              {categoryLoading ? "Loading..." : "-- Select Category --"}
+            </option>
+            {categoryData.map((category) => (
+              <option key={category.id} value={category.id}>
+                {category.name}
+              </option>
+            ))}
+          </select>
+          {errors.workCategoryId && (
+            <div className="danger-text">{errors.workCategoryId.message}</div>
+          )}
+        </div>
+
        <div className="col-4">
          <label className="form-label">Planned Work</label>
          <input
@ -219,7 +231,15 @@ const SubTask = ({ activity, onClose }) => {
          )}
        </div>

-        <div className="col-12 text-center">
+        <div className="d-flex flex-row gap-3 justify-content-end  py-2">
+           <button
+            type="button"
+            className="btn btn-sm btn-label-secondary"
+            onClick={() => onClose()}
+            disabled={isPending}
+          >
+            Cancel
+          </button>
          <button
            type="submit"
            className="btn btn-sm btn-primary me-2"
@ -227,14 +247,7 @@ const SubTask = ({ activity, onClose }) => {
          >
            {isPending ? "Please wait..." : "Submit"}
          </button>
-          <button
-            type="button"
-            className="btn btn-sm btn-secondary"
-            onClick={() => onClose()}
-            disabled={isPending}
-          >
-            Cancel
-          </button>
+         
        </div>
      </form>
    </div>
--- a/src/components/master/ManageDocumentCategory.jsx
+++ b/src/components/master/ManageDocumentCategory.jsx
@ -8,6 +8,7 @@ import {
  useCreateDocumentCatgory,
  useUpdateDocumentCategory,
 } from "../../hooks/masterHook/useMaster";
+import Label from "../common/Label";

 export const Document_Entity = Object.entries(DOCUMENTS_ENTITIES).map(
  ([key, value]) => ({ key, value })
@ -74,9 +75,9 @@ const ManageDocumentCategory = ({ data, onClose }) => {
      ) : (
        <div>
          <div>
-            <p className="fw-semibold">
+            {/* <p className="fw-semibold">
              {data ? "Update Document Category" : "Add Document Category"}
-            </p>
+            </p> */}
          </div>

          <form
@ -84,7 +85,7 @@ const ManageDocumentCategory = ({ data, onClose }) => {
            onSubmit={handleSubmit(onSubmit)}
          >
            <div className="col-12">
-              <label className="form-label">Category Name</label>
+              <Label required >Category Name</Label>
              <input
                type="text"
                {...register("name")}
@ -96,7 +97,7 @@ const ManageDocumentCategory = ({ data, onClose }) => {
            </div>

            <div className="col-12">
-              <label className="form-label">Select Entity</label>
+              <Label required >Select Entity</Label>
              <select
                className="form-select form-select-sm"
                {...register("entityTypeId")}
@ -114,7 +115,7 @@ const ManageDocumentCategory = ({ data, onClose }) => {
            </div>

            <div className="col-12">
-              <label className="form-label">Description</label>
+              <Label required >Description</Label>
              <textarea
                rows="3"
                {...register("description")}
@ -125,7 +126,15 @@ const ManageDocumentCategory = ({ data, onClose }) => {
              )}
            </div>

-            <div className="col-12 text-center">
+            <div className="d-flex flex-row justify-content-end gap-3 ">
+              <button
+                type="button"
+                className="btn btn-sm btn-label-secondary"
+                onClick={onClose}
+                disabled={isPending || Updating}
+              >
+                Cancel
+              </button>
              <button
                type="submit"
                className="btn btn-sm btn-primary me-3"
@ -137,14 +146,7 @@ const ManageDocumentCategory = ({ data, onClose }) => {
                  ? "Update"
                  : "Submit"}
              </button>
-              <button
-                type="button"
-                className="btn btn-sm btn-secondary"
-                onClick={onClose}
-                disabled={isPending || Updating}
-              >
-                Cancel
-              </button>
+              
            </div>
          </form>
        </div>
--- a/src/components/master/ManageDocumentType.jsx
+++ b/src/components/master/ManageDocumentType.jsx
@ -4,6 +4,7 @@ import { z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useCreateDocumentType, useDocumentCategories, useUpdateDocumentType } from "../../hooks/masterHook/useMaster";
 import { DOCUMENTS_ENTITIES } from "../../utils/constants";
+import Label from "../common/Label";


 export const Document_Entity = Object.entries(DOCUMENTS_ENTITIES).map(
@ -84,14 +85,14 @@ const onSubmit = (payload) => {
    <FormProvider {...methods}>
      <form className="row g-2 text-start" onSubmit={handleSubmit(onSubmit)}>
        <div className="text-center">
-          <p className="fw-semibold">
+          {/* <p className="fw-semibold">
            {data ? "Edit Document Type" : "Add Document Type"}
-          </p>
+          </p> */}
        </div>

        {/* Name */}
        <div className="col-12">
-          <label className="form-label">Name</label>
+          <Label required>Name</Label>
          <input
            type="text"
            {...register("name")}
@ -112,7 +113,7 @@ const onSubmit = (payload) => {

        {/* Allowed Content Type */}
        <div className="col-12">
-          <label className="form-label">Allowed Content Type</label>
+          <Label required>Allowed Content Type</Label>
          <input
            type="text"
            {...register("allowedContentType")}
@ -174,7 +175,7 @@ const onSubmit = (payload) => {
        </div>
        {/* Category */}
        <div className="col-12">
-          <label className="form-label">Document Category</label>
+          <Label required> Document Category</Label>
          <select
            {...register("documentCategoryId")}
            className={`form-select form-select-sm`}
@ -194,7 +195,15 @@ const onSubmit = (payload) => {
        </div>

        {/* Buttons */}
-        <div className="col-12 text-center">
+        <div className="d-flex flex-row justify-content-end gap-3 ">
+           <button
+            type="button"
+            className="btn btn-sm btn-label-secondary"
+            onClick={onClose}
+            disabled={creating || updating}
+          >
+            Cancel
+          </button>
          <button
            type="submit"
            className="btn btn-sm btn-primary me-3"
@ -206,14 +215,7 @@ const onSubmit = (payload) => {
              ? "Update"
              : "Submit"}
          </button>
-          <button
-            type="button"
-            className="btn btn-sm btn-secondary"
-            onClick={onClose}
-            disabled={creating || updating}
-          >
-            Cancel
-          </button>
+         
        </div>
      </form>
    </FormProvider>
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@ -69,7 +69,14 @@ const MasterModal = ({ modaldata, closeModal }) => {
    ),
  };

-  return modalComponents[modalType] || null;
+  return (
+<>
+    <div className="text-center">
+      <p className="fs-5 fw-semibold" >{`${masterType, " ",  modalType}`}</p>
+    </div>
+     { modalComponents[modalType] || null}
+</>
+  );
 };

 export default MasterModal;