PeL/force-orange-2022
1
1
Fork 0
mirror of https://github.com/Paris-est-Ludique/intranet.git synced 2025-09-12 14:20:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add charter, Fix absence of meeting dates

Browse Source
This commit is contained in:
pikiou
2023-01-16 17:58:02 +01:00
parent 0f06aaea05
commit a906dfff07
21 changed files with 469 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Asks/AskDayWishes.tsx
View File

@@ -19,10 +19,12 @@ export function AskDayWishes(asks: JSX.Element[], id: number): void {
}, [dispatch, id, jwtToken, volunteerAsks?.hiddenAsks])
const [userWishes] = useUserDayWishes()
const charter = get(userWishes, "charter", false) as boolean
const participation = get(userWishes, "active", "inconnu") as string
const newSelection = get(userWishes, "dayWishes", []) as string[]
const comment = get(userWishes, "dayWishesComment", "") as string
const needToShow = participation === "inconnu" || (newSelection.length === 0 && !comment)
const needToShow =
charter === false || participation === "inconnu" || (newSelection.length === 0 && !comment)
addAsk(
asks,

12
src/components/Asks/index.tsx
View File

@@ -3,8 +3,8 @@ import React, { memo } from "react"
import styles from "./styles.module.scss"
import { useAskTools } from "./utils"
import { AskWelcome } from "./AskWelcome"
import { AskBrunch, fetchFor as fetchForBrunch } from "./AskBrunch"
import { AskRetex, fetchFor as fetchForRetex } from "./AskRetex"
// import { AskBrunch, fetchFor as fetchForBrunch } from "./AskBrunch"
// import { AskRetex, fetchFor as fetchForRetex } from "./AskRetex"
import { AskDiscord, fetchFor as fetchForDiscord } from "./AskDiscord"
import { AskDayWishes, fetchFor as fetchForDayWishes } from "./AskDayWishes"
// import { AskHosting, fetchFor as fetchForHosting } from "./AskHosting"
@@ -22,8 +22,8 @@ const Asks = (): JSX.Element | null => {
const asks: JSX.Element[] = []
AskWelcome(asks, 1)
AskBrunch(asks, 2)
AskRetex(asks, 3)
// AskBrunch(asks, 2)
// AskRetex(asks, 3)
AskDiscord(asks, 5)
AskDayWishes(asks, 10)
@@ -66,8 +66,8 @@ export default memo(Asks)
// Fetch server-side data here
export const fetchFor = [
...fetchForBrunch,
...fetchForRetex,
// ...fetchForBrunch,
// ...fetchForRetex,
...fetchForDiscord,
...fetchForDayWishes,
// ...fetchForHosting,