Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes "Set average weekly working hour" button in user tab is not responsive Fixes #7309 #7480

Merged
merged 11 commits into from
May 7, 2024
Merged

fixes "Set average weekly working hour" button in user tab is not responsive Fixes #7309 #7480

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21f840d
fixes "Set average weekly working hour" button in user tab is not res…
kabirrajsingh Mar 27, 2024
d679ca1
Merge branch 'develop' into issues/#7309/weekly-hours-btn
kabirrajsingh Mar 28, 2024
a04ae42
Merge branch 'develop' into issues/#7309/weekly-hours-btn
rithviknishad Apr 3, 2024
ce0ccee
Merge branch 'develop' into issues/#7309/weekly-hours-btn
nihal467 Apr 16, 2024
b943ab4
Merge branch 'develop' into issues/#7309/weekly-hours-btn
nihal467 Apr 16, 2024
8839578
Merge branch 'develop' into issues/#7309/weekly-hours-btn
kabirrajsingh Apr 21, 2024
fd5fd8a
Update ManageUsers.tsx
kabirrajsingh Apr 21, 2024
3c938d7
Update ManageUsers.tsx
kabirrajsingh Apr 21, 2024
13a3ad8
Merge branch 'develop' into issues/#7309/weekly-hours-btn
nihal467 Apr 23, 2024
a64bd63
fix lint
nihal467 Apr 23, 2024
00d4c66
Update src/Components/Users/ManageUsers.tsx
rithviknishad May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Components/Users/ManageUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,18 +410,21 @@
{["DistrictAdmin", "StateAdmin"].includes(
authUser.user_type
) && (
<div className="flex-col md:flex-row">
<div className="">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div className="">
<div>

<ButtonV2
id="avg-workinghour"
className="flex w-full items-center md:w-full"
className="flex w-full"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
className="flex w-full"
className="w-full"

onClick={() => {
setExpandWorkingHours(true);
setSelectedUser(user.username);
setWeeklyHours(user.weekly_working_hours);
}}
>
<CareIcon icon="l-clock" className="text-xl" />
<p>Set Average weekly working hours</p>
<CareIcon className="care-l-clock text-xl" />

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (1) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (2) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (3) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (4) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (5) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (6) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (7) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.

Check failure on line 423 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / cypress-run (8) 

Property 'icon' is missing in type '{ className: string; }' but required in type 'CareIconProps'.
<p className="whitespace-nowrap md:whitespace-normal">
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
Set Average weekly working hours
</p>

Check failure on line 427 in src/Components/Users/ManageUsers.tsx

View workflow job for this annotation

GitHub Actions / lint 

Delete `⏎·············`
</ButtonV2>
</div>
)}
Expand Down
Loading