Mysaa/Encartes-web
1
0
Fork 0
mirror of https://gitlab.aliens-lyon.fr/encartes/web-interface.git synced 2026-03-17 22:51:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error

Browse Source
This commit is contained in:
Adrien Vannson 2023-03-01 10:25:55 +01:00
parent 5156cfcff5
commit 6f77533716
No known key found for this signature in database
GPG Key ID: FE2E66FD978C1A55
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/App.js
View File

@ -35,9 +35,14 @@ function ChangeFloor({ currentFloor, callbackFloorChanged }) {
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
setSites(data); setSites(data);
// Display a floor
callbackFloorChanged(data[0].buildings[0].floors[0].id)
}); });
}, []); }, []);
if (currentFloor === undefined) return;
var items = []; var items = [];
sites.forEach(site => { sites.forEach(site => {
@ -110,7 +115,7 @@ function RoomInformation({ roomId, setIsEditDialogOpen }) {
const [users, setUsers] = React.useState([]); const [users, setUsers] = React.useState([]);
React.useEffect(() => { React.useEffect(() => {
if (roomId !== null) { if (roomId !== undefined) {
fetch("https://encartes.aliens-lyon.fr/api/map/get_place_info/" + roomId) fetch("https://encartes.aliens-lyon.fr/api/map/get_place_info/" + roomId)
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
@ -120,7 +125,7 @@ function RoomInformation({ roomId, setIsEditDialogOpen }) {
} }
}, [roomId]); }, [roomId]);
if (roomId === null) { if (roomId === undefined) {
return; return;
} }
@ -193,7 +198,7 @@ function EditDialog({ isOpen, setIsOpen, room }) {
const [updatesCount, setupdatesCount] = React.useState(0); const [updatesCount, setupdatesCount] = React.useState(0);
React.useEffect(() => { React.useEffect(() => {
if (room !== null) { if (room !== undefined) {
fetch("https://encartes.aliens-lyon.fr/api/map/get_place_info/" + room) fetch("https://encartes.aliens-lyon.fr/api/map/get_place_info/" + room)
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
@ -251,8 +256,8 @@ function EditDialog({ isOpen, setIsOpen, room }) {
} }
export default function App() { export default function App() {
const [currentFloor, setCurrentFloor] = React.useState(13); const [currentFloor, setCurrentFloor] = React.useState(undefined);
const [selectedRoom, setSelectedRoom] = React.useState(null); const [selectedRoom, setSelectedRoom] = React.useState(undefined);
const [isEditDialogOpen, setIsEditDialogOpen] = React.useState(false); const [isEditDialogOpen, setIsEditDialogOpen] = React.useState(false);
return <> return <>
@ -263,12 +268,12 @@ export default function App() {
/> />
<TopBar /> <TopBar />
<div style={{ flexGrow: '1', display: 'flex', flexDirection: 'line', flexWrap: 'nowrap' }}> <div style={{ flexGrow: '1', display: 'flex', flexDirection: 'line', flexWrap: 'nowrap' }}>
<Map { currentFloor !== undefined ? <Map
selectedRoom={selectedRoom} selectedRoom={selectedRoom}
callbackRoomSelected={setSelectedRoom} callbackRoomSelected={setSelectedRoom}
floorID={currentFloor} floorID={currentFloor}
callbackChangeFloor={setCurrentFloor} callbackChangeFloor={setCurrentFloor}
/> /> : <></>}
<div> <div>
<ChangeFloor currentFloor={currentFloor} callbackFloorChanged={setCurrentFloor} /> <ChangeFloor currentFloor={currentFloor} callbackFloorChanged={setCurrentFloor} />
<Divider /> <Divider />