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

Abhishek singh07/issue#5284 #5289

Closed
wants to merge 2 commits into from
Closed

Abhishek singh07/issue#5284 #5289

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
be024a1
Place buttons in new line in Search Facility Popup #5287
AbhishekPSingh07 Apr 9, 2023
bdc7820
Move Import/Export button to next line #5284
AbhishekPSingh07 Apr 9, 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: 1 addition & 1 deletion src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const FacilitiesSelectDialog = (props: Props) => {
showAll={false}
multiple={false}
/>
<div className="mt-4 flex justify-between">
<div className="mt-4 flex flex-col">
Copy link
Member

Choose a reason for hiding this comment

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

This PR contains changes from your other PR. Ensure you've branched from the develop branch instead of the other PR's branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay will Do

<Cancel onClick={handleCancel} />
<Submit
onClick={handleOk}
Expand Down
49 changes: 26 additions & 23 deletions src/Components/ExternalResult/ResultList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,33 +226,36 @@ export default function ResultList() {
}
handleCancel={() => setShowDialog(false)}
/>
<div className="flex items-center justify-between">
<div className="flex flex-wrap items-center justify-between ">
<PageTitle title="External Results" hideBack breadcrumbs={false} />
<ExportMenu
label="Import/Export"
exportItems={[
{
label: "Import Results",
action: () => navigate("/external_results/upload"),
options: {
icon: <CareIcon className="care-l-import" />,
<div className="w-full sm:w-auto">
<ExportMenu
label="Import/Export"
exportItems={[
{
label: "Import Results",
action: () => navigate("/external_results/upload"),
options: {
icon: <CareIcon className="care-l-import" />,
},
},
},
{
label: "Export Results",
action: () =>
externalResultList(
{ ...qParams, csv: true },
"externalResultList"
),
filePrefix: "external_results",
options: {
icon: <CareIcon className="care-l-export" />,
{
label: "Export Results",
action: () =>
externalResultList(
{ ...qParams, csv: true },
"externalResultList"
),
filePrefix: "external_results",
options: {
icon: <CareIcon className="care-l-export" />,
},
},
},
]}
/>
]}
/>
</div>
</div>

<div className="lg:grid grid-cols-1 gap-5 sm:grid-cols-3 my-4 px-2 md:px-0 relative">
<CountBlock
text="Total Results"
Expand Down