Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat(club): add other contact type for club + fix switching presentation order when change type

Browse Source
This commit is contained in:
Thibaut Valentin 2025-02-14 14:44:54 +01:00
parent 9f4adbe4a4
commit 9e9e8525d6
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/fr/titionfire/ffsaf/utils/Contact.java
View File

@ -2,7 +2,6 @@ package fr.titionfire.ffsaf.utils;
import io.quarkus.runtime.annotations.RegisterForReflection; import io.quarkus.runtime.annotations.RegisterForReflection;
import javax.naming.ldap.HasControls;
import java.util.HashMap; import java.util.HashMap;
@RegisterForReflection @RegisterForReflection
@ -11,7 +10,8 @@ public enum Contact {
TELEPHONE("Téléphone"), TELEPHONE("Téléphone"),
SITE("Site web"), SITE("Site web"),
FACEBOOK("Facebook"), FACEBOOK("Facebook"),
INSTAGRAM("Instagram"); INSTAGRAM("Instagram"),
AUTRE("Autre");
public String name; public String name;

33
src/main/webapp/src/components/Club/ContactEditor.jsx
View File

@ -8,16 +8,18 @@ export function ContactEditor({data}) {
const [out_data, setOutData] = useState({}) const [out_data, setOutData] = useState({})
useEffect(() => { useEffect(() => {
let i = 0;
for (const key in data.contact) { for (const key in data.contact) {
dispatch({type: 'UPDATE_OR_ADD', payload: {id: key, data: data.contact[key]}}) dispatch({type: 'UPDATE_OR_ADD', payload: {id: i, data: {type: key, value: data.contact[key]}}})
i = i + 1
} }
}, [data.contact]); }, [data.contact]);
useEffect(() => { useEffect(() => {
let out_data2 = {} let out_data2 = {}
state.forEach(d => { state.forEach(d => {
if (d.data !== undefined) if (d.data !== undefined && d.data.value !== undefined)
out_data2[d.id] = d.data out_data2[d.data.type] = d.data.value
}) })
setOutData(out_data2) setOutData(out_data2)
}, [state]); }, [state]);
@ -27,26 +29,25 @@ export function ContactEditor({data}) {
<span className="input-group-text">Contacts</span> <span className="input-group-text">Contacts</span>
<ul className="list-group form-control"> <ul className="list-group form-control">
{state.map((d, index) => { {state.map((d, index) => {
if (d.data === undefined) if (d.data === undefined || d.data.value === undefined)
return; return;
return <div key={index} className="input-group"> return <div key={index} className="input-group">
<select className="form-select" aria-label="type" defaultValue={d.id} <select className="form-select" aria-label="type" value={d.data.type}
onChange={(e) => { onChange={(e) => {
dispatch({type: 'UPDATE_OR_ADD', payload: {id: d.id, data: undefined}}) dispatch({type: 'UPDATE_OR_ADD', payload: {id: d.id, data: {type: e.target.value, value: d.data.value}}})
dispatch({type: 'UPDATE_OR_ADD', payload: {id: e.target.value, data: d.data}})
}}> }}>
{Object.keys(data.contactMap).map((key, _) => { {Object.keys(data.contactMap).map((key, _) => {
let b = false; let b = false;
for (let s of state) { for (let s of state) {
if (s.id === key && s.data !== undefined) b = true; if (s.data.type === key && s.data.value !== undefined) b = true;
} }
return (<option key={key} value={key} disabled={b}>{data.contactMap[key]}</option>) return (<option key={key} value={key} disabled={b}>{data.contactMap[key]}</option>)
})} })}
</select> </select>
<input type="text" className="form-control" defaultValue={d.data} required <input type="text" className="form-control" value={d.data.value} required
onChange={(e) => { onChange={(e) => {
dispatch({type: 'UPDATE_OR_ADD', payload: {id: d.id, data: e.target.value}}) dispatch({type: 'UPDATE_OR_ADD', payload: {id: d.id, data: {type: d.data.type, value: e.target.value}}})
}}/> }}/>
<button className="btn btn-danger" type="button" <button className="btn btn-danger" type="button"
onClick={() => dispatch({type: 'REMOVE', payload: d.id})}><FontAwesomeIcon onClick={() => dispatch({type: 'REMOVE', payload: d.id})}><FontAwesomeIcon
@ -61,15 +62,21 @@ export function ContactEditor({data}) {
for (let key in data.contactMap) { for (let key in data.contactMap) {
let b = false; let b = false;
for (let s of state) { for (let s of state) {
if (s.id === key && s.data !== undefined) b = true; if (s.data.type === key && s.data.value !== undefined) b = true;
} }
if (!b) { if (!b) {
id = key id = key
break break
} }
} }
if (id !== null) if (id !== null) {
dispatch({type: 'UPDATE_OR_ADD', payload: {id: id, data: ''}}) let maxId = 0;
state.forEach((d) => {
if (d.id > maxId)
maxId = d.id;
})
dispatch({type: 'UPDATE_OR_ADD', payload: {id: maxId + 1, data: {type: id, value: ''}}})
}
}}> }}>
<FontAwesomeIcon icon={faAdd}/> <FontAwesomeIcon icon={faAdd}/>
</button> </button>