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

fixed reordering of tab issue #1092

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fixed reordering of tab issue #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].58-campaign/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].59-campaign/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.0.58-campaign",
"version": "1.0.59-campaign",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down
8 changes: 8 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,11 @@
}
}
}
.setup-campaign{
.digit-success{
z-index: 1000;
}
}
.digit-error{
z-index: 900;
}
181 changes: 92 additions & 89 deletions ...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ const UploadData = ({ formData, onSelect, ...props }) => {
}
}, [Schemas, type]);


useEffect(async () => {
if (convertedSchema && Object.keys(convertedSchema).length > 0) {
const newFacilitySchema = await translateSchema(convertedSchema?.facilityWithBoundary);
Expand Down Expand Up @@ -391,29 +390,6 @@ const UploadData = ({ formData, onSelect, ...props }) => {
errors.push({ index: (item?.["!row#number!"] || item?.["__rowNum__"]) + 1, errors: validate.errors });
}
});

// if (errors.length > 0) {
// const errorMessage = errors
// .map(({ index, errors }) => {
// const formattedErrors = errors.map((error) => {

// let formattedError = `${error.instancePath}: ${error.message}`;
// if (error.keyword === "enum" && error.params && error.params.allowedValues) {
// formattedError += `. Allowed values are: ${error.params.allowedValues.join("/ ")}`;
// }
// return formattedError;
// })
// .join(", ");
// return `Data at row ${index}: ${formattedErrors} at ${sheetName}`;
// })
// .join(" , ");
// setIsError(true);
// targetError.push(errorMessage);
// return false;
// } else {
// return true;
// }

if (errors.length > 0) {
const errorMessage = errors
.map(({ index, errors }) => {
Expand Down Expand Up @@ -464,15 +440,31 @@ const UploadData = ({ formData, onSelect, ...props }) => {

const validateMultipleTargets = (workbook) => {
let isValid = true;
const sheet = workbook.Sheets[workbook.SheetNames[2]];
// const sheet = workbook.Sheets[workbook.SheetNames[2]];
const mdmsHeaders = sheetHeaders[type];
const expectedHeaders = XLSX.utils.sheet_to_json(sheet, {
header: 1,
})[0];
// const expectedHeaders = XLSX.utils.sheet_to_json(sheet, {
// header: 1,
// })[0];
const excludedSheetNames = [t("HCM_README_SHEETNAME"), t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA")];
let nextSheetName = null;
let expectedHeaders = [];

for (let i = 0; i < workbook.SheetNames.length; i++) {
const sheetName = workbook.SheetNames[i];
if (!excludedSheetNames.includes(sheetName)) {
nextSheetName = workbook.SheetNames[i];
break;
}
}

if (nextSheetName) {
const sheet = workbook.Sheets[nextSheetName];
expectedHeaders = XLSX.utils.sheet_to_json(sheet, { header: 1 })[0];
}
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

for (const header of mdmsHeaders) {
if (!expectedHeaders.includes(t(header))) {
const errorMessage = t("HCM_MISSING_HEADERS");
const errorMessage = t("HCM_BOUNDARY_INVALID_SHEET");
setErrorsType((prevErrors) => ({
...prevErrors,
[type]: errorMessage,
Expand All @@ -485,9 +477,13 @@ const UploadData = ({ formData, onSelect, ...props }) => {

if (!isValid) return isValid;

for (let i = 2; i < workbook.SheetNames.length; i++) {
for (let i = 0; i < workbook.SheetNames.length; i++) {
const sheetName = workbook?.SheetNames[i];

if (sheetName === t("HCM_README_SHEETNAME") || sheetName === t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA")) {
continue;
}

const sheet = workbook?.Sheets[sheetName];

// Convert the sheet to JSON to extract headers
Expand All @@ -512,9 +508,13 @@ const UploadData = ({ formData, onSelect, ...props }) => {
const targetError = [];

// Iterate over each sheet in the workbook, starting from the second sheet
for (let i = 2; i < workbook.SheetNames.length; i++) {
for (let i = 0; i < workbook.SheetNames.length; i++) {
const sheetName = workbook?.SheetNames[i];

if (sheetName === t("HCM_README_SHEETNAME") || sheetName === t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA")) {
continue;
}

const sheet = workbook?.Sheets[sheetName];

// Convert the sheet to JSON to extract headers
Expand All @@ -524,47 +524,41 @@ const UploadData = ({ formData, onSelect, ...props }) => {

const jsonData = XLSX.utils.sheet_to_json(sheet, { blankrows: true });

// const boundaryCodeIndex = headersToValidate.indexOf(t("HCM_ADMIN_CONSOLE_BOUNDARY_CODE"));
// const headersBeforeBoundaryCode = headersToValidate.slice(0, boundaryCodeIndex);

// const columnBeforeBoundaryCode = jsonData.map((row) => row[headersBeforeBoundaryCode[headersBeforeBoundaryCode.length - 1]]);

// // Getting the length of data in the column before the boundary code
// const lengthOfColumnBeforeBoundaryCode = columnBeforeBoundaryCode.filter((value) => value !== undefined && value !== "").length;

// const filteredData = jsonData
// .filter((e) => e[headersBeforeBoundaryCode[headersBeforeBoundaryCode?.length - 1]])
// .filter((e) => e[t("HCM_ADMIN_CONSOLE_TARGET_AT_THE_SELECTED_BOUNDARY_LEVEL")]);
// if (filteredData?.length == 0 || filteredData?.length != lengthOfColumnBeforeBoundaryCode) {
// const errorMessage = t("HCM_MISSING_TARGET");
// setErrorsType((prevErrors) => ({
// ...prevErrors,
// [type]: errorMessage,
// }));
// setIsError(true);
// isValid = false;
// break;
// }

// const targetValue = filteredData?.[0][t("HCM_ADMIN_CONSOLE_TARGET_AT_THE_SELECTED_BOUNDARY_LEVEL")];

// if (targetValue <= 0 || targetValue >= 100000000) {
// const errorMessage = t("HCM_TARGET_VALIDATION_ERROR");
// setErrorsType((prevErrors) => ({
// ...prevErrors,
// [type]: errorMessage,
// }));
// setIsError(true);
// isValid = false;
// break;
// }
// }

if (!validateTargetData(jsonData, sheetName, targetError)) {
// setShowInfoCard(true);
// isValid = false;
// break;
const boundaryCodeIndex = headersToValidate.indexOf(t("HCM_ADMIN_CONSOLE_BOUNDARY_CODE"));

for (const row of jsonData) {
for (let j = boundaryCodeIndex + 1; j < headersToValidate.length; j++) {
const value = row[headersToValidate[j]];
if (value === undefined || value === null) {
targetError.push(
`${t("HCM_DATA_AT_ROW")} ${jsonData.indexOf(row) + 2} ${t("HCM_IN_COLUMN")} "${headersToValidate[j]}" ${t(
"HCM_DATA_SHOULD_NOT_BE_EMPTY"
)} at ${sheetName}`
);
} else if (value >= 100000000) {
targetError.push(
`${t("HCM_DATA_AT_ROW")} ${jsonData.indexOf(row) + 2} ${t("HCM_IN_COLUMN")} "${headersToValidate[j]}" ${t(
"HCM_DATA_SHOULD_BE_LESS_THAN_MAXIMUM"
)} at ${sheetName}`
);
} else if (value < 0) {
targetError.push(
`${t("HCM_DATA_AT_ROW")} ${jsonData.indexOf(row) + 2} ${t("HCM_IN_COLUMN")} "${headersToValidate[j]}" ${t(
"HCM_DATA_SHOULD_BE_GREATER_THAN_ZERO"
)} at ${sheetName}`
);
} else if (typeof value !== "number") {
targetError.push(
`${t("HCM_DATA_AT_ROW")} ${jsonData.indexOf(row) + 2} ${t("HCM_IN_COLUMN")} "${headersToValidate[j]}" ${t(
"HCM_DATA_SHOULD_BE_NUMBER"
)} at ${sheetName}`
);
}
}
}

// if (!validateTargetData(jsonData, sheetName, targetError)) {
// }
}
if (targetError.length > 0) {
const errorMessage = targetError.join(", ");
Expand All @@ -585,6 +579,12 @@ const UploadData = ({ formData, onSelect, ...props }) => {
return isValid;
};

const sheetTypeMap = {
facilityWithBoundary: t("HCM_ADMIN_CONSOLE_AVAILABLE_FACILITIES"),
boundary: t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA"),
userWithBoundary: t("HCM_ADMIN_CONSOLE_USER_LIST"),
};

const validateExcel = (selectedFile) => {
return new Promise((resolve, reject) => {
// Check if a file is selected
Expand All @@ -599,15 +599,16 @@ const UploadData = ({ formData, onSelect, ...props }) => {
try {
const data = new Uint8Array(e.target.result);
const workbook = XLSX.read(data, { type: "array" });
const sheet = workbook.Sheets[workbook.SheetNames[1]];
const sheet = workbook.Sheets[sheetTypeMap[type]];
const headersToValidate = XLSX.utils.sheet_to_json(sheet, {
header: 1,
})[0];

const SheetNames = workbook.SheetNames[1];
const expectedHeaders = sheetHeaders[type];

const sheetData = XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[1]], { blankrows: true });
const SheetNames = sheetTypeMap[type];

const sheetData = XLSX.utils.sheet_to_json(workbook.Sheets[SheetNames], { blankrows: true });
var jsonData = sheetData.map((row, index) => {
const rowData = {};
if (Object.keys(row).length > 0) {
Expand All @@ -620,17 +621,27 @@ const UploadData = ({ formData, onSelect, ...props }) => {
});

jsonData = jsonData.filter((element) => element !== undefined);
if (type === "boundary") {
if (SheetNames !== t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA")) {
const errorMessage = t("HCM_INVALID_BOUNDARY_SHEET");
// if (type === "boundary") {
// if (workbook?.SheetNames.filter(sheetName => sheetName !== t("HCM_ADMIN_CONSOLE_BOUNDARY_DATA")).length == 0) {
// const errorMessage = t("HCM_INVALID_BOUNDARY_SHEET");
// setErrorsType((prevErrors) => ({
// ...prevErrors,
// [type]: errorMessage,
// }));
// setIsError(true);
// return;
// }
// } else
if (type === "facilityWithBoundary") {
if (workbook?.SheetNames.filter((sheetName) => sheetName == t("HCM_ADMIN_CONSOLE_AVAILABLE_FACILITIES")).length == 0) {
const errorMessage = t("HCM_INVALID_FACILITY_SHEET");
setErrorsType((prevErrors) => ({
...prevErrors,
[type]: errorMessage,
}));
setIsError(true);
return;
}
} else if (type === "facilityWithBoundary") {
if (type === "facilityWithBoundary") {
const activeColumnName = t("HCM_ADMIN_CONSOLE_FACILITY_USAGE");
const uniqueIdentifierColumnName = t("HCM_ADMIN_CONSOLE_FACILITY_CODE");
Expand All @@ -647,17 +658,8 @@ const UploadData = ({ formData, onSelect, ...props }) => {
return;
}
}
if (SheetNames !== t("HCM_ADMIN_CONSOLE_AVAILABLE_FACILITIES")) {
const errorMessage = t("HCM_INVALID_FACILITY_SHEET");
setErrorsType((prevErrors) => ({
...prevErrors,
[type]: errorMessage,
}));
setIsError(true);
return;
}
} else {
if (SheetNames !== t("HCM_ADMIN_CONSOLE_USER_LIST")) {
} else if (type === "userWithBoundary") {
if (workbook?.SheetNames.filter((sheetName) => sheetName == t("HCM_ADMIN_CONSOLE_USER_LIST")).length == 0) {
const errorMessage = t("HCM_INVALID_USER_SHEET");
setErrorsType((prevErrors) => ({
...prevErrors,
Expand Down Expand Up @@ -708,6 +710,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
}
}
} catch (error) {
console.log(error);
reject("HCM_FILE_UNAVAILABLE");
}
};
Expand Down
Loading