Merge branch 'btn-proxiwash' of leban/application-amicale into master

This commit is contained in:
Arnaud Vergnet 2021-07-06 19:01:11 +02:00 committed by Gitea
commit 7f763dcbcb
3 changed files with 14 additions and 1 deletions

View file

@ -48,6 +48,7 @@ export default {
paymentMethods: 'screens.proxiwash.washinsa.paymentMethods', paymentMethods: 'screens.proxiwash.washinsa.paymentMethods',
icon: 'school-outline', icon: 'school-outline',
url: Urls.app.api + 'washinsa/washinsa_data.json', url: Urls.app.api + 'washinsa/washinsa_data.json',
webPageUrl: Urls.proxiwash.washinsa,
}, },
tripodeB: { tripodeB: {
id: 'tripodeB', id: 'tripodeB',
@ -58,5 +59,6 @@ export default {
paymentMethods: 'screens.proxiwash.tripodeB.paymentMethods', paymentMethods: 'screens.proxiwash.tripodeB.paymentMethods',
icon: 'domain', icon: 'domain',
url: Urls.app.api + 'washinsa/tripode_b_data.json', url: Urls.app.api + 'washinsa/tripode_b_data.json',
webPageUrl: Urls.proxiwash.tripodeB,
}, },
}; };

View file

@ -30,6 +30,7 @@ const PROXIMO_ENDPOINT = STUDENT_SERVER + '~proximo/v2/api/';
const PROXIMO_IMAGES_ENDPOINT = const PROXIMO_IMAGES_ENDPOINT =
STUDENT_SERVER + '~proximo/api_proximo/storage/app/public/'; STUDENT_SERVER + '~proximo/api_proximo/storage/app/public/';
const APP_IMAGES_ENDPOINT = STUDENT_SERVER + '~amicale_app/images/'; const APP_IMAGES_ENDPOINT = STUDENT_SERVER + '~amicale_app/images/';
const PROXIWASH_ENDPOINT = 'https://www.proxiwash.com/weblaverie/ma-laverie-2?s=';
export default { export default {
amicale: { amicale: {
@ -48,6 +49,10 @@ export default {
images: PROXIMO_IMAGES_ENDPOINT + 'img/', images: PROXIMO_IMAGES_ENDPOINT + 'img/',
icons: PROXIMO_IMAGES_ENDPOINT + 'icon/', icons: PROXIMO_IMAGES_ENDPOINT + 'icon/',
}, },
proxiwash: {
washinsa: PROXIWASH_ENDPOINT + 'cf4f39',
tripodeB: PROXIWASH_ENDPOINT + 'b310b7',
},
planex: { planex: {
planning: PLANEX_SERVER, planning: PLANEX_SERVER,
groups: PLANEX_SERVER + 'wsAdeGrp.php?projectId=1', groups: PLANEX_SERVER + 'wsAdeGrp.php?projectId=1',

View file

@ -19,6 +19,7 @@
import React, { useLayoutEffect, useRef, useState } from 'react'; import React, { useLayoutEffect, useRef, useState } from 'react';
import { import {
Linking,
SectionListData, SectionListData,
SectionListRenderItemInfo, SectionListRenderItemInfo,
StyleSheet, StyleSheet,
@ -153,6 +154,11 @@ function ProxiwashScreen() {
navigation.setOptions({ navigation.setOptions({
headerRight: () => ( headerRight: () => (
<MaterialHeaderButtons> <MaterialHeaderButtons>
<Item
title={'web'}
iconName={'web'}
onPress={() => Linking.openURL(ProxiwashConstants[selectedWash].webPageUrl)}
/>
<Item <Item
title={'information'} title={'information'}
iconName={'information'} iconName={'information'}
@ -161,7 +167,7 @@ function ProxiwashScreen() {
</MaterialHeaderButtons> </MaterialHeaderButtons>
), ),
}); });
}, [navigation]); }, [navigation, selectedWash]);
/** /**
* Callback used when the user clicks on enable notifications for a machine * Callback used when the user clicks on enable notifications for a machine