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

Mukta sor #1959

Open
wants to merge 97 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
8c7b52b
FIxed build issue by Updating dependency version in package.json
jagankumar-egov Feb 1, 2024
a990445
Added the Build configs for the Microfrontend Apps
jagankumar-egov Feb 5, 2024
dbaf47d
Update build-config.yml
jagankumar-egov Mar 12, 2024
2873b1f
Added PGR code from OSS (Urban) (#431)
jagankumar-egov May 2, 2024
ae27835
ISTE-11: Fixed Redirect logout url, Fixed breadcrumb need to hide (#424)
anilsingha-eGov May 3, 2024
943abb3
fix: resolved AJV-related Jenkins build issue (#783)
jagankumar-egov Jun 5, 2024
863d019
Update README.md
jagankumar-egov Jun 8, 2024
a42bd28
HCM Admin console v0.1 release ui changes (#964)
jagankumar-egov Jun 26, 2024
c29df69
Microplan v1 UI Changes merging to master under health folder along w…
siddhant-nawale-egov Jun 26, 2024
9411473
Trimmed microplan name. Open Saved microplan with navigation for all …
siddhant-nawale-egov Jun 27, 2024
ef3963f
Update build-config.yml for microplan build issue
jagankumar-egov Jun 27, 2024
f5f2f81
adding map height css changes, geojson active inactive status change
siddhant-nawale-egov Jun 27, 2024
aa72dda
Merge pull request #969 from egovernments/master-map-css-change-and-g…
nipunarora-eGov Jun 27, 2024
e6d4a8e
Adding handling of same name sheets (#975)
siddhant-nawale-egov Jun 28, 2024
dbdff07
Microplan handling same sheet name (#979)
siddhant-nawale-egov Jun 28, 2024
d0c3c88
added changes in the master for draft boundary (#1002)
Bhavya-egov Jul 2, 2024
1f02a17
updated docker file
jagankumar-egov Jul 2, 2024
ddecfa9
updated workbench docker
jagankumar-egov Jul 2, 2024
f48f044
updated the workspace
jagankumar-egov Jul 2, 2024
05aa759
Update webpack.config.js
jagankumar-egov Jul 3, 2024
43e2f40
Update buildWorkbenchUI.yml
jagankumar-egov Jul 3, 2024
22ad147
Update package.json
jagankumar-egov Jul 3, 2024
cbf898e
updated the log
jagankumar-egov Jul 3, 2024
0828c3c
Update Dockerfile
jagankumar-egov Jul 3, 2024
4995274
Added Dashboard Icon & Commented harcoded check (#1010)
nabeelmd-eGov Jul 3, 2024
dc7b6d2
Updated the Utilites package updated for Kibana dashboard integratio…
nipunarora-eGov Jul 9, 2024
6c66763
Update package.json (#1023)
nipunarora-eGov Jul 9, 2024
11a65fc
Update package.json (#1025)
nipunarora-eGov Jul 9, 2024
0b95620
Added Environment support to use mdms v1 or v2 based on config and Wo…
aaradhya-egov Jul 10, 2024
b5829d4
changed version of workbench and libraries (#1036)
aaradhya-egov Jul 10, 2024
96e6dce
changed version and fix config issue (#1039)
aaradhya-egov Jul 10, 2024
5ce4b59
Workbench Enahancement to have referenced dropdown as popup where dat…
Swathi-eGov Jul 12, 2024
b21d1d8
added mdmsview changes
Swathi-eGov Jul 12, 2024
76ca6c8
added devops changes
Swathi-eGov Jul 12, 2024
6167c98
Added button logic for rates
Swathi-eGov Jul 15, 2024
0105b58
updated css version
Swathi-eGov Jul 15, 2024
25e0fc6
changed css version
Swathi-eGov Jul 15, 2024
bab6eed
Update package.json
jagankumar-egov Jul 15, 2024
a0dcdc0
updated build config
Swathi-eGov Jul 16, 2024
5d6c806
updated css change
Swathi-eGov Jul 16, 2024
f7b795d
Updated the library version for logo style fix
Tulika-eGov Jul 16, 2024
1744ea6
Updated package json version of workbench and render as commented
Tulika-eGov Jul 16, 2024
511fd7a
Updated the namespace from mukta-workbench to workbench
Tulika-eGov Jul 17, 2024
1d48182
serach fix
Swathi-eGov Jul 17, 2024
cc34385
Merge pull request #1093 from egovernments/serach-fix
Tulika-eGov Jul 17, 2024
fda6e9f
added restricion for ViewAll
Swathi-eGov Jul 18, 2024
1a5dde2
UCEM-591 FIX
Swathi-eGov Jul 18, 2024
ccd0aa0
Merge pull request #1099 from egovernments/UCEM-518
Tulika-eGov Jul 18, 2024
c7d0339
removed actionbutton if actionitems are empty
Swathi-eGov Jul 18, 2024
ecc618a
Merge pull request #1101 from egovernments/UCEM-577
Tulika-eGov Jul 18, 2024
b9415a4
uuid has been changed to Sor Id in Success toast message of sor master
Swathi-eGov Jul 19, 2024
d83305c
Merge pull request #1105 from egovernments/UCEM-596
Tulika-eGov Jul 19, 2024
f6d1771
fixed home breadcrumb redirection
Swathi-eGov Jul 22, 2024
5243be3
Merge pull request #1114 from egovernments/UCEM-576
Tulika-eGov Jul 22, 2024
2e29dcd
UCEM-597 : updated the redirection urls for rate analysis in workbench
Tulika-eGov Jul 23, 2024
b0ffa14
UCEM-597 : updated the rate analysis view page redirection method
Tulika-eGov Jul 24, 2024
c98760e
Added else condition for the role based add button
Tulika-eGov Jul 24, 2024
874f625
added date range validation
Swathi-eGov Jul 24, 2024
540f181
Updated the code for the redirection of view rate analysis screen
Tulika-eGov Jul 24, 2024
fad4e09
Merge pull request #1131 from egovernments/UCEM-520
Tulika-eGov Jul 24, 2024
e997b7f
Added the colon to the error toast messgae
Tulika-eGov Jul 24, 2024
522e555
Updated the module param for view rate analysis redirection
Tulika-eGov Jul 24, 2024
73b17fa
error message fix
Swathi-eGov Jul 24, 2024
b7f6d88
Merge pull request #1144 from egovernments/error-message-fix
Tulika-eGov Jul 24, 2024
f8d4b74
added date range error in update screen
Swathi-eGov Jul 25, 2024
1a38b6b
Merge pull request #1151 from egovernments/UCEM-520-UPDATE
Tulika-eGov Jul 25, 2024
80d1bb8
fixed tenantId
Swathi-eGov Jul 25, 2024
70a8465
Merge pull request #1155 from egovernments/tennatId-fix
Tulika-eGov Jul 25, 2024
8fc54d3
fixed pop search issue
Swathi-eGov Jul 26, 2024
454b275
Merge pull request #1164 from egovernments/UCEM-510-FIX
Tulika-eGov Jul 29, 2024
6586028
UCEM-511 : updated the code for the workbench effectivefrom and effec…
Tulika-eGov Aug 5, 2024
e48e5a8
Removing unwanted debugger and console
Tulika-eGov Aug 5, 2024
3a800ff
Merge pull request #1219 from egovernments/UCEM-511-FIX
Tulika-eGov Aug 5, 2024
289467c
Build fix for workbench babel issue
Tulika-eGov Aug 6, 2024
365d9bb
UCEM-511 : updated the effective from and effective to for compositio…
Tulika-eGov Aug 7, 2024
06a29db
Merge pull request #1240 from egovernments/UCEM-511-FIX-1
Tulika-eGov Aug 7, 2024
8eaaaca
UCEM-511 : Updated the effective from and effective params for compos…
Tulika-eGov Aug 7, 2024
c46cc42
Merge pull request #1241 from egovernments/UCEM-511-FIX-2
Tulika-eGov Aug 7, 2024
c2ff8b9
fixed tooltip css issues (#1343)
Swathi-eGov Aug 28, 2024
8ec78e6
epoch to date,sor format,tooltip issues fix (#1352)
Swathi-eGov Sep 4, 2024
f1e6f9c
fixed key name for rate analysis search screen
Swathi-eGov Sep 4, 2024
05d896e
validTo to end of the day and epoch issue fix (#1379)
Swathi-eGov Sep 10, 2024
d9cb685
sor enum issue fix (#1389)
Swathi-eGov Sep 16, 2024
fe047d3
updated limit for sorid (#1428)
Swathi-eGov Sep 25, 2024
a32bffe
updated epoch conversion (#1430)
Swathi-eGov Sep 25, 2024
9f40c60
Adding condition for mukta odisha for add rate analysis (#1432)
Tulika-eGov Sep 26, 2024
e34ef27
Bread crum fix (#1576)
Tulika-eGov Oct 19, 2024
3738092
UCEM-765 : Updated the corev version and package json and home redire…
Tulika-eGov Oct 22, 2024
01f3f77
added core css (#1616)
Swathi-eGov Oct 22, 2024
f9b9eea
UCEM-765 : added home direction logic (#1619)
Tulika-eGov Oct 22, 2024
6640f6d
UCEM-765 : updated the consoles to check (#1628)
Tulika-eGov Oct 23, 2024
48a667c
UCEM-765 : Updated build issue (#1635)
Tulika-eGov Oct 23, 2024
ebbfab8
updated core version (#1625)
Swathi-eGov Oct 23, 2024
5db8b5f
build issue test (#1638)
Swathi-eGov Oct 23, 2024
341517a
updated core version (#1644)
Swathi-eGov Oct 23, 2024
e3ee56b
UCEM-765 : home redirection fix test (#1658)
Tulika-eGov Oct 24, 2024
14bf16a
UCEM-765 : Updated breadcrumb (#1662)
Tulika-eGov Oct 24, 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
Prev Previous commit
Next Next commit
updated epoch conversion (#1430)
  • Loading branch information
Swathi-eGov authored Sep 25, 2024
commit a32bffec7bec21adfc212a24e5a61f7514b2c5e3
Original file line number Diff line number Diff line change
@@ -21,27 +21,21 @@ const convertDateToEpoch = (dateString) => {
if (!dateString) {
return "NA";
}

// Split the date string into day, month, and year
const [day, month, year] = dateString.split('/');

// Create a new Date object with the parsed values in UTC
const dateObject = new Date(Date.UTC(year, month - 1, day, 0, 0, 0));

// Return the epoch time in milliseconds
return dateObject.getTime();
const dateObject = new Date(`${year}-${month}-${day}T00:00:00`);
const options = { timeZone: 'Asia/Kolkata' };
const istDateObject = new Date(dateObject.toLocaleString('en-US', options));
return istDateObject.getTime();
};

const convertEpochToDate = (dateEpoch) => {
if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
if (!dateEpoch || dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
return "NA";
}
const dateFromApi = new Date(dateEpoch);
let month = dateFromApi.getUTCMonth() + 1;
let day = dateFromApi.getUTCDate();
let year = dateFromApi.getUTCFullYear();
month = (month > 9 ? "" : "0") + month;
day = (day > 9 ? "" : "0") + day;
const dateObject = new Date(dateEpoch);
const day = String(dateObject.getDate()).padStart(2, '0');
const month = String(dateObject.getMonth() + 1).padStart(2, '0');
const year = dateObject.getFullYear();
return `${day}/${month}/${year}`;
};

@@ -889,8 +883,8 @@ export const UICustomizations = {
},
AddMdmsConfig: {
"WORKS-SOR.Rates": {
getTrasformedData: async (formData) =>{
return { ...formData, validFrom: String(convertDateToEpoch(formData?.validFrom)) }
getTrasformedData: async (formData, data) =>{
return { ...formData, validFrom: data?.data?.validFrom }
},
validateForm: async (data, props) => {
try {
@@ -920,8 +914,8 @@ export const UICustomizations = {
},
},
"WORKS-SOR.Composition":{
getTrasformedData: async (formData) =>{
return { ...formData, effectiveFrom: String(convertDateToEpoch(formData?.effectiveFrom)) }
getTrasformedData: async (formData,data) =>{
return { ...formData, effectiveFrom: data?.data?.effectiveFrom}
},
}
},
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ const MDMSEdit = ({...props}) => {

const handleUpdate = async (formData) => {
const schemaCodeToValidate = `${moduleName}.${masterName}`;
let transformedData = await Digit?.Customizations?.["commonUiConfig"]?.["AddMdmsConfig"]?.[schemaCodeToValidate]?.getTrasformedData(formData) ;
let transformedData = await Digit?.Customizations?.["commonUiConfig"]?.["AddMdmsConfig"]?.[schemaCodeToValidate]?.getTrasformedData(formData, data) ;
transformedData = transformedData && transformedData !== undefined && transformedData !== "undefined" ? transformedData : formData;
const validation = await Digit?.Customizations?.["commonUiConfig"]?.["AddMdmsConfig"]?.[schemaCodeToValidate]?.validateForm(transformedData, { tenantId: stateId });

@@ -135,19 +135,16 @@ const MDMSEdit = ({...props}) => {
}

const convertEpochToDate = (dateEpoch) => {
if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
if (!dateEpoch || dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
return "NA";
}
const dateFromApi = new Date(dateEpoch);
let month = dateFromApi.getUTCMonth() + 1;
let day = dateFromApi.getUTCDate();
let year = dateFromApi.getUTCFullYear();
month = (month > 9 ? "" : "0") + month;
day = (day > 9 ? "" : "0") + day;
const dateObject = new Date(dateEpoch);
const day = String(dateObject.getDate()).padStart(2, '0');
const month = String(dateObject.getMonth() + 1).padStart(2, '0');
const year = dateObject.getFullYear();
return `${day}/${month}/${year}`;
};


const formattedData = data?.data
? {
...data?.data,
Original file line number Diff line number Diff line change
@@ -194,14 +194,19 @@ const formatDates = (value, type,key) => {
}
switch (type) {
case "date":
return new Date(value)?.toISOString?.()?.split?.("T")?.[0];
const options = { timeZone: 'Asia/Kolkata', year: 'numeric', month: '2-digit', day: '2-digit' };
const indianDate = new Date(value).toLocaleDateString('en-CA', options);
return indianDate;
case "datetime":
return new Date(value).toISOString();
case "EPOC":
const date = new Date(value);
if(key==="validTo" || key==="effectiveTo") {
date.setHours(23, 59, 59, 999);
}
else{
date.setHours(0, 0, 0, 0);
}
return String(date?.getTime());
}
};