Date: Mon, 7 Oct 2024 11:25:26 +0530
Subject: [PATCH 3/9] join course issue
---
packages/nulp_elite/src/App.js | 2 --
packages/nulp_elite/src/pages/content/joinCourse.js | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index 7d74c5af..61a632d4 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -40,7 +40,6 @@ const routeConfig = require("./configs/routeConfig.json");
import PopupForm from "pages/profileData";
import axios from "axios";
import ReactGA from "react-ga4";
-import LernModal from "components/learnathon/LernModal";
function App() {
// const [t] = useTranslation();
@@ -326,7 +325,6 @@ function App() {
))}
-
{/* */}
{/* */}
diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
index da4be659..024c374b 100644
--- a/packages/nulp_elite/src/pages/content/joinCourse.js
+++ b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -76,7 +76,7 @@ const JoinCourse = () => {
const [open, setOpen] = useState(false);
const [chat, setChat] = useState([]);
const [childnode, setChildNode] = useState([]);
- const [isOwner, setIsOwner] = useState([]);
+ const [isOwner, setIsOwner] = useState(false);
const [formData, setFormData] = useState({
message: "",
});
@@ -158,6 +158,7 @@ const JoinCourse = () => {
setCourseData(data);
setUserData(data);
if (_userId == data?.result?.content?.createdBy) {
+ console.log("here");
setIsOwner(true);
}
const identifiers =
From d994fef14b1d114a298457f64549f9b594f1de88 Mon Sep 17 00:00:00 2001
From: Shivani Parit <58217306+paritshivani@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:58:41 +0530
Subject: [PATCH 4/9] Revert "TASK : #0000 Event crtificate functionality"
---
.../nulp_elite/src/configs/urlConfig.json | 3 +-
.../src/pages/events/eventDetails.js | 86 -------------------
2 files changed, 1 insertion(+), 88 deletions(-)
diff --git a/packages/nulp_elite/src/configs/urlConfig.json b/packages/nulp_elite/src/configs/urlConfig.json
index d5bd7cf2..4650f216 100644
--- a/packages/nulp_elite/src/configs/urlConfig.json
+++ b/packages/nulp_elite/src/configs/urlConfig.json
@@ -143,8 +143,7 @@
"ADD_CERTIFICATE": "v1/add/template",
"ATTACH_CERTIFICATE": "v1/template/add",
"CREATE_CERT_TEMPLATE": "asset/v1/create",
- "UPLOAD_CERT_TEMPLATE": "asset/v1/upload",
- "CUSTOM_CERTIFICATE_CREATE": "/custom_event/certificate/create"
+ "UPLOAD_CERT_TEMPLATE": "asset/v1/upload"
},
"COMPOSITE": {
"SEARCH": "composite/v1/search",
diff --git a/packages/nulp_elite/src/pages/events/eventDetails.js b/packages/nulp_elite/src/pages/events/eventDetails.js
index a871547b..3ddb8c39 100644
--- a/packages/nulp_elite/src/pages/events/eventDetails.js
+++ b/packages/nulp_elite/src/pages/events/eventDetails.js
@@ -109,8 +109,6 @@ const EventDetails = () => {
const [isChecked, setIsChecked] = useState(false);
const [open, setOpen] = React.useState(false);
const [recording, setRecording] = useState();
- const [batchCertData,setBatchCertData] = useState();
- const [isCertificateIssued , setIsCertificateIssued] = useState(true)
const [isAllreadyFilledRegistation,setIsAlreadyFilledRegistration] = useState(true)
const [isExpired , setIsExpired] = useState(false)
const handleClickOpen = () => {
@@ -288,8 +286,6 @@ const formatTimeWithTimezone = (date) => {
getUserData(_userId, "loggedIn");
fetchMyEvents();
getEventRecording();
- fetchData();
- checkCertificateAlreadyIssued();
// checkEnrolledCourse();
}, [_userId, eventId]);
@@ -312,7 +308,6 @@ const formatTimeWithTimezone = (date) => {
const { result } = response.data;
const { response: batchResponse } = result;
- setBatchCertData(response.data.result)
if (batchResponse && batchResponse.count === 0) {
showErrorMessage(t("This course has no active Batches"));
@@ -460,83 +455,6 @@ const formatTimeWithTimezone = (date) => {
});
};
- const fetchData = async () => {
- try {
- const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.USER.GET_PROFILE}${_userId}?fields=${urlConfig.params.userReadParam.fields}`;
-
- const header = "application/json";
- const response = await fetch(url, {
- // headers: {
- // "Content-Type": "application/json",
- // },
- });
- const data = await response.json();
- setUserData(data);
- } catch (error) {
- console.error("Error fetching user data:", error);
- showErrorMessage(t("FAILED_TO_FETCH_DATA"));
- }
- };
-
- const checkCertificateAlreadyIssued = async () => {
- try{
- const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.CERTIFICATE.CERTIF_SEARCH}`;
- const requestBody = {
- filters: {
- recipient: {
- id: {
- eq: _userId
- }
- }
- }
- }
- const resopnse = await axios.post(url, requestBody);
- setIsCertificateIssued(resopnse.data.some((item) => item.training?.id === eventId));
-
- }catch(error){
- console.log("error While calling API ");
- }
-
- }
-
- const generateCertificate = async () => {
- const templateId = Object.keys(batchCertData?.response?.content[0]["certTemplates"])[0];
- const certificateDetails = batchCertData?.response?.content[0]["certTemplates"][templateId];
- try {
- const url = `${urlConfig.URLS.CERTIFICATE.CUSTOM_CERTIFICATE_CREATE}`;
- const requestBody = {
- recipient: {
- id: _userId,
- name: userData?.result?.response?.firstName + " " + userData?.result?.response?.lastName,
- type: "user",
- },
- issuer: certificateDetails?.issuer,
- training: {
- id: detailData?.identifier,
- name: detailData?.name,
- type: "Event",
- batchId: batchData?.batchId,
- },
- templateUrl:
- certificateDetails?.url,
- status: "ACTIVE",
- signatoryList:
- certificateDetails?.signatoryList,
- certificateLabel: "test",
- issuedOn: new Date().toISOString(),
- };
- if(!isCertificateIssued){
- const response = await axios.post(url, requestBody);
- if(response.data.responseCode === "OK"){
- setIsCertificateIssued(true)
- }
- }
- } catch (error) {
- console.error("Error creating certificate:", error);
- }
-};
-
-
const managePublicPrivateEvent = (button) => {
if (eventVisibility && eventVisibility === "Public" && button === "reg") {
handleOpenConsentModal();
@@ -947,10 +865,6 @@ const formatTimeWithTimezone = (date) => {
type="button"
onClick={() => {
managePublicPrivateEvent("join");
- // generateCertificate();
- if(detailData.issueCerificate === "Yes"){
- generateCertificate();
- }
}}
// onClick={attendWebinar}
style={{
From 9056becbc17e9e7701c2132501fbfcf4e5fab6e5 Mon Sep 17 00:00:00 2001
From: Shivani Parit <58217306+paritshivani@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:59:00 +0530
Subject: [PATCH 5/9] =?UTF-8?q?Revert=20"Task=20#228396=20:=20[FE]=20Add?=
=?UTF-8?q?=20the=20Ribbon=20on=20certificate=20card=20of=20course=20and?=
=?UTF-8?q?=20=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/pages/profile/certificate.js | 43 ++++++-------------
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/packages/nulp_elite/src/pages/profile/certificate.js b/packages/nulp_elite/src/pages/profile/certificate.js
index 160f6da5..86f1ba5a 100644
--- a/packages/nulp_elite/src/pages/profile/certificate.js
+++ b/packages/nulp_elite/src/pages/profile/certificate.js
@@ -93,7 +93,6 @@ 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);
@@ -280,7 +279,7 @@ const Certificate = () => {
fontWeight: "600",
}}
>
- {certificate?._source?.data?.badge?.name}
+ {certificate._source.data.badge.name}
{t("NO_POLL_AVAILABLE")}