From 70df3d350b71bbc01763990c21fecda57727db62 Mon Sep 17 00:00:00 2001
From: sonaligarud <sonali.garud@tekditechnologies.com>
Date: Mon, 14 Oct 2024 19:01:11 +0530
Subject: [PATCH 1/9] Task #228044 - learnathon creator- my content list view

---
 .../pages/learnathon/LernSubmissionTable.js   | 84 ++++++++++++-------
 packages/nulp_elite/src/styles/style.css      | 10 ++-
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/packages/nulp_elite/src/pages/learnathon/LernSubmissionTable.js b/packages/nulp_elite/src/pages/learnathon/LernSubmissionTable.js
index d9e92381..4f4104db 100644
--- a/packages/nulp_elite/src/pages/learnathon/LernSubmissionTable.js
+++ b/packages/nulp_elite/src/pages/learnathon/LernSubmissionTable.js
@@ -7,13 +7,13 @@ import {
   TableHead,
   TableRow,
   TablePagination,
-  Paper,
   TextField,
   Button,
   IconButton,
   Typography,
   Box,
   DialogActions,
+  Grid
 } from "@mui/material";
 import { useTranslation } from "react-i18next";
 
@@ -23,7 +23,9 @@ import DialogContent from "@mui/material/DialogContent";
 import { Edit, Visibility, Delete } from "@mui/icons-material";
 import SearchIcon from "@mui/icons-material/Search";
 import submissions from "./lernSubmission.json";
+import Paper from "@mui/material/Paper";
 import { useNavigate, useLocation } from "react-router-dom";
+import { Pagination } from "@mui/material";
 
 import Footer from "components/Footer";
 import Header from "components/header";
@@ -82,6 +84,7 @@ const LernSubmissionTable = () => {
       console.log(result.result);
       setData(result.result.data);
       setTotalRows(result.result.totalCount);
+
     } catch (error) {
       console.log("error---", error);
       // setError(error.message);
@@ -158,35 +161,43 @@ const LernSubmissionTable = () => {
           alignItems="center"
           mb={2}
         >
-          <Typography variant="h6">Learnathon Submissions List</Typography>
+          <Typography variant="h6" gutterBottom className="fw-600 mt-20">
+            Learnathon Submissions List
+          </Typography>
           <Button
-            variant="contained"
-            color="primary"
+            className="viewAll"
             onClick={() =>
-              (window.location.href =
-                routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT)
+            (window.location.href =
+              routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT)
             }
+            sx={{padding: '7px 45px',borderRadius: '90px !important'
+          }}
           >
             Upload Submission
           </Button>
         </Box>
+        <Grid container>
+          <Grid item xs={6}>
+            <Box display="flex" alignItems="center" mb={2}>
+              <TextField
+                variant="outlined"
+                placeholder="Search Submission"
+                value={search}
+                onChange={handleSearchChange}
+                InputProps={{
+                  endAdornment: <SearchIcon />,
+                }}
+                size="small"
+                sx={{ background: '#fff' }}
+              />
 
-        <Box display="flex" alignItems="center" mb={2}>
-          <TextField
-            variant="outlined"
-            placeholder="Search Submission"
-            value={search}
-            onChange={handleSearchChange}
-            InputProps={{
-              endAdornment: <SearchIcon />,
-            }}
-            size="small"
-          />
-        </Box>
+            </Box>
+          </Grid>
+        </Grid>
 
-        <TableContainer>
-          <Table>
-            <TableHead>
+        <TableContainer component={Paper}>
+          <Table aria-label="simple table">
+            <TableHead sx={{ background: "#D8F6FF" }}>
               <TableRow>
                 <TableCell>Name</TableCell>
                 <TableCell>Last Updated</TableCell>
@@ -207,8 +218,9 @@ const LernSubmissionTable = () => {
                         row.status === "live"
                           ? "green"
                           : row.status === "review"
-                          ? "orange"
-                          : "red",
+                            ? "orange"
+                            : "red",
+                      textTransform: 'capitalize'
                     }}
                   >
                     {row.status}
@@ -216,13 +228,16 @@ const LernSubmissionTable = () => {
                   <TableCell>
                     {row.status == "draft" && (
                       <IconButton
+
                         color="primary"
                         onClick={() =>
-                          (window.location.href =
-                            routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT +
-                            "?" +
-                            row.learnathon_content_id)
+                        (window.location.href =
+                          routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT +
+                          "?" +
+                          row.learnathon_content_id)
                         }
+                        sx={{ color: '#057184' }}
+                        className="table-icon"
                       >
                         <Edit />
                       </IconButton>
@@ -231,11 +246,13 @@ const LernSubmissionTable = () => {
                       <IconButton
                         color="primary"
                         onClick={() =>
-                          (window.location.href =
-                            routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT +
-                            "?" +
-                            row.learnathon_content_id)
+                        (window.location.href =
+                          routeConfig.ROUTES.LEARNATHON.CREATELEARNCONTENT +
+                          "?" +
+                          row.learnathon_content_id)
                         }
+                        sx={{ color: '#054753' }}
+                        className="table-icon"
                       >
                         <Visibility />
                       </IconButton>
@@ -244,7 +261,10 @@ const LernSubmissionTable = () => {
                       <IconButton
                         color="secondary"
                         onClick={() => handleDialogOpen()}
+                        sx={{ color: 'red' }}
+                        className="table-icon"
                       >
+
                         <Delete />
                       </IconButton>
                     )}
@@ -255,7 +275,7 @@ const LernSubmissionTable = () => {
           </Table>
         </TableContainer>
 
-        <TablePagination
+        <Pagination
           component="div"
           count={totalRows}
           page={page}
diff --git a/packages/nulp_elite/src/styles/style.css b/packages/nulp_elite/src/styles/style.css
index e0212363..1368eb13 100644
--- a/packages/nulp_elite/src/styles/style.css
+++ b/packages/nulp_elite/src/styles/style.css
@@ -149,7 +149,7 @@ button {
 }
 
 .MuiIconButton-sizeMedium {
-  color: #484848 !important;
+  color: #484848;
   font-size: 16px !important;
   padding: 0 !important;
 }
@@ -3763,3 +3763,11 @@ animation: blink-border 1s infinite alternate;
   display: flex;
   justify-content: center;
 }
+
+.table-icon{
+background:#6c666647 !important;
+width: 40px;
+height: 40px;
+border-radius: 4px !important;
+margin-right: 10px !important;
+}
\ No newline at end of file

From 4ea8e83a842d85b2883533cf4bf94706abdd5748 Mon Sep 17 00:00:00 2001
From: Mahesh Mahajan <mahajanmahesh935@gmail.com>
Date: Tue, 15 Oct 2024 09:52:03 +0530
Subject: [PATCH 2/9] Task #228833 : [FE] Create List view of learnathon
 content votting list

---
 packages/nulp_elite/src/App.js                |   7 +
 packages/nulp_elite/src/assets/votting.png    | Bin 0 -> 3239 bytes
 .../nulp_elite/src/configs/routeConfig.json   |   3 +-
 .../src/pages/learnathon/lernVotingList.js    | 191 ++++++++++++++++++
 .../src/pages/voting/votingDetails.js         | 123 +++++++----
 5 files changed, 288 insertions(+), 36 deletions(-)
 create mode 100644 packages/nulp_elite/src/assets/votting.png
 create mode 100644 packages/nulp_elite/src/pages/learnathon/lernVotingList.js

diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index 42070df7..81657c8e 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -42,6 +42,7 @@ import axios from "axios";
 import ReactGA from "react-ga4";
 import LernModal from "components/learnathon/LernModal";
 import LernSubmissionTable from "pages/learnathon/LernSubmissionTable";
+import LernVotingList from "pages/learnathon/lernVotingList";
 
 function App() {
   // const [t] = useTranslation();
@@ -218,6 +219,12 @@ function App() {
       component: LernSubmissionTable,
 
     },
+    {
+      moduleName: "nulp_elite",
+      path: routeConfig.ROUTES.LEARNATHON.LERNVOTINGLIST,
+      component: LernVotingList,
+
+    },
   ];
 
   initializeI18n(
diff --git a/packages/nulp_elite/src/assets/votting.png b/packages/nulp_elite/src/assets/votting.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f68d32aae43e93f9b4b5ff96e9a478721154b3
GIT binary patch
literal 3239
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
Z_J7PSCBBAxICKC2002ovPDHLkV1k0`6|(>U

literal 0
HcmV?d00001

diff --git a/packages/nulp_elite/src/configs/routeConfig.json b/packages/nulp_elite/src/configs/routeConfig.json
index 4d884b00..26723045 100644
--- a/packages/nulp_elite/src/configs/routeConfig.json
+++ b/packages/nulp_elite/src/configs/routeConfig.json
@@ -87,7 +87,8 @@
     "LEARNATHON": {
       "CREATELEARNCONTENT": "/webapp/learnthon",
       "SUBMISSIONLIST": "webapp/SubmissionList",
-      "MYLERNSUBMISSION": "/webapp/mylernsubmissions"
+      "MYLERNSUBMISSION": "/webapp/mylernsubmissions",
+      "LERNVOTINGLIST":"/webapp/lernvotinglist"
     }
   }
 }
diff --git a/packages/nulp_elite/src/pages/learnathon/lernVotingList.js b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
new file mode 100644
index 00000000..3e23d2b2
--- /dev/null
+++ b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
@@ -0,0 +1,191 @@
+import React, { useState, useEffect } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  TablePagination,
+  Paper,
+  TextField,
+  Button,
+  Typography,
+  Box,
+} from "@mui/material";
+import { useTranslation } from "react-i18next";
+import SearchIcon from "@mui/icons-material/Search";
+import { useNavigate } from "react-router-dom";
+import axios from "axios";
+import Footer from "components/Footer";
+import Header from "components/header";
+
+const LernVotingList = () => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const [data, setData] = useState([]);
+  const [page, setPage] = useState(0);
+  const [rowsPerPage, setRowsPerPage] = useState(5);
+  const [totalRows, setTotalRows] = useState(0);
+  const [search, setSearch] = useState("");
+  const [pollData, setPollData] = useState([]);
+  const [voteCounts, setVoteCounts] = useState({}); // Object to store vote counts
+
+  useEffect(() => {
+    fetchData();
+  }, [page, rowsPerPage, search]);
+
+  const fetchData = async () => {
+    const assetBody = {
+      request: {
+        filters: {
+          category: "Learnathon",
+          status: ["Live"],
+        },
+
+        limit: rowsPerPage,
+        offset: page * rowsPerPage,
+        search: search,
+      },
+    };
+    try {
+      const response = await fetch("/polls/list", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(assetBody),
+      });
+
+      if (!response.ok) {
+        throw new Error("Failed to fetch polls");
+      }
+
+      const result = await response.json();
+      setData(result.result.data);
+      const pollIds = result.result.data.map((poll) => poll.poll_id);
+      setPollData(pollIds);
+      setTotalRows(result.result.totalCount);
+
+      // Fetch vote counts for each poll
+      getVoteCounts(pollIds);
+    } catch (error) {
+      console.log("Error fetching data:", error);
+    }
+  };
+
+  const getVoteCounts = async (pollIds) => {
+    try {
+      const url = "/polls/all/get_poll";
+      const body = {
+        poll_ids: pollIds,
+      };
+      const response = await axios.post(url, body);
+      const data = response.data;
+
+      // Map vote counts by poll_id
+      const voteCountMap = {};
+      data.result.polls.forEach((poll) => {
+        voteCountMap[poll.poll_id] = poll.result[0].count; // Assuming result contains vote count
+      });
+
+      setVoteCounts(voteCountMap); // Set the vote count in state
+    } catch (error) {
+      console.error("Error fetching vote counts:", error);
+    }
+  };
+
+  const handleSearchChange = (e) => {
+    setSearch(e.target.value);
+    setPage(0); // Reset to first page on search
+  };
+
+  const handlePageChange = (event, newPage) => {
+    setPage(newPage);
+  };
+
+  const handleRowsPerPageChange = (event) => {
+    setRowsPerPage(parseInt(event.target.value, 10));
+    setPage(0);
+  };
+
+  const handleClick = (poll_id) => {
+    navigate(`/webapp/pollDetails?${poll_id}`);
+  };
+
+  return (
+    <>
+      <Header />
+      <Paper sx={{ padding: "20px", backgroundColor: "#f9f4eb" }}>
+        <Box
+          display="flex"
+          justifyContent="space-between"
+          alignItems="center"
+          mb={2}
+        >
+          <Typography variant="h6">Learnathon Votting List</Typography>
+        </Box>
+
+        <Box display="flex" alignItems="center" mb={2}>
+          <TextField
+            variant="outlined"
+            placeholder="Search Submission"
+            value={search}
+            onChange={handleSearchChange}
+            InputProps={{
+              endAdornment: <SearchIcon />,
+            }}
+            size="small"
+          />
+        </Box>
+
+        <TableContainer>
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableCell>Submission Name</TableCell>
+                <TableCell>Voting Deadline</TableCell>
+                <TableCell>Vote Count</TableCell>
+                <TableCell>Vote Now</TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {data.map((row) => (
+                <TableRow key={row.id}>
+                  <TableCell>{row.title}</TableCell>
+                  <TableCell>
+                    {new Date(row.end_date).toLocaleDateString()}
+                  </TableCell>
+                  <TableCell>{voteCounts[row.poll_id] || 0}</TableCell>
+                  <TableCell>
+                    <img
+                      src={require("assets/votting.png")}
+                      alt="Voting"
+                      style={{
+                        width: "108px",
+                        height: "42px",
+                      }}
+                      onClick={() => handleClick(row.poll_id)}
+                    />
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+
+        <TablePagination
+          component="div"
+          count={totalRows}
+          page={page}
+          onPageChange={handlePageChange}
+          rowsPerPage={rowsPerPage}
+          onRowsPerPageChange={handleRowsPerPageChange}
+        />
+      </Paper>
+      <Footer />
+    </>
+  );
+};
+
+export default LernVotingList;
diff --git a/packages/nulp_elite/src/pages/voting/votingDetails.js b/packages/nulp_elite/src/pages/voting/votingDetails.js
index 656f153b..4e9a32cb 100644
--- a/packages/nulp_elite/src/pages/voting/votingDetails.js
+++ b/packages/nulp_elite/src/pages/voting/votingDetails.js
@@ -14,7 +14,7 @@ import RadioGroup from "@mui/material/RadioGroup";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import FormControl from "@mui/material/FormControl";
 import TodayOutlinedIcon from "@mui/icons-material/TodayOutlined";
-
+import TextField from "@mui/material/TextField";
 import Breadcrumbs from "@mui/material/Breadcrumbs";
 import Link from "@mui/material/Link";
 import LinearProgress from "@mui/material/LinearProgress";
@@ -73,8 +73,10 @@ const VotingDetails = () => {
   const [open, setOpen] = useState(false);
   const [poll, setPoll] = useState(null);
   const [selectedOption, setSelectedOption] = useState("");
+  const [enteredRemark, setEnteredRemark] = useState("");
   const [userVote, setUserVote] = useState([]);
   const [toasterMessage, setToasterMessage] = useState("");
+  const [errormessage, setErrorMessage] = useState("");
   const [toasterOpen, setToasterOpen] = useState(false);
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -87,6 +89,7 @@ const VotingDetails = () => {
   const [startDate, setStartDate] = useState(moment());
   const [endDate, setEndDate] = useState(moment());
   const [updateFlag, setUpdateFlag] = useState(false);
+  const [remark, setRemark] = useState(null);
 
   useEffect(() => {
     const timer = setInterval(() => {
@@ -144,6 +147,7 @@ const VotingDetails = () => {
       );
       setUserVote(response.data.result);
       setSelectedOption(response.data.result[0].poll_result);
+      setEnteredRemark(response?.data?.result[0]?.remark);
     } catch (error) {
       console.error("Error fetching user vote", error);
     }
@@ -153,43 +157,52 @@ const VotingDetails = () => {
   };
 
   const handleVoteSubmit = async () => {
-    const data = {
-      poll_id: pollId,
-      user_id: userId,
-      poll_submitted: true,
-      poll_result: selectedOption,
-    };
+    if (poll.category === "Learnathon" && remark == null) {
+      setErrorMessage("Please Enter the Remark");
+    } else {
+      const data = {
+        poll_id: pollId,
+        user_id: userId,
+        poll_submitted: true,
+        poll_result: selectedOption,
+        ...(remark ? { remark } : {}),
+      };
 
-    try {
-      await axios.post(`${urlConfig.URLS.POLL.USER_CREATE}`, data);
-      setToasterMessage(
-        "Vote submitted successfully, You can update your vote within next 15 minutes"
-      );
-      setToasterOpen(true);
-      fetchUserVote(pollId);
-    } catch (error) {
-      console.error("Error submitting vote", error);
+      try {
+        await axios.post(`${urlConfig.URLS.POLL.USER_CREATE}`, data);
+        setToasterMessage(
+          "Vote submitted successfully, You can update your vote within next 15 minutes"
+        );
+        setToasterOpen(true);
+        fetchUserVote(pollId);
+      } catch (error) {
+        console.error("Error submitting vote", error);
+      }
     }
   };
 
   const handleVoteUpdate = async () => {
-    const data = {
-      poll_id: pollId,
-      user_id: userId,
-      poll_submitted: true,
-      poll_result: selectedOption,
-    };
+    if (poll.category === "Learnathon" && remark == "") {
+      setErrorMessage("Please Enter the Remark");
+    } else {
+      const data = {
+        poll_id: pollId,
+        user_id: userId,
+        poll_submitted: true,
+        poll_result: selectedOption,
+        ...(remark ? { remark } : {}),
+      };
 
-    try {
-      await axios.put(`${urlConfig.URLS.POLL.USER_UPDATE}`, data);
-      setToasterMessage("Vote updated successfully");
-      setToasterOpen(true);
-      fetchUserVote(pollId);
-    } catch (error) {
-      console.error("Error updating vote", error);
+      try {
+        await axios.put(`${urlConfig.URLS.POLL.USER_UPDATE}`, data);
+        setToasterMessage("Vote updated successfully");
+        setToasterOpen(true);
+        fetchUserVote(pollId);
+      } catch (error) {
+        console.error("Error updating vote", error);
+      }
     }
   };
-
   const handleClose = () => {
     setOpen(false);
   };
@@ -220,10 +233,15 @@ const VotingDetails = () => {
     window.open(url, "_blank");
   };
 
+  const handleRemarkChange = (event) => {
+    setRemark(event.target.value);
+  };
+
   return (
     <div>
       <Header />
       {toasterMessage && <Toast response={toasterMessage} type="success" />}
+      {errormessage && <Toast response={errormessage} type="error" />}
       {poll && (
         <Container maxWidth="xl" role="main" className=" xs-pb-20 mt-12">
           <Breadcrumbs
@@ -271,7 +289,7 @@ const VotingDetails = () => {
                   )}
                   <TodayOutlinedIcon
                     className="h3-custom-title pl-10 pt-10"
-                    style={{ verticalAlign: 'sub',marginRight: '10px'}}
+                    style={{ verticalAlign: "sub", marginRight: "10px" }}
                   />
                   <span className="h3-custom-title ">
                     {moment(poll.end_date).format(
@@ -279,7 +297,7 @@ const VotingDetails = () => {
                     )}
                   </span>
                 </Box>
-                {userVote && userVote?.length > 0 && ( 
+                {userVote && userVote?.length > 0 && (
                   <Box className="pr-5 my-20">
                     <span className=" h3-custom-title"> Your Vote</span>
                     <VerifiedIcon
@@ -292,11 +310,10 @@ const VotingDetails = () => {
                       }}
                     />
                     <span className="h3-custom-title ">
-                      {userVote[0]?.poll_result} 
-                      
+                      {userVote[0]?.poll_result}
                     </span>
                   </Box>
-                )} 
+                )}
                 <Box sx={{ width: "100%" }}>
                   {pollResult && (
                     <div>
@@ -392,6 +409,7 @@ const VotingDetails = () => {
                       value={selectedOption}
                       onChange={handleOptionChange}
                       name="radio-buttons-group"
+                      sx={{ marginTop: "24px" }}
                     >
                       {poll?.poll_options?.map((option, index) => (
                         <FormControlLabel
@@ -402,6 +420,23 @@ const VotingDetails = () => {
                         />
                       ))}
                     </RadioGroup>
+                    {poll && poll.category === "Learnathon" && (
+                      <Box>
+                        <TextField
+                          label={
+                            <>
+                              {t("Remark")}{" "}
+                              <span style={{ color: "red" }}>*</span>
+                            </>
+                          }
+                          variant="outlined"
+                          fullWidth
+                          placeholder={t("Enter your remark")}
+                          value={enteredRemark || remark}
+                          onChange={handleRemarkChange}
+                        />
+                      </Box>
+                    )}
                     <Box>
                       {userVote?.length > 0 ? (
                         <Button
@@ -409,6 +444,7 @@ const VotingDetails = () => {
                           className="custom-btn-primary"
                           onClick={handleVoteUpdate}
                           disabled={!selectedOption} // Disable the button if no option is selected
+                          sx={{ marginTop: "24px" }}
                         >
                           {t("UPDATE_VOTE")}
                         </Button>
@@ -418,6 +454,7 @@ const VotingDetails = () => {
                           className="custom-btn-primary"
                           onClick={handleVoteSubmit}
                           disabled={!selectedOption} // Disable the button if no option is selected
+                          sx={{ marginTop: "24px" }}
                         >
                           {t("SUBMIT_VOTE")}
                         </Button>
@@ -595,6 +632,22 @@ const VotingDetails = () => {
               className="event-h2-title  pl-20 mb-20"
               style={{ fontWeight: "400" }}
             >
+              {poll && poll.category === "Learnathon" && (
+                <Box>
+                  <Button
+                    type="button"
+                    className="custom-btn-primary"
+                    onClick={() =>
+                      window.open("/webapp/player?" + poll.content_id, "_blank")
+                    }
+                    sx={{ marginTop: "24px" }}
+
+                    // disabled={!selectedOption} // Disable the button if no option is selected
+                  >
+                    {t("VIEW_SUBMISSIONS")}
+                  </Button>
+                </Box>
+              )}
               {poll.description}
             </Box>
             <Box className="lg-hide ml-20">

From 24eabb4075acb8adc0dac874ec2b58e87cf9b651 Mon Sep 17 00:00:00 2001
From: paritshivani <shivani_p@techjoomla.com>
Date: Tue, 15 Oct 2024 10:01:57 +0530
Subject: [PATCH 3/9] icon submit phase I

---
 .../nulp_elite/src/configs/urlConfig.json     |  6 +++-
 .../src/pages/learnathon/lernCreatorForm.js   | 30 +++++++++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/nulp_elite/src/configs/urlConfig.json b/packages/nulp_elite/src/configs/urlConfig.json
index ace296a0..feb0c073 100644
--- a/packages/nulp_elite/src/configs/urlConfig.json
+++ b/packages/nulp_elite/src/configs/urlConfig.json
@@ -345,7 +345,7 @@
     },
     "ASSET": {
       "CREATE": "content/v3/create",
-      "UPDATE": "content/v3/upload"
+      "UPLOAD": "content/v3/upload/"
     },
     "ITEMSET": {
       "CREATE": "itemset/v3/create",
@@ -457,6 +457,10 @@
       "CREATE": "/learnathon/content/create",
       "UPDATE": "/learnathon/content/update",
       "DELETE": "/learnathon/content/delete"
+    },
+    "ICON": {
+      "CREATE": "asset/v1/create",
+      "UPLOAD": "asset/v1/upload/"
     }
   }
 }
diff --git a/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js b/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
index cca632c3..d981c050 100644
--- a/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
+++ b/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
@@ -82,6 +82,7 @@ const LernCreatorForm = () => {
     fetchData();
     getUserData();
   }, [contentId]);
+  const reader = new FileReader();
 
   const fetchData = async () => {
     const requestBody = {
@@ -198,6 +199,7 @@ const LernCreatorForm = () => {
   };
 
   const handleIconChange = async (e) => {
+    reader.readAsDataURL(e.target.files[0]);
     const _uuid = uuidv4();
     const assetBody = {
       request: {
@@ -238,7 +240,7 @@ const LernCreatorForm = () => {
       };
       try {
         const response = await fetch(
-          `${urlConfig.URLS.ICON.UPLOAD}${result.result.identifier}`,
+          `${urlConfig.URLS.ICON.UPLOAD}/${result.result.identifier}`,
           {
             method: "POST",
             headers: {
@@ -319,7 +321,7 @@ const LernCreatorForm = () => {
       };
       try {
         const response = await fetch(
-          `${urlConfig.URLS.ASSET.UPDATE}${result.result.identifier}`,
+          `${urlConfig.URLS.ASSET.UPLOAD}/${result.result.identifier}`,
           {
             method: "POST",
             headers: {
@@ -554,7 +556,15 @@ const LernCreatorForm = () => {
             </Box>
           </Grid>
         </Grid>
-        <Grid container sx={{ padding: "20px", backgroundColor: "#fff", boxShadow: '0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)' }}>
+        <Grid
+          container
+          sx={{
+            padding: "20px",
+            backgroundColor: "#fff",
+            boxShadow:
+              "0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)",
+          }}
+        >
           <Box p={3} mx="auto">
             <Typography variant="h6" gutterBottom>
               Participant Details
@@ -612,7 +622,7 @@ const LernCreatorForm = () => {
             <Divider sx={{ marginBottom: "20px" }} />
             <Grid item xs={12}>
               <div>
-                <Tooltip title="Supported formats: MP4, PDF, HTML5, YouTube links">
+                <Tooltip title="Supported formats:jpg, png">
                   <IconButton>
                     <HelpOutlineIcon />
                   </IconButton>
@@ -749,9 +759,10 @@ const LernCreatorForm = () => {
                     fullWidth
                     onChange={handleFileChange}
                     inputProps={{
-                      accept: "video/mp4,application/pdf,text/html,video/youtube",
+                      accept:
+                        "video/mp4,application/pdf,text/html,video/youtube",
                     }}
-                    sx={{border: '1px dashed'}}
+                    sx={{ border: "1px dashed" }}
                   />
                 </div>
               </Grid>
@@ -777,12 +788,13 @@ const LernCreatorForm = () => {
         xs={12}
         justifyContent="center"
         alignItems="center"
-        direction="column" 
+        direction="column"
         textAlign="center"
         className="mb-30"
       >
         <Box>
-          Your submission will be used for NULP purposes only and your personal details will not be disclosed to any entity.
+          Your submission will be used for NULP purposes only and your personal
+          details will not be disclosed to any entity.
         </Box>
 
         <Box mt={3}>
@@ -798,7 +810,7 @@ const LernCreatorForm = () => {
             disabled={isNotDraft}
             className="viewAll"
             onClick={() => handleSubmit("review")}
-            sx={{ ml: 2,padding:'9px 35px' }} // Adds spacing between the buttons
+            sx={{ ml: 2, padding: "9px 35px" }} // Adds spacing between the buttons
           >
             Submit
           </Button>

From 967d9f8412f8f31de98809a8551fe2d0a45fc0af Mon Sep 17 00:00:00 2001
From: paritshivani <shivani_p@techjoomla.com>
Date: Tue, 15 Oct 2024 10:15:04 +0530
Subject: [PATCH 4/9] deployment issue

---
 packages/nulp_elite/src/pages/content/joinCourse.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
index f1515584..9878b1b8 100644
--- a/packages/nulp_elite/src/pages/content/joinCourse.js
+++ b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -629,11 +629,11 @@ const JoinCourse = () => {
                   <Button
                     onClick={handleLeaveCourseClick} // Open confirmation dialog
                     className="custom-btn-danger xs-mt-10"
-
-                  > {t("LEAVE_COURSE")}
-
+                  >
+                    {" "}
+                    {t("LEAVE_COURSE")}
                   </Button>
-                }
+                )}
               </Box>
             </div>
 

From 210d4a89a0629a2f98b22bd3751ab775bb09bc01 Mon Sep 17 00:00:00 2001
From: Mahesh Mahajan <mahajanmahesh935@gmail.com>
Date: Tue, 15 Oct 2024 12:05:30 +0530
Subject: [PATCH 5/9] Resolved deployment issue

---
 packages/nulp_elite/src/App.js                 | 5 +----
 packages/nulp_elite/src/configs/urlConfig.json | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index e4cd56d6..ad880a39 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -217,13 +217,11 @@ function App() {
       moduleName: "nulp_elite",
       path: routeConfig.ROUTES.LEARNATHON.MYLERNSUBMISSION,
       component: LernSubmissionTable,
-
     },
     {
       moduleName: "nulp_elite",
       path: routeConfig.ROUTES.LEARNATHON.LERNVOTINGLIST,
       component: LernVotingList,
-
     },
   ];
 
@@ -333,9 +331,8 @@ function App() {
               />
             ))}
           </Routes>
+          <LernModal />
         </Router>
-      <LernModal />    
-            
       </React.Suspense>
       {/* </ChakraProvider> */}
       {/* </ChakraProvider> */}
diff --git a/packages/nulp_elite/src/configs/urlConfig.json b/packages/nulp_elite/src/configs/urlConfig.json
index cfac4f57..19d87b95 100644
--- a/packages/nulp_elite/src/configs/urlConfig.json
+++ b/packages/nulp_elite/src/configs/urlConfig.json
@@ -145,10 +145,8 @@
       "ADD_CERTIFICATE": "v1/add/template",
       "ATTACH_CERTIFICATE": "v1/template/add",
       "CREATE_CERT_TEMPLATE": "asset/v1/create",
-      "UPLOAD_CERT_TEMPLATE": "asset/v1/upload"
       "UPLOAD_CERT_TEMPLATE": "asset/v1/upload",
       "CUSTOM_CERTIFICATE_CREATE": "/custom_event/certificate/create"
-
     },
     "COMPOSITE": {
       "SEARCH": "composite/v1/search",
@@ -443,7 +441,8 @@
       "DELETE_POLL": "/polls/delete",
       "GET_USER_POLL": "/polls/user/get_user_poll",
       "USER_CREATE": "/polls/user/create",
-      "USER_UPDATE": "/polls/user/update"
+      "USER_UPDATE": "/polls/user/update",
+      "GET_VOTTING_LIST": "/polls/all/get_poll"
     },
     "FEEDBACK": {
       "CREATE": "/custom_feedback/create",

From 08450883104ea1fc06c2e7a1d93760646253195f Mon Sep 17 00:00:00 2001
From: Mahesh Mahajan <mahajanmahesh935@gmail.com>
Date: Tue, 15 Oct 2024 12:08:11 +0530
Subject: [PATCH 6/9] Bug #226609 : [webapp] pagination is not workin properly
 on my events page

---
 packages/nulp_elite/src/App.js                    | 2 ++
 packages/nulp_elite/src/pages/events/eventList.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index ad880a39..81657c8e 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -217,11 +217,13 @@ function App() {
       moduleName: "nulp_elite",
       path: routeConfig.ROUTES.LEARNATHON.MYLERNSUBMISSION,
       component: LernSubmissionTable,
+
     },
     {
       moduleName: "nulp_elite",
       path: routeConfig.ROUTES.LEARNATHON.LERNVOTINGLIST,
       component: LernVotingList,
+
     },
   ];
 
diff --git a/packages/nulp_elite/src/pages/events/eventList.js b/packages/nulp_elite/src/pages/events/eventList.js
index c91f90f4..5a7d5ac2 100644
--- a/packages/nulp_elite/src/pages/events/eventList.js
+++ b/packages/nulp_elite/src/pages/events/eventList.js
@@ -98,6 +98,7 @@ const EventList = (props) => {
   ]);
 
   const handleChangeTab = (event, newValue) => {
+    setCurrentPage(1);
     setValueTab(newValue);
   };
 

From c0f10c71fd2b597ba2e06218de0573dc20f871ab Mon Sep 17 00:00:00 2001
From: sonaligarud <sonali.garud@tekditechnologies.com>
Date: Tue, 15 Oct 2024 15:07:41 +0530
Subject: [PATCH 7/9] Task #228854 - [FE] - Create List view of learnathon
 content votting list and voting detail page UI

---
 .../public/locales/be/translation.json        |  9 ++-
 .../public/locales/en/translation.json        |  9 ++-
 .../public/locales/gg/translation.json        |  9 ++-
 .../public/locales/hi/translation.json        |  9 ++-
 .../public/locales/ma/translation.json        |  9 ++-
 .../public/locales/mal/translation.json       |  9 ++-
 .../public/locales/ta/translation.json        |  8 ++-
 .../public/locales/te/translation.json        |  9 ++-
 .../src/pages/learnathon/lernVotingList.js    | 63 ++++++++++---------
 .../src/pages/voting/votingDetails.js         |  6 +-
 10 files changed, 101 insertions(+), 39 deletions(-)

diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json
index e222c345..e86dcced 100644
--- a/packages/nulp_elite/public/locales/be/translation.json
+++ b/packages/nulp_elite/public/locales/be/translation.json
@@ -327,5 +327,12 @@
   "PARTICIPATE_NOW":"এখনই অংশগ্রহণ করুন",
   "LERN_title": "The Learnathon 2.0 শুরু হয়েছে!",
   "LERN_MESSAGE": "যেখানে শহুরে অনুশীলনকারীরা সহযোগিতামূলক শিক্ষাকে উৎসাহিত করার জন্য সমাধানগুলি ভাগ করে নেয়।",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18ই নভেম্বর 2024 এ চালু হয়েছে এবং 20শে ডিসেম্বর 2024 পর্যন্ত চলবে। এখনই আপনার শহুরে সমাধান জমা দিন!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18ই নভেম্বর 2024 এ চালু হয়েছে এবং 20শে ডিসেম্বর 2024 পর্যন্ত চলবে। এখনই আপনার শহুরে সমাধান জমা দিন!",
+"VOTE_NOW_LEARNATHON_SUBMISSIONS":"এখনই ভোট দিন: লার্নথন সাবমিশন",
+  "SUBMISSION_NAME":"জমা দাখিলের নাম",
+  "VOTING_DEADLINE":"ভোটের সময়সীমা",
+  "VOTE_COUNT":"ভোটের সংখ্যা",
+  "VOTE_NOW":"এখনই ভোট দিন",
+  "SEARCH_SUBMISSION":"অনুসন্ধান জমা",
+  "VIEW_SUBMISSIONS":"সাবমিশন দেখুন"
 }
diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json
index ea0703cd..8711c6c9 100644
--- a/packages/nulp_elite/public/locales/en/translation.json
+++ b/packages/nulp_elite/public/locales/en/translation.json
@@ -324,5 +324,12 @@
   "PARTICIPATE_NOW":"Participate Now",
   "LERN_title": "The Learnathon 2.0 Has Begun!",
   "LERN_MESSAGE": "Where urban practitioners share solutions to foster collaborative learning.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 launched on 18th November 2024 and will continue until 20th December 2024. Submit your urban solutions now!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 launched on 18th November 2024 and will continue until 20th December 2024. Submit your urban solutions now!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"Vote Now: Learnathon Submissions",
+  "SUBMISSION_NAME":"Submission Name",
+  "VOTING_DEADLINE":"Voting Deadline",
+  "VOTE_COUNT":"Vote Count",
+  "VOTE_NOW":"Vote Now",
+  "SEARCH_SUBMISSION":"Search Submission",
+  "VIEW_SUBMISSIONS":"View Submissions"
 }
diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json
index b099cc22..7d0b60bd 100644
--- a/packages/nulp_elite/public/locales/gg/translation.json
+++ b/packages/nulp_elite/public/locales/gg/translation.json
@@ -330,5 +330,12 @@
   "PARTICIPATE_NOW":"હવે ભાગ લો",
   "LERN_title": "ધ લર્નથોન 2.0 શરૂ થઈ ગયું છે!",
   "LERN_MESSAGE": "જ્યાં શહેરી પ્રેક્ટિશનરો સહયોગી શિક્ષણને પ્રોત્સાહન આપવા માટે ઉકેલો શેર કરે છે.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18મી નવેમ્બર 2024 ના રોજ લોન્ચ થયું અને 20મી ડિસેમ્બર 2024 સુધી ચાલુ રહેશે. તમારા શહેરી ઉકેલો હમણાં જ સબમિટ કરો!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18મી નવેમ્બર 2024 ના રોજ લોન્ચ થયું અને 20મી ડિસેમ્બર 2024 સુધી ચાલુ રહેશે. તમારા શહેરી ઉકેલો હમણાં જ સબમિટ કરો!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"હવે મત આપો: લર્નથોન સબમિશન",
+  "SUBMISSION_NAME":"સબમિશન નામ",
+  "VOTING_DEADLINE":"મતદાનની અંતિમ તારીખ",
+  "VOTE_COUNT":"મત ગણતરી",
+  "VOTE_NOW":"હવે મત આપો",
+  "SEARCH_SUBMISSION":"સર્ચ સબમિશન",
+  "VIEW_SUBMISSIONS":"સબમિશન જુઓ"
 }
diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json
index 716a1f4c..f9c544dd 100644
--- a/packages/nulp_elite/public/locales/hi/translation.json
+++ b/packages/nulp_elite/public/locales/hi/translation.json
@@ -321,5 +321,12 @@
   "PARTICIPATE_NOW":"अभी भाग लें",
   "LERN_title": "लर्नथॉन 2.0 शुरू हो गया है!",
   "LERN_MESSAGE": "जहां शहरी व्यवसायी सहयोगात्मक शिक्षा को बढ़ावा देने के लिए समाधान साझा करते हैं।",
-  "LERN_MESSAGE_LINE_TWO":"लर्नथॉन 2.0 18 नवंबर 2024 को लॉन्च हुआ और 20 दिसंबर 2024 तक जारी रहेगा। अब अपना शहरी समाधान सबमिट करें!"
+  "LERN_MESSAGE_LINE_TWO":"लर्नथॉन 2.0 18 नवंबर 2024 को लॉन्च हुआ और 20 दिसंबर 2024 तक जारी रहेगा। अब अपना शहरी समाधान सबमिट करें!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"अभी वोट करें: लर्नथॉन सबमिशन",
+  "SUBMISSION_NAME":"प्रस्तुति नाम",
+  "VOTING_DEADLINE":"मतदान की समय सीमा",
+  "VOTE_COUNT":"मतदान गणना",
+  "VOTE_NOW":"अभी वोट करें",
+  "SEARCH_SUBMISSION":"खोज सबमिशन",
+  "VIEW_SUBMISSIONS":"सबमिशन देखें"
 }
diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json
index 35510d44..adec659e 100644
--- a/packages/nulp_elite/public/locales/ma/translation.json
+++ b/packages/nulp_elite/public/locales/ma/translation.json
@@ -322,6 +322,13 @@
   "PARTICIPATE_NOW":"आता सहभागी व्हा",
   "LERN_title": "लर्नथॉन २.० सुरु झाली आहे!",
   "LERN_MESSAGE": "जेथे शहरी अभ्यासक सहयोगी शिक्षणाला चालना देण्यासाठी उपाय सामायिक करतात.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 नोव्हेंबर 2024 ला लॉन्च झाला आणि 20 डिसेंबर 2024 पर्यंत सुरू राहील. तुमचे शहरी उपाय आता सबमिट करा!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 नोव्हेंबर 2024 ला लॉन्च झाला आणि 20 डिसेंबर 2024 पर्यंत सुरू राहील. तुमचे शहरी उपाय आता सबमिट करा!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"आता मत द्या: लर्नथॉन सबमिशन",
+  "SUBMISSION_NAME":"सबमिशनचे नाव",
+  "VOTING_DEADLINE":"मतदानाची अंतिम मुदत",
+  "VOTE_COUNT":"मतांची संख्या",
+  "VOTE_NOW":"आता मतदान करा",
+  "SEARCH_SUBMISSION":"शोध सबमिशन",
+  "VIEW_SUBMISSIONS":"सबमिशन पहा"
 }
 
diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json
index fcb4a8df..ebf4ef8c 100644
--- a/packages/nulp_elite/public/locales/mal/translation.json
+++ b/packages/nulp_elite/public/locales/mal/translation.json
@@ -322,5 +322,12 @@
   "PARTICIPATE_NOW":"ഇപ്പോൾ പങ്കെടുക്കുക",
   "LERN_title": "ലേണത്തോൺ 2.0 ആരംഭിച്ചു!",
   "LERN_MESSAGE": "സഹകരണ പഠനം പ്രോത്സാഹിപ്പിക്കുന്നതിന് നഗരപരിശീലകർ പരിഹാരങ്ങൾ പങ്കിടുന്നിടത്ത്.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 2024 നവംബർ 18-ന് സമാരംഭിച്ചു, 2024 ഡിസംബർ 20 വരെ തുടരും. നിങ്ങളുടെ നഗര പരിഹാരങ്ങൾ ഇപ്പോൾ സമർപ്പിക്കുക!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 2024 നവംബർ 18-ന് സമാരംഭിച്ചു, 2024 ഡിസംബർ 20 വരെ തുടരും. നിങ്ങളുടെ നഗര പരിഹാരങ്ങൾ ഇപ്പോൾ സമർപ്പിക്കുക!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"ഇപ്പോൾ വോട്ട് ചെയ്യുക: ലേണത്തോൺ സമർപ്പിക്കലുകൾ",
+  "SUBMISSION_NAME":"സമർപ്പണ നാമം",
+  "VOTING_DEADLINE":"വോട്ടിംഗ് സമയപരിധി",
+  "VOTE_COUNT":"വോട്ട് കൗണ്ട്",
+  "VOTE_NOW":"ഇപ്പോൾ വോട്ട് ചെയ്യുക",
+  "SEARCH_SUBMISSION":"തിരയൽ സമർപ്പിക്കൽ",
+  "VIEW_SUBMISSIONS":"സമർപ്പിക്കലുകൾ കാണുക"
 }
diff --git a/packages/nulp_elite/public/locales/ta/translation.json b/packages/nulp_elite/public/locales/ta/translation.json
index bc93f858..f0abd314 100644
--- a/packages/nulp_elite/public/locales/ta/translation.json
+++ b/packages/nulp_elite/public/locales/ta/translation.json
@@ -347,5 +347,11 @@
   "PARTICIPATE_NOW":"இப்போது பங்கேற்கவும்",
   "LERN_title": "The Learnathon 2.0 Has Begun!",
   "LERN_MESSAGE": "நகர்ப்புற பயிற்சியாளர்கள் கூட்டுக் கற்றலை வளர்ப்பதற்கான தீர்வுகளை எங்கே பகிர்ந்து கொள்கிறார்கள்.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 நவம்பர் 2024 அன்று தொடங்கப்பட்டது மற்றும் 20 டிசம்பர் 2024 வரை தொடரும். உங்கள் நகர்ப்புற தீர்வுகளை இப்போதே சமர்ப்பிக்கவும்!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 நவம்பர் 2024 அன்று தொடங்கப்பட்டது மற்றும் 20 டிசம்பர் 2024 வரை தொடரும். உங்கள் நகர்ப்புற தீர்வுகளை இப்போதே சமர்ப்பிக்கவும்!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"இப்போது வாக்களியுங்கள்: கற்றல் சமர்ப்பிப்புகள்",
+  "SUBMISSION_NAME":"சமர்ப்பிப்பு பெயர்",
+  "VOTING_DEADLINE":"வாக்களிக்கும் காலக்கெடு",
+  "VOTE_COUNT":"வாக்கு எண்ணிக்கை",
+  "VOTE_NOW":"இப்போது வாக்களியுங்கள்",
+  "SEARCH_SUBMISSION":"தேடல் சமர்ப்பிப்பு"
 }
diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json
index fde633d3..899e73cb 100644
--- a/packages/nulp_elite/public/locales/te/translation.json
+++ b/packages/nulp_elite/public/locales/te/translation.json
@@ -286,5 +286,12 @@
   "PARTICIPATE_NOW":"ఇప్పుడే పాల్గొనండి",
   "LERN_title": "లెర్నాథాన్ 2.0 ప్రారంభమైంది!",
   "LERN_MESSAGE": "పట్టణ అభ్యాసకులు సహకార అభ్యాసాన్ని ప్రోత్సహించడానికి పరిష్కారాలను పంచుకునే చోట.",
-  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 నవంబర్ 2024న ప్రారంభించబడింది మరియు 20 డిసెంబర్ 2024 వరకు కొనసాగుతుంది. మీ పట్టణ పరిష్కారాలను ఇప్పుడే సమర్పించండి!"
+  "LERN_MESSAGE_LINE_TWO":"Learnathon 2.0 18 నవంబర్ 2024న ప్రారంభించబడింది మరియు 20 డిసెంబర్ 2024 వరకు కొనసాగుతుంది. మీ పట్టణ పరిష్కారాలను ఇప్పుడే సమర్పించండి!",
+  "VOTE_NOW_LEARNATHON_SUBMISSIONS":"ఇప్పుడే ఓటు వేయండి: లెర్నాథాన్ సమర్పణలు",
+  "SUBMISSION_NAME":"సమర్పణ పేరు",
+  "VOTING_DEADLINE":"ఓటింగ్ గడువు",
+  "VOTE_COUNT":"ఓట్ల లెక్కింపు",
+  "VOTE_NOW":"ఇప్పుడే ఓటు వేయండి",
+  "SEARCH_SUBMISSION":"శోధన సమర్పణ",
+  "VIEW_SUBMISSIONS":"సమర్పణలను వీక్షించండి"
 }
diff --git a/packages/nulp_elite/src/pages/learnathon/lernVotingList.js b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
index 3e23d2b2..11893afb 100644
--- a/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
+++ b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
@@ -6,12 +6,12 @@ import {
   TableContainer,
   TableHead,
   TableRow,
-  TablePagination,
-  Paper,
+  Pagination,
   TextField,
   Button,
   Typography,
   Box,
+
 } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import SearchIcon from "@mui/icons-material/Search";
@@ -19,6 +19,8 @@ import { useNavigate } from "react-router-dom";
 import axios from "axios";
 import Footer from "components/Footer";
 import Header from "components/header";
+import Paper from "@mui/material/Paper";
+import Grid from "@mui/material/Grid";
 
 const LernVotingList = () => {
   const { t } = useTranslation();
@@ -123,30 +125,34 @@ const LernVotingList = () => {
           alignItems="center"
           mb={2}
         >
-          <Typography variant="h6">Learnathon Votting List</Typography>
-        </Box>
-
-        <Box display="flex" alignItems="center" mb={2}>
-          <TextField
-            variant="outlined"
-            placeholder="Search Submission"
-            value={search}
-            onChange={handleSearchChange}
-            InputProps={{
-              endAdornment: <SearchIcon />,
-            }}
-            size="small"
-          />
+          <Typography variant="h6" gutterBottom className="fw-600 mt-20">{t("VOTE_NOW_LEARNATHON_SUBMISSIONS")}</Typography>
         </Box>
-
-        <TableContainer>
-          <Table>
-            <TableHead>
+        <Grid container>
+          <Grid item xs={6}>
+            <Box display="flex" alignItems="center" mb={2}>
+              <TextField
+                variant="outlined"
+                placeholder={t("SEARCH_SUBMISSION")}
+                value={search}
+                onChange={handleSearchChange}
+                InputProps={{
+                  endAdornment: <SearchIcon />,
+                }}
+                size="small"
+                sx={{ background: '#fff' }}
+              />
+            </Box>
+          </Grid>
+        </Grid>
+
+        <TableContainer component={Paper}>
+          <Table aria-label="simple table">
+            <TableHead sx={{ background: "#D8F6FF" }}>
               <TableRow>
-                <TableCell>Submission Name</TableCell>
-                <TableCell>Voting Deadline</TableCell>
-                <TableCell>Vote Count</TableCell>
-                <TableCell>Vote Now</TableCell>
+                <TableCell>{t("SUBMISSION_NAME")}</TableCell>
+                <TableCell>{t("VOTING_DEADLINE")}</TableCell>
+                <TableCell>{t("VOTE_COUNT")}</TableCell>
+                <TableCell>{t("VOTE_NOW")}</TableCell>
               </TableRow>
             </TableHead>
             <TableBody>
@@ -162,19 +168,20 @@ const LernVotingList = () => {
                       src={require("assets/votting.png")}
                       alt="Voting"
                       style={{
-                        width: "108px",
-                        height: "42px",
+                        width: "100px",
+                        height: "40px",
+                        cursor: "pointer"
                       }}
                       onClick={() => handleClick(row.poll_id)}
                     />
                   </TableCell>
                 </TableRow>
-              ))}
+              ))} 
             </TableBody>
           </Table>
         </TableContainer>
 
-        <TablePagination
+        <Pagination
           component="div"
           count={totalRows}
           page={page}
diff --git a/packages/nulp_elite/src/pages/voting/votingDetails.js b/packages/nulp_elite/src/pages/voting/votingDetails.js
index 4e9a32cb..0288ccb0 100644
--- a/packages/nulp_elite/src/pages/voting/votingDetails.js
+++ b/packages/nulp_elite/src/pages/voting/votingDetails.js
@@ -409,7 +409,7 @@ const VotingDetails = () => {
                       value={selectedOption}
                       onChange={handleOptionChange}
                       name="radio-buttons-group"
-                      sx={{ marginTop: "24px" }}
+                      sx={{ marginBottom: "24px" }}
                     >
                       {poll?.poll_options?.map((option, index) => (
                         <FormControlLabel
@@ -620,8 +620,6 @@ const VotingDetails = () => {
                 </Box>
               </Box>
             )}
-
-            <Box style={{ display: "block", width: "100%" }}></Box>
             <Box
               className="h2-title pl-20 mb-20 mt-20"
               style={{ fontWeight: "600" }}
@@ -648,7 +646,9 @@ const VotingDetails = () => {
                   </Button>
                 </Box>
               )}
+              <Box className="mt-20">
               {poll.description}
+              </Box>
             </Box>
             <Box className="lg-hide ml-20">
               <FacebookShareButton url={shareUrl} className="pr-3">

From 32e9de6eeef350ed23adc4f45394fac53f46bad6 Mon Sep 17 00:00:00 2001
From: paritshivani <shivani_p@techjoomla.com>
Date: Tue, 15 Oct 2024 16:08:34 +0530
Subject: [PATCH 8/9] deployment issue

---
 packages/nulp_elite/src/configs/urlConfig.json | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/nulp_elite/src/configs/urlConfig.json b/packages/nulp_elite/src/configs/urlConfig.json
index cfac4f57..4eb63dee 100644
--- a/packages/nulp_elite/src/configs/urlConfig.json
+++ b/packages/nulp_elite/src/configs/urlConfig.json
@@ -145,10 +145,8 @@
       "ADD_CERTIFICATE": "v1/add/template",
       "ATTACH_CERTIFICATE": "v1/template/add",
       "CREATE_CERT_TEMPLATE": "asset/v1/create",
-      "UPLOAD_CERT_TEMPLATE": "asset/v1/upload"
       "UPLOAD_CERT_TEMPLATE": "asset/v1/upload",
       "CUSTOM_CERTIFICATE_CREATE": "/custom_event/certificate/create"
-
     },
     "COMPOSITE": {
       "SEARCH": "composite/v1/search",
@@ -346,8 +344,8 @@
       "RETIRE": "assessment/v3/itemsets/retire"
     },
     "ASSET": {
-      "CREATE": "content/v3/create",
-      "UPLOAD": "content/v3/upload/"
+      "CREATE": "/action/content/v3/create",
+      "UPLOAD": "/action/content/v3/upload/"
     },
     "ITEMSET": {
       "CREATE": "itemset/v3/create",
@@ -461,8 +459,8 @@
       "DELETE": "/learnathon/content/delete"
     },
     "ICON": {
-      "CREATE": "asset/v1/create",
-      "UPLOAD": "asset/v1/upload/"
+      "CREATE": "/action/asset/v1/create",
+      "UPLOAD": "/action/asset/v1/upload/"
     }
   }
 }

From c4101a1aa80edb4a5ac8a2622fd15a6490303c04 Mon Sep 17 00:00:00 2001
From: Mahesh Mahajan <mahajanmahesh935@gmail.com>
Date: Fri, 18 Oct 2024 18:08:41 +0530
Subject: [PATCH 9/9] TASK #228992 : Votting List and Learnathon Votting flow

---
 .../public/locales/be/translation.json        |  5 +-
 .../public/locales/en/translation.json        |  5 +-
 .../public/locales/gg/translation.json        |  5 +-
 .../public/locales/hi/translation.json        |  5 +-
 .../public/locales/ma/translation.json        |  5 +-
 .../public/locales/mal/translation.json       |  5 +-
 .../public/locales/te/translation.json        |  5 +-
 .../nulp_elite/src/pages/content/Player.js    | 78 ++++++++++++++++++-
 .../src/pages/learnathon/lernVotingList.js    | 59 +++++++-------
 .../src/pages/voting/votingDetails.js         | 25 +++---
 10 files changed, 143 insertions(+), 54 deletions(-)

diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json
index e86dcced..7d677649 100644
--- a/packages/nulp_elite/public/locales/be/translation.json
+++ b/packages/nulp_elite/public/locales/be/translation.json
@@ -334,5 +334,8 @@
   "VOTE_COUNT":"ভোটের সংখ্যা",
   "VOTE_NOW":"এখনই ভোট দিন",
   "SEARCH_SUBMISSION":"অনুসন্ধান জমা",
-  "VIEW_SUBMISSIONS":"সাবমিশন দেখুন"
+  "VIEW_SUBMISSIONS":"সাবমিশন দেখুন",
+  "VOTIGN_DEADLINE":"ভোটের সময়সীমা",
+  "VIEW_AND_VOTE":"দেখুন এবং ভোট দিন",
+  "VOTE_FOR_THIS_CONTENT":"এই কন্টেন্ট জন্য ভোট"
 }
diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json
index 8711c6c9..1648eebf 100644
--- a/packages/nulp_elite/public/locales/en/translation.json
+++ b/packages/nulp_elite/public/locales/en/translation.json
@@ -331,5 +331,8 @@
   "VOTE_COUNT":"Vote Count",
   "VOTE_NOW":"Vote Now",
   "SEARCH_SUBMISSION":"Search Submission",
-  "VIEW_SUBMISSIONS":"View Submissions"
+  "VIEW_SUBMISSIONS":"View Submissions",
+  "VOTIGN_DEADLINE":"Votting Deadline",
+  "VIEW_AND_VOTE":"View and vote",
+  "VOTE_FOR_THIS_CONTENT":"Vote for this content"
 }
diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json
index 7d0b60bd..bd3fcecb 100644
--- a/packages/nulp_elite/public/locales/gg/translation.json
+++ b/packages/nulp_elite/public/locales/gg/translation.json
@@ -337,5 +337,8 @@
   "VOTE_COUNT":"મત ગણતરી",
   "VOTE_NOW":"હવે મત આપો",
   "SEARCH_SUBMISSION":"સર્ચ સબમિશન",
-  "VIEW_SUBMISSIONS":"સબમિશન જુઓ"
+  "VIEW_SUBMISSIONS":"સબમિશન જુઓ",
+  "VOTIGN_DEADLINE":"મતદાનની અંતિમ તારીખ",
+  "VIEW_AND_VOTE":"જુઓ અને મત આપો",
+  "VOTE_FOR_THIS_CONTENT":"આ સામગ્રી માટે મત આપો"
 }
diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json
index f9c544dd..40977899 100644
--- a/packages/nulp_elite/public/locales/hi/translation.json
+++ b/packages/nulp_elite/public/locales/hi/translation.json
@@ -328,5 +328,8 @@
   "VOTE_COUNT":"मतदान गणना",
   "VOTE_NOW":"अभी वोट करें",
   "SEARCH_SUBMISSION":"खोज सबमिशन",
-  "VIEW_SUBMISSIONS":"सबमिशन देखें"
+  "VIEW_SUBMISSIONS":"सबमिशन देखें",
+  "VOTIGN_DEADLINE":"मतदान की समय सीमा",
+  "VIEW_AND_VOTE":"देखें और वोट करें",
+  "VOTE_FOR_THIS_CONTENT":"इस सामग्री के लिए वोट करें"
 }
diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json
index adec659e..ab4b25c1 100644
--- a/packages/nulp_elite/public/locales/ma/translation.json
+++ b/packages/nulp_elite/public/locales/ma/translation.json
@@ -329,6 +329,9 @@
   "VOTE_COUNT":"मतांची संख्या",
   "VOTE_NOW":"आता मतदान करा",
   "SEARCH_SUBMISSION":"शोध सबमिशन",
-  "VIEW_SUBMISSIONS":"सबमिशन पहा"
+  "VIEW_SUBMISSIONS":"सबमिशन पहा",
+  "VOTIGN_DEADLINE":"मतदानाची अंतिम मुदत",
+  "VIEW_AND_VOTE":"पहा आणि मत द्या",
+  "VOTE_FOR_THIS_CONTENT":"या सामग्रीसाठी मत द्या"
 }
 
diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json
index ebf4ef8c..d8d433cf 100644
--- a/packages/nulp_elite/public/locales/mal/translation.json
+++ b/packages/nulp_elite/public/locales/mal/translation.json
@@ -329,5 +329,8 @@
   "VOTE_COUNT":"വോട്ട് കൗണ്ട്",
   "VOTE_NOW":"ഇപ്പോൾ വോട്ട് ചെയ്യുക",
   "SEARCH_SUBMISSION":"തിരയൽ സമർപ്പിക്കൽ",
-  "VIEW_SUBMISSIONS":"സമർപ്പിക്കലുകൾ കാണുക"
+  "VIEW_SUBMISSIONS":"സമർപ്പിക്കലുകൾ കാണുക",
+  "VOTIGN_DEADLINE":"വോട്ടിംഗ് സമയപരിധി",
+  "VIEW_AND_VOTE":"കാണുക, വോട്ട് ചെയ്യുക",
+  "VOTE_FOR_THIS_CONTENT":"ഈ ഉള്ളടക്കത്തിന് വോട്ട് ചെയ്യുക"
 }
diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json
index 899e73cb..cd1e6d05 100644
--- a/packages/nulp_elite/public/locales/te/translation.json
+++ b/packages/nulp_elite/public/locales/te/translation.json
@@ -293,5 +293,8 @@
   "VOTE_COUNT":"ఓట్ల లెక్కింపు",
   "VOTE_NOW":"ఇప్పుడే ఓటు వేయండి",
   "SEARCH_SUBMISSION":"శోధన సమర్పణ",
-  "VIEW_SUBMISSIONS":"సమర్పణలను వీక్షించండి"
+  "VIEW_SUBMISSIONS":"సమర్పణలను వీక్షించండి",
+  "VOTIGN_DEADLINE":"ఓటింగ్ గడువు",
+  "VIEW_AND_VOTE":"వీక్షించి ఓటు వేయండి",
+  "VOTE_FOR_THIS_CONTENT":"ఈ కంటెంట్ కోసం ఓటు వేయండి"
 }
diff --git a/packages/nulp_elite/src/pages/content/Player.js b/packages/nulp_elite/src/pages/content/Player.js
index 87246fd6..3f5d1f28 100644
--- a/packages/nulp_elite/src/pages/content/Player.js
+++ b/packages/nulp_elite/src/pages/content/Player.js
@@ -29,6 +29,7 @@ import AccordionSummary from '@mui/material/AccordionSummary';
 import AccordionDetails from '@mui/material/AccordionDetails';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import md5 from 'md5';
+import { isEmpty } from "lodash";
 const urlConfig = require("../../configs/urlConfig.json");
 
 const Player = () => {
@@ -55,9 +56,12 @@ const Player = () => {
 const [assessEvents, setAssessEvents] =useState ([]);
 const [propLength, setPropLength] =useState();
   const _userId = util.userId();
-
+  const[isLearnathon,setIsLearnathon]=useState(false)
+  const[alreadyVoted,setAlreadyVoted] = useState(false)
+  const[pollId,setPollId] = useState()
   const queryString = location.search;
   let contentId = queryString.startsWith("?do_") ? queryString.slice(1) : null;
+  
   // Check if contentId ends with '=' and remove it
   if (contentId && contentId.endsWith("=")) {
     contentId = contentId.slice(0, -1);
@@ -170,6 +174,7 @@ const attemptid = ()=>{
        return hashValue;
 }
 
+
 const updateContentStateForAssessment = async () => {
     await updateContentState(2);
   try {
@@ -246,6 +251,8 @@ const updateContentStateForAssessment = async () => {
     fetchUserData();
   }, [contentId, consumedContent, fetchUserData, updateContentState]);
 
+
+
   useEffect(() => {
     if (isCompleted) {
       updateContentState(2);
@@ -258,6 +265,56 @@ const updateContentStateForAssessment = async () => {
     navigate(-1); // Navigate back in history
   };
 
+  const CheckLearnathonContent=async()=>{
+  try{
+   const url = `${urlConfig.URLS.LEARNATHON.LIST}`;
+    const requestBody = {
+        request : {
+          filters : {
+            content_id :contentId,
+            status : "Live",
+            // start_date:start_date,
+            // end_date:end_date,
+
+          }
+        }
+    }
+
+    const response = await axios.post(url, requestBody);
+    if(response?.data?.result?.totalCount > 0){
+      setPollId(response?.data?.result?.data[0]?.poll_id)
+      setIsLearnathon(true)
+    }
+  }catch (error) {
+    console.error("Error fetching course data:", error);
+  }
+
+  }
+
+  const CheckAlreadyVoted=async()=>{
+  try{
+   const url = `${urlConfig.URLS.POLL.GET_USER_POLL}?poll_id=${pollId}&user_id=${_userId}`;
+    const response = await axios.get(url);
+    if(Array.isArray(response?.data?.result) && response?.data?.result.length !== 0){
+      setAlreadyVoted(true)
+    }
+  }catch (error) {
+    console.error("Error fetching course data:", error);
+  }
+
+  }
+
+    useEffect(() => {
+      CheckLearnathonContent();
+  },[contentId])
+  useEffect(() => {
+      CheckAlreadyVoted();
+  },[pollId])
+
+    const handleClick = (poll_id) => {
+    navigate(`/webapp/pollDetails?${poll_id}`);
+  };
+
   return (
     <div>
       <Header />
@@ -461,6 +518,25 @@ const updateContentStateForAssessment = async () => {
           paddingBottom: "2%",
           marginTop: '2%'
         }}>
+          {isLearnathon &&
+         <div className="vote-section">
+  <Button
+    type="button"
+    className="custom-btn-primary ml-20"
+    onClick={() => handleClick(pollId)}
+    disabled={alreadyVoted}  // Disable button if alreadyVoted is true
+  >
+    {t("VOTE_FOR_THIS_CONTENT")}
+  </Button>
+
+  {/* Conditionally render the message if alreadyVoted is true */}
+  {alreadyVoted && (
+    <Typography variant="body1" color="error" className="ml-20">
+      {t("You have already voted")}
+    </Typography>
+  )}
+</div>
+              }
           <Accordion defaultExpanded
           >
             <AccordionSummary
diff --git a/packages/nulp_elite/src/pages/learnathon/lernVotingList.js b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
index 11893afb..9b4a6a60 100644
--- a/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
+++ b/packages/nulp_elite/src/pages/learnathon/lernVotingList.js
@@ -21,21 +21,25 @@ import Footer from "components/Footer";
 import Header from "components/header";
 import Paper from "@mui/material/Paper";
 import Grid from "@mui/material/Grid";
+const routeConfig = require("../../configs/routeConfig.json");
+const urlConfig = require("../../configs/urlConfig.json");
 
 const LernVotingList = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const [data, setData] = useState([]);
   const [page, setPage] = useState(0);
-  const [rowsPerPage, setRowsPerPage] = useState(5);
+  const [rowsPerPage, setRowsPerPage] = useState(10);
   const [totalRows, setTotalRows] = useState(0);
   const [search, setSearch] = useState("");
   const [pollData, setPollData] = useState([]);
   const [voteCounts, setVoteCounts] = useState({}); // Object to store vote counts
+  const[pageNumber,setPageNumber] = useState(1);
+  const[currentPage,setCurrentPage] = useState(1)
 
   useEffect(() => {
     fetchData();
-  }, [page, rowsPerPage, search]);
+  }, [currentPage, rowsPerPage, search]);
 
   const fetchData = async () => {
     const assetBody = {
@@ -46,12 +50,12 @@ const LernVotingList = () => {
         },
 
         limit: rowsPerPage,
-        offset: page * rowsPerPage,
+        offset: 10 * (currentPage-1),
         search: search,
       },
     };
     try {
-      const response = await fetch("/polls/list", {
+      const response = await fetch(`${urlConfig.URLS.POLL.LIST}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -67,7 +71,7 @@ const LernVotingList = () => {
       setData(result.result.data);
       const pollIds = result.result.data.map((poll) => poll.poll_id);
       setPollData(pollIds);
-      setTotalRows(result.result.totalCount);
+      setTotalRows(Math.ceil(result.result.totalCount / 10));
 
       // Fetch vote counts for each poll
       getVoteCounts(pollIds);
@@ -78,7 +82,7 @@ const LernVotingList = () => {
 
   const getVoteCounts = async (pollIds) => {
     try {
-      const url = "/polls/all/get_poll";
+      const url = `${urlConfig.URLS.POLL.GET_VOTTING_LIST}`;
       const body = {
         poll_ids: pollIds,
       };
@@ -102,17 +106,16 @@ const LernVotingList = () => {
     setPage(0); // Reset to first page on search
   };
 
-  const handlePageChange = (event, newPage) => {
-    setPage(newPage);
+  const handleClick = (contentId) => {
+    navigate(`${routeConfig.ROUTES.PLAYER_PAGE.PLAYER}?${contentId}`);
   };
 
-  const handleRowsPerPageChange = (event) => {
-    setRowsPerPage(parseInt(event.target.value, 10));
-    setPage(0);
-  };
-
-  const handleClick = (poll_id) => {
-    navigate(`/webapp/pollDetails?${poll_id}`);
+    const handleChange = (event, value) => {
+    if (value !== pageNumber) {
+      setPageNumber(value);
+      setCurrentPage(value);
+      fetchData();
+    }
   };
 
   return (
@@ -164,16 +167,15 @@ const LernVotingList = () => {
                   </TableCell>
                   <TableCell>{voteCounts[row.poll_id] || 0}</TableCell>
                   <TableCell>
-                    <img
-                      src={require("assets/votting.png")}
-                      alt="Voting"
-                      style={{
-                        width: "100px",
-                        height: "40px",
-                        cursor: "pointer"
-                      }}
-                      onClick={() => handleClick(row.poll_id)}
-                    />
+                     <Box>
+                <Button
+                  type="button"
+                  className="custom-btn-primary ml-20"
+                  onClick={() => handleClick(row.content_id)}
+                >
+                  {t("VIEW_AND_VOTE")}
+                </Button>
+              </Box>
                   </TableCell>
                 </TableRow>
               ))} 
@@ -182,12 +184,9 @@ const LernVotingList = () => {
         </TableContainer>
 
         <Pagination
-          component="div"
           count={totalRows}
-          page={page}
-          onPageChange={handlePageChange}
-          rowsPerPage={rowsPerPage}
-          onRowsPerPageChange={handleRowsPerPageChange}
+          page={pageNumber}
+          onChange={handleChange}
         />
       </Paper>
       <Footer />
diff --git a/packages/nulp_elite/src/pages/voting/votingDetails.js b/packages/nulp_elite/src/pages/voting/votingDetails.js
index 0288ccb0..f96e49a9 100644
--- a/packages/nulp_elite/src/pages/voting/votingDetails.js
+++ b/packages/nulp_elite/src/pages/voting/votingDetails.js
@@ -266,6 +266,15 @@ const VotingDetails = () => {
               {poll.title}
             </Link>
           </Breadcrumbs>
+          <Box>
+                <Button
+                  type="button"
+                  className="custom-btn-primary ml-20"
+                  onClick={handleGoBack}
+                >
+                  {t("BACK")}
+                </Button>
+              </Box>
           <Grid
             container
             spacing={2}
@@ -630,22 +639,6 @@ const VotingDetails = () => {
               className="event-h2-title  pl-20 mb-20"
               style={{ fontWeight: "400" }}
             >
-              {poll && poll.category === "Learnathon" && (
-                <Box>
-                  <Button
-                    type="button"
-                    className="custom-btn-primary"
-                    onClick={() =>
-                      window.open("/webapp/player?" + poll.content_id, "_blank")
-                    }
-                    sx={{ marginTop: "24px" }}
-
-                    // disabled={!selectedOption} // Disable the button if no option is selected
-                  >
-                    {t("VIEW_SUBMISSIONS")}
-                  </Button>
-                </Box>
-              )}
               <Box className="mt-20">
               {poll.description}
               </Box>