trackerTask #18

Merged
nik.polishuk merged 6 commits from trackerTask into main 2024-02-14 15:00:34 +03:00
4 changed files with 26 additions and 12 deletions
Showing only changes of commit 183659459a - Show all commits

View File

@ -8,7 +8,7 @@ export const Loader = ({ width = 50, height = 50, style }) => {
<div className="loader"> <div className="loader">
<SVGLoader <SVGLoader
type="Circles" type="Circles"
color={style ? style : `#fff`} color={style ? style : `green`}
height={height} height={height}
width={width} width={width}
/> />

View File

@ -5,7 +5,6 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: relative; position: relative;
//&:hover { //&:hover {
// path { // path {
// fill: #6aaf5c; // fill: #6aaf5c;

View File

@ -25,9 +25,11 @@ import TestImg from "assets/images/partnerProfile/PersonalTesters.svg";
import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import "./quiz-page.scss"; import "./quiz-page.scss";
import { Loader } from "@components/Common/Loader/Loader";
export const QuizPage = () => { export const QuizPage = () => {
const [questionnaires, setQuestionnaires] = useState([]); const [questionnaires, setQuestionnaires] = useState([]);
const [loader, setLoader] = useState(false)
const dispatch = useDispatch(); const dispatch = useDispatch();
const [personalInfoItems] = useState([ const [personalInfoItems] = useState([
{ {
@ -102,8 +104,12 @@ export const QuizPage = () => {
const [selectedCategory, setSetSelectedCategory] = useState(false); const [selectedCategory, setSetSelectedCategory] = useState(false);
useEffect(() => { useEffect(() => {
setLoader(true)
apiRequest(`/user-questionnaire/questionnaires-list?user_id=${userId}`) apiRequest(`/user-questionnaire/questionnaires-list?user_id=${userId}`)
.then((res) => setQuestionnaires(res)) .then((res) => {
setQuestionnaires(res)
setLoader(false)
})
.catch((e) => console.log(e)); .catch((e) => console.log(e));
}, []); }, []);
@ -122,7 +128,7 @@ export const QuizPage = () => {
<div className="quiz-page__title main-title"> <div className="quiz-page__title main-title">
{!selectedCategory ? "Тестирование" : "Замена специализации"} {!selectedCategory ? "Тестирование" : "Замена специализации"}
</div> </div>
{!selectedCategory && ( {loader ? <Loader /> : (
<> <>
{/*<div className="quiz-page__specialization">*/} {/*<div className="quiz-page__specialization">*/}
{/* <SelectedCategory setSelectedCategory={setSetSelectedCategory} />*/} {/* <SelectedCategory setSelectedCategory={setSetSelectedCategory} />*/}

View File

@ -13,6 +13,7 @@ import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; // import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { AlertResult } from "@components/features/quiz/AlertResult"; import { AlertResult } from "@components/features/quiz/AlertResult";
import { QuizReport } from "@components/features/quiz/QuizReport"; import { QuizReport } from "@components/features/quiz/QuizReport";
import { Loader } from "@components/Common/Loader/Loader";
export const QuizReportPage = () => { export const QuizReportPage = () => {
const test = useSelector(selectedTest); const test = useSelector(selectedTest);
@ -23,15 +24,19 @@ export const QuizReportPage = () => {
navigate("/Quiz"); navigate("/Quiz");
} }
const [testInfo, setTestInfo] = useState({});
const [loader, setLoader] = useState(false)
useEffect(() => { useEffect(() => {
setLoader(true)
apiRequest( apiRequest(
`/user-questionnaire/questionnaire-completed?user_questionnaire_uuid=${params.uuid}` `/user-questionnaire/questionnaire-completed?user_questionnaire_uuid=${params.uuid}`
).then((res) => { ).then((res) => {
setTestInfo(res); setTestInfo(res);
setLoader(false)
}); });
}, []); }, []);
const [testInfo, setTestInfo] = useState({});
return ( return (
<div className="quiz-report-page"> <div className="quiz-report-page">
@ -46,6 +51,8 @@ export const QuizReportPage = () => {
{ name: "Отчет по тестированию", link: "/profile/quiz" } { name: "Отчет по тестированию", link: "/profile/quiz" }
]} ]}
/> />
{loader ? <Loader/> :
<>
<div className="quiz-report-page__title main-title"> <div className="quiz-report-page__title main-title">
Отчет по тестированию позиции {testInfo.questionnaire_title} Отчет по тестированию позиции {testInfo.questionnaire_title}
</div> </div>
@ -53,6 +60,8 @@ export const QuizReportPage = () => {
<QuizReport info={testInfo} /> <QuizReport info={testInfo} />
</div> </div>
<AlertResult info={testInfo} /> <AlertResult info={testInfo} />
</>
}
</div> </div>
<Footer /> <Footer />
</div> </div>