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 rewriting test management config menu page #1215

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7aa83ee
fix(TestManagementConfigMenu-page): restController init
adityadeshlahre Aug 1, 2024
1987045
fix(TestManagementConfigMenu-page): non recursive pages init
adityadeshlahre Aug 1, 2024
49bb1d7
fix(TestManagementConfigMenu-page): recursive pages init (with subpages)
adityadeshlahre Aug 2, 2024
398c0a9
fix(TestManagementConfigMenu-page): other likewise RestController added
adityadeshlahre Aug 2, 2024
00af99b
fix(TestManagementConfigMenu-page): initalization(Test organization) …
adityadeshlahre Aug 2, 2024
0078210
fix(TestManagementConfigMenu-page): Renaming pages left-over INIT
adityadeshlahre Aug 3, 2024
5b4b18d
fix(TestNotificationConfigMenu): left-over controllers + TestRenameEn…
adityadeshlahre Aug 10, 2024
70d4d15
fix(TestManagementConfigMenu-page): reusable component + PanelRenameP…
adityadeshlahre Aug 14, 2024
5cc212e
fix(TestManagementConfigMenu-page): [remaning]RenamePages done
adityadeshlahre Aug 14, 2024
9698292
fix(TestManagementConfigMenuPage): selectListRenameEntry bug fix + te…
adityadeshlahre Aug 17, 2024
4bccdcb
fix(TestManagementConfigMenuPage): UI implementation existing.test.se…
adityadeshlahre Aug 21, 2024
255e14d
fix(fucntion): added onHandleFuntions
adityadeshlahre Aug 24, 2024
05a2e0d
fix(redndering): rendering selected sampleType
adityadeshlahre Aug 25, 2024
089a9a3
fix(redndering): range[ELEMENTS] rendering fixed
adityadeshlahre Aug 26, 2024
56f47c9
fix:onClick routing
adityadeshlahre Dec 6, 2024
98031a9
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
mozzy11 Dec 16, 2024
d6f0845
minor fix
mozzy11 Dec 16, 2024
7ba1f99
fix(testManagementRoute):pointed onclick to old jsp pages
adityadeshlahre Dec 16, 2024
2d52209
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
adityadeshlahre Dec 16, 2024
be75ad2
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
adityadeshlahre Dec 16, 2024
fcc30df
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
mozzy11 Dec 19, 2024
fad2dfa
fix(testManagementConfigMenu):404 call fixed && undefined data fix
adityadeshlahre Dec 22, 2024
2686c1a
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
mozzy11 Dec 23, 2024
e10395e
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
adityadeshlahre Dec 23, 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
125 changes: 118 additions & 7 deletions frontend/src/components/admin/Admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
Bullhorn,
User,
BatchJob,
ResultNew,
Popup,
Search,
} from "@carbon/icons-react";
Expand Down Expand Up @@ -59,6 +60,35 @@ import BatchTestReassignmentAndCancelation from "./BatchTestReassignmentAndCance
import TestNotificationConfigMenu from "./testNotificationConfigMenu/TestNotificationConfigMenu.js";
import TestNotificationConfigEdit from "./testNotificationConfigMenu/TestNotificationConfigEdit.js";
import SearchIndexManagement from "./searchIndexManagement/SearchIndexManagement";
import TestManagementConfigMenu from "./testManagementConfigMenu/TestManagementConfigMenu.js";
import ResultSelectListAdd from "./testManagementConfigMenu/ResultSelectListAdd.js";
import TestAdd from "./testManagementConfigMenu/TestAdd.js";
import TestModifyEntry from "./testManagementConfigMenu/TestModifyEntry.js";
import TestOrderability from "./testManagementConfigMenu/TestOrderability.js";
import MethodManagement from "./testManagementConfigMenu/MethodManagement.js";
import MethodCreate from "./testManagementConfigMenu/MethodCreate.js";
import TestSectionManagement from "./testManagementConfigMenu/TestSectionManagement.js";
import TestSectionCreate from "./testManagementConfigMenu/TestSectionCreate.js";
import TestSectionOrder from "./testManagementConfigMenu/TestSectionOrder.js";
import SampleTypeManagement from "./testManagementConfigMenu/SampleTypeManagement.js";
import TestSectionTestAssign from "./testManagementConfigMenu/TestSectionTestAssign.js";
import SampleTypeOrder from "./testManagementConfigMenu/SampleTypeOrder.js";
import SampleTypeCreate from "./testManagementConfigMenu/SampleTypeCreate.js";
import SampleTypeTestAssign from "./testManagementConfigMenu/SampleTypeTestAssign.js";
import UomManagement from "./testManagementConfigMenu/UomManagement.js";
import UomCreate from "./testManagementConfigMenu/UomCreate.js";
import PanelManagement from "./testManagementConfigMenu/PanelManagement.js";
import PanelCreate from "./testManagementConfigMenu/PanelCreate.js";
import PanelOrder from "./testManagementConfigMenu/PanelOrder.js";
import PanelTestAssign from "./testManagementConfigMenu/PanelTestAssign.js";
import TestActivation from "./testManagementConfigMenu/TestActivation.js";
import TestRenameEntry from "./testManagementConfigMenu/TestRenameEntry.js";
import PanelRenameEntry from "./testManagementConfigMenu/PanelRenameEntry.js";
import SampleTypeRenameEntry from "./testManagementConfigMenu/SampleTypeRenameEntry.js";
import TestSectionRenameEntry from "./testManagementConfigMenu/TestSectionRenameEntry.js";
import UomRenameEntry from "./testManagementConfigMenu/UomRenameEntry.js";
import SelectListRenameEntry from "./testManagementConfigMenu/SelectListRenameEntry.js";
import MethodRenameEntry from "./testManagementConfigMenu/MethodRenameEntry.js";

function Admin() {
const intl = useIntl();
Expand Down Expand Up @@ -93,12 +123,6 @@ function Admin() {
<SideNavMenuItem href="#calculatedValue">
<FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
</SideNavMenuItem>
<SideNavMenuItem href="#TestCatalog">
<FormattedMessage id="sidenav.label.admin.testmgt.ViewtestCatalog" />
</SideNavMenuItem>
<SideNavMenuItem href="#MethodManagment">
<FormattedMessage id="sidenav.label.admin.testmgt.ManageMethod" />
</SideNavMenuItem>
</SideNavMenu>
<SideNavLink href="#AnalyzerTestName" renderIcon={ListDropdown}>
<FormattedMessage id="sidenav.label.admin.analyzerTest" />
Expand Down Expand Up @@ -133,6 +157,9 @@ function Admin() {
<SideNavLink renderIcon={BatchJob} href="#batchTestReassignment">
<FormattedMessage id="configuration.batch.test.reassignment" />
</SideNavLink>
<SideNavLink renderIcon={ResultNew} href="#testManagementConfigMenu">
<FormattedMessage id="master.lists.page.test.management" />
</SideNavLink>
<SideNavMenu
title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
renderIcon={TableOfContents}
Expand Down Expand Up @@ -224,7 +251,7 @@ function Admin() {
<PathRoute path="#TestCatalog">
<TestCatalog />
</PathRoute>
<PathRoute path="#MethodManagment">
<PathRoute path="#MethodManagement">
<ManageMethod />
</PathRoute>
<PathRoute path="#AnalyzerTestName">
Expand Down Expand Up @@ -281,6 +308,90 @@ function Admin() {
<PathRoute path="#commonproperties">
<CommonProperties />
</PathRoute>
<PathRoute path="#testManagementConfigMenu">
<TestManagementConfigMenu />
</PathRoute>
<PathRoute path="#ResultSelectListAdd">
<ResultSelectListAdd />
</PathRoute>
<PathRoute path="#TestAdd">
<TestAdd />
</PathRoute>
<PathRoute path="#TestModifyEntry">
<TestModifyEntry />
</PathRoute>
<PathRoute path="#TestOrderability">
<TestOrderability />
</PathRoute>
<PathRoute path="#MethodCreate">
<MethodCreate />
</PathRoute>
<PathRoute path="#TestSectionManagement">
<TestSectionManagement />
</PathRoute>
<PathRoute path="#TestSectionCreate">
<TestSectionCreate />
</PathRoute>
<PathRoute path="#TestSectionOrder">
<TestSectionOrder />
</PathRoute>
<PathRoute path="#TestSectionTestAssign">
<TestSectionTestAssign />
</PathRoute>
<PathRoute path="#SampleTypeManagement">
<SampleTypeManagement />
</PathRoute>
<PathRoute path="#SampleTypeCreate">
<SampleTypeCreate />
</PathRoute>
<PathRoute path="#SampleTypeOrder">
<SampleTypeOrder />
</PathRoute>
<PathRoute path="#SampleTypeTestAssign">
<SampleTypeTestAssign />
</PathRoute>
<PathRoute path="#UomManagement">
<UomManagement />
</PathRoute>
<PathRoute path="#UomCreate">
<UomCreate />
</PathRoute>
<PathRoute path="#PanelManagement">
<PanelManagement />
</PathRoute>
<PathRoute path="#PanelCreate">
<PanelCreate />
</PathRoute>
<PathRoute path="#PanelOrder">
<PanelOrder />
</PathRoute>
<PathRoute path="#PanelTestAssign">
<PanelTestAssign />
</PathRoute>
<PathRoute path="#TestActivation">
<TestActivation />
</PathRoute>
<PathRoute path="#TestRenameEntry">
<TestRenameEntry />
</PathRoute>
<PathRoute path="#PanelRenameEntry">
<PanelRenameEntry />
</PathRoute>
<PathRoute path="#SampleTypeRenameEntry">
<SampleTypeRenameEntry />
</PathRoute>
<PathRoute path="#TestSectionRenameEntry">
<TestSectionRenameEntry />
</PathRoute>
<PathRoute path="#UomRenameEntry">
<UomRenameEntry />
</PathRoute>
<PathRoute path="#SelectListRenameEntry">
<SelectListRenameEntry />
</PathRoute>
<PathRoute path="#MethodRenameEntry">
<MethodRenameEntry />
</PathRoute>

<PathRoute path="#NonConformityConfigurationMenu">
<ConfigMenuDisplay
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import React, { useContext, useState, useEffect, useRef } from "react";
import {
Form,
Heading,
Button,
Loading,
Grid,
Column,
Section,
DataTable,
Table,
TableHead,
TableRow,
TableBody,
TableHeader,
TableCell,
TableSelectRow,
TableSelectAll,
TableContainer,
Pagination,
Search,
Select,
SelectItem,
Stack,
} from "@carbon/react";
import {
getFromOpenElisServer,
postToOpenElisServer,
postToOpenElisServerFormData,
postToOpenElisServerFullResponse,
postToOpenElisServerJsonResponse,
} from "../../utils/Utils.js";
import { NotificationContext } from "../../layout/Layout.js";
import {
AlertDialog,
NotificationKinds,
} from "../../common/CustomNotification.js";
import { FormattedMessage, injectIntl, useIntl } from "react-intl";
import PageBreadCrumb from "../../common/PageBreadCrumb.js";
import CustomCheckBox from "../../common/CustomCheckBox.js";
import ActionPaginationButtonType from "../../common/ActionPaginationButtonType.js";

let breadcrumbs = [
{ label: "home.label", link: "/" },
{ label: "breadcrums.admin.managment", link: "/MasterListsPage" },
{
label: "master.lists.page.test.management",
link: "/MasterListsPage#testManagementConfigMenu",
},
{
label: "configuration.testUnit.manage",
link: "/MasterListsPage#MethodManagement",
},
{
label: "configuration.method.create",
link: "/MasterListsPage#MethodCreate",
},
];

function MethodCreate() {
const { notificationVisible, setNotificationVisible, addNotification } =
useContext(NotificationContext);

const intl = useIntl();

const componentMounted = useRef(false);

return (
<>
{notificationVisible === true ? <AlertDialog /> : ""}
<div className="adminPageContent">
<PageBreadCrumb breadcrumbs={breadcrumbs} />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Heading>
<FormattedMessage id="banner.menu.patientEdit" />
</Heading>
</Section>
</Column>
</Grid>
<br />
<hr />
<br />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Heading>
<FormattedMessage id="configuration.method.create" />
</Heading>
</Section>
</Column>
</Grid>
</div>
</>
);
}

export default injectIntl(MethodCreate);
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import React, { useContext, useState, useEffect, useRef } from "react";
import {
Form,
Heading,
Button,
Loading,
Grid,
Column,
Section,
DataTable,
Table,
TableHead,
TableRow,
TableBody,
TableHeader,
TableCell,
TableSelectRow,
TableSelectAll,
TableContainer,
Pagination,
Search,
Select,
SelectItem,
Stack,
UnorderedList,
ListItem,
} from "@carbon/react";
import {
getFromOpenElisServer,
postToOpenElisServer,
postToOpenElisServerFormData,
postToOpenElisServerFullResponse,
postToOpenElisServerJsonResponse,
} from "../../utils/Utils.js";
import { NotificationContext } from "../../layout/Layout.js";
import {
AlertDialog,
NotificationKinds,
} from "../../common/CustomNotification.js";
import { FormattedMessage, injectIntl, useIntl } from "react-intl";
import PageBreadCrumb from "../../common/PageBreadCrumb.js";
import CustomCheckBox from "../../common/CustomCheckBox.js";
import ActionPaginationButtonType from "../../common/ActionPaginationButtonType.js";

let breadcrumbs = [
{ label: "home.label", link: "/" },
{ label: "breadcrums.admin.managment", link: "/MasterListsPage" },
{
label: "master.lists.page.test.management",
link: "/MasterListsPage#testManagementConfigMenu",
},
{
label: "configuration.testUnit.manage",
link: "/MasterListsPage#MethodManagement",
},
];

function MethodManagement() {
const { notificationVisible, setNotificationVisible, addNotification } =
useContext(NotificationContext);

const intl = useIntl();

const componentMounted = useRef(false);

return (
<>
{notificationVisible === true ? <AlertDialog /> : ""}
<div className="adminPageContent">
<PageBreadCrumb breadcrumbs={breadcrumbs} />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Heading>
<FormattedMessage id="configuration.testUnit.manage" />
</Heading>
</Section>
</Column>
</Grid>
<br />
<hr />
<br />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<UnorderedList>
<ListItem
onClick={() => {
window.location.assign("/MasterListsPage#MethodCreate");
}}
>
<FormattedMessage id="configuration.method.create" />
</ListItem>
</UnorderedList>
</Column>
</Grid>
</div>
</>
);
}

export default injectIntl(MethodManagement);
Loading
Loading