fix: editing grades

pull/100/head
Pierre-Louis Guhur 1 year ago
parent 17bde71578
commit 9853eddd85

@ -171,7 +171,7 @@ const CandidateModal = ({isOpen, position, toggle}) => {
</div>
</div>
</div>
<div className="">
<div className="mt-3">
<Label className="fw-bold">
{t('common.description')}{' '}
<span className="text-muted"> ({t('admin.optional')})</span>

@ -78,7 +78,9 @@ const Grades = () => {
const activeIdx = names.indexOf(active.id);
const overIdx = names.indexOf(over.id);
const newGrades = arrayMove(election.grades, activeIdx, overIdx);
console.log(newGrades,election.grades, activeIdx,overIdx)
newGrades.forEach((g, i) => (g.value = newGrades.length - i - 1));
console.log(newGrades)
dispatch({
type: ElectionTypes.SET,
field: 'grades',

@ -116,7 +116,7 @@ const HeaderRubbon = ({token}) => {
}));
const grades = election.grades
.filter((c) => c.active)
.map((g: GradeItem, i: number) => ({name: g.name, value: i, id: g.id}));
.map((g: GradeItem, i: number) => ({name: g.name, value: g.value, id: g.id}));
const response = await updateElection(
election.ref,
@ -265,7 +265,7 @@ const CreateElection = ({context, token}) => {
}));
const grades = election.grades
.filter((c) => c.active)
.map((g: GradeItem, i: number) => ({name: g.name, value: i, id: g.id}));
.map((g: GradeItem) => ({name: g.name, value: g.value, id: g.id}));
setWaiting(true);
const response = await updateElection(

@ -106,9 +106,9 @@ const getNumVotes = (result: ResultInterface) => {
return numVotes;
};
const WillClose = ({delay}) => {
const WillClose = ({delay, forceClose}) => {
const {t} = useTranslation();
if (delay < 365) {
if (delay < 365 || forceClose) {
return <div>{t('result.closed')}</div>;
} else if (delay < 0) {
return (
@ -149,7 +149,7 @@ const ResultBanner = ({result}) => {
<div className="text-muted w-100 d-flex justify-content-between">
<div className="d-flex align-items-center flex-fill border-end border-end-2">
<Image alt="Calendar" src={calendar} className="me-2" />
<WillClose delay={closedSince} />
<WillClose delay={closedSince} forceClose={result.forceClose} />
</div>
<div className="d-flex align-items-center justify-content-end flex-fill">
<Image src={avatarBlue} alt="Avatar" className="me-2" />

Loading…
Cancel
Save