Compare commits

..

No commits in common. "4ac2cddabed215d90d5985bbe89d7bbb8cd925aa" and "51ae926a2f066b4e973107de8950c667c628ce56" have entirely different histories.

5 changed files with 38 additions and 21 deletions

View File

@ -52,7 +52,7 @@
position: relative; position: relative;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 630px; width: 600px;
margin: 26px 0 0 21px; margin: 26px 0 0 21px;
.title-project { .title-project {
@ -100,11 +100,10 @@
} }
&__task { &__task {
margin-top: -20px; margin-top: -5px;
padding: 18px; padding: 18px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y: scroll;
input { input {
font-style: normal; font-style: normal;
@ -145,9 +144,12 @@
} }
.taskName { .taskName {
display: -webkit-box;
max-width: 550px; max-width: 550px;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.fullName { .fullName {
@ -611,8 +613,8 @@
.exit { .exit {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
top: 15px; top: 25px;
right: 15px; right: 20px;
width: 13px; width: 13px;
height: 13px; height: 13px;
display: flex; display: flex;
@ -659,7 +661,7 @@
color: #000000; color: #000000;
font-size: 12px; font-size: 12px;
line-height: 32px; line-height: 32px;
margin-left: 10px; margin-left: 17px;
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
} }
@ -962,11 +964,11 @@
} }
&_box { &_box {
padding: 25px 0px 10px 20px; padding: 25px 0px 10px 40px;
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
&-middle { &-middle {
padding: 0px 0px 10px 20px; padding: 0px 0px 10px 35px;
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
} }
@ -977,7 +979,7 @@
position: relative; position: relative;
row-gap: 10px; row-gap: 10px;
padding: 10px 40px 0px 20px; padding: 10px 40px 0px 40px;
border-radius: 10px; border-radius: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -1108,7 +1110,7 @@
&-priority { &-priority {
position: relative; position: relative;
padding: 10px 40px 0 20px; padding: 10px 40px 0 40px;
border-radius: 10px; border-radius: 10px;
margin-bottom: 10px; margin-bottom: 10px;
.priority { .priority {
@ -1168,7 +1170,7 @@
} }
&-bottom { &-bottom {
padding: 0px 90px 10px 35px; padding: 0px 110px 10px 35px;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
line-height: 32px; line-height: 32px;
@ -1184,7 +1186,7 @@
} }
p { p {
margin: 0 0 0 5px; margin: 0 0 0 12px;
} }
} }

View File

@ -17,8 +17,8 @@ export const AlertResult = ({ info }) => {
className="alert-result__text" className="alert-result__text"
style={{ color: successTest ? "#52B709" : "#5B6871" }} style={{ color: successTest ? "#52B709" : "#5B6871" }}
> >
Благодарим Вас за прохождение теста "{info.questionnaire_title}". Ваши Благодарим Вас за прохождение теста "{info.questionnaire_title}".
результаты проверены, мы готовы пригласить Вас в команду Ваши результаты проверены, готовы пригласить Вас в команду
</div> </div>
</div> </div>
{!successTest && ( {!successTest && (

View File

@ -3,6 +3,12 @@ import React from "react";
import StarRating from "@components/StarRating/StarRating"; import StarRating from "@components/StarRating/StarRating";
export const QuizReport = ({ info }) => { export const QuizReport = ({ info }) => {
function correctAnswers() {
return info.number_questions * info.percent_correct_answers;
}
function correctWrongAnswers() {
return info.number_questions * (1 - info.percent_correct_answers);
}
return ( return (
<div className="report"> <div className="report">
<div className="report__row"> <div className="report__row">
@ -17,10 +23,16 @@ export const QuizReport = ({ info }) => {
</div> </div>
<div className="report__column"> <div className="report__column">
<div className="report__value"> <div className="report__value">
{info.count_correct_answers}/{info.number_questions} {Boolean(correctAnswers()) ? correctAnswers() : 0}
</div> </div>
<div className="report__text">правильных ответов</div> <div className="report__text">правильных ответов</div>
</div> </div>
<div className="report__column">
<div className="report__value report__value_false">
{Boolean(correctWrongAnswers()) ? correctWrongAnswers() : 0}
</div>
<div className="report__text">неправильных ответов</div>
</div>
<div className="report__column"> <div className="report__column">
<div className="report__status-text">Статус:</div> <div className="report__status-text">Статус:</div>
<div className="report__status">Пройден!</div> <div className="report__status">Пройден!</div>

View File

@ -580,7 +580,7 @@ $maxWidthContainer: 1123;
&__column { &__column {
&:first-child { &:first-child {
background: #ffffff; background: #ffffff;
flex: 0 1 40%; flex: 0 1 22%;
border-radius: 12px 0 0 12px; border-radius: 12px 0 0 12px;
@media (max-width: 1000px) { @media (max-width: 1000px) {
flex: 0 1 50%; flex: 0 1 50%;
@ -590,7 +590,7 @@ $maxWidthContainer: 1123;
} }
} }
height: 90px; height: 90px;
flex: 0 1 30%; flex: 0 1 26%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

View File

@ -354,7 +354,7 @@
border: 1px solid #e3e2e2; border: 1px solid #e3e2e2;
padding: 2px 6px; padding: 2px 6px;
position: relative; position: relative;
max-width: 190px; max-width: 220px;
width: 100%; width: 100%;
@media (max-width: 915px) { @media (max-width: 915px) {
@ -830,7 +830,9 @@
max-height: 100px; max-height: 100px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
-webkit-box-orient: vertical;
} }
span { span {
@ -866,7 +868,6 @@
column-gap: 10px; column-gap: 10px;
align-items: center; align-items: center;
pointer-events: none; pointer-events: none;
margin-top: 5px;
&__more { &__more {
cursor: pointer; cursor: pointer;
@ -897,7 +898,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
column-gap: 5px; column-gap: 5px;
margin-top: 3px; margin-bottom: 8px;
p { p {
font-weight: 500; font-weight: 500;
@ -926,6 +927,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
column-gap: 5px; column-gap: 5px;
margin-bottom: 8px;
p { p {
font-weight: 500; font-weight: 500;
@ -942,6 +944,7 @@
&__executor { &__executor {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 2px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
column-gap: 5px; column-gap: 5px;
@ -964,7 +967,7 @@
flex-wrap: wrap; flex-wrap: wrap;
column-gap: 6px; column-gap: 6px;
row-gap: 3px; row-gap: 3px;
margin: 3px 0; margin: 5px 0 8px;
.tagItem { .tagItem {
padding: 3px 10px; padding: 3px 10px;