mirror of
https://github.com/Paris-est-Ludique/intranet.git
synced 2025-06-09 17:14:21 +02:00
Add knowledge identification requirement and unknown filter
This commit is contained in:
parent
1b93b41225
commit
df33d3a951
@ -1,4 +1,4 @@
|
|||||||
import React, { memo } from "react"
|
import React, { memo, useState } from "react"
|
||||||
import { useSelector } from "react-redux"
|
import { useSelector } from "react-redux"
|
||||||
import styles from "./styles.module.scss"
|
import styles from "./styles.module.scss"
|
||||||
import BoxItem from "./BoxItem"
|
import BoxItem from "./BoxItem"
|
||||||
@ -11,20 +11,45 @@ import {
|
|||||||
const BoxList: React.FC = (): JSX.Element | null => {
|
const BoxList: React.FC = (): JSX.Element | null => {
|
||||||
const detailedBoxes = useSelector(selectSortedUniqueDetailedBoxes)
|
const detailedBoxes = useSelector(selectSortedUniqueDetailedBoxes)
|
||||||
const [volunteerKnowledge, saveVolunteerKnowledge] = useVolunteerKnowledge()
|
const [volunteerKnowledge, saveVolunteerKnowledge] = useVolunteerKnowledge()
|
||||||
|
const [showUnknownOnly, setShowUnknownOnly] = useState(false)
|
||||||
|
|
||||||
|
const onShowUnknownOnly = (e: React.ChangeEvent<HTMLInputElement>) =>
|
||||||
|
setShowUnknownOnly(e.target.checked)
|
||||||
|
|
||||||
if (!detailedBoxes || detailedBoxes.length === 0) return null
|
if (!detailedBoxes || detailedBoxes.length === 0) return null
|
||||||
|
|
||||||
|
const boxesToShow = detailedBoxes.filter(
|
||||||
|
(box) =>
|
||||||
|
!box ||
|
||||||
|
!showUnknownOnly ||
|
||||||
|
!volunteerKnowledge ||
|
||||||
|
(!volunteerKnowledge.ok.includes(box.gameId) &&
|
||||||
|
!volunteerKnowledge.bof.includes(box.gameId) &&
|
||||||
|
!volunteerKnowledge.niet.includes(box.gameId))
|
||||||
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ul className={styles.boxList}>
|
<div>
|
||||||
{detailedBoxes.map((detailedBox: any) => (
|
<label className={styles.showUnknownOnlyLabel}>
|
||||||
<BoxItem
|
<input
|
||||||
detailedBox={detailedBox}
|
type="checkbox"
|
||||||
volunteerKnowledge={volunteerKnowledge}
|
name="showUnknownOnly"
|
||||||
saveVolunteerKnowledge={saveVolunteerKnowledge}
|
onChange={onShowUnknownOnly}
|
||||||
key={detailedBox.id}
|
checked={showUnknownOnly}
|
||||||
/>
|
/>{" "}
|
||||||
))}
|
Uniquement les non-renseignés
|
||||||
</ul>
|
</label>
|
||||||
|
<ul className={styles.boxList}>
|
||||||
|
{boxesToShow.map((detailedBox: any) => (
|
||||||
|
<BoxItem
|
||||||
|
detailedBox={detailedBox}
|
||||||
|
volunteerKnowledge={volunteerKnowledge}
|
||||||
|
saveVolunteerKnowledge={saveVolunteerKnowledge}
|
||||||
|
key={detailedBox.id}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
@import "../../theme/variables";
|
@import "../../theme/variables";
|
||||||
@import "../../theme/mixins";
|
@import "../../theme/mixins";
|
||||||
|
|
||||||
|
.showUnknownOnlyLabel {
|
||||||
|
text-align: left;
|
||||||
|
display: inline-block;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
width: 280px;
|
||||||
|
}
|
||||||
|
|
||||||
.boxList {
|
.boxList {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
|
@ -1,22 +1,31 @@
|
|||||||
import { FC, memo } from "react"
|
import { FC, memo } from "react"
|
||||||
|
import { useSelector } from "react-redux"
|
||||||
import { RouteComponentProps } from "react-router-dom"
|
import { RouteComponentProps } from "react-router-dom"
|
||||||
import { Helmet } from "react-helmet"
|
import { Helmet } from "react-helmet"
|
||||||
|
|
||||||
import { AppThunk } from "../../store"
|
import { AppThunk } from "../../store"
|
||||||
import styles from "./styles.module.scss"
|
import styles from "./styles.module.scss"
|
||||||
import { BoxList, KnowledgeIntro, fetchForKnowledge } from "../../components"
|
import { BoxList, KnowledgeIntro, fetchForKnowledge } from "../../components"
|
||||||
|
import { selectUserJwtToken } from "../../store/auth"
|
||||||
|
|
||||||
export type Props = RouteComponentProps
|
export type Props = RouteComponentProps
|
||||||
|
|
||||||
const KnowledgesPage: FC<Props> = (): JSX.Element => (
|
const KnowledgesPage: FC<Props> = (): JSX.Element => {
|
||||||
<div className={styles.knowledgesPage}>
|
const jwtToken = useSelector(selectUserJwtToken)
|
||||||
<div className={styles.knowledgesContent}>
|
if (jwtToken === undefined) return <p>Loading...</p>
|
||||||
<Helmet title="KnowledgesPage" />
|
if (!jwtToken) {
|
||||||
<KnowledgeIntro />
|
return <div>Besoin d'être identifié</div>
|
||||||
<BoxList />
|
}
|
||||||
|
return (
|
||||||
|
<div className={styles.knowledgesPage}>
|
||||||
|
<div className={styles.knowledgesContent}>
|
||||||
|
<Helmet title="KnowledgesPage" />
|
||||||
|
<KnowledgeIntro />
|
||||||
|
<BoxList />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
)
|
||||||
)
|
}
|
||||||
|
|
||||||
// Fetch server-side data here
|
// Fetch server-side data here
|
||||||
export const loadData = (): AppThunk[] => [...fetchForKnowledge.map((f) => f())]
|
export const loadData = (): AppThunk[] => [...fetchForKnowledge.map((f) => f())]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user