merge + home
This commit is contained in:
@@ -1,15 +1,14 @@
|
|||||||
import SelectChantier from '@/components/selectChantier';
|
import SelectChantier from "@/components/selectChantier";
|
||||||
import { ThemedText } from '@/components/themed-text';
|
import { ThemedText } from "@/components/themed-text";
|
||||||
import { ThemedTextInput } from '@/components/themed-textinput';
|
import { ThemedTextInput } from "@/components/themed-textinput";
|
||||||
import { ThemedView } from '@/components/themed-view';
|
import { ThemedView } from "@/components/themed-view";
|
||||||
import Constants from 'expo-constants'; //pour connaître la taille de la barre menu de l'OS en haut
|
import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
|
||||||
import { useLocalSearchParams, useRouter } from 'expo-router';
|
import { useLocalSearchParams, useRouter } from "expo-router";
|
||||||
import React, { useMemo, useState } from 'react';
|
import React, { useMemo, useState } from "react";
|
||||||
import { Button, FlatList, Image, StyleSheet, Text } from 'react-native';
|
import { FlatList, Image, StyleSheet, Text } from "react-native";
|
||||||
import rawConcerts from '../../data/concerts.json';
|
import rawConcerts from "../../data/concerts.json";
|
||||||
|
|
||||||
import { useChantier } from '../ContextChantier';
|
|
||||||
|
|
||||||
|
import { useChantier } from "../ContextChantier";
|
||||||
|
|
||||||
type Concert = {
|
type Concert = {
|
||||||
group: string;
|
group: string;
|
||||||
@@ -23,14 +22,11 @@ type Concert = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default function BonjourScreen() {
|
export default function BonjourScreen() {
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
|
const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
|
||||||
const [search, setSearch] = useState('');
|
const [search, setSearch] = useState("");
|
||||||
const { chantier, setChantier } = useChantier();
|
const { chantier, setChantier } = useChantier();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const concertsData: Concert[] = Array.isArray(rawConcerts)
|
const concertsData: Concert[] = Array.isArray(rawConcerts)
|
||||||
? (rawConcerts as Concert[])
|
? (rawConcerts as Concert[])
|
||||||
: [];
|
: [];
|
||||||
@@ -40,32 +36,29 @@ export default function BonjourScreen() {
|
|||||||
const q = search.trim().toLowerCase();
|
const q = search.trim().toLowerCase();
|
||||||
if (!q) return concertsData;
|
if (!q) return concertsData;
|
||||||
return concertsData.filter(
|
return concertsData.filter(
|
||||||
(item) => !!item && (item.group ?? '').toLowerCase().includes(q)
|
(item) => !!item && (item.group ?? "").toLowerCase().includes(q)
|
||||||
);
|
);
|
||||||
}, [concertsData, search]);
|
}, [concertsData, search]);
|
||||||
|
|
||||||
|
const renderItem = ({ item, index }: { item?: Concert; index: number }) => {
|
||||||
const renderItem = ({ item, index }: { item?: Concert; index: number }) => {
|
|
||||||
if (!item) {
|
if (!item) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return(
|
return (
|
||||||
<ThemedView lvl={1} shadow={true} style={styles.card}>
|
<ThemedView lvl={1} shadow={true} style={styles.card}>
|
||||||
<Image source={{ uri: item.Image }} style={styles.image} />
|
<Image source={{ uri: item.Image }} style={styles.image} />
|
||||||
<ThemedView lvl={1} style={styles.info}>
|
<ThemedView lvl={1} style={styles.info}>
|
||||||
<ThemedText style={styles.group}>{item.group}</ThemedText>
|
<ThemedText style={styles.group}>{item.group}</ThemedText>
|
||||||
<ThemedText>{item.date}</ThemedText>
|
<ThemedText>{item.date}</ThemedText>
|
||||||
<ThemedText>{item.location}</ThemedText>
|
<ThemedText>{item.location}</ThemedText>
|
||||||
<ThemedText>Prix : {item.price} €</ThemedText>
|
<ThemedText>Prix : {item.price} €</ThemedText>
|
||||||
<ThemedText>Places restantes : {item.ticketsLeft}</ThemedText>
|
<ThemedText>Places restantes : {item.ticketsLeft}</ThemedText>
|
||||||
|
</ThemedView>
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
</ThemedView>);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
|
||||||
|
|
||||||
return(
|
|
||||||
<ThemedView lvl={3} style={styles.container}>
|
<ThemedView lvl={3} style={styles.container}>
|
||||||
<FlatList
|
<FlatList
|
||||||
data={filteredData}
|
data={filteredData}
|
||||||
@@ -75,7 +68,7 @@ export default function BonjourScreen() {
|
|||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<ThemedView opacity="00" style={styles.header}>
|
<ThemedView opacity="00" style={styles.header}>
|
||||||
<ThemedText style={styles.text}>
|
<ThemedText style={styles.text}>
|
||||||
Bonjour {prenom} {nom} {chantier&&chantier.chef.nom}
|
Bonjour {prenom} {nom} {chantier && chantier.chef.name}
|
||||||
</ThemedText>
|
</ThemedText>
|
||||||
|
|
||||||
<ThemedView style={styles.inputBack} shadow={true}>
|
<ThemedView style={styles.inputBack} shadow={true}>
|
||||||
@@ -94,14 +87,17 @@ export default function BonjourScreen() {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<ThemedView
|
||||||
|
style={{
|
||||||
<ThemedView style={{width:"100%", position: 'absolute', backgroundColor:'transparent',}}>
|
width: "100%",
|
||||||
<SelectChantier ></SelectChantier>
|
position: "absolute",
|
||||||
|
backgroundColor: "transparent",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SelectChantier></SelectChantier>
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
|
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
)
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
@@ -113,21 +109,21 @@ const styles = StyleSheet.create({
|
|||||||
header: {
|
header: {
|
||||||
marginTop: 60,
|
marginTop: 60,
|
||||||
marginBottom: 20,
|
marginBottom: 20,
|
||||||
alignItems: 'center',
|
alignItems: "center",
|
||||||
paddingHorizontal: 20,
|
paddingHorizontal: 20,
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
fontSize: 22,
|
fontSize: 22,
|
||||||
fontWeight: 'bold',
|
fontWeight: "bold",
|
||||||
marginBottom: 10,
|
marginBottom: 10,
|
||||||
},
|
},
|
||||||
inputBack:{
|
inputBack: {
|
||||||
width:"100%",
|
width: "100%",
|
||||||
borderRadius:10,
|
borderRadius: 10,
|
||||||
backgroundColor:'transparent'
|
backgroundColor: "transparent",
|
||||||
},
|
},
|
||||||
input: {
|
input: {
|
||||||
width: '100%',
|
width: "100%",
|
||||||
//borderWidth: 1,
|
//borderWidth: 1,
|
||||||
//borderColor: '#ccc',
|
//borderColor: '#ccc',
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
@@ -135,7 +131,7 @@ const styles = StyleSheet.create({
|
|||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
},
|
},
|
||||||
card: {
|
card: {
|
||||||
flexDirection: 'row',
|
flexDirection: "row",
|
||||||
marginHorizontal: 20,
|
marginHorizontal: 20,
|
||||||
marginBottom: 15,
|
marginBottom: 15,
|
||||||
//borderWidth: 1,
|
//borderWidth: 1,
|
||||||
@@ -143,7 +139,6 @@ const styles = StyleSheet.create({
|
|||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
//backgroundColor: '#fafafa',
|
//backgroundColor: '#fafafa',
|
||||||
|
|
||||||
},
|
},
|
||||||
image: {
|
image: {
|
||||||
width: 80,
|
width: 80,
|
||||||
@@ -153,10 +148,10 @@ const styles = StyleSheet.create({
|
|||||||
},
|
},
|
||||||
info: {
|
info: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
justifyContent: 'center',
|
justifyContent: "center",
|
||||||
},
|
},
|
||||||
group: {
|
group: {
|
||||||
fontWeight: 'bold',
|
fontWeight: "bold",
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
marginBottom: 5,
|
marginBottom: 5,
|
||||||
},
|
},
|
||||||
@@ -164,8 +159,8 @@ const styles = StyleSheet.create({
|
|||||||
padding: 20,
|
padding: 20,
|
||||||
},
|
},
|
||||||
empty: {
|
empty: {
|
||||||
textAlign: 'center',
|
textAlign: "center",
|
||||||
marginTop: 30,
|
marginTop: 30,
|
||||||
color: '#888',
|
color: "#888",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -1,22 +1,24 @@
|
|||||||
import { useRouter, useLocalSearchParams } from "expo-router";
|
import { ThemedText } from "@/components/themed-text";
|
||||||
import { navigate } from "expo-router/build/global-state/routing";
|
import { ThemedTextInput } from '@/components/themed-textinput';
|
||||||
|
import { ThemedView } from "@/components/themed-view";
|
||||||
|
import { useLocalSearchParams, useRouter } from "expo-router";
|
||||||
|
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
FlatList,
|
FlatList,
|
||||||
Image,
|
Image,
|
||||||
Text,
|
|
||||||
TextInput,
|
|
||||||
View,
|
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
|
Text
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
import { getRessources, Ressource } from "../../services/ressourcesService";
|
import { getRessources, Ressource } from "../../services/ressourcesService";
|
||||||
|
|
||||||
export default function GestionnaireRessource() {
|
export default function GestionnaireRessource() {
|
||||||
const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
|
const { nom, prenom } = useLocalSearchParams();
|
||||||
const [search, setSearch] = useState("");
|
const [search, setSearch] = useState("");
|
||||||
const [ressource, setRessources] = useState<Ressource[]>([]);
|
const [ressource, setRessources] = useState<Ressource[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -25,12 +27,11 @@ export default function GestionnaireRessource() {
|
|||||||
const data = await getRessources();
|
const data = await getRessources();
|
||||||
setRessources(data);
|
setRessources(data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Erreur lors du chargement des ressources :", error);
|
console.error("Erreur lors du chargement :", error);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
loadData();
|
loadData();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -38,73 +39,66 @@ export default function GestionnaireRessource() {
|
|||||||
r.name.toLowerCase().includes(search.toLowerCase())
|
r.name.toLowerCase().includes(search.toLowerCase())
|
||||||
);
|
);
|
||||||
|
|
||||||
const renderRessource = ({
|
const renderRessource = ({ item }: { item: Ressource }) => {
|
||||||
item,
|
if (!item) return null;
|
||||||
index,
|
|
||||||
}: {
|
|
||||||
item?: Ressource;
|
|
||||||
index: number;
|
|
||||||
}) => {
|
|
||||||
if (!item) {
|
|
||||||
// optionnel : afficher un placeholder pour debug
|
|
||||||
// return <View style={styles.card}><Text>Item manquant</Text></View>;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.card}>
|
<ThemedView lvl={1} shadow={true} style={styles.card}>
|
||||||
<View style={styles.info}>
|
<Image source={{ uri: item.Image }} style={styles.image} />
|
||||||
<Image source={{ uri: item.Image }} style={styles.image} />
|
<ThemedView lvl={1} style={styles.info}>
|
||||||
<Text>{item.id}</Text>
|
<Text>{item.id}</Text>
|
||||||
<Text>{item.name}</Text>
|
<Text>{item.name}</Text>
|
||||||
<Text>{item.type}</Text>
|
<Text>{item.type}</Text>
|
||||||
<Text>{item.quantity}</Text>
|
<Text>{item.quantity}</Text>
|
||||||
<Text>{item.available_quantity}</Text>
|
<Text>{item.available_quantity}</Text>
|
||||||
</View>
|
</ThemedView>
|
||||||
</View>
|
</ThemedView>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<ThemedView lvl={3} style={styles.container}>
|
||||||
<FlatList
|
<FlatList
|
||||||
data={filteredData}
|
data={filteredData}
|
||||||
renderItem={renderRessource}
|
renderItem={renderRessource}
|
||||||
keyExtractor={(_, index) => index.toString()}
|
keyExtractor={(_, index) => index.toString()}
|
||||||
contentContainerStyle={{ paddingBottom: 40 }}
|
contentContainerStyle={{ paddingBottom: 40 }}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<View style={styles.header}>
|
<ThemedView opacity="00" style={styles.header}>
|
||||||
<Text style={styles.text}>
|
<Text style={styles.text}>
|
||||||
Bonjour {prenom} {nom}
|
Bonjour {prenom} {nom}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
{/* 🔍 Champ de recherche */}
|
{/* Input background */}
|
||||||
<TextInput
|
<ThemedView lvl={1} shadow={true} style={styles.inputBack}>
|
||||||
style={styles.input}
|
<ThemedTextInput
|
||||||
placeholder="Rechercher une ressource..."
|
lvl={0}
|
||||||
value={search}
|
style={styles.input}
|
||||||
onChangeText={setSearch}
|
placeholder="Rechercher une ressource..."
|
||||||
/>
|
value={search}
|
||||||
</View>
|
onChangeText={setSearch}
|
||||||
|
/>
|
||||||
|
</ThemedView>
|
||||||
|
</ThemedView>
|
||||||
}
|
}
|
||||||
ListEmptyComponent={
|
ListEmptyComponent={
|
||||||
<Text style={styles.empty}>Aucun résultat trouvé 😕</Text>
|
<ThemedText style={styles.empty}>Aucun résultat trouvé 😕</ThemedText>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<View style={styles.footer}>
|
<ThemedView lvl={3} style={styles.footer}>
|
||||||
<Button
|
<Button
|
||||||
title="Retour"
|
title="Retour"
|
||||||
onPress={() => router.push("/(tabs)/bonjourFL")}
|
onPress={() => router.push("/(tabs)/bonjourFL")}
|
||||||
/>
|
/>
|
||||||
</View>
|
</ThemedView>
|
||||||
</View>
|
</ThemedView>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
container: {
|
container: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
backgroundColor: "#fff",
|
|
||||||
},
|
},
|
||||||
header: {
|
header: {
|
||||||
marginTop: 60,
|
marginTop: 60,
|
||||||
@@ -117,10 +111,12 @@ const styles = StyleSheet.create({
|
|||||||
fontWeight: "bold",
|
fontWeight: "bold",
|
||||||
marginBottom: 10,
|
marginBottom: 10,
|
||||||
},
|
},
|
||||||
|
inputBack: {
|
||||||
|
width: "100%",
|
||||||
|
borderRadius: 10,
|
||||||
|
},
|
||||||
input: {
|
input: {
|
||||||
width: "100%",
|
width: "100%",
|
||||||
borderWidth: 1,
|
|
||||||
borderColor: "#ccc",
|
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
@@ -129,11 +125,8 @@ const styles = StyleSheet.create({
|
|||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
marginHorizontal: 20,
|
marginHorizontal: 20,
|
||||||
marginBottom: 15,
|
marginBottom: 15,
|
||||||
borderWidth: 1,
|
|
||||||
borderColor: "#ddd",
|
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
backgroundColor: "#fafafa",
|
|
||||||
},
|
},
|
||||||
image: {
|
image: {
|
||||||
width: 80,
|
width: 80,
|
||||||
@@ -145,11 +138,6 @@ const styles = StyleSheet.create({
|
|||||||
flex: 1,
|
flex: 1,
|
||||||
justifyContent: "center",
|
justifyContent: "center",
|
||||||
},
|
},
|
||||||
group: {
|
|
||||||
fontWeight: "bold",
|
|
||||||
fontSize: 16,
|
|
||||||
marginBottom: 5,
|
|
||||||
},
|
|
||||||
footer: {
|
footer: {
|
||||||
padding: 20,
|
padding: 20,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Chantier, Chef, exempleChantier } from '@/class/class';
|
import { Chantier } from "@/class/class";
|
||||||
import { createContext, ReactNode, useContext, useMemo, useState } from 'react';
|
import { createContext, ReactNode, useContext, useMemo, useState } from "react";
|
||||||
|
|
||||||
type ChantierContextType = {
|
type ChantierContextType = {
|
||||||
chantier: Chantier | null;
|
chantier: Chantier | null;
|
||||||
@@ -15,10 +15,7 @@ type ChantierProviderProps = {
|
|||||||
export const ChantierProvider = ({ children }: ChantierProviderProps) => {
|
export const ChantierProvider = ({ children }: ChantierProviderProps) => {
|
||||||
const [chantier, setChantier] = useState<Chantier | null>(null);
|
const [chantier, setChantier] = useState<Chantier | null>(null);
|
||||||
|
|
||||||
const value = useMemo(
|
const value = useMemo(() => ({ chantier, setChantier }), [chantier]);
|
||||||
() => ({ chantier, setChantier }),
|
|
||||||
[chantier]
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ChantierContext.Provider value={value}>
|
<ChantierContext.Provider value={value}>
|
||||||
@@ -30,7 +27,7 @@ export const ChantierProvider = ({ children }: ChantierProviderProps) => {
|
|||||||
export const useChantier = () => {
|
export const useChantier = () => {
|
||||||
const context = useContext(ChantierContext);
|
const context = useContext(ChantierContext);
|
||||||
if (!context) {
|
if (!context) {
|
||||||
throw new Error('useChantier doit être utilisé dans <ChantierProvider>');
|
throw new Error("useChantier doit être utilisé dans <ChantierProvider>");
|
||||||
}
|
}
|
||||||
return context;
|
return context;
|
||||||
};
|
};
|
||||||
260
class/class.tsx
260
class/class.tsx
@@ -1,155 +1,125 @@
|
|||||||
export class Chantier{
|
import { collection, getDocs, Timestamp } from "firebase/firestore";
|
||||||
id: number;
|
import { db } from "../firebase_config";
|
||||||
adresse: string;
|
|
||||||
etat: string;
|
|
||||||
contact: string;
|
|
||||||
chef: Chef;
|
|
||||||
equipe : Equipier[];
|
|
||||||
materiel : Materiel[];
|
|
||||||
dateDep : string;
|
|
||||||
tempsEst : number;
|
|
||||||
vehicules : Vehicule[];
|
|
||||||
anomalies : string[];
|
|
||||||
urlImg : string;
|
|
||||||
|
|
||||||
constructor(
|
export type Chantier = {
|
||||||
id: number,
|
id: number;
|
||||||
adresse: string,
|
adresse: string;
|
||||||
etat: string,
|
etat: string;
|
||||||
contact: string,
|
contact: string;
|
||||||
chef: Chef,
|
chef: User;
|
||||||
equipe: Equipier[],
|
equipe: User[];
|
||||||
materiel: Materiel[],
|
materiel: Ressources[];
|
||||||
dateDep: string,
|
dateDep: Date;
|
||||||
tempsEst: number,
|
tempsEst: number;
|
||||||
vehicules: Vehicule[],
|
vehicules: Ressources[];
|
||||||
anomalies: string[],
|
anomalies: string[];
|
||||||
urlImg: string
|
};
|
||||||
) {
|
|
||||||
this.id = id;
|
export async function getChantiers(): Promise<Chantier[]> {
|
||||||
this.adresse = adresse;
|
try {
|
||||||
this.etat = etat;
|
const colRef = collection(db, "chantier");
|
||||||
this.contact = contact;
|
const snapshot = await getDocs(colRef);
|
||||||
this.chef = chef;
|
return snapshot.docs.map((doc) => {
|
||||||
this.equipe = equipe;
|
const data = doc.data() as any;
|
||||||
this.materiel = materiel;
|
return {
|
||||||
this.dateDep = dateDep;
|
...data,
|
||||||
this.tempsEst = tempsEst;
|
chef: {
|
||||||
this.vehicules = vehicules;
|
...data.chef,
|
||||||
this.anomalies = anomalies;
|
allocation: data.chef?.allocation?.map(convertReservation) || [],
|
||||||
this.urlImg = urlImg;
|
},
|
||||||
}
|
equipe:
|
||||||
|
data.equipe?.map((u: any) => ({
|
||||||
|
...u,
|
||||||
|
allocation: u.allocation?.map(convertReservation) || [],
|
||||||
|
})) || [],
|
||||||
|
materiel:
|
||||||
|
data.materiel?.map((m: any) => ({
|
||||||
|
...m,
|
||||||
|
allocation: m.allocation?.map(convertReservation) || [],
|
||||||
|
})) || [],
|
||||||
|
vehicules:
|
||||||
|
data.vehicules?.map((v: any) => ({
|
||||||
|
...v,
|
||||||
|
allocation: v.allocation?.map(convertReservation) || [],
|
||||||
|
})) || [],
|
||||||
|
anomalies: data.anomalies || [],
|
||||||
|
} as Chantier;
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Firestore Chantiers Error:", err);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export abstract class Equipier{
|
export type User = {
|
||||||
id: number;
|
id: string;
|
||||||
nom: string;
|
name: string;
|
||||||
prenom: string;
|
last_name: string;
|
||||||
allocation: Reservation[];
|
allocation: Reservation[];
|
||||||
|
role: string;
|
||||||
|
qualifications: string;
|
||||||
|
};
|
||||||
|
|
||||||
constructor(id: number, nom:string, prenom:string, allocation: Reservation[]){
|
export async function getUsers(): Promise<User[]> {
|
||||||
this.id = id;
|
try {
|
||||||
this.nom = nom;
|
const colRef = collection(db, "user");
|
||||||
this.prenom = prenom;
|
const snapshot = await getDocs(colRef);
|
||||||
this.allocation = allocation;
|
return snapshot.docs.map((doc) => {
|
||||||
}
|
const data = doc.data();
|
||||||
|
return {
|
||||||
|
...data,
|
||||||
|
allocation: data.allocation?.map(convertReservation) || [],
|
||||||
|
} as User;
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Firestore Users Error:", err);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Chef extends Equipier{
|
export type Ressources = {
|
||||||
constructor(id: number, nom:string, prenom:string, allocation: Reservation[]){
|
id: number;
|
||||||
super(id,nom,prenom,allocation);
|
name: string;
|
||||||
}
|
type: string;
|
||||||
|
Image: string;
|
||||||
|
quantity: number;
|
||||||
|
available_quantity: number;
|
||||||
|
allocation: Reservation[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function getRessources(): Promise<Ressources[]> {
|
||||||
|
try {
|
||||||
|
const colRef = collection(db, "ressources");
|
||||||
|
const snapshot = await getDocs(colRef);
|
||||||
|
return snapshot.docs.map((doc) => {
|
||||||
|
const data = doc.data();
|
||||||
|
return {
|
||||||
|
...data,
|
||||||
|
allocation: data.allocation?.map(convertReservation) || [],
|
||||||
|
} as Ressources;
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Firestore Ressources Error:", err);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Ouvrier extends Equipier{
|
export type Reservation = {
|
||||||
qualification : string;
|
id: string;
|
||||||
|
dateChantier: Date;
|
||||||
|
dateFin: Date;
|
||||||
|
};
|
||||||
|
|
||||||
constructor(id: number, nom:string, prenom:string, allocation: Reservation[], qualification: string){
|
function convertReservation(res: any): Reservation {
|
||||||
super(id,nom,prenom,allocation);
|
return {
|
||||||
this.qualification=qualification;
|
id: res.id,
|
||||||
}
|
dateChantier:
|
||||||
|
res.dateChantier instanceof Timestamp
|
||||||
|
? res.dateChantier.toDate()
|
||||||
|
: new Date(res.dateChantier),
|
||||||
|
dateFin:
|
||||||
|
res.dateFin instanceof Timestamp
|
||||||
|
? res.dateFin.toDate()
|
||||||
|
: new Date(res.dateFin),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ResponsableChantier extends Equipier{
|
|
||||||
constructor(id: number, nom:string, prenom:string, allocation: Reservation[]){
|
|
||||||
super(id,nom,prenom,allocation);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Materiel {
|
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
prenom: string;
|
|
||||||
type: string;
|
|
||||||
allocation: Reservation[];
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
id: number,
|
|
||||||
nom: string,
|
|
||||||
prenom: string,
|
|
||||||
type: string,
|
|
||||||
allocation: Reservation[]
|
|
||||||
) {
|
|
||||||
this.id = id;
|
|
||||||
this.nom = nom;
|
|
||||||
this.prenom = prenom;
|
|
||||||
this.type = type;
|
|
||||||
this.allocation = allocation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export class Reservation {
|
|
||||||
id: string;
|
|
||||||
dateChantier: Date;
|
|
||||||
dateFin: Date;
|
|
||||||
duree: number;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
id: string,
|
|
||||||
dateChantier: Date,
|
|
||||||
dateFin: Date,
|
|
||||||
duree: number
|
|
||||||
) {
|
|
||||||
this.id = id;
|
|
||||||
this.dateChantier = dateChantier;
|
|
||||||
this.dateFin = dateFin;
|
|
||||||
this.duree = duree;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export class Vehicule {
|
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
type: string;
|
|
||||||
allocation: Reservation[];
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
id: number,
|
|
||||||
nom: string,
|
|
||||||
type: string,
|
|
||||||
allocation: Reservation[]
|
|
||||||
) {
|
|
||||||
this.id = id;
|
|
||||||
this.nom = nom;
|
|
||||||
this.type = type;
|
|
||||||
this.allocation = allocation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const exempleChantier = new Chantier(
|
|
||||||
1,
|
|
||||||
"Rennes",
|
|
||||||
"en cours",
|
|
||||||
"contact",
|
|
||||||
new Chef(1,"Chyeef","YEE",[]),
|
|
||||||
[],
|
|
||||||
[],
|
|
||||||
"01/01/25",
|
|
||||||
10,
|
|
||||||
[],
|
|
||||||
["YEE"],
|
|
||||||
"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=69392bb2&is=6937da32&hm=dcc09e76d3dca89d2418947b46efbd38673b9dc559027724b2e51d493b173bc9&"
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,16 +1,25 @@
|
|||||||
import { useChantier } from '@/app/ContextChantier';
|
import { useChantier } from "@/app/ContextChantier";
|
||||||
import { Chantier, exempleChantier } from '@/class/class';
|
import { Chantier, getChantiers } from "@/class/class";
|
||||||
import { useState } from 'react';
|
import { useEffect, useState } from "react";
|
||||||
import { Dimensions, Image, LayoutAnimation, Pressable, ScrollView, StyleSheet, View } from 'react-native';
|
import {
|
||||||
import Animated, { LinearTransition } from 'react-native-reanimated';
|
Dimensions,
|
||||||
import { ThemedButton } from './themed-button';
|
Image,
|
||||||
import { ThemedText } from './themed-text';
|
LayoutAnimation,
|
||||||
import { ThemedTextInput } from './themed-textinput';
|
Pressable,
|
||||||
|
ScrollView,
|
||||||
|
StyleSheet,
|
||||||
|
View
|
||||||
|
} from "react-native";
|
||||||
|
import Animated, {
|
||||||
|
LinearTransition
|
||||||
|
} from "react-native-reanimated";
|
||||||
|
import { ThemedButton } from "./themed-button";
|
||||||
|
import { ThemedText } from "./themed-text";
|
||||||
|
import { ThemedTextInput } from "./themed-textinput";
|
||||||
import { ThemedView } from "./themed-view";
|
import { ThemedView } from "./themed-view";
|
||||||
|
|
||||||
const screenHeight = Dimensions.get("window").height;
|
const screenHeight = Dimensions.get("window").height;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
<ThemedView style={{width:"100%", position: 'absolute', backgroundColor:'transparent',}}>
|
<ThemedView style={{width:"100%", position: 'absolute', backgroundColor:'transparent',}}>
|
||||||
@@ -20,136 +29,123 @@ const screenHeight = Dimensions.get("window").height;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
export default function SelectChantier() {
|
export default function SelectChantier() {
|
||||||
|
const { chantier, setChantier } = useChantier();
|
||||||
|
const [search, setSearch] = useState("");
|
||||||
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
|
const [chantiers, setChantiers] = useState<Chantier[]>([]);
|
||||||
|
|
||||||
const { chantier, setChantier } = useChantier();
|
const AnimatedThemedView = Animated.createAnimatedComponent(ThemedView);
|
||||||
const [search, setSearch] = useState('');
|
const AnimatedThemedText = Animated.createAnimatedComponent(ThemedText);
|
||||||
const [isOpen,setIsOpen] = useState(false);
|
const AnimatedThemedButton = Animated.createAnimatedComponent(ThemedButton);
|
||||||
const [chantiers,setChantiers] = useState<Chantier[]>([exempleChantier,exempleChantier,exempleChantier,exempleChantier,exempleChantier,exempleChantier]);
|
const AnimatedThemedTextInput =
|
||||||
|
Animated.createAnimatedComponent(ThemedTextInput);
|
||||||
const AnimatedThemedView = Animated.createAnimatedComponent(ThemedView);
|
|
||||||
const AnimatedThemedText = Animated.createAnimatedComponent(ThemedText);
|
|
||||||
const AnimatedThemedButton = Animated.createAnimatedComponent(ThemedButton);
|
|
||||||
const AnimatedThemedTextInput = Animated.createAnimatedComponent(ThemedTextInput);
|
|
||||||
|
|
||||||
function onPressOpen(): void {
|
function onPressOpen(): void {
|
||||||
LayoutAnimation.configureNext(
|
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
|
||||||
LayoutAnimation.Presets.easeInEaseOut
|
|
||||||
);
|
|
||||||
setIsOpen(!isOpen);
|
setIsOpen(!isOpen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
async function loadChantiers() {
|
||||||
|
const list = await getChantiers();
|
||||||
|
setChantiers(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
loadChantiers();
|
||||||
|
}, []);
|
||||||
|
|
||||||
function selectChantier(chantier: Chantier): void {
|
function selectChantier(chantier: Chantier): void {
|
||||||
setChantier(chantier);
|
setChantier(chantier);
|
||||||
setIsOpen(false);
|
setIsOpen(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const renderChantier = (chantier: Chantier, index: number) => {
|
||||||
|
return (
|
||||||
const renderChantier = (chantier:Chantier, index: number) => {
|
<Pressable key={index} onPress={() => selectChantier(chantier)}>
|
||||||
return(
|
<ThemedView lvl={4} style={styles.chantier}>
|
||||||
<Pressable key={index} onPress={() => selectChantier(chantier)}>
|
<View>
|
||||||
<ThemedView lvl={4} style={styles.chantier}>
|
<Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=69392bb2&is=6937da32&hm=dcc09e76d3dca89d2418947b46efbd38673b9dc559027724b2e51d493b173bc9&" /*chantier.urlImg*/ }} style={styles.image} />
|
||||||
<View>
|
|
||||||
<Image source={{ uri: chantier.urlImg }} style={styles.image} />
|
|
||||||
|
|
||||||
</View>
|
|
||||||
<View>
|
|
||||||
<ThemedText>Adresse: {chantier.adresse}</ThemedText>
|
|
||||||
<ThemedText>Chef de chantier: {chantier.chef.prenom} {chantier.chef.nom}</ThemedText>
|
|
||||||
<ThemedText >Date de début: {chantier.dateDep}</ThemedText>
|
|
||||||
<ThemedText>Etat: {chantier.etat}</ThemedText>
|
|
||||||
</View>
|
|
||||||
</ThemedView >
|
|
||||||
</Pressable>
|
|
||||||
);
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
return(
|
|
||||||
<Animated.View
|
|
||||||
layout={LinearTransition.duration(200)}
|
|
||||||
style={isOpen ? styles.windowOpean : styles.windowClose}>
|
|
||||||
|
|
||||||
<AnimatedThemedView layout={LinearTransition.duration(200)} lvl={2} shadow={true} style={styles.window}>
|
|
||||||
<ThemedButton style={isOpen ? styles.buttonOpen : styles.buttonClose} lvl={isOpen ? 1 : 1} onPress={() => onPressOpen()}>
|
|
||||||
<ThemedText style={styles.buttonText}>{isOpen ? "Fermer" : "Chantiers"}</ThemedText>
|
|
||||||
</ThemedButton>
|
|
||||||
{isOpen &&
|
|
||||||
<View style={styles.menu}>
|
|
||||||
<ThemedTextInput
|
|
||||||
lvl={1}
|
|
||||||
border={4}
|
|
||||||
style={styles.input}
|
|
||||||
placeholder='Rechercher un chantier'
|
|
||||||
value={search}
|
|
||||||
onChangeText={setSearch}
|
|
||||||
/>
|
|
||||||
<ThemedView lvl={2} style={styles.list}>
|
|
||||||
<ScrollView contentContainerStyle={styles.chantiersList} >
|
|
||||||
|
|
||||||
{chantiers.map((chantier, index) => (
|
|
||||||
renderChantier(chantier, index)
|
|
||||||
))
|
|
||||||
}
|
|
||||||
</ScrollView>
|
|
||||||
</ThemedView>
|
|
||||||
</View>
|
</View>
|
||||||
}
|
<View>
|
||||||
</AnimatedThemedView>
|
<ThemedText>Adresse: {chantier.adresse}</ThemedText>
|
||||||
</Animated.View>
|
<ThemedText>Chef de chantier: {chantier.chef.last_name}{" "}{chantier.chef.name}</ThemedText>
|
||||||
)
|
<ThemedText>État: {chantier.etat}</ThemedText>
|
||||||
|
</View>
|
||||||
|
</ThemedView>
|
||||||
|
</Pressable>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Animated.View layout={LinearTransition.duration(200)} style={isOpen ? styles.windowOpean : styles.windowClose}>
|
||||||
|
<AnimatedThemedView layout={LinearTransition.duration(200)} lvl={2} shadow={true} style={styles.window}>
|
||||||
|
<ThemedButton style={isOpen ? styles.buttonOpen : styles.buttonClose} lvl={isOpen ? 1 : 1} onPress={() => onPressOpen()}>
|
||||||
|
<ThemedText style={styles.buttonText}>
|
||||||
|
{isOpen ? "Fermer" : "Chantier"}
|
||||||
|
</ThemedText>
|
||||||
|
</ThemedButton>
|
||||||
|
{isOpen && (
|
||||||
|
<View style={styles.menu}>
|
||||||
|
<ThemedTextInput lvl={1} border={4} style={styles.input} placeholder="Rechercher un chantier" value={search} onChangeText={setSearch}/>
|
||||||
|
<ThemedView lvl={2} style={styles.list}>
|
||||||
|
<ScrollView contentContainerStyle={styles.chantiersList}>
|
||||||
|
{chantiers.map((chantier, index) =>
|
||||||
|
renderChantier(chantier, index)
|
||||||
|
)}
|
||||||
|
</ScrollView>
|
||||||
|
</ThemedView>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</AnimatedThemedView>
|
||||||
|
</Animated.View>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
|
windowClose: {
|
||||||
windowClose:{
|
|
||||||
//backgroundColor: '#00FFFF',
|
//backgroundColor: '#00FFFF',
|
||||||
//borderRadius:10,
|
//borderRadius:10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
width:"50%",
|
width: "50%",
|
||||||
height:60,
|
height: 60,
|
||||||
overflow: 'hidden',
|
overflow: "hidden",
|
||||||
},
|
},
|
||||||
windowOpean:{
|
windowOpean: {
|
||||||
//backgroundColor: '#00FFFF',
|
//backgroundColor: '#00FFFF',
|
||||||
//borderRadius:10,
|
//borderRadius:10,
|
||||||
width:"100%",
|
width: "100%",
|
||||||
height: screenHeight/2,
|
height: screenHeight / 2,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
},
|
},
|
||||||
window:{
|
window: {
|
||||||
borderRadius:15,
|
borderRadius: 15,
|
||||||
height: "100%",
|
height: "100%",
|
||||||
//backgroundColor: '#00FF00',
|
//backgroundColor: '#00FF00',
|
||||||
overflow: 'hidden',
|
overflow: "hidden",
|
||||||
},
|
},
|
||||||
menu:{
|
menu: {
|
||||||
padding:5,
|
padding: 5,
|
||||||
flex: 1,
|
flex: 1,
|
||||||
minHeight: 0,
|
minHeight: 0,
|
||||||
//backgroundColor:'#FF00FF',
|
//backgroundColor:'#FF00FF',
|
||||||
},
|
},
|
||||||
list:{
|
list: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
overflow: 'hidden',
|
overflow: "hidden",
|
||||||
borderRadius:10,
|
borderRadius: 10,
|
||||||
|
|
||||||
},
|
},
|
||||||
chantiersList:{
|
chantiersList: {
|
||||||
//padding:5,
|
//padding:5,
|
||||||
//backgroundColor:'0000FF',
|
//backgroundColor:'0000FF',
|
||||||
//flexDirection: 'row',
|
//flexDirection: 'row',
|
||||||
//alignItems: 'center',
|
//alignItems: 'center',
|
||||||
gap: 8,
|
gap: 8,
|
||||||
|
|
||||||
},
|
},
|
||||||
chantier:{
|
chantier: {
|
||||||
padding:5,
|
padding: 5,
|
||||||
//marginTop:5,
|
//marginTop:5,
|
||||||
//margin:5,
|
//margin:5,
|
||||||
borderRadius:10,
|
borderRadius: 10,
|
||||||
//borderWidth: 1,
|
//borderWidth: 1,
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
height: 100,
|
height: 100,
|
||||||
@@ -162,28 +158,28 @@ const styles = StyleSheet.create({
|
|||||||
marginRight: 10,
|
marginRight: 10,
|
||||||
},
|
},
|
||||||
input: {
|
input: {
|
||||||
width: '100%',
|
width: "100%",
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
marginBottom:10,
|
marginBottom: 10,
|
||||||
},
|
},
|
||||||
buttonClose:{
|
buttonClose: {
|
||||||
width:'100%',
|
width: "100%",
|
||||||
margin: 0,
|
margin: 0,
|
||||||
borderRadius: 15,
|
borderRadius: 15,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
height:40,
|
height: 40,
|
||||||
},
|
},
|
||||||
buttonOpen:{
|
buttonOpen: {
|
||||||
width:'50%',
|
width: "50%",
|
||||||
margin: 5,
|
margin: 5,
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
height:40,
|
height: 40,
|
||||||
|
},
|
||||||
|
buttonText: {
|
||||||
|
textAlign: "center",
|
||||||
},
|
},
|
||||||
buttonText:{
|
|
||||||
textAlign: 'center',
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { collection, getDocs } from "firebase/firestore";
|
import { collection, getDocs, doc, updateDoc } from "firebase/firestore";
|
||||||
import { db } from "../firebase_config";
|
import { db } from "../firebase_config";
|
||||||
|
|
||||||
export type Ressource = {
|
export type Ressource = {
|
||||||
|
|||||||
Reference in New Issue
Block a user