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

Production Release; Oct Week 4 #6480

Merged
merged 20 commits into from
Oct 22, 2023
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
73f49f9
Optimize lodash. Fixes #6006
Omkar76 Oct 7, 2023
3f75c86
Merge branch 'develop' into optimize-lodash-es
nihal467 Oct 8, 2023
9bf4233
Merge branch 'develop' into optimize-lodash-es
nihal467 Oct 9, 2023
be98542
Replace startCase, camelCase with css capitalize
Omkar76 Oct 12, 2023
362003c
fix: add action and recommend discharge data on patient consultation …
aeswibon Oct 17, 2023
dd16bfa
Middleware override feature in asset location (#6368)
Ashesh3 Oct 17, 2023
c776524
Replaced useDispatch with useQuery and request in ExternalResult (src…
konavivekramakrishna Oct 17, 2023
7e29f25
Added cypress test to verify warranty expiry label on an asset (#6428)
GokulramGHV Oct 17, 2023
8ad1353
Replaced export button Icon with relevant Export Icon (#6451)
shyamprakash123 Oct 17, 2023
9b362c1
Replaced dispatch with useQuery and request in Asset module (#6374)
kshitijv256 Oct 18, 2023
a92ad24
Merge pull request #6415 from Omkar76/optimize-lodash-es
mathew-alex Oct 18, 2023
67f5189
Fix CSS unintentended RTL style (#6465)
rithviknishad Oct 18, 2023
d26aba5
Replaced useDispatch with useQuery and request. (#6344)
shyamprakash123 Oct 18, 2023
db52839
Fixes JWT token refresh interval default fallback to 5 mins (instead …
rithviknishad Oct 18, 2023
6ee8422
Daily Rounds: Updated consciousness levels choices to MEWS (#6435)
aeswibon Oct 18, 2023
8011653
Fixed typo in pathParams of ConfigureHealthFacility and replaced useD…
khavinshankar Oct 19, 2023
9eac85c
New Cypress Test | Search using username | User Tab (#6478)
nihal467 Oct 20, 2023
08193ba
Fix loadash-es import (#6477)
Ashesh3 Oct 20, 2023
33f103d
Fix session expiry detection (#6472)
Ashesh3 Oct 20, 2023
e452bb5
Added test of patient_crud.cy.ts (#6135)
ShivamJhaa Oct 20, 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
Prev Previous commit
Next Next commit
Replaced export button Icon with relevant Export Icon (#6451)
  • Loading branch information
shyamprakash123 authored Oct 17, 2023
commit 8ad1353ddba349aa5006ab967acd8d1eb8eb6a3c
2 changes: 1 addition & 1 deletion src/Components/Common/Export.tsx
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ export const ExportMenu = ({
<DropdownMenu
disabled={isExporting || disabled}
title={isExporting ? "Exporting..." : label}
icon={<CareIcon className="care-l-import" />}
icon={<CareIcon className="care-l-export" />}
className="tooltip border-primary-500 bg-white text-primary-500 hover:bg-primary-100 enabled:border"
>
{exportItems.map((item) => (
2 changes: 1 addition & 1 deletion src/Components/Patient/ManagePatients.tsx
Original file line number Diff line number Diff line change
@@ -815,7 +815,7 @@ export const PatientManager = () => {
}}
className="mr-5 w-full lg:w-fit"
>
<CareIcon className="care-l-import" />
<CareIcon className="care-l-export" />
<span className="lg:my-[3px]">Export</span>
</ButtonV2>
) : (
Loading