vuminh224/mmm-projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet

Browse Source
This commit is contained in:
tuanvu
2025-12-13 23:24:25 +01:00
parent 3d44d635a2 dfa26df502
commit 1f698076df
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/chantierSummary.tsx
View File

@@ -17,10 +17,9 @@ export default function ChantierSummary({data,style , ...otherProps }: Props) {
{data.chantier ? ( {data.chantier ? (
<ThemedView lvl={4} style={styles.chantier}> <ThemedView lvl={4} style={styles.chantier}>
<View> <View>
<Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=69392bb2&is=6937da32&hm=dcc09e76d3dca89d2418947b46efbd38673b9dc559027724b2e51d493b173bc9&" /*chantier.urlImg*/ }} style={styles.image} /> <Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=693f1a72&is=693dc8f2&hm=86ffb97145fc8d3aec822b87d99be233c98477d4424c1ef58f80eb81b17c7c80&" /*chantier.urlImg*/ }} style={styles.image} />
</View> </View>
<View> <View style={{flex: 1}}>
<ThemedText>Renovation: {data.chantier.name}</ThemedText>
<ThemedText>Adresse: {data.chantier.adresse}</ThemedText> <ThemedText>Adresse: {data.chantier.adresse}</ThemedText>
<ThemedText>Chef de chantier: {data.chantier.chef.last_name}{" "}{data.chantier.chef.name}</ThemedText> <ThemedText>Chef de chantier: {data.chantier.chef.last_name}{" "}{data.chantier.chef.name}</ThemedText>
<ThemedText>État: {data.chantier.etat}</ThemedText> <ThemedText>État: {data.chantier.etat}</ThemedText>
@@ -44,12 +43,11 @@ const styles = StyleSheet.create({
//borderWidth: 1, //borderWidth: 1,
flexDirection: 'row', flexDirection: 'row',
height: 150, height: 150,
gap: 10,
}, },
image:{ image:{
margin:0,
width: 70, width: 70,
height: 140, height: 140,
borderRadius: 5, borderRadius: 5,
marginRight: 10,
}, },
}); });

10
components/selectChantier.tsx
View File

@@ -119,13 +119,13 @@ export default function SelectChantier() {
<Pressable onPress={() => selectChantier(item)}> <Pressable onPress={() => selectChantier(item)}>
<ThemedView lvl={4} style={styles.chantier}> <ThemedView lvl={4} style={styles.chantier}>
<View> <View>
<Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=69392bb2&is=6937da32&hm=dcc09e76d3dca89d2418947b46efbd38673b9dc559027724b2e51d493b173bc9&" /*chantier.urlImg*/ }} style={styles.image} /> <Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=693f1a72&is=693dc8f2&hm=86ffb97145fc8d3aec822b87d99be233c98477d4424c1ef58f80eb81b17c7c80&" /*chantier.urlImg*/ }} style={styles.image} />
</View> </View>
<View> <View style={{flex: 1}}>
<ThemedText>Renovation: {item.name}</ThemedText> <ThemedText>Renovation: {item.name}</ThemedText>
<ThemedText>Adresse: {item.adresse}</ThemedText> <ThemedText>Adresse: {item.adresse}</ThemedText>
<ThemedText>Chef de chantier: {item.chef.last_name}{" "}{item.chef.name}</ThemedText> <ThemedText>Chef de chantier: {item.chef.last_name}{" "}{item.chef.name}</ThemedText>
<ThemedText>État: {item.etat}</ThemedText> <ThemedText>État: {item.etat}</ThemedText>
</View> </View>
</ThemedView> </ThemedView>
</Pressable> </Pressable>