Merge branch 'master' of https://git.etud.insa-toulouse.fr/vergnet/application-amicale
This commit is contained in:
commit
b9c99bf269
3 changed files with 14 additions and 1 deletions
|
@ -48,6 +48,7 @@ export default {
|
|||
paymentMethods: 'screens.proxiwash.washinsa.paymentMethods',
|
||||
icon: 'school-outline',
|
||||
url: Urls.app.api + 'washinsa/washinsa_data.json',
|
||||
webPageUrl: Urls.proxiwash.washinsa,
|
||||
},
|
||||
tripodeB: {
|
||||
id: 'tripodeB',
|
||||
|
@ -58,5 +59,6 @@ export default {
|
|||
paymentMethods: 'screens.proxiwash.tripodeB.paymentMethods',
|
||||
icon: 'domain',
|
||||
url: Urls.app.api + 'washinsa/tripode_b_data.json',
|
||||
webPageUrl: Urls.proxiwash.tripodeB,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -30,6 +30,7 @@ const PROXIMO_ENDPOINT = STUDENT_SERVER + '~proximo/v2/api/';
|
|||
const PROXIMO_IMAGES_ENDPOINT =
|
||||
STUDENT_SERVER + '~proximo/api_proximo/storage/app/public/';
|
||||
const APP_IMAGES_ENDPOINT = STUDENT_SERVER + '~amicale_app/images/';
|
||||
const PROXIWASH_ENDPOINT = 'https://www.proxiwash.com/weblaverie/ma-laverie-2?s=';
|
||||
|
||||
export default {
|
||||
amicale: {
|
||||
|
@ -48,6 +49,10 @@ export default {
|
|||
images: PROXIMO_IMAGES_ENDPOINT + 'img/',
|
||||
icons: PROXIMO_IMAGES_ENDPOINT + 'icon/',
|
||||
},
|
||||
proxiwash: {
|
||||
washinsa: PROXIWASH_ENDPOINT + 'cf4f39',
|
||||
tripodeB: PROXIWASH_ENDPOINT + 'b310b7',
|
||||
},
|
||||
planex: {
|
||||
planning: PLANEX_SERVER,
|
||||
groups: PLANEX_SERVER + 'wsAdeGrp.php?projectId=1',
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
import React, { useLayoutEffect, useRef, useState } from 'react';
|
||||
import {
|
||||
Linking,
|
||||
SectionListData,
|
||||
SectionListRenderItemInfo,
|
||||
StyleSheet,
|
||||
|
@ -153,6 +154,11 @@ function ProxiwashScreen() {
|
|||
navigation.setOptions({
|
||||
headerRight: () => (
|
||||
<MaterialHeaderButtons>
|
||||
<Item
|
||||
title={'web'}
|
||||
iconName={'web'}
|
||||
onPress={() => Linking.openURL(ProxiwashConstants[selectedWash].webPageUrl)}
|
||||
/>
|
||||
<Item
|
||||
title={'information'}
|
||||
iconName={'information'}
|
||||
|
@ -161,7 +167,7 @@ function ProxiwashScreen() {
|
|||
</MaterialHeaderButtons>
|
||||
),
|
||||
});
|
||||
}, [navigation]);
|
||||
}, [navigation, selectedWash]);
|
||||
|
||||
/**
|
||||
* Callback used when the user clicks on enable notifications for a machine
|
||||
|
|
Loading…
Reference in a new issue