diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index 9293955b..26c3c2f1 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -326,7 +326,7 @@ function App() {
))}
-
+
{/* */}
{/* */}
diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js
index 0096583a..d1d1fb98 100644
--- a/packages/nulp_elite/src/components/header.js
+++ b/packages/nulp_elite/src/components/header.js
@@ -216,9 +216,9 @@ function Header({ globalSearchQuery }) {
boxShadow: searchQuery ? '0 2px 4px rgba(0, 0, 0, 0.2)' : 'none',
color: searchQuery ? '#fff' : "#000"
};
-const handleLogout =() => {
- sessionStorage.setItem('isModalShown', 'false');
-}
+ const handleLogout = () => {
+ sessionStorage.setItem('isModalShown', 'false');
+ }
return (
<>
{
+ onClick={handleLogout}>
@@ -873,9 +878,9 @@ const handleLogout =() => {
className="ml-10"
onClick={() => {
sessionStorage.setItem("urlPath", "learningreport");
- window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
+ window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
}}
- style={{color:'#1976d2'}}
+ style={{ color: '#1976d2' }}
>
{t("LEARNING_REPORT")}
diff --git a/packages/nulp_elite/src/pages/content/Player.js b/packages/nulp_elite/src/pages/content/Player.js
index 7390d09c..87246fd6 100644
--- a/packages/nulp_elite/src/pages/content/Player.js
+++ b/packages/nulp_elite/src/pages/content/Player.js
@@ -261,7 +261,7 @@ const updateContentStateForAssessment = async () => {
return (
-
+
@@ -269,9 +269,12 @@ const updateContentStateForAssessment = async () => {
className="d-flex mr-20 my-20 px-10"
style={{ alignItems: "center",justifyContent:'space-between' }}
>
-
+
diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
index 9d166ed4..03677b86 100644
--- a/packages/nulp_elite/src/pages/content/joinCourse.js
+++ b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -57,7 +57,8 @@ const JoinCourse = () => {
const [batchDetails, setBatchDetails] = useState();
const [userCourseData, setUserCourseData] = useState({});
const [showEnrollmentSnackbar, setShowEnrollmentSnackbar] = useState(false);
- const [showUnEnrollmentSnackbar, setShowUnEnrollmentSnackbar] = useState(false);
+ const [showUnEnrollmentSnackbar, setShowUnEnrollmentSnackbar] =
+ useState(false);
const [showConsentForm, setShowConsentForm] = useState(false);
const [enrolled, setEnrolled] = useState(false);
const [progress, setCourseProgress] = useState();
@@ -75,6 +76,7 @@ const JoinCourse = () => {
const [open, setOpen] = useState(false);
const [chat, setChat] = useState([]);
const [childnode, setChildNode] = useState([]);
+ const [isOwner, setIsOwner] = useState([]);
const [formData, setFormData] = useState({
message: "",
});
@@ -155,8 +157,15 @@ const JoinCourse = () => {
setCreatorId(data?.result?.content?.createdBy);
setCourseData(data);
setUserData(data);
-
- const identifiers = data?.result?.content?.children[0]?.children[0]?.identifier;
+ if (_userId == data?.result?.content?.createdBy) {
+ setIsOwner(true);
+ }
+ let identifiers;
+ if(data?.result?.content?.children[0]?.children){
+ identifiers = data?.result?.content?.children[0]?.children[0]?.identifier;
+ }else{
+ identifiers = data?.result?.content?.children[0]?.identifier
+ }
console.log(identifiers, "setChildNode");
setChildNode(identifiers);
@@ -180,7 +189,6 @@ const JoinCourse = () => {
setAllContents(allContents);
console.log("allContents-------", allContents);
-
} catch (error) {
console.error("Error fetching course data:", error);
showErrorMessage(t("FAILED_TO_FETCH_DATA"));
@@ -222,7 +230,7 @@ const JoinCourse = () => {
batchId: batchDetails.batchId,
});
setBatchDetails(batchDetails);
- console.log("batchDetail---", batchDetails)
+ console.log("batchDetail---", batchDetails);
} else {
console.error("Batch data not found in response");
}
@@ -287,12 +295,11 @@ const JoinCourse = () => {
if (content.status) {
completedCount = completedCount + 1;
}
- })
+ });
if (allContents.length == completedCount) {
- setIsCompleted(true)
+ setIsCompleted(true);
}
-
- }
+ };
const flattenDeep = async (contents) => {
if (contents) {
@@ -310,7 +317,6 @@ const JoinCourse = () => {
};
const calculateProgress = async () => {
-
console.log(
"courseData?.result?.content?.children",
courseData?.result?.content?.children
@@ -383,8 +389,9 @@ const JoinCourse = () => {
useEffect(() => {
const fetchChats = async () => {
try {
- const url = `${urlConfig.URLS.DIRECT_CONNECT.GET_CHATS
- }?sender_id=${_userId}&receiver_id=${creatorId}&is_accepted=${true}`;
+ const url = `${
+ urlConfig.URLS.DIRECT_CONNECT.GET_CHATS
+ }?sender_id=${_userId}&receiver_id=${creatorId}&is_accepted=${true}`;
const response = await axios.get(url, {
withCredentials: true,
@@ -453,8 +460,8 @@ const JoinCourse = () => {
for (let identifier of allContents) {
const found = Array.isArray(contentList)
? contentList.find(
- (item) => item.contentId === identifier && item.status === 2
- )
+ (item) => item.contentId === identifier && item.status === 2
+ )
: undefined;
if (!found) {
@@ -599,14 +606,18 @@ const JoinCourse = () => {
return (
-
+
+ {" "}
+
-
+ )}
+
-
{showConfirmation && (
-
);
}
}
@@ -811,7 +821,7 @@ const JoinCourse = () => {
await handleJoinCourse(); // Wait for the user to join the course
setShowConsentForm(true); // Open the consent form after joining the course
} catch (error) {
- setShowEnrollmentSnackbar
+ setShowEnrollmentSnackbar;
console.error("Error:", error);
}
};
@@ -939,14 +949,13 @@ const JoinCourse = () => {
}
};
-
const handlecopyrightOpen = () => {
setcopyrightOpen(true);
};
const handlecopyrightClose = () => {
setcopyrightOpen(false);
- }
+ };
const handleOpen = () => {
setOpen(true);
@@ -982,165 +991,173 @@ const JoinCourse = () => {
{toasterMessage &&
}
-
-
-
+
- {t("ENROLLMENT_SUCCESS_MESSAGE")}
-
-
-
-
+ {t("ENROLLMENT_SUCCESS_MESSAGE")}
+
+
+
- {t("UNENROLLMENT_SUCCESS_MESSAGE")}
-
-
-
- {
- if (reason === "backdropClick" || reason === "escapeKeyDown") {
- setOpenModal(true);
- } else {
- handleCloseModal();
- }
- }}
- >
-
-
- {t("CONSENT_FORM_TITLE")}
-
-
-
-
-
-
-
-
-
-
-
-
+ {t("UNENROLLMENT_SUCCESS_MESSAGE")}
+
+
+
+ {
+ if (reason === "backdropClick" || reason === "escapeKeyDown") {
+ setOpenModal(true);
+ } else {
+ handleCloseModal();
+ }
+ }}
+ >
+
+
+ {t("CONSENT_FORM_TITLE")}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {t("DONT_SHARE")}
+
+
+ {t("SHARE")}
+
+
+
-
-
-
+
+
+
+
+
-
-
- {t("DONT_SHARE")}
-
-
+
- {t("SHARE")}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- {t("ALL_CONTENT")}
-
-
- {userData?.result?.content?.name}
-
-
-
-
- {" "}
- {userData?.result?.content?.name}
-
+
+ {t("ALL_CONTENT")}
+
+
+ {userData?.result?.content?.name}
+
+
+
+
+ {" "}
+ {userData?.result?.content?.name}
+
- {(courseData?.result?.content?.board ||
- courseData?.result?.content?.se_boards ||
- courseData?.result?.content?.gradeLevel ||
- courseData?.result?.content?.se_gradeLevels) && (
+ {(courseData?.result?.content?.board ||
+ courseData?.result?.content?.se_boards ||
+ courseData?.result?.content?.gradeLevel ||
+ courseData?.result?.content?.se_gradeLevels) && (
{
color: "#424242",
fontSize: "10px",
margin: "0 10px 3px 6px",
- cursor: "auto"
+ cursor: "auto",
}}
className="bg-blueShade3"
>
@@ -1166,21 +1183,23 @@ const JoinCourse = () => {
))}
{courseData?.result?.content?.se_boards &&
- courseData?.result?.content?.se_boards?.map((item, index) => (
-
- {item}
-
- ))}
+ courseData?.result?.content?.se_boards?.map(
+ (item, index) => (
+
+ {item}
+
+ )
+ )}
{courseData?.result?.content?.gradeLevel &&
courseData?.result?.content?.gradeLevel?.map(
(item, index) => (
@@ -1191,7 +1210,7 @@ const JoinCourse = () => {
color: "#424242",
fontSize: "10px",
margin: "0 10px 3px 6px",
- cursor: "auto"
+ cursor: "auto",
}}
className="bg-blueShade3"
>
@@ -1209,7 +1228,7 @@ const JoinCourse = () => {
color: "#424242",
fontSize: "10px",
margin: "0 10px 3px 6px",
- cursor: "auto"
+ cursor: "auto",
}}
className="bg-blueShade3"
>
@@ -1219,80 +1238,144 @@ const JoinCourse = () => {
)}
)}
- {renderActionButton()}
-
-
- {t("BATCH_DETAILS")}:
-
+ {renderActionButton()}
- {t("BATCH_START_DATE")}:{" "}
- {batchData?.startDate
- ? formatDate(batchData?.startDate)
- : "Not Provided"}
+ {t("BATCH_DETAILS")}:
-
- {t("BATCH_END_DATE")}:{" "}
- {batchData?.endDate
- ? formatDate(batchData?.endDate)
- : "Not Provided"}
-
-
+ {t("BATCH_START_DATE")}:{" "}
+ {batchData?.startDate
+ ? formatDate(batchData?.startDate)
+ : "Not Provided"}
+
+
+ {t("BATCH_END_DATE")}:{" "}
+ {batchData?.endDate
+ ? formatDate(batchData?.endDate)
+ : "Not Provided"}
+
+
+ {t("LAST_DATE_FOR_ENROLLMENT")}:{" "}
+ {batchData?.enrollmentEndDate
+ ? formatDate(batchData.enrollmentEndDate)
+ : "Not Provided"}
+
+
+
+ {batchDetails && batchDetails.cert_templates != null && (
+
- {t("LAST_DATE_FOR_ENROLLMENT")}:{" "}
- {batchData?.enrollmentEndDate
- ? formatDate(batchData.enrollmentEndDate)
- : "Not Provided"}
-
-
-
- {batchDetails && batchDetails.cert_templates != null &&
+
}
+ aria-controls="panel1-content"
+ id="panel1-header"
+ className="xs-hide h4-title"
+ >
+ {t("CERTIFICATION_CRITERIA")}
+
+
+ {batchDetail && (
+
+ -
+ {t("COMPLETION_CERTIFICATE_ISSUED")}
+
+ {score !== "no certificate" && (
+ -
+ {t("CERT_ISSUED_SCORE")}
+ {` ${score}% `}
+ {t("ASSESSMENT")}
+
+ )}
+
+ )}
+
+
+ )}
+ {isEnrolled &&
+ batchDetails &&
+ batchDetails.cert_templates == null && (
+
+
+ {t("CERT_NOT_ATTACHED")}
+
+
+ )}
{
expandIcon={}
aria-controls="panel1-content"
id="panel1-header"
- className="xs-hide h4-title"
+ className="h4-title"
>
- {t("CERTIFICATION_CRITERIA")}
+ {t("OTHER_DETAILS")}
-
- {batchDetail && (
-
- -
- {t("COMPLETION_CERTIFICATE_ISSUED")}
-
- {score !== "no certificate" && (
- -
- {t("CERT_ISSUED_SCORE")}
- {` ${score}% `}
- {t("ASSESSMENT")}
-
+
+
+ {t("Created By")}:{" "}
+ {userData &&
+ userData.result &&
+ userData.result.content.creator}
+
+
+ {t("Published on NULP by")}:{" "}
+ {userData &&
+ userData.result &&
+ userData.result?.content?.orgDetails?.orgName}
+
+
+ {t("CREATED_ON")}:{" "}
+ {userData &&
+ userData.result &&
+ formatDate(userData.result.content.children[0].createdOn)}
+
+
+ {t("UPDATED_ON")}:{" "}
+ {userData &&
+ userData.result &&
+ formatDate(
+ userData.result.content.children[0].lastUpdatedOn
)}
-
- )}
-
-
- }
-
-
- {isEnrolled && batchDetails && batchDetails.cert_templates == null &&
-
-
-
- {t("CERT_NOT_ATTACHED")}
-
-
-
- }
-
- }
- aria-controls="panel1-content"
- id="panel1-header"
- className="h4-title"
- >
- {t("OTHER_DETAILS")}
-
-
-
- {t("Created By")}:{" "}
- {userData &&
- userData.result &&
- userData.result.content.creator
- }
-
-
- {t("Published on NULP by")}:{" "}
- {userData &&
- userData.result &&
- userData.result?.content?.orgDetails?.orgName
- }
-
-
- {t("CREATED_ON")}:{" "}
- {userData &&
- userData.result &&
- formatDate(userData.result.content.children[0].createdOn)}
-
-
- {t("UPDATED_ON")}:{" "}
- {userData &&
- userData.result &&
- formatDate(
- userData.result.content.children[0].lastUpdatedOn
- )}
-
-
-
- {t("CREDITS")}
-
-
- {t("CREDITS")}
-
-
- {t("COPYRIGHT")}
-
- {userData?.result?.content?.orgDetails?.orgName && userData?.result?.content?.copyrightYear
- ? `${userData.result.content.orgDetails.orgName}, ${userData.result.content.copyrightYear}`
- : userData?.result?.content?.orgDetails?.orgName || userData?.result?.content?.copyrightYear
- }
- {t("THIS_CONTENT_IS_DERIVED_FROM")}
-
- {t("CONTENT")}
-
- {userData?.result?.content?.name}
-
- {t("LICENSE_TERMS")}
-
- {userData?.result?.content?.licenseDetails?.name}
-
- {t("PUBLISHED_ON_NULP_BY")}
-
- {userData?.result?.content?.orgDetails?.orgName}
-
-
-
- {t("CLOSE")}
-
-
-
-
- {t("LICENSE_TERMS")}:{" "}
- {userData?.result?.content?.licenseDetails?.name}
- {t("FOR_DETAILS")}:{" "}
-
- {userData?.result?.content?.licenseDetails?.url}
-
-
-
-
-
+
-
-
- {chat.length === 0 && (
-
- {t("CONNECT_WITH_CREATOR")}
-
- )}
- {chat.length > 0 && chat[0]?.is_accepted === false && (
-
-
- {t("YOUR_CHAT_REQUEST_IS_PENDING")}
-
+ {t("CREDITS")}
+
+
+ {t("CREDITS")}
+
+
+ {t("COPYRIGHT")}
+
+ {userData?.result?.content?.orgDetails?.orgName &&
+ userData?.result?.content?.copyrightYear
+ ? `${userData.result.content.orgDetails.orgName}, ${userData.result.content.copyrightYear}`
+ : userData?.result?.content?.orgDetails?.orgName ||
+ userData?.result?.content?.copyrightYear}
+ {t("THIS_CONTENT_IS_DERIVED_FROM")}
+
+ {t("CONTENT")}
+
+ {userData?.result?.content?.name}
+
+ {t("LICENSE_TERMS")}
+
+ {userData?.result?.content?.licenseDetails?.name}
+
+ {t("PUBLISHED_ON_NULP_BY")}
+
+ {userData?.result?.content?.orgDetails?.orgName}
+
+
+
+ {t("CLOSE")}
+
+
+
+
+ {t("LICENSE_TERMS")}:{" "}
+ {userData?.result?.content?.licenseDetails?.name}
+ {t("FOR_DETAILS")}:{" "}
+
+ {userData?.result?.content?.licenseDetails?.url}
+
+
+
+
+
+
+
+ {chat.length === 0 && (
+
+ {t("CONNECT_WITH_CREATOR")}
+
+ )}
+ {chat.length > 0 && chat[0]?.is_accepted === false && (
+
+
+ {t("YOUR_CHAT_REQUEST_IS_PENDING")}
+
+ 0 && chat[0]?.is_accepted === false
+ ? "#a9b3f5"
+ : "#004367",
+ }}
+ disabled
+ >
+ {t("CHAT_WITH_CREATOR")}
+
+
+ )}
+ {chat.length > 0 && chat[0].is_accepted === true && (
0 && chat[0]?.is_accepted === false
- ? "#a9b3f5"
- : "#004367",
+ background: "#004367",
}}
- disabled
>
{t("CHAT_WITH_CREATOR")}
-
- )}
- {chat.length > 0 && chat[0].is_accepted === true && (
-
- {t("CHAT_WITH_CREATOR")}
-
+ )}
+
+ {_userId && creatorId && (
+
+
+ {" "}
+
+
)}
-
- {_userId && creatorId && (
-
-
- {" "}
-
-
- )}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {" "}
- {renderActionButton()}
-
-
- {courseData && courseData?.result?.content && (
- <>
-
- {t("DESCRIPTION")}:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {" "}
+ {renderActionButton()}
+
+
+ {courseData && courseData?.result?.content && (
+ <>
+
+ {t("DESCRIPTION")}:
+
+
+ {courseData?.result?.content?.description.split(" ")
+ .length > 100
+ ? showMore
+ ? courseData?.result?.content?.description
+ : courseData?.result?.content?.description
+ .split(" ")
+ .slice(0, 30)
+ .join(" ") + "..."
+ : courseData?.result?.content?.description}
+
{courseData?.result?.content?.description.split(" ")
- .length > 100
- ? showMore
- ? courseData?.result?.content?.description
- : courseData?.result?.content?.description
- .split(" ")
- .slice(0, 30)
- .join(" ") + "..."
- : courseData?.result?.content?.description}
-
- {courseData?.result?.content?.description.split(" ").length >
- 100 && (
+ .length > 100 && (
{showMore ? t("Show Less") : t("Show More")}
)}
- >
- )}
-
+ >
+ )}
+
-
- }
- aria-controls="panel1-content"
- id="panel1-header"
- className="h4-title"
- style={{ fontWeight: "500" }}
+
- {t("COURSES_MODULE")}
-
-
- {userData?.result?.content?.children.map((faqIndex) => (
-
- }
- aria-controls={`panel${faqIndex.id}-content`}
- id={`panel${faqIndex.id}-header`}
- className="h5-title"
+ }
+ aria-controls="panel1-content"
+ id="panel1-header"
+ className="h4-title"
+ style={{ fontWeight: "500" }}
+ >
+ {t("COURSES_MODULE")}
+
+
+ {userData?.result?.content?.children.map((faqIndex) => (
+
- {faqIndex.name}
-
+ }
+ aria-controls={`panel${faqIndex.id}-content`}
+ id={`panel${faqIndex.id}-header`}
+ className="h5-title"
+ >
+ {faqIndex.name}
+
-
+
{/* If it's not a content collection, render it like a clickable child */}
- {faqIndex.mimeType !== "application/vnd.ekstep.content-collection" ? (
+ {faqIndex.mimeType !==
+ "application/vnd.ekstep.content-collection" ? (
{
className="h6-title"
>
{faqIndex.name}
- {completedContents.includes(faqIndex.identifier) && (
+ {completedContents.includes(
+ faqIndex.identifier
+ ) && (
)}
- ) : (
- faqIndex?.children?.map((faqIndexname) => (
-
- {faqIndexname.children &&
- faqIndexname.children.length > 0 ? (
- (
+
- {faqIndexname.name}
-
- ) : (
- handleLinkClick(faqIndexname.identifier)}
- className="h6-title"
- >
- {faqIndexname.name}
- {completedContents.includes(faqIndexname.identifier) && (
-
- )}
-
- )}
-
- {faqIndexname.children &&
- faqIndexname.children.length > 0 && (
-
- {faqIndexname.children.map((child) => (
-
- {child.children &&
- child.children.length > 0 ? (
- 0 ? (
+
+ {faqIndexname.name}
+
+ ) : (
+
+ handleLinkClick(faqIndexname.identifier)
+ }
+ className="h6-title"
+ >
+ {faqIndexname.name}
+ {completedContents.includes(
+ faqIndexname.identifier
+ ) && (
+
+ )}
+
+ )}
+
+ {faqIndexname.children &&
+ faqIndexname.children.length > 0 && (
+
+ {faqIndexname.children.map((child) => (
+
- {child.name}
-
- ) : (
-
- handleLinkClick(child.identifier)
- }
- className="h6-title"
- >
- {child.name}
- {completedContents.includes(
- child.identifier
- ) && (
-
- )}
-
- )}
- {child.children &&
- child.children.length > 0 && (
-
- {child.children.map((grandchild) => (
-
0 ? (
+
+ {child.name}
+
+ ) : (
+
+ handleLinkClick(child.identifier)
+ }
+ className="h6-title"
+ >
+ {child.name}
+ {completedContents.includes(
+ child.identifier
+ ) && (
+
+ )}
+
+ )}
+ {child.children &&
+ child.children.length > 0 && (
+
- {grandchild.children &&
- grandchild.children.length > 0 ? (
-
- {grandchild.name}
-
- ) : (
-
- handleLinkClick(
- grandchild.identifier
- )
- }
- className="h6-title"
- >
- {grandchild.name}
- {completedContents.includes(
- grandchild.identifier
- ) && (
-
(
+
+ {grandchild.children &&
+ grandchild.children.length >
+ 0 ? (
+
+ {grandchild.name}
+
+ ) : (
+
+ onClick={() =>
+ handleLinkClick(
+ grandchild.identifier
+ )
+ }
+ className="h6-title"
+ >
+ {grandchild.name}
+ {completedContents.includes(
+ grandchild.identifier
+ ) && (
+
+ )}
+
)}
-
+
+ )
)}
-
- ))}
-
- )}
-
- ))}
-
- )}
-
- ))
- )}
+
+ )}
+
+ ))}
+
+ )}
+
+ ))
+ )}
+
+
+ ))}
- ))}
-
-
-
-
-
-
-
- {t("BATCH_DETAILS")}:
-
- {t("BATCH_START_DATE")}: {formatDate(batchData?.startDate)}
+ {t("BATCH_DETAILS")}:
-
- {t("BATCH_END_DATE")}: {formatDate(batchData?.endDate)}
-
-
+ {t("BATCH_START_DATE")}: {formatDate(batchData?.startDate)}
+
+
+ {t("BATCH_END_DATE")}: {formatDate(batchData?.endDate)}
+
+
+ {t("LAST_DATE_FOR_ENROLLMENT")}:{" "}
+ {formatDate(batchData?.enrollmentEndDate)}
+
+
+
+ {batchDetails && batchDetails.cert_templates != null && (
+
- {t("LAST_DATE_FOR_ENROLLMENT")}:{" "}
- {formatDate(batchData?.enrollmentEndDate)}
-
-
-
- {batchDetails && batchDetails.cert_templates != null &&
+ }
+ aria-controls="panel1-content"
+ id="panel1-header"
+ className="h4-title"
+ >
+ {t("CERTIFICATION_CRITERIA")}
+
+
+ {batchDetail && (
+
+ -
+ {t("COMPLETION_CERTIFICATE_ISSUED")}
+
+ {score !== "no certificate" && (
+ -
+ {t("CERT_ISSUED_SCORE")}
+ {` ${score}% `}
+ {t("ASSESSMENT")}
+
+ )}
+
+ )}
+
+
+ )}
+ {isEnrolled &&
+ batchDetails &&
+ batchDetails.cert_templates == null && (
+
+
+ {t("CERT_NOT_ATTACHED")}:
+
+
+ )}
{
id="panel1-header"
className="h4-title"
>
- {t("CERTIFICATION_CRITERIA")}
+ {t("OTHER_DETAILS")}
{
borderRadius: "10px",
}}
>
- {batchDetail && (
-
- -
- {t("COMPLETION_CERTIFICATE_ISSUED")}
-
- {score !== "no certificate" && (
- -
- {t("CERT_ISSUED_SCORE")}
- {` ${score}% `}
- {t("ASSESSMENT")}
-
+
+ {t("CREATED_ON")}:{" "}
+ {courseData &&
+ courseData.result &&
+ formatDate(
+ courseData.result.content.children[0].createdOn
)}
-
- )}
+
+
+ {t("UPDATED_ON")}:{" "}
+ {courseData &&
+ courseData.result &&
+ formatDate(
+ courseData.result.content.children[0].lastUpdatedOn
+ )}
+
+ {t("CREDITS")}:
+
+ {t("LICENSE_TERMS")}:{" "}
+ {courseData?.result?.content?.licenseDetails?.name}
+ {t("FOR_DETAILS")}:{" "}
+
+ {courseData?.result?.content?.licenseDetails?.url}
+
+
- }
-
- {isEnrolled && batchDetails && batchDetails.cert_templates == null &&
-
-
-
- {t("CERT_NOT_ATTACHED")}:
-
-
-
- }
-
- }
- aria-controls="panel1-content"
- id="panel1-header"
- className="h4-title"
- >
- {t("OTHER_DETAILS")}
-
-
-
- {t("CREATED_ON")}:{" "}
- {courseData &&
- courseData.result &&
- formatDate(courseData.result.content.children[0].createdOn)}
-
-
- {t("UPDATED_ON")}:{" "}
- {courseData &&
- courseData.result &&
- formatDate(
- courseData.result.content.children[0].lastUpdatedOn
+
+
+ {chat && chat.length === 0 && (
+
+ {t("CONNECT_WITH_CREATOR")}
+
+ )}
+ {chat &&
+ chat.length > 0 &&
+ chat[0]?.is_accepted === false && (
+
+
+ {t("YOUR_CHAT_REQUEST_IS_PENDING")}
+
+ 0 && chat[0]?.is_accepted === false
+ ? "#a9b3f5"
+ : "#004367",
+ }}
+ disabled
+ >
+ {t("CHAT_WITH_CREATOR")}
+
+
)}
-
- {t("CREDITS")}:
-
- {t("LICENSE_TERMS")}:{" "}
- {courseData?.result?.content?.licenseDetails?.name}
- {t("FOR_DETAILS")}:{" "}
-
- {courseData?.result?.content?.licenseDetails?.url}
-
-
-
-
-
-
- {chat && chat.length === 0 && (
-
- {t("CONNECT_WITH_CREATOR")}
-
- )}
- {chat && chat.length > 0 && chat[0]?.is_accepted === false && (
-
-
- {t("YOUR_CHAT_REQUEST_IS_PENDING")}
-
+ {chat && chat.length > 0 && chat[0].is_accepted === true && (
0 && chat[0]?.is_accepted === false
- ? "#a9b3f5"
- : "#004367",
+ background: "#004367",
}}
- disabled
>
{t("CHAT_WITH_CREATOR")}
-
- )}
- {chat && chat.length > 0 && chat[0].is_accepted === true && (
-
- {t("CHAT_WITH_CREATOR")}
-
+ )}
+
+ {_userId && creatorId && (
+
+
+ {" "}
+
+
)}
-
- {_userId && creatorId && (
-
-
- {" "}
-
-
- )}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
diff --git a/packages/nulp_elite/src/pages/events/eventDetails.js b/packages/nulp_elite/src/pages/events/eventDetails.js
index 66245d55..a871547b 100644
--- a/packages/nulp_elite/src/pages/events/eventDetails.js
+++ b/packages/nulp_elite/src/pages/events/eventDetails.js
@@ -770,7 +770,7 @@ const formatTimeWithTimezone = (date) => {
{toasterMessage &&
}
-
+
{
spacing={2}
className="bg-whitee custom-event-container mb-20 custom-container mb-38"
>
-
+
{
alt="App Icon"
/>
-
+
{detailData.name}
@@ -878,20 +878,20 @@ const formatTimeWithTimezone = (date) => {
-
+
{formatDate(detailData.startDate)}
-
+
{formatTimeToIST(detailData.startTime)}
To
-
+
{formatDate(detailData.endDate)}
-
+
{formatTimeToIST(detailData.endTime)}
@@ -1341,7 +1341,6 @@ const formatTimeWithTimezone = (date) => {
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
- width: 1000,
bgcolor: "background.paper",
border: "2px solid #000",
boxShadow: 24,
@@ -1431,14 +1430,14 @@ const formatTimeWithTimezone = (date) => {
/>
{t("SUBMIT")}
diff --git a/packages/nulp_elite/src/pages/profile/certificate.js b/packages/nulp_elite/src/pages/profile/certificate.js
index 86f1ba5a..160f6da5 100644
--- a/packages/nulp_elite/src/pages/profile/certificate.js
+++ b/packages/nulp_elite/src/pages/profile/certificate.js
@@ -93,6 +93,7 @@ const Certificate = () => {
const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.CERTIFICATE.CERTIF_SEARCH}`;
const response = await axios.post(url, request);
const data = response.data;
+
setOtherCertData(data);
} catch (error) {
console.error("Error fetching user data:", error);
@@ -279,7 +280,7 @@ const Certificate = () => {
fontWeight: "600",
}}
>
- {certificate._source.data.badge.name}
+ {certificate?._source?.data?.badge?.name}
{
style={{ fontSize: "12px" }}
>
{t("CERTIFICATE_GIVEN_BY")}:{" "}
- {certificate._source.data.badge.issuer.name}
+ {certificate?._source?.data?.badge?.issuer?.name}
{
style={{ fontSize: "12px" }}
>
{t("CERTIFICATE_ISSUE_DATE")}:{" "}
- {formatDate(certificate._source.data.issuedOn)}
+ {formatDate(certificate?._source?.data?.issuedOn)}
{
>
{
}}
onClick={() => {
getCertificateReport(
- certificate._id,
- certificate._source.data.badge.name
+ certificate?._id,
+ certificate?._source?.data?.badge?.name
);
}}
>
@@ -331,7 +332,7 @@ const Certificate = () => {
))}
{otherCertData.map((certificate) => (
-
+
{
border: "solid 1px #EFEFEF",
boxShadow: "none",
color: "#484848",
+ position: 'relative',
}}
>
+ {certificate?.training?.type && (
+
+ {certificate?.training?.type}
+
+ )}
+
{
paddingBottom: "0",
height: "42px",
fontWeight: "600",
+ marginTop : "27px"
}}
>
- {certificate.training.name}
+ {certificate?.training?.name}
{
component="div"
style={{ fontSize: "12px" }}
>
- {t("CERTIFICATE_GIVEN_BY")}: {certificate.issuer.name}
+ {t("CERTIFICATE_GIVEN_BY")}: {certificate?.issuer?.name}
{
style={{ fontSize: "12px" }}
>
{t("CERTIFICATE_ISSUE_DATE")}:{" "}
- {formatDate(certificate.osCreatedAt)}
+ {formatDate(certificate?.osCreatedAt)}
{
className="text-green"
onClick={() => {
getCertificate(
- certificate.templateUrl,
- certificate.osid,
- certificate.training.name
+ certificate?.templateUrl,
+ certificate?.osid,
+ certificate?.training?.name
);
}}
>
{
key={index}
title={keyword}
placement="right"
- className="customlabeltwo cardLabelEllips"
+ className="customlabeltwo"
>
{index < 2
@@ -318,7 +318,7 @@ const pollsDetailes = () => {
{items.poll_keywords[2]} + {items.poll_keywords.length - 3}
diff --git a/packages/nulp_elite/src/pages/voting/votingDashboard.js b/packages/nulp_elite/src/pages/voting/votingDashboard.js
index 3e6c73ec..96041874 100644
--- a/packages/nulp_elite/src/pages/voting/votingDashboard.js
+++ b/packages/nulp_elite/src/pages/voting/votingDashboard.js
@@ -469,7 +469,7 @@ const votingDashboard = () => {
key={index}
title={keyword}
placement="right"
- className="customlabeltwo cardLabelEllips"
+ className="customlabeltwo"
>
{index < 2
@@ -484,7 +484,7 @@ const votingDashboard = () => {
{items.poll_keywords[2]} + {items.poll_keywords.length - 3}
@@ -774,7 +774,7 @@ const votingDashboard = () => {
key={index}
title={keyword}
placement="right"
- className="customlabeltwo cardLabelEllips"
+ className="customlabeltwo"
>
{index < 2
@@ -788,7 +788,7 @@ const votingDashboard = () => {
{items.poll_keywords[2]} + {items.poll_keywords.length - 3}
@@ -1027,7 +1027,7 @@ const votingDashboard = () => {
key={index}
title={keyword}
placement="right"
- className="customlabeltwo cardLabelEllips"
+ className="customlabeltwo"
>
{index < 2
@@ -1041,7 +1041,7 @@ const votingDashboard = () => {
{items.poll_keywords[2]} +{" "}
diff --git a/packages/nulp_elite/src/styles/style.css b/packages/nulp_elite/src/styles/style.css
index 70c75358..05f98bd4 100644
--- a/packages/nulp_elite/src/styles/style.css
+++ b/packages/nulp_elite/src/styles/style.css
@@ -767,6 +767,12 @@ button {
}
@media (max-width: 768px) {
+ .xs-mt-10{
+ margin-top:10px;
+ }
+ .jc-bw{
+ margin-left: 0px!important;
+ }
.searchField .MuiInputBase-input::placeholder {
font-size: 12px;
}
@@ -798,6 +804,7 @@ button {
.h1-title {
line-height: 30px;
margin-bottom: 25px;
+ font-size: 18px !important;
}
.custom-btn-primary,
@@ -965,7 +972,8 @@ button {
}
.xss-pb-0 {
- padding: 3px 0 5px 16px !important;
+ padding: 19% 0 5% 16px !important;
+
}
.MuiDrawer-paper {
@@ -1151,7 +1159,7 @@ button {
}
.xs-mb-10 {
- margin-bottom: 10px;
+ margin-bottom: 10px !important;
}
.xs-mb-20 {