Changed weekly to average weekly for working hours (ohcnetwork#6228)

* Added padding to count block on patients page * fixed date format in asset manage page * Merged configure facility and configure health facility in one page * removed commented code * changed weekly to average weekly for working hours
yogeshbhutkar · Sep 6, 2023 · 995f4d7 · 995f4d7
1 parent b94851c
commit 995f4d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
@@ -387,7 +387,10 @@ export default function ManageUsers() {
                   )}
                 </div>
                 <div>
-                  <UserDetails id="working-hours" title="Weekly working hours">
+                  <UserDetails
+                    id="working-hours"
+                    title="Average weekly working hours"
+                  >
                     {user.weekly_working_hours ? (
                       <span className="font-semibold">
                         {user.weekly_working_hours} hours
@@ -438,7 +441,7 @@ export default function ManageUsers() {
                         }}
                       >
                         <CareIcon className="care-l-clock text-xl" />
-                        <p>Set weekly working hours</p>
+                        <p>Set Average weekly working hours</p>
                       </ButtonV2>
                     </div>
                   )}
@@ -492,15 +495,15 @@ export default function ManageUsers() {
         open={expandWorkingHours}
         setOpen={setExpandWorkingHours}
         slideFrom="right"
-        title="Weekly working hours"
+        title="Average weekly working hours"
         dialogClass="md:w-[400px]"
         onCloseClick={() => {
           setWeeklyHours(0);
         }}
       >
         <div className="px-2">
           <dt className="mb-3 text-sm font-medium leading-5 text-black">
-            Set weekly working hours for {selectedUser}
+            Set Average weekly working hours for {selectedUser}
           </dt>
           <TextFormField
             name="weekly_working_hours"
@@ -511,7 +514,7 @@ export default function ManageUsers() {
             }}
             error={
               weeklyHours < 0 || weeklyHours > 168
-                ? "Weekly working hours should be between 0 and 168"
+                ? "Average weekly working hours should be between 0 and 168"
                 : ""
             }
             required

diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
@@ -264,7 +264,7 @@ export default function UserProfile() {
             !/^\d+$/.test(states.form[field] ?? "")
           ) {
             errors[field] =
-              "Weekly working hours must be a number between 0 and 168";
+              "Average weekly working hours must be a number between 0 and 168";
             invalidForm = true;
           }
           return;
@@ -416,7 +416,7 @@ export default function UserProfile() {
   };
   return (
     <div>
-      <div className="p-10 lg:p-20">
+      <div className="p-10 lg:p-16">
         <div className="lg:grid lg:grid-cols-3 lg:gap-6">
           <div className="lg:col-span-1">
             <div className="px-4 sm:px-0">
@@ -559,7 +559,7 @@ export default function UserProfile() {
                   </div>
                   <div className="my-2  sm:col-span-1">
                     <dt className="text-sm font-medium leading-5 text-black">
-                      Weekly working hours
+                      Average weekly working hours
                     </dt>
                     <dd className="mt-1 text-sm leading-5 text-gray-900">
                       {details.weekly_working_hours ?? "-"}
@@ -568,7 +568,6 @@ export default function UserProfile() {
                 </dl>
               </div>
             )}
-
             {showEdit && (
               <div className="space-y-4">
                 <form action="#" method="POST">
@@ -661,7 +660,7 @@ export default function UserProfile() {
                         <TextFormField
                           {...fieldProps("weekly_working_hours")}
                           required
-                          label="Weekly working hours"
+                          label="Average weekly working hours"
                           className="col-span-6 sm:col-span-3"
                           type="number"
                           min={0}