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

Refactored condition of Different Districts in External Result #7339

Merged
merged 10 commits into from Mar 19, 2024
Merged

Refactored condition of Different Districts in External Result #7339

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
16d2d79
Refactored condition of Different Districts in External Result
jainvedant392 Mar 5, 2024
7116650
minor corrections
jainvedant392 Mar 5, 2024
557bea7
Merge branch 'develop' into issue7101
jainvedant392 Mar 5, 2024
86fd456
Merge branch 'develop' into issue7101
jainvedant392 Mar 7, 2024
a93847c
Merge branch 'develop' into issue7101
jainvedant392 Mar 12, 2024
cd103d5
Merge branch 'develop' into issue7101
jainvedant392 Mar 13, 2024
e90ba82
Merge branch 'develop' into issue7101
jainvedant392 Mar 17, 2024
f9dfc43
Added permission for StateLabAdmin as well
jainvedant392 Mar 18, 2024
ec22353
Merge branch 'develop' into issue7101
nihal467 Mar 19, 2024
75c88d2
Merge branch 'develop' into issue7101
jainvedant392 Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 25 additions & 9 deletions src/Components/ExternalResult/ExternalResultUpload.tsx
View file
Open in desktop
Expand Up @@ -2,16 +2,16 @@ import _ from "lodash-es";
import { navigate } from "raviger";
import { lazy, useEffect, useState } from "react";
import CSVReader from "react-csv-reader";
import useConfig from "../../Common/hooks/useConfig";
import * as Notification from "../../Utils/Notifications.js";
const PageTitle = lazy(() => import("../Common/PageTitle"));
import { useTranslation } from "react-i18next";
import { Cancel, Submit } from "../Common/components/ButtonV2";
import CareIcon from "../../CAREUI/icons/CareIcon";
import useAppHistory from "../../Common/hooks/useAppHistory";
import request from "../../Utils/request/request";
import useConfig from "../../Common/hooks/useConfig";
import routes from "../../Redux/api";
import * as Notification from "../../Utils/Notifications.js";
import request from "../../Utils/request/request";
import { Cancel, Submit } from "../Common/components/ButtonV2";
import { IExternalResult } from "./models";
import CareIcon from "../../CAREUI/icons/CareIcon";
const PageTitle = lazy(() => import("../Common/PageTitle"));

export default function ExternalResultUpload() {
const { sample_format_external_result_import } = useConfig();
Expand All @@ -26,7 +26,12 @@ export default function ExternalResultUpload() {
setValidationErrorCount(
data.filter(
(result: IExternalResult) =>
result.district !== user.district_object.name
((user.user_type === "StateAdmin" ||
user.user_type === "StateLabAdmin") &&
result.address.split(",").pop()?.trim() !==
user.state_object.name) ||
(user.user_type !== "StateAdmin" &&
result.district !== user.district_object.name)
).length
);
};
Expand Down Expand Up @@ -67,7 +72,12 @@ export default function ExternalResultUpload() {
sample_tests: validationErrorCount
? csvData.filter(
(data: IExternalResult) =>
data.district === user.district_object.name
((user.user_type === "StateAdmin" ||
user.user_type === "StateLabAdmin") &&
data.address.split(",").pop()?.trim() !==
user.state_object.name) ||
(user.user_type !== "StateAdmin" &&
data.district !== user.district_object.name)
)
: csvData,
},
Expand Down Expand Up @@ -179,7 +189,13 @@ export default function ExternalResultUpload() {
: null}
</div>
<div>
{data.district !== user.district_object.name && (
{(((user.user_type === "StateAdmin" ||
user.user_type === "StateLabAdmin") &&
data.address.split(",").pop()?.trim() !==
user.state_object.name) ||
(user.user_type !== "StateAdmin" &&
user.user_type !== "StateLabAdmin" &&
data.district !== user.district_object.name)) && (
<p className="mt-2 flex items-center justify-center gap-1 text-red-500">
<CareIcon icon="l-exclamation-triangle" /> Different
districts
Expand Down