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.

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

Fix PatientUsers card | Dialog | AddUserSheet | UserSelector Overflow | Change Remove-button background | Modify Translation #10172

Merged
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
f8f0f59
Fix `PatientUsers` card overflow and Remove-btn bg
rajku-dev Jan 25, 2025
ddfdaa0
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 25, 2025
9e14a9b
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 25, 2025
347e49d
use tooltip component
rajku-dev Jan 26, 2025
661138e
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 27, 2025
d0e8568
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 27, 2025
1dd2ccb
reduce max-w
rajku-dev Jan 29, 2025
01b6829
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 29, 2025
51af025
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 30, 2025
2f77e93
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 30, 2025
4ca15e0
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 31, 2025
49f615b
Merge remote-tracking branch 'upstream/develop' into issue/10158/pati…
rajku-dev Jan 31, 2025
e05cd94
Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…
rajku-dev Jan 31, 2025
1796cd8
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 31, 2025
926cfa8
fix trash icon alignment
rajku-dev Jan 31, 2025
ef79fab
Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…
rajku-dev Jan 31, 2025
a8a1791
make the card resposive for all viewports
rajku-dev Jan 31, 2025
3c7cf72
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 31, 2025
710b57f
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Jan 31, 2025
835bae6
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 1, 2025
d6eb604
fix css
rajku-dev Feb 3, 2025
0d44a1d
Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…
rajku-dev Feb 3, 2025
2f15f7d
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 3, 2025
6a751ce
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 3, 2025
bde8648
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 4, 2025
82fc57c
fix css
rajku-dev Feb 4, 2025
1181e5a
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 4, 2025
34c55dc
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 4, 2025
5b0ad15
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 6, 2025
0669643
Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…
rajku-dev Feb 6, 2025
aa885cb
set xl breakpoint css
rajku-dev Feb 6, 2025
7127d26
Merge remote-tracking branch 'upstream/develop' into issue/10158/pati…
rajku-dev Feb 7, 2025
d3a0e99
use cn instead
rajku-dev Feb 7, 2025
19acd6f
adjust xl max-w
rajku-dev Feb 7, 2025
9633864
modify i18n trasnlation
rajku-dev Feb 7, 2025
8d50fb5
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 8, 2025
e306e5c
fix text alignment
rajku-dev Feb 10, 2025
70e5891
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 10, 2025
a8d5d41
Merge remote-tracking branch 'upstream/develop' into issue/10158/pati…
rajku-dev Feb 10, 2025
cabc722
use ToolTipComponent instead
rajku-dev Feb 11, 2025
5e50fec
Merge branch 'develop' into issue/10158/patient-user-card-fix
rajku-dev Feb 11, 2025
70774fb
fix name overflow in AddUserSheet and UserSelector
rajku-dev Feb 11, 2025
7d96f7d
Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…
rajku-dev Feb 11, 2025
571cfc9
reposition tooltip to bottom
rajku-dev Feb 12, 2025
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
Next Next commit
Fix PatientUsers card overflow and Remove-btn bg
  • Loading branch information
rajku-dev committed Jan 25, 2025
commit f8f0f599ef58371c8230914a1bd273d6d7a31544
11 changes: 8 additions & 3 deletions src/components/Patient/PatientDetailsTab/PatientUsers.tsx
Original file line number Diff line number Diff line change
@@ -236,7 +236,7 @@ export const PatientUsers = (props: PatientProps) => {
const ManageUsers = () => {
if (!users?.results?.length) {
return (
<div className="h-full text-center space-y-2 mt-2 text-center rounded-lg bg-white px-7 py-12 border border-secondary-300 text-lg text-secondary-600">
<div className="h-full text-center space-y-2 mt-2 rounded-lg bg-white px-7 py-12 border border-secondary-300 text-lg text-secondary-600">
{t("no_user_assigned")}
</div>
);
@@ -259,7 +259,12 @@ export const PatientUsers = (props: PatientProps) => {
<h3 className="text-sm font-medium text-gray-900">
{formatDisplayName(user)}
</h3>
<p className="text-sm text-gray-500">{user.username}</p>
<p
className="text-sm text-gray-500 truncate sm:max-w-28"
title={user.username}
>
{user.username}
</p>
</div>
</div>
<AlertDialog>
@@ -281,7 +286,7 @@ export const PatientUsers = (props: PatientProps) => {
<AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
<AlertDialogAction
onClick={() => removeUser(user.id)}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
className="bg-red-500 text-white hover:bg-red-600"
>
{t("remove")}
</AlertDialogAction>
Loading