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

Minor ui fixes in shifting and consultation #5784

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Minor ui fixes in shifting and consultation #5784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f8c19
Minor ui fixes in shifting and consultation
Ashesh3 Jun 26, 2023
9df7f72
Merge branch 'develop' into issue-5766
nihal467 Jun 27, 2023
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
2 changes: 2 additions & 0 deletions src/Components/Facility/ConsultationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export const ConsultationCard = (props: ConsultationProps) => {
<div className="text-sm text-gray-700 items-center flex flex-col md:flex-row">
Created:{" "}
<RelativeDateUserMention
tooltipPosition="left"
actionDate={itemData.created_date}
user={itemData.created_by}
/>
Expand All @@ -112,6 +113,7 @@ export const ConsultationCard = (props: ConsultationProps) => {
<div className="text-sm text-gray-700 items-center flex flex-col md:flex-row">
Last Modified:{" "}
<RelativeDateUserMention
tooltipPosition="left"
actionDate={itemData.modified_date}
user={itemData.last_edited_by}
/>
Expand Down
2 changes: 2 additions & 0 deletions src/Components/Patient/SampleTestCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
<RelativeDateUserMention
actionDate={itemData.created_date}
user={itemData.created_by}
tooltipPosition="left"
/>
</div>
}
Expand All @@ -167,6 +168,7 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
<RelativeDateUserMention
actionDate={itemData.modified_date}
user={itemData.last_edited_by}
tooltipPosition="left"
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Locale/en/Shifting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"patient_category": "Patient Category",
"ambulance_driver_name": "Name of ambulance driver",
"ambulance_phone_number": "Phone number of Ambulance",
"ambulance_number": "Ambulance No.",
"ambulance_number": "Ambulance No",
"is_emergency": "Is emergency",
"contact_person_at_the_facility": "Contact person at the current facility",
"update_status_details": "Update Status/Details",
Expand Down