diff --git a/packages/nulp_elite/src/components/VotingCard.js b/packages/nulp_elite/src/components/VotingCard.js index 1b7be2b2..01ff36a5 100644 --- a/packages/nulp_elite/src/components/VotingCard.js +++ b/packages/nulp_elite/src/components/VotingCard.js @@ -124,7 +124,7 @@ export default function VotingCard({ items, index, onClick }) { > - + {items.title && ( - + {moment(items?.start_date).format( "dddd, MMMM Do YYYY, h:mm:ss a" diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js index 365efa64..1099e7e5 100644 --- a/packages/nulp_elite/src/components/header.js +++ b/packages/nulp_elite/src/components/header.js @@ -35,6 +35,7 @@ import { Collapse, List } from "@mui/material"; import NotificationPopup from "./Notification"; function Header({ globalSearchQuery }) { + const navigate = useNavigate(); const { t } = useTranslation(); const [language, setLanguage] = useState( localStorage.getItem("lang") ? localStorage.getItem("lang") : "en" @@ -50,10 +51,8 @@ function Header({ globalSearchQuery }) { const [anchorElNav, setAnchorElNav] = React.useState(null); const [anchorElUser, setAnchorElUser] = React.useState(null); const [anchorElNotify, setAnchorElNotify] = React.useState(null); - const [anchorElPoll, setAnchorElPoll] = React.useState(null); const [searchQuery, setSearchQuery] = useState(globalSearchQuery || ""); - const navigate = useNavigate(); const _userId = util.userId(); const [userData, setUserData] = useState(null); const [roles, setRoles] = useState([]); @@ -65,18 +64,6 @@ function Header({ globalSearchQuery }) { const [openNotification, setOpenNotification] = useState(false); const [notificationCount, setNotificationCount] = useState(0); - - const handleTooltipClose = () => { - setOpen(false); - }; - - const handleTooltipOpen = () => { - setOpen(true); - }; - - const handleSelectClick = () => { - setOpen(false); - }; const handleSubmenuToggle = () => { setOpenSubmenu(!openSubmenu); @@ -202,7 +189,6 @@ function Header({ globalSearchQuery }) { } }; const [scrolled, setScrolled] = useState(false); - // const navigate = useNavigate(); const handleResize = () => { setIsMobile(window.innerWidth <= 767); @@ -224,12 +210,13 @@ function Header({ globalSearchQuery }) { const roleNames = userData?.result?.response?.roles.map((role) => role.role) || []; - const textFieldStyle = { - fontSize: '12px', - backgroundColor: searchQuery ? '#065872' : 'transparent', - boxShadow: searchQuery ? '0 2px 4px rgba(0, 0, 0, 0.2)' : 'none', - color:searchQuery? '#fff' :"#000" - }; + const textFieldStyle = { + fontSize: '12px', + backgroundColor: searchQuery ? '#065872' : 'transparent', + boxShadow: searchQuery ? '0 2px 4px rgba(0, 0, 0, 0.2)' : 'none', + color: searchQuery ? '#fff' : "#000" + }; + return ( <> - + ), style: { - color: searchQuery ? '#fff' : '#000', + color: searchQuery ? '#fff' : '#000', }, }} /> @@ -882,15 +869,17 @@ function Header({ globalSearchQuery }) { href={routeConfig.ROUTES.LEARNING_REPORT} underline="none" textAlign="center" - target="_blank" > - - + { + sessionStorage.setItem("urlPath", "learningreport"); + window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); + }} + > {t("LEARNING_REPORT")} - - - - + { + sessionStorage.setItem("urlPath", "learningreport"); + window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); + }}> + {t("LEARNING_REPORT")}