Compare commits

...

39 commits

Author SHA1 Message Date
Vincent BRIDIER
3d41a78dad
feat: Delete store.ldc.fr deps + remove useless MySpace feature 2025-09-04 20:30:20 +02:00
Vincent BRIDIER
564e30ce07
feat: update readme 2025-09-01 19:40:04 +02:00
Vincent BRIDIER
cabe183f27
feat: - Update select and select multiple fields to get list in alphabetical order - Close #59 2025-09-01 19:33:08 +02:00
Vincent BRIDIER
b2cb5182bc
feat: - Update Install and Download docs call to handle tenant changes 2025-09-01 18:58:14 +02:00
Vincent BRIDIER
665cd3f3ea
fix: - Fix sendBrochure call, put data into data axios object instead of params 2025-09-01 18:54:57 +02:00
Vincent BRIDIER
aedc74c50a
fix: Patches for building https://stackoverflow.com/questions/79324115/react-native-build-fails-with-expo-modules-coreprepareboost-error-not-in-gzip 2025-09-01 18:50:48 +02:00
Jérémy Munsch
68ea08d7a8
Clean gradle.properties 2023-09-27 16:19:00 +02:00
Jérémy Munsch
c62d048fba
fix login verify method 2023-09-13 11:29:05 +02:00
Jérémy Munsch
01506e126d
Fix send doc to email 2023-09-13 10:51:30 +02:00
Jérémy Munsch
d309c699c1
Fix SendEmail method on pdf screen 2023-09-06 11:48:14 +02:00
Jérémy Munsch
0bca8542ef
Fixes #49 send contact to correct contact 2023-09-05 12:27:09 +02:00
Jérémy Munsch
17ae639c1b
ContactDetailScreen fix render during edit 2023-09-05 12:10:26 +02:00
Jérémy Munsch
8931694c33
LoginScreen Fix foreach of undefined 2023-09-05 12:06:03 +02:00
Jérémy Munsch
0ef471e175
ContactScreen.js use either firstname or lastname or both on Name column 2023-09-05 11:56:56 +02:00
Jérémy Munsch
66784532b4
Fixes #46 Contact.js change console warn to debug on new contact 2023-09-05 11:56:42 +02:00
Jérémy Munsch
30cda93bde
ContactDetailsScreen prevent double click on contact create 2023-09-05 11:51:27 +02:00
Jérémy Munsch
a1e6083f7e
Comment out qr code button 2023-09-05 11:44:14 +02:00
Jérémy Munsch
182c56b72c
Trim and validate locked fields (if they are required) 2023-09-05 11:41:08 +02:00
Jérémy Munsch
9aa660fdb2
ContactDetailsScreen trim input textbox value 2023-09-05 11:20:46 +02:00
Jérémy Munsch
038220c569
Contact Detail screen Fix display none on inputs 2023-09-05 11:15:08 +02:00
Jérémy Munsch
8d9d117323
Contact Detail screen hide vcard btton , comment ask permissions 2023-09-05 11:11:46 +02:00
Jérémy Munsch
fbf5ba4ae7
#40 Synchro des settings sur login screen if possible 2023-09-05 11:10:01 +02:00
Jérémy Munsch
34358f52b1
By pass url check if react is in dev mode 2023-09-05 09:56:57 +02:00
Jérémy Munsch
6ae2a44629
Add contact details field controller for length 2023-09-05 09:35:09 +02:00
Jérémy Munsch
e3ee53bcd5
Add error logs 2023-09-05 09:27:14 +02:00
Jérémy Munsch
9527502024
Directories screen and Search screen consol.error on unhandled types 2023-09-04 11:35:32 +02:00
Jérémy Munsch
b438596c9f
Video screen update to check unhandled promise 2023-09-04 11:34:56 +02:00
Jérémy Munsch
2009925fb2
Redo npx Expo Install bump @rneui/themed package to 4.0.0-rc.7 2023-09-04 11:01:45 +02:00
Jérémy Munsch
dae7b0efd2
Fixes #45 Initilize docs before opening contact screen 2023-09-04 10:22:41 +02:00
Jérémy Munsch
7d80af326b
Bump version to 3.0.0 + update changelog and readme 2023-09-04 10:10:19 +02:00
Jérémy Munsch
b52795e588
Change and fix console log and debugs (changes all simple console.log) 2023-09-04 10:08:54 +02:00
Jérémy Munsch
918e20a72b
SYNC 15 Major update, Formularies and Fixes
- Add type Definitions
- Fix models methods
- Sync controller add route names
- Formularies sync OK
- Closes https://lab.s-web.fr/ldc-web/projets/com-app-bo/-/issues/18
- Closes https://lab.s-web.fr/ldc-web/projets/com-app/-/issues/9
2023-09-04 10:08:53 +02:00
Jérémy Munsch
64c324d30a
Sync users if possible on login screen (prevent reinstalling app to sync new users) 2023-09-04 09:34:50 +02:00
Jérémy Munsch
d418f1312f
Fix ContactDetailScreen missing key on visits dropdown 2023-09-04 09:27:02 +02:00
Jérémy Munsch
ce52471941
Fix add contact from HomeScreen Error 2023-09-04 09:27:02 +02:00
Jérémy Munsch
f9a66aff00
Fix graddle build fail app package is now 'com.comapp.ldc' every where 2023-09-04 09:26:53 +02:00
Jérémy Munsch
2ca1167c57
package lock update 2023-08-22 14:06:41 +02:00
Jérémy Munsch
9e178a24bb
add vscode to git ignore 2023-08-22 14:05:29 +02:00
Jérémy Munsch
8d3a99fde4
lint source + fix error on app closing tag 2023-08-22 10:32:40 +02:00
88 changed files with 20223 additions and 15244 deletions

21
.editorconfig Normal file
View file

@ -0,0 +1,21 @@
root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
[*.{yml,yaml}]
indent_size = 2
[*.{vue,js}]
indent_size = 2
[docker-compose.yml]
indent_size = 4

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
.vscode/*

3
.idea/.gitignore generated vendored Normal file
View file

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

9
.idea/com-app.iml generated Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/com-app.iml" filepath="$PROJECT_DIR$/.idea/com-app.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

23
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,23 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#3e8040",
"activityBar.activeBorder": "#ffffff",
"activityBar.background": "#3e8040",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#aaa9d5",
"activityBarBadge.foreground": "#15202b",
"sash.hoverBorder": "#3e8040",
"statusBar.background": "#2d5e2f",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#3e8040",
"statusBarItem.remoteBackground": "#2d5e2f",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#8d1800",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#2d5e2f99",
"titleBar.inactiveForeground": "#e7e7e799",
"commandCenter.border": "#e7e7e799"
},
"peacock.remoteColor": "#2d5e2f"
}

View file

@ -1,7 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: false,
bracketSpacing: true,
singleQuote: true,
trailingComma: 'all',
};

View file

@ -1,7 +1,55 @@
# 2.0.0
## Bug
# CHANGELOG
## 4.0.0
### Évolution - 4.0.0
- Delete store.ldc.fr dependance
- Remove useless MySpace feature
## 3.2.1
### Évolution - 3.2.1
- Update select and select multiple fields to get list in alphabetical order
## 3.1.1
### Évolution - 3.1.1
- Update Install and Download docs call to handle tenant changes
## 3.0.1
### Bug - 3.0.1
- Fix sendBrochure call, put data into data axios object instead of params
## 3.0.0
### Bug - 3.0.0
- Fix add contact from HomeScreen Error
- Fixed appID was not properly setup `com.comapp.ldc`
- Lint du Code, Ajout de définitions
- L'ordre d'affichage des contacts est respecté
- Tri des contact lors de l'envoi d'un contact
### Évolution - 3.0.0
- Ajout d'une synchronisation users discrete on Login (pour sync les news users apres que l'app ai déjà été installé)
- Changed les Formulaires sont dynamiques
- La synchro utilise 3 méthodes pour les contacts
- Ajout de timestamp sur contact pour définir le contact le plus a jour a conserver (pour un utilisateur)
## 2.0.0
### Bug - 2.0.0
- Fix format vidéo lors de la rotation de l'écran
## Évolution
### Évolution - 2.0.0
- Bump React Native 0.70.1 -> 0.70.6
- Amélioration de l'usage de Redux avec reducers, actions, etc.
- Amélioration sur l'arborescence du projet.

View file

@ -1,4 +1,18 @@
# ComApp
# Run with Windows + WSL
- Install Android studio and create a Virtual Device
- Launch emulator
- In WSL :
```bash
adb reverse tcp:8081 tcp:8081
npx react-native start // TO start metro
npx react-native run-android --deviceId emulator-5554 // TO build and run to this Emulator
```
You can set internet proxy in emulator params
## Dependencies
- i18n-js
- @react-native-community/netinfo
@ -26,3 +40,7 @@
- react-native-flash-message
- @react-native-picker/picker
- vcard-parser
- react-native-email-link
- buffer
- react-native-sectioned-multi-select
- react-native-uuid

View file

@ -35,12 +35,12 @@ android_library(
android_build_config(
name = "build_config",
package = "com.comapp",
package = "com.comapp.ldc",
)
android_resource(
name = "res",
package = "com.comapp",
package = "com.comapp.ldc",
res = "src/main/res",
)

View file

@ -139,7 +139,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "2.0.0"
versionName "4.0.0"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {

View file

@ -4,7 +4,7 @@
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package com.comapp;
package com.comapp.ldc;
import android.content.Context;
import com.facebook.flipper.android.AndroidFlipperClient;

View file

@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.comapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.comapp.ldc">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.CAMERA"/>
<application

View file

@ -1,4 +1,4 @@
package com.comapp;
package com.comapp.ldc;
import expo.modules.ReactActivityDelegateWrapper;

View file

@ -1,4 +1,4 @@
package com.comapp;
package com.comapp.ldc;
import android.content.res.Configuration;
import expo.modules.ApplicationLifecycleDispatcher;
@ -13,7 +13,7 @@ import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.soloader.SoLoader;
import com.comapp.newarchitecture.MainApplicationReactNativeHost;
import com.comapp.ldc.newarchitecture.MainApplicationReactNativeHost;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@ -81,7 +81,7 @@ public class MainApplication extends Application implements ReactApplication {
We use reflection here to pick up the class that initializes Flipper,
since Flipper library is not available in release mode
*/
Class<?> aClass = Class.forName("com.comapp.ReactNativeFlipper");
Class<?> aClass = Class.forName("com.comapp.ldc.ReactNativeFlipper");
aClass
.getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
.invoke(null, context, reactInstanceManager);

View file

@ -1,4 +1,4 @@
package com.comapp.newarchitecture;
package com.comapp.ldc.newarchitecture;
import android.app.Application;
import androidx.annotation.NonNull;
@ -19,9 +19,9 @@ import com.facebook.react.fabric.CoreComponentsRegistry;
import com.facebook.react.fabric.FabricJSIModuleProvider;
import com.facebook.react.fabric.ReactNativeConfig;
import com.facebook.react.uimanager.ViewManagerRegistry;
import com.comapp.BuildConfig;
import com.comapp.newarchitecture.components.MainComponentsRegistry;
import com.comapp.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
import com.comapp.ldc.BuildConfig;
import com.comapp.ldc.newarchitecture.components.MainComponentsRegistry;
import com.comapp.ldc.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package com.comapp.newarchitecture.components;
package com.comapp.ldc.newarchitecture.components;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;

View file

@ -1,4 +1,4 @@
package com.comapp.newarchitecture.modules;
package com.comapp.ldc.newarchitecture.modules;
import com.facebook.jni.HybridData;
import com.facebook.react.ReactPackage;

View file

@ -41,5 +41,5 @@ newArchEnabled=false
MYAPP_UPLOAD_STORE_FILE=upload.keystore
MYAPP_UPLOAD_KEY_ALIAS=app-native-1
MYAPP_UPLOAD_STORE_PASSWORD=9LjCAts7qtetVqMT
MYAPP_UPLOAD_KEY_PASSWORD=9LjCAts7qtetVqMT
MYAPP_UPLOAD_STORE_PASSWORD=
MYAPP_UPLOAD_KEY_PASSWORD=

1481
ComApp/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -11,16 +11,17 @@
},
"dependencies": {
"@react-native-community/netinfo": "^9.3.7",
"@react-native-community/slider": "^4.3.2",
"@react-native-community/slider": "4.2.4",
"@react-native-picker/picker": "^2.4.6",
"@react-navigation/native": "^6.0.13",
"@react-navigation/native-stack": "^6.9.0",
"@rneui/base": "^0.0.0-edge.2",
"@rneui/themed": "^0.0.0-edge.2",
"@rneui/base": "^4.0.0-rc.7",
"@rneui/themed": "^4.0.0-rc.7",
"@sentry/react-native": "^4.12.0",
"axios": "^0.27.2",
"buffer": "^6.0.3",
"expo": "^47.0.10",
"expo-av": "^13.0.2",
"expo-av": "~13.0.3",
"expo-barcode-scanner": "^11.4.0",
"expo-splash-screen": "^0.16.2",
"expo-video-player": "^2.2.0",
@ -33,13 +34,16 @@
"react-native-animated-tree-view": "^0.1.4",
"react-native-b-crypt-bridge": "file:react-native-b-crypt-bridge-2.1.0.tgz",
"react-native-blob-util": "^0.16.2",
"react-native-email-link": "^1.14.6",
"react-native-flash-message": "^0.3.1",
"react-native-gesture-handler": "^2.7.0",
"react-native-pdf": "^6.6.2",
"react-native-progress": "^5.0.0",
"react-native-safe-area-context": "^4.4.1",
"react-native-screens": "^3.18.0",
"react-native-sectioned-multi-select": "^0.10.0",
"react-native-svg": "^13.2.0",
"react-native-uuid": "^2.0.1",
"react-native-vector-icons": "^9.2.0",
"react-redux": "^8.0.4",
"realm": "^11.0.0-rc.2",
@ -54,9 +58,11 @@
"eslint": "^7.32.0",
"jest": "^26.6.3",
"metro-react-native-babel-preset": "^0.72.3",
"patch-package": "^8.0.0",
"react-test-renderer": "18.1.0"
},
"jest": {
"preset": "react-native"
}
},
"postinstall": "patch-package"
}

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,13 @@
diff --git a/node_modules/react-native/ReactAndroid/build.gradle b/node_modules/react-native/ReactAndroid/build.gradle
index 3be8b26..3f7bba8 100644
--- a/node_modules/react-native/ReactAndroid/build.gradle
+++ b/node_modules/react-native/ReactAndroid/build.gradle
@@ -61,7 +61,7 @@ task createNativeDepsDirectories {
}
task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
- src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
+ src("https://archives.boost.io/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
onlyIfNewer(true)
overwrite(false)
dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))

View file

@ -1,49 +1,58 @@
import React from 'react';
// Sentry
import * as Sentry from "@sentry/react-native";
import * as Sentry from '@sentry/react-native';
// Redux
import { Provider } from 'react-redux';
import { store } from './App/Store/ConfigureStore';
import { initDocuments } from './App/Store/Actions/documents';
import { store } from './App/Store/ConfigureStore';
// Deps
import 'react-native-gesture-handler';
import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { navigationRef, navigate } from './Navigation';
import { TouchableOpacity, View, Image, Text, TextInput, Alert, DrawerLayoutAndroid, Button } from 'react-native';
import Icon from 'react-native-vector-icons/FontAwesome5';
import FlashMessage, { showMessage } from 'react-native-flash-message';
import * as SplashScreen from 'expo-splash-screen';
import {
Alert,
Button,
DrawerLayoutAndroid,
Image,
Text,
TextInput,
TouchableOpacity,
View,
} from 'react-native';
import FlashMessage, { showMessage } from 'react-native-flash-message';
import 'react-native-gesture-handler';
import Icon from 'react-native-vector-icons/FontAwesome5';
import { navigate, navigationRef } from './Navigation';
// Application infos
import * as Application from 'expo-application';
// i18n
import i18n from "./I18n";
import i18n from './I18n';
// FileSytem
import * as FileSystem from 'expo-file-system';
// Views
import ContactDetailsScreen from './App/Views/ContactDetailsScreen';
import ContactScreen from './App/Views/ContactScreen';
import DirectoriesScreen from './App/Views/DirectoriesScreen';
import HomeScreen from './App/Views/HomeScreen';
import InstallScreen from './App/Views/InstallScreen';
import LoginScreen from './App/Views/LoginScreen';
import SyncScreen from './App/Views/SyncScreen';
import HomeScreen from './App/Views/HomeScreen';
import DirectoriesScreen from './App/Views/DirectoriesScreen';
import PDFScreen from './App/Views/PDFScreen';
import VideoScreen from './App/Views/VideoScreen';
import OnlyVideosScreen from './App/Views/OnlyVideosScreen';
import ContactScreen from './App/Views/ContactScreen';
import ContactDetailsScreen from './App/Views/ContactDetailsScreen';
import SearchScreen from "./App/Views/SearchScreen";
import MySpaceScreen from './App/Views/MySpaceScreen';
import PDFScreen from './App/Views/PDFScreen';
import SearchScreen from './App/Views/SearchScreen';
import SyncScreen from './App/Views/SyncScreen';
import VideoScreen from './App/Views/VideoScreen';
// Style
import Helpers from './App/Lib/Helpers';
import styles from './Resources/Styles/NavigationStyle';
// Controllers
import SyncController from './App/Controllers/SyncController';
Sentry.init({
dsn: "https://ab87e8d840324f41873c95b06903b0bf@o4504314935640064.ingest.sentry.io/4504441255886848",
dsn: 'https://ab87e8d840324f41873c95b06903b0bf@o4504314935640064.ingest.sentry.io/4504441255886848',
});
Sentry.setContext("app", {
boUrl: SyncController.getUrlBo()
Sentry.setContext('app', {
boUrl: SyncController.getUrlBo(),
});
SplashScreen.preventAutoHideAsync(); //Keep
@ -61,7 +70,7 @@ class App extends React.Component {
searchTxt: '',
sendEmail: '',
mainColor: '',
drawerRef: React.createRef()
drawerRef: React.createRef(),
};
componentDidMount() {
@ -69,7 +78,7 @@ class App extends React.Component {
this.setState({
isSetup: store.getState().app.isSetup,
isLogged: store.getState().app.logged,
mainColor: store.getState().app.mainColor
mainColor: store.getState().app.mainColor,
});
}
@ -77,9 +86,8 @@ class App extends React.Component {
this.setState({
isSetup: store.getState().app.isSetup,
isLogged: store.getState().app.logged,
mainColor: store.getState().app.mainColor
mainColor: store.getState().app.mainColor,
}); // to force re-rendering
console.log("state changed")
}
navigationView = () => (
@ -89,16 +97,23 @@ class App extends React.Component {
onPress={() => {
this.state.drawerRef.current.closeDrawer();
store.dispatch({ type: 'EDIT_LOCALE' });
store.dispatch(initDocuments(store.getState().locale.locale, store.getState().directories.global))
store.dispatch(
initDocuments(
store.getState().locale.locale,
store.getState().directories.global,
),
);
}}
style={styles.drawer.btn}>
<Image source={this.renderFlag()} style={{ width: 25, height: 25 }} />
<Text style={styles.drawer.btnText}>{i18n.t('global.change_lang')}</Text>
<Text style={styles.drawer.btnText}>
{i18n.t('global.change_lang')}
</Text>
</TouchableOpacity>
<TouchableOpacity
onPress={() => {
this.state.drawerRef.current.closeDrawer();
navigate('SyncScreen')
navigate('SyncScreen');
}}
style={styles.drawer.btn}>
<Icon name="sync-alt" size={20} />
@ -115,7 +130,9 @@ class App extends React.Component {
</TouchableOpacity>
</View>
<View>
<Text style={{ marginBottom: 10 }}>Version : {Application.nativeApplicationVersion}</Text>
<Text style={{ marginBottom: 10 }}>
Version : {Application.nativeApplicationVersion}
</Text>
<Button
title={i18n.t('global.close')}
color={this.state.mainColor}
@ -132,45 +149,58 @@ class App extends React.Component {
<DrawerLayoutAndroid
ref={this.state.drawerRef}
drawerWidth={300}
drawerPosition={"right"}
drawerPosition={'right'}
drawerLockMode={'locked-open'}
renderNavigationView={this.navigationView}
>
renderNavigationView={this.navigationView}>
<Stack.Navigator initialRouteName="HomeScreen">
{this.state.isSetup === false &&
{this.state.isSetup === false && (
<Stack.Screen
name="InstallScreen"
component={InstallScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('install.installation'), false),
headerTitle: () =>
this.LogoTitle(
navigation,
i18n.t('install.installation'),
false,
),
headerRight: () => (
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<View
style={{ flexDirection: 'row', alignItems: 'center' }}>
<TouchableOpacity
onPress={() => {
store.dispatch({ type: 'EDIT_LOCALE' });
}}
style={{ marginRight: 15 }}>
<Image source={this.renderFlag()} style={{ width: 25, height: 25 }} />
<Image
source={this.renderFlag()}
style={{ width: 25, height: 25 }}
/>
</TouchableOpacity>
</View>
),
})}
/>
}
)}
{this.state.isLogged === false ? (
<Stack.Screen
name="LoginScreen"
component={LoginScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('global.login'), false),
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('global.login'), false),
headerRight: () => (
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<View
style={{ flexDirection: 'row', alignItems: 'center' }}>
<TouchableOpacity
onPress={() => {
store.dispatch({ type: 'EDIT_LOCALE' });
}}
style={{ marginRight: 15 }}>
<Image source={this.renderFlag()} style={{ width: 25, height: 25 }} />
<Image
source={this.renderFlag()}
style={{ width: 25, height: 25 }}
/>
</TouchableOpacity>
</View>
),
@ -181,18 +211,28 @@ class App extends React.Component {
name="HomeScreen"
component={HomeScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('global.home')),
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('global.home')),
headerRight: () => (
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<View
style={{ flexDirection: 'row', alignItems: 'center' }}>
<View style={{ flexDirection: 'row', marginRight: 50 }}>
<TextInput
style={{ ...styles.searchInput, borderColor: this.state.mainColor }}
style={{
...styles.searchInput,
borderColor: this.state.mainColor,
}}
placeholder={i18n.t('global.search')}
value={this.state.searchTxt}
onChangeText={(text) => this.setState({ searchTxt: text })}
onChangeText={text =>
this.setState({ searchTxt: text })
}
/>
<TouchableOpacity
style={{ ...styles.btnSearch, backgroundColor: this.state.mainColor }}
style={{
...styles.btnSearch,
backgroundColor: this.state.mainColor,
}}
onPress={() => {
if (this.state.searchTxt.length > 0) {
navigation.navigation.navigate('SearchScreen', {
@ -205,23 +245,18 @@ class App extends React.Component {
<Icon name={'search'} size={20} color={'white'} />
</TouchableOpacity>
</View>
{store.getState().app.ShowIsActive === '1' && (
<TouchableOpacity
onPress={() => navigation.navigation.navigate('MySpaceScreen')}
style={{ marginRight: 25 }}>
<Icon name="user-circle" size={25} />
</TouchableOpacity>
)}
<TouchableOpacity
onPress={() => navigation.navigation.navigate('ContactScreen', {
onPress={() =>
navigation.navigation.navigate('ContactScreen', {
action: 'add',
})}
})
}
style={{ marginRight: 25 }}>
<Icon name="user-plus" size={20} />
</TouchableOpacity>
<TouchableOpacity
onPress={() => {
this.state.drawerRef.current.openDrawer()
this.state.drawerRef.current.openDrawer();
}}
style={{ marginRight: 25 }}>
<Icon name="sliders-h" size={20} />
@ -236,25 +271,46 @@ class App extends React.Component {
component={SyncScreen}
initialParams={{ forceSync: false }}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('global.synchronization'))
headerTitle: () =>
this.LogoTitle(
navigation,
i18n.t('global.synchronization'),
),
})}
/>
<Stack.Screen
name="DirectoriesScreen"
component={DirectoriesScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('app.folders'))
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('app.folders')),
})}
/>
<Stack.Screen
name="OnlyVideosScreen"
component={OnlyVideosScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('global.videos')),
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('global.videos')),
headerRight: () => (
<View style={{ flexDirection: 'row', marginRight: 5 }}>
<TextInput style={{ ...styles.searchInput, borderColor: this.state.mainColor }} placeholder={i18n.t('global.search')} value={this.state.searchTxt} onChangeText={(text) => this.setState({ searchTxt: text })} />
<TouchableOpacity style={{ ...styles.btnSearch, backgroundColor: this.state.mainColor }} onPress={() => {
<TextInput
style={{
...styles.searchInput,
borderColor: this.state.mainColor,
}}
placeholder={i18n.t('global.search')}
value={this.state.searchTxt}
onChangeText={text =>
this.setState({ searchTxt: text })
}
/>
<TouchableOpacity
style={{
...styles.btnSearch,
backgroundColor: this.state.mainColor,
}}
onPress={() => {
if (this.state.searchTxt.length > 0) {
navigation.navigation.navigate('SearchScreen', {
needle: this.state.searchTxt,
@ -273,9 +329,10 @@ class App extends React.Component {
name="VideoScreen"
component={VideoScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('app.video')),
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('app.video')),
headerRight: () => this.SendEmail(),
orientation: 'landscape'
orientation: 'landscape',
})}
/>
<Stack.Screen
@ -283,14 +340,15 @@ class App extends React.Component {
component={PDFScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, 'PDF'),
headerRight: () => this.SendEmail()
headerRight: () => this.SendEmail(),
})}
/>
<Stack.Screen
name="ContactScreen"
component={ContactScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('global.contacts'))
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('global.contacts')),
})}
initialParams={{ contactAdded: false }}
/>
@ -298,33 +356,16 @@ class App extends React.Component {
name="ContactDetailsScreen"
component={ContactDetailsScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('app.contact_details'))
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('app.contact_details')),
})}
/>
<Stack.Screen
name="SearchScreen"
component={SearchScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('app.results_search'))
})}
/>
<Stack.Screen
name="MySpaceScreen"
component={MySpaceScreen}
options={(navigation, route) => ({
headerTitle: () => this.LogoTitle(navigation, i18n.t('app.my_space')),
headerRight: () => (
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<TouchableOpacity
onPress={() => {
const folder = store.getState().directories.treeview.filter(tmp => tmp.id === 1);
navigation.navigation.navigate('DirectoriesScreen', { folder: folder })
}}
style={{ marginRight: 15 }}>
<Icon name="briefcase" size={20} />
</TouchableOpacity>
</View>
),
headerTitle: () =>
this.LogoTitle(navigation, i18n.t('app.results_search')),
})}
/>
</Stack.Navigator>
@ -338,15 +379,18 @@ class App extends React.Component {
LogoTitle(navigation, title, wantBtn = true) {
return (
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<TouchableOpacity onPress={() => {
<TouchableOpacity
onPress={() => {
if (wantBtn) {
navigation.navigation.navigate('HomeScreen')
navigation.navigation.navigate('HomeScreen');
}
}}>
{this.state.isSetup ? (
<Image
style={{ width: 100, height: 50, resizeMode: 'stretch' }}
source={{ uri: FileSystem.documentDirectory + 'RectangleLogo.png' }}
source={{
uri: FileSystem.documentDirectory + 'RectangleLogo.png',
}}
/>
) : (
<Image
@ -362,30 +406,42 @@ class App extends React.Component {
SendEmail() {
return (
<View style={{ flexDirection: 'row', alignItems: 'center', marginRight: 10 }}>
<TextInput style={{ ...styles.searchInput, borderColor: this.state.mainColor }} placeholder={i18n.t('global.email')} value={this.state.sendEmail} onChangeText={(text) => this.setState({ sendEmail: text })} />
<TouchableOpacity style={{ ...styles.btnSearch, backgroundColor: this.state.mainColor }} onPress={() => {
<View
style={{ flexDirection: 'row', alignItems: 'center', marginRight: 10 }}>
<TextInput
style={{ ...styles.searchInput, borderColor: this.state.mainColor }}
placeholder={i18n.t('global.email')}
value={this.state.sendEmail}
onChangeText={text => this.setState({ sendEmail: text })}
/>
<TouchableOpacity
style={{ ...styles.btnSearch, backgroundColor: this.state.mainColor }}
onPress={() => {
if (this.state.sendEmail.length > 0) {
if (Helpers.isEmailValid(this.state.sendEmail)) {
const email = {
email: this.state.sendEmail,
subject: i18n.t('app.file_sharing'),
message: '',
documents: JSON.stringify([store.getState().currentOpenedDoc]),
user_id: store.getState().currentUser.id
documents: JSON.stringify([
store.getState().app.currentOpenedDoc,
]),
app_user_id: store.getState().app.currentUser.id,
};
store.dispatch({ type: 'SEND_BROCHURE', data: email });
showMessage({
message: i18n.t('global.message_sent') + '.',
description: i18n.t('global.message_will_be_sent_after_sync') + '.',
description:
i18n.t('global.message_will_be_sent_after_sync') + '.',
type: 'success',
duration: 1500,
});
this.setState({ sendEmail: '' });
} else {
Alert.alert(i18n.t('global.warning') + ' !', i18n.t('error.invalid_email_address') + '.', [
{ text: 'OK' },
],
Alert.alert(
i18n.t('global.warning') + ' !',
i18n.t('error.invalid_email_address') + '.',
[{ text: 'OK' }],
{ cancelable: false },
);
}
@ -400,22 +456,21 @@ class App extends React.Component {
renderFlag() {
let flag;
switch (store.getState().locale.locale) {
case "fr":
case 'fr':
flag = require('./assets/img/flags/fr.png');
break;
case "en":
case 'en':
flag = require('./assets/img/flags/en.png');
break;
case "de":
case 'de':
flag = require('./assets/img/flags/de.png');
break;
case "es":
case 'es':
flag = require('./assets/img/flags/es.png');
break;
}
return flag;
}
}
export default Sentry.wrap(App);

View file

@ -1,25 +1,23 @@
import { Alert } from "react-native";
import { Alert } from 'react-native';
// Lodash
import _ from 'lodash';
// Http Client
import axios from 'axios';
// Network Infos
import NetInfo from "@react-native-community/netinfo";
import NetInfo from '@react-native-community/netinfo';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// Database
import { Setting } from "../../Database";
import { Setting } from '../../Database';
const api_token = 'G9Q62jt8eL8gN4Ls';
class InstallController {
async getConfig(url) {
return axios({
method: 'GET',
url: url + '/api/settings',
responseType: 'json',
params: {
token: api_token
token: api_token,
},
});
}
@ -32,32 +30,43 @@ class InstallController {
url: url + '/api/app',
responseType: 'json',
params: {
token: api_token
token: api_token,
},
})
.then(function (response) {
if (response.data) {
if (response.data.status === "OK") {
Setting.upsert({ key: 'HomeFolders', value: JSON.stringify(response.data.datas.folders) });
if (response.data.status === 'OK') {
Setting.upsert({
key: 'HomeFolders',
value: JSON.stringify(response.data.datas.folders),
});
} else {
Alert.alert(i18n.t("alert.error"), i18n.t("error.error_has_occurred"));
Alert.alert(
i18n.t('alert.error'),
i18n.t('error.error_has_occurred'),
);
return false;
}
}
})
.catch(function (error) {
console.log(error)
Alert.alert(i18n.t("alert.error"), i18n.t("error.error_has_occurred"));
console.error(error);
Alert.alert(
i18n.t('alert.error'),
i18n.t('error.error_has_occurred'),
);
return false;
})
});
} else {
Alert.alert(i18n.t("alert.error"), i18n.t("error.tablet_not_connected_internet"));
Alert.alert(
i18n.t('alert.error'),
i18n.t('error.tablet_not_connected_internet'),
);
return false;
}
});
return true;
}
}
export default new InstallController();

View file

@ -1,15 +1,11 @@
// Database
import { Setting } from "../../Database";
import { Setting } from '../../Database';
// BCrypt
import { verify } from 'react-native-b-crypt-bridge';
class LoginController {
verify(user, password) {
return verify(
password,
user.password
);
async verify(user, password) {
return await verify(password, user.password);
}
login(user) {

View file

@ -1,30 +1,19 @@
// Lodash
import _ from 'lodash';
// Http Client
import axios from 'axios';
// Network Infos
import NetInfo from "@react-native-community/netinfo";
// Application infos
import * as Application from 'expo-application';
import NetInfo from '@react-native-community/netinfo';
// Database
import { Setting, Contact, SendBrochure, Document } from '../../Database';
import { Contact, Document, SendBrochure, Setting } from '../../Database';
import { ContactData } from '../Models/Contact';
const api_token = 'G9Q62jt8eL8gN4Ls';
class SyncController {
getUrlBo() {
const test = Setting.get('bo_url');
if (test === false || test === undefined) {
return "noset";
}
return test.value;
}
getAppStoreUUID() {
const test = Setting.get('AppStoreUUID');
if (test === false || test === undefined) {
return "noset";
if (test === null) {
return 'noset';
}
return test.value;
}
@ -33,65 +22,107 @@ class SyncController {
return NetInfo.fetch();
}
async getVersion() {
return axios({
method: 'GET',
url: this.getUrlBo() + '/api/version',
responseType: 'json',
params: {
token: api_token,
app_uuid: this.getAppStoreUUID(),
app_version: Application.nativeApplicationVersion
},
});
}
async getUsers() {
return axios({
method: 'GET',
// * users.index
url: this.getUrlBo() + '/api/users',
responseType: 'json',
params: {
token: api_token
token: api_token,
},
});
}
async getContacts(userId) {
let contacts = Contact.getAll();
/**
* @param {number} app_user_id
*/
async getContacts(app_user_id) {
// * We retrieve all contacts avec upsert and destroy
return axios({
method: 'POST',
url: this.getUrlBo() + '/api/contacts',
method: 'GET',
// * contacts.index
url: this.getUrlBo() + `/api/contacts/${app_user_id}`,
responseType: 'json',
params: {
token: api_token
token: api_token,
},
});
}
/**
* @param {number} app_user_id
*/
async upsertContacts(app_user_id) {
const contacts = Contact.getAll(app_user_id).map(contact => {
// * This casts contact to a simple Object
// * Realm object does not support changing prop type
/** @type {ContactData} */
contact = contact.toJSON();
// * Convert to UTC timestamp
contact.timestamp = contact.timestamp.toUTCString();
// * Unstringify complex Fields
contact.data = JSON.parse(contact.data);
contact.visits = JSON.parse(contact.visits);
return contact;
});
return axios({
method: 'POST',
// * contacts.index
url: this.getUrlBo() + `/api/contacts/${app_user_id}`,
responseType: 'json',
params: {
token: api_token,
},
data: {
contacts: contacts,
userId: userId,
},
});
}
/**
* @param {number} app_user_id
*/
async deleteContacts(app_user_id) {
const contactsToDelete = Contact.getAllToDelete(app_user_id);
return axios({
method: 'DELETE',
// * contacts.index
url: this.getUrlBo() + `/api/contacts/${app_user_id}`,
responseType: 'json',
params: {
token: api_token,
},
data: {
contactUuidList: contactsToDelete.map(contact => contact.id),
},
});
}
async sendBrochure(brochure) {
return axios({
method: 'POST',
// * send-flyers
url: this.getUrlBo() + '/api/sendBrochure',
responseType: 'json',
params: {
token: api_token,
emails: brochure,
},
data: {
emails: brochure,
}
});
}
async getDirectories() {
return axios({
method: 'GET',
// * directories.index
url: this.getUrlBo() + '/api/directories',
responseType: 'json',
params: {
token: api_token
token: api_token,
},
});
}
@ -99,6 +130,7 @@ class SyncController {
async getDocuments() {
return axios({
method: 'GET',
// * documents.index
url: this.getUrlBo() + '/api/documents',
responseType: 'json',
params: {
@ -107,31 +139,29 @@ class SyncController {
});
}
async getFormularies() {
return axios({
method: 'GET',
// * formularies.index
url: this.getUrlBo() + '/api/formularies',
responseType: 'json',
params: {
token: api_token,
},
});
}
updateLastModificationDoc(id, date) {
Document.update({ id: id, updated_at: date.toString() }, true);
}
updateVersion(version) {
const localVersion = Setting.get('version');
if (localVersion === false || localVersion === undefined) {
Setting.add({ key: 'version', value: version });
} else {
Setting.update({ id: localVersion.id, key: 'version', value: version });
}
}
updateShowIsActive(value) {
const local = Setting.get('ShowIsActive');
if (local === false || local === undefined) {
Setting.add({ key: 'ShowIsActive', value: value });
} else {
Setting.update({ id: local.id, key: 'ShowIsActive', value: value });
}
}
isSynced() {
/**
* @param {number} app_user_id
* @returns
*/
isSynced(app_user_id) {
const brochures = SendBrochure.getAll();
const Contacts = Contact.getAll();
const Contacts = Contact.getAll(app_user_id);
if (brochures !== undefined && Contacts !== undefined) {
const noSynced = Contacts.filtered('synced = false');
@ -145,12 +175,7 @@ class SyncController {
isLogged() {
const logged = Setting.get('isLogged');
const loggedTime = Setting.get('loggedTime');
if (
logged !== false &&
loggedTime !== false &&
logged !== undefined &&
loggedTime !== undefined
) {
if (logged !== null && loggedTime !== null) {
let seconds =
Math.abs(new Date(Number(loggedTime.value)) - Date.now()) / 1000;
if (seconds < 14400) {
@ -162,48 +187,17 @@ class SyncController {
return false;
}
needSync(callback) {
NetInfo.fetch().then(state => {
if (state.isConnected) {
axios({
method: 'get',
url: this.getUrlBo() + '/version',
responseType: 'json',
params: {
token: api_token,
},
})
.then(response => {
const localVersion = Setting.get('version');
if (
localVersion === undefined ||
localVersion === false ||
localVersion.value !== response.data.version
) {
return callback();
}
return false;
})
.catch(function (error) {
console.log(error);
});
}
return false;
});
return false;
}
setInstalled(remove = false) {
if (remove) {
Setting.delete('installed');
} else {
Setting.add({ key: 'installed', value: "true" });
Setting.add({ key: 'installed', value: 'true' });
}
}
isInstalled() {
const test = Setting.get('installed');
if (test === false || test === undefined) {
if (test === null) {
return false;
}
return true;

View file

@ -0,0 +1,17 @@
/** InputStatusEnum */
/**
* @typedef {keyof InputStatusKeys} InputStatus
*/
export const InputStatus = {
SYSTEM: 1,
LOCKED: 2,
DEFAULT: 3,
};
// eslint-disable-next-line no-unused-vars
const InputStatusKeys = {
1: 'SYSTEM',
2: 'LOCKED',
3: 'DEFAULT',
};

View file

@ -0,0 +1,25 @@
/** InputTypeEnum */
/**
* @typedef {keyof InputTypeKeys} InputType
*/
export const InputType = {
TEXT: 1,
EMAIL: 2,
PHONE: 3,
RADIO: 4,
SELECT: 5,
SELECT_MULTIPLE: 6,
CHECKBOX: 7,
};
// eslint-disable-next-line no-unused-vars
const InputTypeKeys = {
1: 'TEXT',
2: 'EMAIL',
3: 'PHONE',
4: 'RADIO',
5: 'SELECT',
6: 'SELECT_MULTIPLE',
7: 'CHECKBOX',
};

View file

@ -5,10 +5,8 @@ class Helpers {
// property doesn't exist on either object
return 0;
}
const varA = (typeof a[key] === 'string')
? a[key].toUpperCase() : a[key];
const varB = (typeof b[key] === 'string')
? b[key].toUpperCase() : b[key];
const varA = typeof a[key] === 'string' ? a[key].toUpperCase() : a[key];
const varB = typeof b[key] === 'string' ? b[key].toUpperCase() : b[key];
let comparison = 0;
if (varA > varB) {
@ -16,35 +14,65 @@ class Helpers {
} else if (varA < varB) {
comparison = -1;
}
return (
(order === 'desc') ? (comparison * -1) : comparison
);
return order === 'desc' ? comparison * -1 : comparison;
};
}
isEmailValid(email) {
const expression = /(?!.*\.{2})^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([\t]*\r\n)?[\t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([\t]*\r\n)?[\t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.?$/i;
const expression =
/(?!.*\.{2})^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([\t]*\r\n)?[\t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([\t]*\r\n)?[\t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.?$/i;
return expression.test(String(email).toLowerCase());
}
/**
* Test url is valid
* @param {string} value Url to test.
* @returns {boolean}
*/
isUrlValid(value) {
return /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value.toLowerCase());
}
generateUUID() { // Public Domain/MIT
let d = new Date().getTime();//Timestamp
let d2 = new Date().getUTCMilliseconds() + Math.random();//Time in microseconds since page-load or 0 if unsupported
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
let r = Math.random() * 16;//random number between 0 and 16
if(d > 0){//Use timestamp until depleted
r = (d + r)%16 | 0;
d = Math.floor(d/16);
} else {//Use microseconds since page-load if supported
r = (d2 + r)%16 | 0;
d2 = Math.floor(d2/16);
}
return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
});
const re_weburl = new RegExp(
'^' +
// protocol identifier (optional)
// short syntax // still required
'(?:(?:(?:https?|ftp):)?\\/\\/)' +
// user:pass BasicAuth (optional)
'(?:\\S+(?::\\S*)?@)?' +
'(?:' +
// IP address exclusion
// private & local networks
'(?!(?:10|127)(?:\\.\\d{1,3}){3})' +
'(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})' +
'(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})' +
// IP address dotted notation octets
// excludes loopback network 0.0.0.0
// excludes reserved space >= 224.0.0.0
// excludes network & broadcast addresses
// (first & last IP address of each class)
'(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])' +
'(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}' +
'(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))' +
'|' +
// host & domain names, may end with dot
// can be replaced by a shortest alternative
// (?![-_])(?:[-\\w\\u00a1-\\uffff]{0,63}[^-_]\\.)+
'(?:' +
'(?:' +
'[a-z0-9\\u00a1-\\uffff]' +
'[a-z0-9\\u00a1-\\uffff_-]{0,62}' +
')?' +
'[a-z0-9\\u00a1-\\uffff]\\.' +
')+' +
// TLD identifier name, may end with dot
'(?:[a-z\\u00a1-\\uffff]{2,}\\.?)' +
')' +
// port number (optional)
'(?::\\d{2,5})?' +
// resource path (optional)
'(?:[/?#]\\S*)?' +
'$',
'i',
);
return re_weburl.test(value.toLowerCase());
}
}
export default new Helpers();

View file

@ -1,107 +1,195 @@
import { default as UuidGenerator } from 'react-native-uuid';
import { UpdateMode } from 'realm';
import { InputType } from './../Enums/InputType';
/**
* @typedef {typeof ContactData} ContactData
*/
export const ContactData = {
/** @type {string|undefined} */
id: undefined,
/** @type {string} */
email: undefined,
/** @type {string|null} */
lastname: null,
/** @type {string|null} */
firstname: null,
/** @type {string|null} */
phone: null,
/** @type {Array<InputDataType>} */
data: [],
/** @type {string|null} */
notes: null,
/** @type {Array<Record<string,string>>|null} */
visits: null,
/** @type {Date} */
timestamp: null,
/** @type {number} The app user id */
app_user_id: undefined,
/** @type {number|null} The app user id that should receive this contact on sync */
send_to_app_user_id: null,
/** @type {boolean} If this model is to delete */
to_delete: false,
/** @type {boolean} This model need sync */
synced: true,
};
export const ContactsSchema = {
name: 'Contacts',
primaryKey: 'id',
properties: {
id: 'int',
...ContactData,
...{
id: 'string',
email: 'string',
type: 'string',
other: { type: 'string', optional: true },
select1: { type: 'string', optional: true },
select2: { type: 'string', optional: true },
name: 'string',
firstname: 'string',
company: { type: 'string', optional: true },
address: { type: 'string', optional: true },
phone: 'string',
products: { type: 'string', optional: true },
// TODO : card_url ?
lastname: { type: 'string', optional: true },
firstname: { type: 'string', optional: true },
phone: { type: 'string', optional: true },
/** Json encoded string of ContactData.data */
data: { type: 'string', default: '[]' },
notes: { type: 'string', optional: true },
visits: { type: 'string', optional: true },
user_id: 'int',
uniq_id: 'string',
/** Json encoded string of ContactData.visists */
visits: { type: 'string', default: '[]' },
timestamp: 'date',
send_to_app_user_id: { type: 'int', optional: true, default: null },
app_user_id: 'int',
to_delete: { type: 'bool', default: false },
synced: { type: 'bool', default: true },
},
},
};
/**
* @typedef {typeof InputData} InputDataType
*/
export const InputData = {
title: '',
formSlug: '',
/** @type {import('./../Enums/InputType').InputType} */
type: InputType.TEXT,
/** @type {string|Array<number,string>} */
value: '',
required: false,
};
/**
* @typedef {Unmanaged<typeof ContactData> & import('realm').Object} Contact
*/
class ContactModel {
/**
* ContactModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Contacts';
/** @type {Realm} */
this.realm = realm;
}
add(data) {
data.uniq_id = data.id;
data.id = undefined;
this.realm.write(() => {
if (data.id === undefined) {
let id = this.realm.objects(this.schema).max('id');
data.id = id === undefined ? 1 : id + 1;
/** @return {Unmanaged<typeof ContactData>} */
new() {
return Object.assign({}, ContactData);
}
/**
* Set contact
* ! We can use only set since all contacts are dropped and redownloaded on sync
* @param {Contact} data
*/
set(data) {
const isNew = typeof data.id !== 'string' || !data.id?.length;
if (isNew) {
console.debug('is new', data);
// * Set Local UUID until it get synced
//* it will be ignore and new one will be generated by BO
data.id = UuidGenerator.v4();
}
this.realm.write(() => {
try {
this.realm.create(this.schema, data, 'never');
this.realm.create(
this.schema,
data,
isNew ? UpdateMode.Never : UpdateMode.Modified,
);
} catch (e) {
console.log('db setting add', e);
console.error('db contact set', e);
}
});
}
upsert(data) {
let tmp = this.get(data.key);
if (tmp === false || tmp === undefined) {
this.add(data);
} else {
if (data.id === undefined) {
data.id = tmp.id;
}
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
}
update(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
get(id) {
let tmp = this.realm.objects(this.schema);
/**
* get contact with uuid
* @param {number} app_user_id App User id
* @param {string} uuid
* @returns {Contact?}
*/
get(app_user_id, uuid) {
/** @type {import('realm').Results<Contact>} */
const tmp = this.realm
.objects(this.schema)
.filtered(`app_user_id = ${app_user_id}`);
if (tmp.length === 0) {
return false;
} else {
tmp = tmp.filtered('id = ' + id)[0];
return null;
}
return tmp;
return tmp.filtered(`id = '${uuid}'`)[0] ?? null;
}
getByUser(userId) {
let tmp = this.realm.objects(this.schema);
tmp = tmp.filtered('to_delete = false AND user_id = ' + userId);
return tmp;
/**
* @param {number} app_user_id App User id
* @returns {import('realm').Results<Contact>}
*/
getAll(app_user_id) {
return this.realm
.objects(this.schema)
.filtered(`to_delete = false AND app_user_id = ${app_user_id}`);
}
getAll() {
let tmp = this.realm.objects(this.schema);
return tmp;
/**
* @param {number} app_user_id App User id
* @returns {import('realm').Results<Contact>}
*/
getAllEditable(app_user_id) {
return this.realm
.objects(this.schema)
.filtered(
`to_delete = false AND send_to_app_user_id = null AND app_user_id = ${app_user_id}`,
);
}
clear() {
/**
* @param {number} app_user_id App User id
* @returns {import('realm').Results<Contact>}
*/
getAllToDelete(app_user_id) {
return this.realm
.objects(this.schema)
.filtered(`to_delete = true AND app_user_id = ${app_user_id}`);
}
/**
* delete contact with id
* @param {number} app_user_id App User id
* @param {string} uuid
*/
delete(app_user_id, uuid) {
const contact = this.get(app_user_id, uuid);
if (typeof contact === 'object') {
this.realm.write(() => {
this.realm.delete(this.getAll());
});
}
delete(key) {
const tmp = this.get(key);
if (typeof tmp === 'object') {
this.realm.write(() => {
this.realm.delete(tmp);
this.realm.delete(contact);
});
}
}
/**
* @param {number} app_user_id App User id
*/
clear(app_user_id) {
this.realm.write(() => {
this.realm.delete(this.getAll(app_user_id));
});
}
}
export default ContactModel;

View file

@ -2,58 +2,91 @@ export const DirectoriesSchema = {
name: 'Directories',
primaryKey: 'id',
properties: {
/** @type {number} */
id: 'int',
name: 'string',
/** @type {number|null} */
parent: { type: 'int', optional: true },
/** @type {number} */
order: 'int',
/** @type {number} */
needAuthorization: 'int',
},
};
/**
* @typedef {Unmanaged<typeof DirectoriesSchema.properties> & import('realm').Object} Directory
*/
class DirectoryModel {
/**
* DirectoryModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Directories';
/** @type {Realm} */
this.realm = realm;
}
/**
* @param {Directory} data
*/
add(data) {
this.realm.write(() => {
this.realm.create(this.schema, data);
});
}
/**
* @param {Directory} data
*/
update(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
/**
* get directory with id
* @param {number} id
* @returns {Directory?}
*/
get(id) {
let tmp = this.realm.objects(this.schema);
/** @type {import('realm').Results<Directory>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return false;
} else {
tmp = tmp.filtered('id = ' + id)[0];
return null;
}
return tmp;
return tmp.filtered('id = ' + id)[0] ?? null;
}
getAll(role, authorizedFolders, format, lang) {
if (authorizedFolders !== null && authorizedFolders !== undefined) {
authorizedFolders = JSON.parse(authorizedFolders);
}
/**
* @param {string} role
* @param {string} authorizedDirs JSON array of {Directory}
* @param {boolean} format
* @param {string} lang
* @returns {import('realm').Results<Directory>}
*/
getAll(role, authorizedDirs, format, lang) {
/** @type {Array<Directory>} */
const allowedDirs =
authorizedDirs !== null && authorizedDirs !== undefined
? JSON.parse(authorizedDirs)
: [];
/** @type {import('realm').Results<Directory>} */
let tmp = this.realm.objects(this.schema);
if (role === 'USER') {
if (authorizedFolders.length > 0) {
if (allowedDirs.length > 0) {
tmp = tmp.filtered(
'needAuthorization = 0 OR ' +
authorizedFolders
.map(folder => ' id = "' + folder.id + '"')
allowedDirs
.map(directory => ' id = "' + directory.id + '"')
.join(' OR '),
);
} else {
tmp = tmp.filtered(
'needAuthorization = 0'
);
tmp = tmp.filtered('needAuthorization = 0');
}
}
if (format) {
@ -62,18 +95,28 @@ class DirectoryModel {
return tmp;
}
/** Delete all */
clear() {
this.realm.write(() => {
this.realm.delete(this.realm.objects(this.schema));
});
}
/**
* Recursive Dir filter
*
* @param {import('realm').Results<Directory>} list
* @param {string} lang
* @param {DirectoryData} parent
* @returns {DirectoryData[]}
*/
_recursiveDir(list, lang, parent = null) {
let root = list.filter(e => e.parent === parent);
let tmp = [];
const root = list.filter(e => e.parent === parent);
const tmp = [];
for (let i = 0; i < root.length; i++) {
let childs = this._recursiveDir(list, lang, root[i].id);
let name = JSON.parse(root[i].name);
const childs = this._recursiveDir(list, lang, root[i].id);
/** @type {Object<string,string>} */
const name = JSON.parse(root[i].name);
tmp[i] = {};
tmp[i].id = root[i].id;
tmp[i].name = this.getI18nName(lang, name);
@ -89,19 +132,26 @@ class DirectoryModel {
return tmp;
}
/**
* Get i18n name
* @param {string} lang
* @param {Record<string,string>} name
* @returns {string}
*/
getI18nName(lang, name) {
let tmp = undefined;
/** @type {string} */
let tmp;
switch (lang) {
case "fr":
case 'fr':
tmp = name.fr;
break;
case "en":
case 'en':
tmp = name.en;
break;
case "de":
case 'de':
tmp = name.de;
break;
case "es":
case 'es':
tmp = name.es;
break;
}
@ -110,7 +160,6 @@ class DirectoryModel {
}
return tmp;
}
}
export default DirectoryModel;

View file

@ -2,57 +2,94 @@ export const DocumentsSchema = {
name: 'Documents',
primaryKey: 'id',
properties: {
/** @type {number} */
id: 'int',
uuid: 'string',
title: 'string',
type: 'string',
path: 'string',
/** @type {number} */
directory: 'int',
lang: 'string',
updated_at: 'string',
},
};
/**
* @typedef {Unmanaged<typeof DocumentsSchema.properties> & import('realm').Object} Document
*/
class DocumentModel {
/**
* DocumentModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Documents';
/** @type {Realm} */
this.realm = realm;
}
add(document) {
/**
* @param {Document} data
*/
add(data) {
this.realm.write(() => {
this.realm.create(this.schema, document, 'never');
this.realm.create(this.schema, data, 'never');
});
}
update(document, updatedAtChange = false) {
let tmp = this.get(document.id);
if (tmp === undefined) {
this.add(document);
/**
* @param {Document} data
* @param {boolean} updatedAtChange
*/
update(data, updatedAtChange = false) {
const tmp = this.get(data.id);
if (tmp === null) {
this.add(data);
} else {
this.realm.write(() => {
if (updatedAtChange === false) {
this.realm.create(this.schema, {
this.realm.create(
this.schema,
{
id: tmp.id,
uuid: document.uuid,
title: document.title,
type: document.type,
path: document.path,
directory: document.directory
}, 'modified');
uuid: data.uuid,
title: data.title,
type: data.type,
path: data.path,
directory: data.directory,
},
'modified',
);
} else {
this.realm.create(this.schema, document, 'modified');
this.realm.create(this.schema, data, 'modified');
}
});
}
}
/**
* get document with id
* @param {number} id
* @returns {Document?}
*/
get(id) {
let tmp = this.realm.objects(this.schema).filtered('id = ' + id)[0];
return tmp;
/** @type {Realm.Results<Document>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return null;
}
return tmp.filtered('id = ' + id)[0] ?? null;
}
/**
* @param {Array<import("./Directory").Directory>} authorizedDirs
* @returns {import('realm').Results<Document>}
*/
getAll(authorizedDirs = false) {
/** @type {Realm.Results<Document>} */
let tmp = this.realm.objects(this.schema);
if (authorizedDirs) {
authorizedDirs = authorizedDirs.map(item => item.id);
@ -61,10 +98,20 @@ class DocumentModel {
return tmp;
}
/**
* @typedef { { uuid: typeof DocumentsSchema.properties.uuid, type: typeof DocumentsSchema.properties.type } } DocumentCleared
*/
/**
* Delete all
* @param {Array<Document>} docs
* @param {Array<DocumentCleared>} toDelete
* @returns {Array<DocumentCleared>}
*/
clear(docs, toDelete = []) {
const localDocs = this.getAll();
localDocs.forEach(doc => {
let tmp = docs.filter(item => item.uuid === doc.uuid);
const tmp = docs.filter(item => item.uuid === doc.uuid);
if (tmp.length === 0) {
toDelete.push({ uuid: doc.uuid, type: doc.type });
this.realm.write(() => {

View file

@ -0,0 +1,107 @@
import { UpdateMode } from 'realm';
export const FormData = {
/** @type {number} */
id: undefined,
/** @type {import('./../Enums/InputType').InputType} */
type: undefined,
/** @type {string} */
name: undefined,
/** @type {string} */
slug: undefined,
/** @type {import('realm').Dictionary<string>} list of translated placeholders Map<string,string> */
placeholder: {},
/** @type {import('realm').List<string>} list of json encoded translated details, list of Map<string,string> */
details: [],
/** @type {boolean} */
is_visible: false,
/** @type {boolean} */
required: false,
/** @type {import('./../Enums/InputStatus').InputStatus} */
status: 0,
/** @type {number} */
order: 0,
};
export const FormsSchema = {
name: 'Formularies',
primaryKey: 'id',
properties: {
id: 'int',
type: 'int',
name: 'string',
slug: 'string',
placeholder: { type: 'dictionary', objectType: 'string' },
details: { type: 'list', objectType: 'string' },
is_visible: 'bool',
required: 'bool',
status: 'int',
order: 'int',
},
};
/**
* @typedef {Unmanaged<typeof FormData> & import('realm').Object} Form
*/
class FormModel {
/**
* DocumentModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Formularies';
/** @type {Realm} */
this.realm = realm;
}
/**
* @param {Form} data
*/
add(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, UpdateMode.Never);
});
}
/**
* get document with id
* @param {number} id
* @returns {Form?}
*/
get(id) {
/** @type {Realm.Results<Form>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return null;
}
return tmp.filtered(`id = ${id}`)[0] ?? null;
}
/**
* @param {import('./../Enums/InputStatus').InputStatus|null} status
* @returns {import('realm').Results<Form>}
*/
getAll(status = null) {
const objects = this.realm.objects(this.schema);
if (status !== null) {
return objects.filtered(`status = ${status}`);
}
return objects;
}
/**
* @typedef { { uuid: typeof FormsSchema.properties.uuid, type: typeof FormsSchema.properties.type } } DocumentCleared
*/
/** Delete all */
clear() {
this.realm.write(() => {
this.realm.delete(this.getAll());
});
}
}
export default FormModel;

View file

@ -2,21 +2,36 @@ export const SendBrochuresSchema = {
name: 'SendBrochures',
primaryKey: 'id',
properties: {
/** @type {number} */
id: 'int',
email: 'string',
subject: 'string',
message: 'string',
documents: 'string',
user_id: 'int'
/** @type {number} */
app_user_id: 'int',
},
};
/**
* @typedef {Unmanaged<typeof SendBrochuresSchema.properties> & import('realm').Object} SendBrochure
*/
class SendBrochureModel {
/**
* SendBrochureModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'SendBrochures';
/** @type {Realm} */
this.realm = realm;
}
/**
* @param {SendBrochure} data
*/
add(data) {
this.realm.write(() => {
if (data.id === undefined) {
@ -26,14 +41,17 @@ class SendBrochureModel {
try {
this.realm.create(this.schema, data, 'never');
} catch (e) {
console.log('db setting add', e);
console.error('db setting add', e);
}
});
}
/**
* @param {SendBrochure} data
*/
upsert(data) {
let tmp = this.get(data.key);
if (tmp === false || tmp === undefined) {
const tmp = this.get(data.key);
if (tmp === null) {
this.add(data);
} else {
if (data.id === undefined) {
@ -45,42 +63,55 @@ class SendBrochureModel {
}
}
/**
* @param {SendBrochure} data
*/
update(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
/**
* get sendBrochure with id
* @param {number} id
* @returns {SendBrochure?}
*/
get(id) {
let tmp = this.realm.objects(this.schema);
/** @type {import('realm').Results<SendBrochure>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return false;
} else {
tmp = tmp.filtered('id = ' + id)[0];
return null;
}
return tmp;
return tmp.filtered('id = ' + id)[0] ?? null;
}
/**
* @returns {import('realm').Results<SendBrochure>}
*/
getAll() {
let tmp = this.realm.objects(this.schema);
return tmp;
return this.realm.objects(this.schema);
}
/** Delete all */
clear() {
this.realm.write(() => {
this.realm.delete(this.getAll());
});
}
delete(key) {
const tmp = this.get(key);
/**
* delete sendBrochure with id
* @param {number} id id
*/
delete(id) {
const tmp = this.get(id);
if (typeof tmp === 'object') {
this.realm.write(() => {
this.realm.delete(tmp);
});
}
}
}
export default SendBrochureModel;

View file

@ -2,35 +2,52 @@ export const SettingsSchema = {
name: 'Settings',
primaryKey: 'id',
properties: {
/** @type {number} */
id: 'int',
key: 'string',
value: 'string',
},
};
/**
* @typedef {Unmanaged<typeof SettingsSchema.properties> & import('realm').Object} Setting
*/
class SettingModel {
/**
* SettingModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Settings';
/** @type {Realm} */
this.realm = realm;
}
/**
* @param {Setting} data
*/
add(data) {
this.realm.write(() => {
if (data.id === undefined) {
let id = this.realm.objects(this.schema).max('id');
const id = this.realm.objects(this.schema).max('id');
data.id = id === undefined ? 1 : id + 1;
}
try {
this.realm.create(this.schema, data, 'never');
} catch (e) {
console.log('db setting add', e);
console.error('db setting add', e);
}
});
}
/**
* @param {Setting} data
*/
upsert(data) {
let tmp = this.get(data.key);
if (tmp === false || tmp === undefined) {
const tmp = this.get(data.key);
if (tmp === null) {
this.add(data);
} else {
if (data.id === undefined) {
@ -42,31 +59,41 @@ class SettingModel {
}
}
/**
* @param {Setting} data
*/
update(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
/**
* get setting with key
* @param {string} key
* @returns {Setting?}
*/
get(key) {
let tmp = this.realm.objects(this.schema);
/** @type {import('realm').Results<Setting>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return false;
} else {
tmp = tmp.filtered('key = "' + key + '"')[0];
return null;
}
return tmp;
return tmp.filtered('key = "' + key + '"')[0] ?? null;
}
delete(key) {
const tmp = this.get(key);
/**
* delete setting with id
* @param {number} id id
*/
delete(id) {
const tmp = this.get(id);
if (typeof tmp === 'object') {
this.realm.write(() => {
this.realm.delete(tmp);
});
}
}
}
export default SettingModel;

View file

@ -1,23 +1,55 @@
/**
* @typedef {typeof UserData} UserData
*/
export const UserData = {
/** @type {string|undefined} */
id: undefined,
/** @type {string} */
surname: undefined,
/** @type {string|null} */
lastname: null,
/** @type {string|null} */
firstname: null,
/** @type {string|null} */
role: null,
/** @type {string|null} */
authorizedFolders: null,
};
export const UsersSchema = {
name: 'Users',
primaryKey: 'id',
properties: {
/** @type {number} */
id: 'int',
email: 'string',
surname: 'string',
firstname: 'string',
password: 'string',
role: 'string',
/** Json encoded string of {import('./Models/Directory').Directory[]} */
authorizedFolders: 'string',
},
};
/**
* @typedef {Unmanaged<typeof UsersSchema.properties> & import('realm').Object} User
*/
class UserModel {
/**
* UserModel
* @param {Realm} realm
*/
constructor(realm) {
/** @type string */
this.schema = 'Users';
/** @type {Realm} */
this.realm = realm;
}
/**
* @param {User} data
*/
add(data) {
this.realm.write(() => {
if (data.id === undefined) {
@ -27,13 +59,16 @@ class UserModel {
try {
this.realm.create(this.schema, data, 'never');
} catch (e) {
console.log('db setting add', e);
console.error('db setting add', e);
}
});
}
/**
* @param {User} data
*/
upsert(data) {
let tmp = this.get(data.key);
const tmp = this.get(data.key);
if (tmp === false || tmp === undefined) {
this.add(data);
} else {
@ -46,33 +81,42 @@ class UserModel {
}
}
/**
* @param {User} data
*/
update(data) {
this.realm.write(() => {
this.realm.create(this.schema, data, 'modified');
});
}
/**
* get user with id
* @param {number} id
* @returns {User?}
*/
get(id) {
let tmp = this.realm.objects(this.schema);
/** @type {import('realm').Results<User>} */
const tmp = this.realm.objects(this.schema);
if (tmp.length === 0) {
return false;
} else {
tmp = tmp.filtered('id = ' + id)[0];
return null;
}
return tmp;
return tmp.filtered('key = "' + id + '"')[0] ?? null;
}
/**
* @returns {import('realm').Results<User>}
*/
getAll() {
let tmp = this.realm.objects(this.schema);
return tmp;
return this.realm.objects(this.schema);
}
/** Delete all */
clear() {
this.realm.write(() => {
this.realm.delete(this.getAll());
});
}
}
export default UserModel;

View file

@ -1,14 +1,15 @@
// Locale
export const INIT_LOCALE = "INIT_LOCALE";
export const EDIT_LOCALE = "EDIT_LOCALE";
export const INIT_LOCALE = 'INIT_LOCALE';
export const EDIT_LOCALE = 'EDIT_LOCALE';
// Users
export const INIT_USERS = "INIT_USERS";
export const INIT_USERS = 'INIT_USERS';
// Contacts
export const INIT_CONTACT = "INIT_CONTACT";
export const ADD_CONTACT = "ADD_CONTACT";
export const EDIT_CONTACT = "EDIT_CONTACT";
export const DELETE_CONTACT = "DELETE_CONTACT";
export const INIT_CONTACT = 'INIT_CONTACT';
export const SET_CONTACT = 'ADD_CONTACT';
export const DELETE_CONTACT = 'DELETE_CONTACT';
// Directories
export const INIT_DIRECTORIES = "INIT_DIRECTORIES";
export const INIT_DIRECTORIES = 'INIT_DIRECTORIES';
// Documents
export const INIT_DOCUMENTS = "INIT_DOCUMENTS";
export const INIT_DOCUMENTS = 'INIT_DOCUMENTS';
// Formularies
export const INIT_FORMS = 'INIT_FORMS';

View file

@ -1,9 +1,13 @@
import { INIT_CONTACT, ADD_CONTACT, EDIT_CONTACT, DELETE_CONTACT } from "./actionType";
import { DELETE_CONTACT, INIT_CONTACT, SET_CONTACT } from './actionType';
/**
* @typedef { {currentUser: import('../../Models/User').User, data: import('../../Models/Contact').Contact} } InitContactAction
*/
/**
* Init contact
* @param {object} currentUser The currentUser
* @param {object} data The contact data
* @param {import('../../Models/User').User} currentUser The currentUser
* @param {import('../../Models/Contact').Contact} data The contact data
*/
export const initContact = (currentUser, data) => {
return {
@ -14,40 +18,35 @@ export const initContact = (currentUser, data) => {
};
/**
* Add contact
* @param {object} currentUser The currentUser
* @param {object} data The contact data
* @typedef { {currentUser: import('../../Models/User').User, data: import('../../Models/Contact').Contact} } SetContactAction
*/
export const addContact = (currentUser, data) => {
/**
* Add contact
* @param {import('../../Models/User').User} currentUser The currentUser
* @param {import('../../Models/Contact').Contact} data The contact data
*/
export const setContact = (currentUser, data) => {
return {
type: ADD_CONTACT,
type: SET_CONTACT,
currentUser,
data,
};
};
/**
* Edit contact
* @param {object} currentUser The currentUser
* @param {object} data The contact data
* @typedef { {currentUser: import('../../Models/User').User, uuid: string} } DeleteContactAction
*/
export const editContact = (currentUser, data) => {
return {
type: EDIT_CONTACT,
currentUser,
data,
};
};
/**
* Delete contact
* @param {object} currentUser The currentUser
* @param {string} id The contact id
* @param {import('../../Models/User').User} currentUser The currentUser
* @param {string} uuid The contact uuid
*/
export const deleteContact = (currentUser, id) => {
export const deleteContact = (currentUser, uuid) => {
return {
type: DELETE_CONTACT,
currentUser,
id,
uuid: uuid,
};
};

View file

@ -1,10 +1,15 @@
import { INIT_DIRECTORIES } from "./actionType";
import { INIT_DIRECTORIES } from './actionType';
/**
* @typedef { {type: typeof INIT_DIRECTORIES, lang: string, user: import('../../Models/User').User, data: import('../../Models/Directory').Directory} } InitDirectoryAction
*/
/**
* Init
* @param {string} lang The lang
* @param {object} user User
* @param {object} data The document data
* @param {import('../../Models/User').User} user
* @param {import('../../Models/Directory').Directory} data The document data
* @returns {InitDirectoryAction}
*/
export const initDirectories = (lang, user, data) => {
return {

View file

@ -1,10 +1,14 @@
import { INIT_DOCUMENTS } from "./actionType";
import { INIT_DOCUMENTS } from './actionType';
/**
* @typedef { {type: typeof INIT_DOCUMENTS, lang: string, directories: import('realm').Results<import('../../Models/Directory').Directory>, data: import('../../Models/Document').Document } } InitDocumentsAction
*/
/**
* Init contact
* @param {string} lang The lang
* @param {object} directories Directories
* @param {object} data The document data
* @param {Realm.Results<import('../../Models/Directory').Directory>} directories Directories
* @param {import('../../Models/Document').Document} data The document data
*/
export const initDocuments = (lang, directories, data) => {
return {

View file

@ -0,0 +1,16 @@
import { INIT_FORMS } from './actionType';
/**
* @typedef { {type: typeof INIT_FORMS, data: import('../../Models/Form').Form } } InitFormAction
*/
/**
* Init forms
* @param {import('../../Models/Form').Form} data The forms data
*/
export const initFormularies = data => {
return {
type: INIT_FORMS,
data,
};
};

View file

@ -1,8 +1,12 @@
import { INIT_LOCALE, EDIT_LOCALE } from "./actionType";
import { EDIT_LOCALE, INIT_LOCALE } from './actionType';
/**
* @typedef { {type: typeof INIT_LOCALE, data: string } } InitLocaleAction
*/
/**
* Init locale
* @param {object} data The locale data
* @param {string} data The locale data
*/
export const initLocale = data => {
return {
@ -11,9 +15,13 @@ export const initLocale = data => {
};
};
/**
* @typedef { {type: typeof EDIT_LOCALE, data: string } } EditLocaleAction
*/
/**
* Edit locale
* @param {object} data The locale data
* @param {string} data The locale data
*/
export const editLocale = data => {
return {

View file

@ -1,8 +1,12 @@
import { INIT_USERS } from "./actionType";
import { INIT_USERS } from './actionType';
/**
* @typedef { {type: typeof INIT_USERS, data: import('../../Models/User').User } } InitUserAction
*/
/**
* Init users
* @param {object} data The users data
* @param {import('../../Models/User').User} data The users data
*/
export const initUsers = data => {
return {

View file

@ -1,11 +1,12 @@
import { createStore, combineReducers } from "redux";
import { combineReducers, createStore } from 'redux';
import appReducer from "./Reducers/AppReducer";
import contactsReducer from "./Reducers/contacts";
import documentsReducer from "./Reducers/documents";
import directoriesReducer from "./Reducers/directories";
import localesReducer from "./Reducers/locales";
import usersReducer from "./Reducers/users";
import appReducer from './Reducers/AppReducer';
import contactsReducer from './Reducers/contacts';
import directoriesReducer from './Reducers/directories';
import documentsReducer from './Reducers/documents';
import formulariesReducer from './Reducers/formularies';
import localesReducer from './Reducers/locales';
import usersReducer from './Reducers/users';
const rootReducer = combineReducers({
app: appReducer,
@ -13,7 +14,8 @@ const rootReducer = combineReducers({
documents: documentsReducer,
directories: directoriesReducer,
locale: localesReducer,
users: usersReducer
users: usersReducer,
formularies: formulariesReducer,
});
export const store = createStore(rootReducer);

View file

@ -1,56 +1,50 @@
import SyncController from "../../Controllers/SyncController";
import SyncController from '../../Controllers/SyncController';
// Database
import { Setting, SendBrochure } from '../../../Database';
import { SendBrochure, Setting } from '../../../Database';
const initialState = {
isSetup: false,
locale: 'fr',
currentUser: {},
logged: false,
syncVersion: 0,
forceSync: false,
currentOpenedDoc: {},
ShowIsActive: 0,
HomeBtns: {},
mainColor: '#D4021D',
FormSelect1: {},
FormSelect2: {},
FormCheck: [],
};
const reducer = (state = initialState, action) => {
let saved;
switch (action.type) {
case 'INIT':
let ShowIsActive = Setting.get('ShowIsActive');
let MainColor = Setting.get('MainColor');
let FormSelect1 = Setting.get('FormSelect1');
let FormSelect2 = Setting.get('FormSelect2');
let FormCheck = Setting.get('FormCheck');
saved = Setting.get('isSetup');
return {
...state,
isSetup: saved === undefined ? false : saved.value === "true" ? true : false,
ShowIsActive: ShowIsActive === undefined ? false : ShowIsActive.value,
mainColor: MainColor === undefined ? initialState.mainColor : MainColor === false ? initialState.mainColor : MainColor.value,
FormSelect1: FormSelect1 === undefined ? initialState.FormSelect1 : FormSelect1 === false ? initialState.FormSelect1 : JSON.parse(FormSelect1.value),
FormSelect2: FormSelect2 === undefined ? initialState.FormSelect2 : FormSelect2 === false ? initialState.FormSelect2 : JSON.parse(FormSelect2.value),
FormCheck: FormCheck === undefined ? initialState.FormCheck : FormCheck === false ? initialState.FormCheck : JSON.parse(FormCheck.value),
isSetup:
saved === undefined ? false : saved?.value === 'true' ? true : false,
mainColor:
MainColor === undefined
? initialState.mainColor
: MainColor === null
? initialState.mainColor
: MainColor?.value,
};
case 'INIT_HOME_BTNS': {
let HomeFolders = Setting.get('HomeFolders');
let Btns = JSON.parse(HomeFolders.value);
let Btns = HomeFolders ? JSON.parse(HomeFolders?.value) : [];
return {
...state,
HomeBtns: Btns
}
HomeBtns: Btns,
};
}
case 'SET_ISSETUP':
Setting.upsert({ key: 'isSetup', value: "true" });
Setting.upsert({ key: 'isSetup', value: 'true' });
saved = Setting.get('isSetup');
return {
...state,
isSetup: saved === undefined ? false : saved.value === "true" ? true : false
isSetup:
saved === undefined ? false : saved?.value === 'true' ? true : false,
};
case 'SET_CURRENT_USER':
let user = false;
@ -58,14 +52,14 @@ const reducer = (state = initialState, action) => {
if (action.data === false) {
Setting.delete('isLogged');
} else {
userObj = Setting.get('isLogged').value
user = JSON.parse(userObj)
isLogged = true
let userObj = Setting.get('isLogged');
user = userObj ? JSON.parse(userObj?.value) : false;
isLogged = true;
}
return {
...state,
currentUser: user !== false ? user : initialState.currentUser,
logged: isLogged
logged: isLogged,
};
// case 'UPDATE_LOCALE':
// let nxt;
@ -101,18 +95,7 @@ const reducer = (state = initialState, action) => {
case 'SET_CURRENT_OPENED_DOC':
return {
...state,
currentOpenedDoc: action.data
};
case 'UPDATE_VERSION':
return {
...state,
syncVersion: action.data,
};
case 'UPDATE_SHOW_IS_ACTIVE':
SyncController.updateShowIsActive(action.data);
return {
...state,
ShowIsActive: action.data,
currentOpenedDoc: action.data,
};
case 'SEND_BROCHURE':
SendBrochure.add(action.data);
@ -120,6 +103,6 @@ const reducer = (state = initialState, action) => {
default:
return state;
}
}
};
export default reducer;

View file

@ -1,26 +1,32 @@
import { INIT_CONTACT, ADD_CONTACT, EDIT_CONTACT, DELETE_CONTACT } from "../Actions/actionType";
import {
DELETE_CONTACT,
INIT_CONTACT,
SET_CONTACT,
} from '../Actions/actionType';
// Models
import { Contact } from "../../../Database";
import { Contact } from '../../../Database';
/** @type {import('../../Models/Contact').Contact[]} */
const initialState = [];
/**
* @param {typeof initialState} state
* @param {import('../Actions/contacts').InitContactAction|import('../Actions/contacts').SetContactAction|import('../Actions/contacts').DeleteContactAction} action
* @returns {import('realm').Results<import('../../Models/Contact').Contact>}
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_CONTACT: {
return Contact.getByUser(action.currentUser.id);
return Contact.getAllEditable(action.currentUser.id);
}
case ADD_CONTACT: {
action.data.user_id = action.currentUser.id;
Contact.add(action.data);
return Contact.getByUser(action.currentUser.id);
}
case EDIT_CONTACT: {
Contact.update(action.data);
return Contact.getByUser(action.currentUser.id);
case SET_CONTACT: {
action.data.app_user_id = action.currentUser.id;
Contact.set(action.data);
return Contact.getAllEditable(action.currentUser.id);
}
case DELETE_CONTACT: {
Contact.delete(action.id);
return Contact.getByUser(action.currentUser.id);
Contact.delete(action.currentUser.id, action.uuid);
return Contact.getAllEditable(action.currentUser.id);
}
default: {

View file

@ -1,9 +1,19 @@
import { INIT_DIRECTORIES } from "../Actions/actionType";
import { Directory } from '../../../Database';
import { INIT_DIRECTORIES } from '../Actions/actionType';
// Models
import { Directory } from "../../../Database";
const initialState = [];
const initialState = {
/** @type {Realm.Results<import('../../Models/Directory').Directory>} */
global: [],
/** @type {Realm.Results<import('../../Models/Directory').Directory>} */
treeview: [],
};
/**
* @param {typeof initialState} state
* @param {import('../Actions/directories').InitDirectoryAction} action
* @returns
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_DIRECTORIES: {
@ -12,15 +22,15 @@ const reducer = (state = initialState, action) => {
action.user.role,
action.user.authorizedFolders,
false,
action.lang
action.lang,
),
treeview: Directory.getAll(
action.user.role,
action.user.authorizedFolders,
true,
action.lang
)
}
action.lang,
),
};
}
default: {

View file

@ -1,15 +1,21 @@
import { INIT_DOCUMENTS } from "../Actions/actionType";
import { INIT_DOCUMENTS } from '../Actions/actionType';
// Models
import { Document } from "../../../Database";
import { Document } from '../../../Database';
/** @type {import('../../Models/Document').Document[]} */
const initialState = [];
/**
* @param {typeof initialState} state
* @param {import('../Actions/documents').InitDocumentsAction} action
* @returns
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_DOCUMENTS: {
let docs = Document.getAll(action.directories);
const docs = Document.getAll(action.directories);
if (docs.length === 0) {
return state
return state;
}
return docs.filter(item => item.lang === action.lang);
}

View file

@ -0,0 +1,30 @@
import { INIT_FORMS } from '../Actions/actionType';
// Models
import { Form } from '../../../Database';
const initialState = {
/** @type {Realm.Results<import('../../Models/Form').Form>} */
users: [],
};
/**
* @param {typeof initialState} state
* @param {import('../Actions/formularies').InitFormAction} action
* @returns
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_FORMS: {
return {
...state,
forms: Form.getAll(),
};
}
default: {
return state;
}
}
};
export default reducer;

View file

@ -1,26 +1,36 @@
import { INIT_LOCALE, EDIT_LOCALE } from "../Actions/actionType";
import { EDIT_LOCALE, INIT_LOCALE } from '../Actions/actionType';
// Models
import { Setting } from "../../../Database";
import { Setting } from '../../../Database';
// Translations
import i18n from "../../../I18n";
import i18n from '../../../I18n';
const initialState = [];
const initialState = {
locale: 'fr',
};
const availableLocales = ['fr', 'en', 'de'];
/**
* @param {typeof initialState} state
* @param {import('../Actions/locales').InitLocaleAction|import('../Actions/locales').EditLocaleAction} action
* @returns
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_LOCALE: {
const savedLocale = Setting.get('locale');
return {
...state,
locale: savedLocale === undefined ? 'fr' : savedLocale === false ? 'fr' : savedLocale.value
locale: savedLocale === null ? initialState.locale : savedLocale.value,
};
}
case EDIT_LOCALE: {
let nxt;
if (action.data === undefined) {
const availableLocales = ['fr', 'en', 'de'];
if (availableLocales.indexOf(i18n.locale) === availableLocales.length - 1) {
if (
availableLocales.indexOf(i18n.locale) ===
availableLocales.length - 1
) {
nxt = availableLocales[0];
} else {
nxt = availableLocales[availableLocales.indexOf(i18n.locale) + 1];

View file

@ -1,9 +1,17 @@
import { INIT_USERS } from "../Actions/actionType";
import { INIT_USERS } from '../Actions/actionType';
// Models
import { User } from "../../../Database";
import { User } from '../../../Database';
const initialState = [];
const initialState = {
/** @type {Realm.Results<import('../../Models/User').User>} */
users: [],
};
/**
* @param {typeof initialState} state
* @param {import('../Actions/users').InitUserAction} action
* @returns
*/
const reducer = (state = initialState, action) => {
switch (action.type) {
case INIT_USERS: {

File diff suppressed because it is too large Load diff

View file

@ -1,21 +1,24 @@
import React from 'react';
import {
View,
Alert,
Button,
FlatList,
Linking,
Platform,
Text,
TouchableOpacity,
Alert,
TextInput,
TouchableOpacity,
View,
} from 'react-native';
import { openComposer } from 'react-native-email-link';
// Reduxs
import { connect } from 'react-redux';
import { editContact } from '../Store/Actions/contacts';
import { deleteContact } from '../Store/Actions/contacts';
import { deleteContact, setContact } from '../Store/Actions/contacts';
// Helpers
import Helpers from "../Lib/Helpers";
import Helpers from '../Lib/Helpers';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// Icons
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
// Flash Messages
@ -33,15 +36,21 @@ function mapStateToProps(state) {
contacts: state.contacts,
documents: state.documents,
currentUser: state.app.currentUser,
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
/**
* @typedef {(user: import('./../Models/User').User, data: import('./../Models/Contact').Contact) => void} setContact
* @typedef {(user: import('./../Models/User').User, uuid: string ) => void} deleteContact
* @typedef {(email: string ) => void} sendBrochure
*/
const mapDispatchToProps = dispatch => {
return {
editContact: (user, data) => dispatch(editContact(user, data)),
setContact: (user, data) => dispatch(setContact(user, data)),
deleteContact: (user, id) => dispatch(deleteContact(user, id)),
sendBrochure: (email) => dispatch({ type: 'SEND_BROCHURE', data: email })
sendBrochure: email => dispatch({ type: 'SEND_BROCHURE', data: email }),
};
};
@ -51,9 +60,6 @@ class ContactScreen extends React.Component {
sortType: 'asc',
sortField: 'name',
searchTxt: '',
showTransferContact: false,
selectedTransferUser: 0,
contactToTransfer: {},
showSendBrochure: false,
selectedDocument: -1,
sendDocumentList: [],
@ -63,9 +69,21 @@ class ContactScreen extends React.Component {
tmpSendBrochureMessage: '',
sortedDocuments: [],
sortedEmails: [],
/** @type {number} The user index selected for transfert */
selectedTransferUserIndex: 0,
/** @type {import('./../Models/Contact').Contact|null} The contact to transfert */
contactToTransfer: null,
/** @type {boolean} Is tranfert contact model display ? */
showTransferContact: false,
};
// * --- ACTIONS
sendBrochure() {
// FIXME: Si on n'a pas consulté les documents la liste des documents est vide apres initialisation
if (
this.state.tmpSendBrochureEmail !== '' &&
this.state.tmpSendBrochureSubject !== '' &&
@ -73,14 +91,16 @@ class ContactScreen extends React.Component {
this.state.sendDocumentList.length > 0 &&
Helpers.isEmailValid(this.state.tmpSendBrochureEmail)
) {
/** @type {sendBrochure} */
const sendBrochure = this.props.sendBrochure;
const email = {
email: this.state.tmpSendBrochureEmail,
subject: this.state.tmpSendBrochureSubject,
message: this.state.tmpSendBrochureMessage,
documents: JSON.stringify(this.state.sendDocumentList),
user_id: this.props.currentUser.id
app_user_id: this.props.currentUser.id,
};
this.props.sendBrochure(email);
sendBrochure(email);
this.setState({
showSendBrochure: false,
tmpSendBrochureEmail: '',
@ -105,29 +125,27 @@ class ContactScreen extends React.Component {
}
transferContact() {
const nextUser = this.props.users.filter(user => user.id !== this.props.currentUser.id)[this.state.selectedTransferUser];
const transferContact = this.state.contactToTransfer;
const contact = {
id: transferContact.id,
email: transferContact.email,
type: transferContact.type,
other: transferContact.other,
network: transferContact.network,
name: transferContact.name,
firstname: transferContact.firstname,
office: transferContact.office,
company: transferContact.company,
address: transferContact.address,
phone: transferContact.phone,
products: transferContact.products,
notes: transferContact.note,
visits: transferContact.visits,
to_delete: false,
synced: false,
user_id: nextUser.id,
};
this.props.editContact(this.props.currentUser, contact);
this.setState({ showTransferContact: false });
/** @type {import('./../Models/User').User} */
const nextUser = this.props.users
.filter(user => user.id !== this.props.currentUser.id)
.sort(Helpers.compareValues('email', 'asc'))[
this.state.selectedTransferUserIndex
];
/** @type {import('./../Models/Contact').ContactData} cloned contact */
const transferContact = this.state.contactToTransfer.toJSON();
if (transferContact === null) {
throw new Error('No selected contact to transfert');
}
// * Assign cloned contact to another user
transferContact.send_to_app_user_id = nextUser.id;
transferContact.timestamp = new Date();
transferContact.synced = false;
/** @type {setContact} */
const setContactHook = this.props.setContact;
setContactHook(this.props.currentUser, transferContact);
this.setState({ showTransferContact: false, contactToTransfer: null });
showMessage({
message: i18n.t('contact_s.contact_transferred') + '.',
description: i18n.t('contact_s.contact_will_be_sent_after_sync') + '.',
@ -136,21 +154,30 @@ class ContactScreen extends React.Component {
});
}
deleteContactAction(id) {
/**
* Delete contact
* @param {import('../Models/Contact').Contact} contact
*/
deleteContactAction(contact) {
Alert.alert(
i18n.t('global.confirmation'),
i18n.t('contact_s.confirm_contact_delete'),
[
{
text: i18n.t('global.no'),
onPress: () => console.log('Cancel Pressed'),
onPress: () => console.debug('Cancel Pressed'),
style: 'cancel',
},
{
text: i18n.t('global.yes'),
onPress: () => {
this.setState({ contacts: [], sortedEmails: [] });
this.props.deleteContact(this.props.currentUser, id);
/** @type {setContact} */
const setContactHook = this.props.setContact;
/** @type {import('./../Models/Contact').ContactData} */
const contactToDelete = contact.toJSON();
contactToDelete.to_delete = true;
setContactHook(this.props.currentUser, contactToDelete);
showMessage({
message: i18n.t('contact_s.contact_deleted') + '.',
type: 'success',
@ -163,27 +190,114 @@ class ContactScreen extends React.Component {
);
}
Item(item) {
/**
* Try to call the number
*
* @param {string} phone
*/
callNumberIfSupported(phone) {
let phoneNumber = phone;
if (Platform.OS !== 'android') {
phoneNumber = `telprompt:${phone}`;
} else {
phoneNumber = `tel:${phone}`;
}
Linking.canOpenURL(phoneNumber)
.then(supported => {
if (supported) {
return Linking.openURL(phoneNumber);
}
})
.catch(err => console.error(err));
}
/**
* Write a new email to
*
* @param {string} email
*/
composeNewEmailTo(email) {
openComposer({
to: email,
});
}
// * END --- ACTIONS
/**
* Render the table header
* @returns {JSX.Element}
*/
HeaderItem() {
return (
<View style={styles.item}>
<TouchableOpacity
onPress={() => {
this.sortContacts('lastname');
}}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>
{i18n.t('global.lastname')} <FontAwesome5 name={'sort'} />
</Text>
</TouchableOpacity>
<TouchableOpacity
onPress={() => {
this.sortContacts('email');
}}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>
{i18n.t('global.email')} <FontAwesome5 name={'sort'} />
</Text>
</TouchableOpacity>
<TouchableOpacity
onPress={() => {
this.sortContacts('phone');
}}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>
{i18n.t('global.phone')} <FontAwesome5 name={'sort'} />
</Text>
</TouchableOpacity>
<Text style={styles.buttons} />
</View>
);
}
/**
* Render a line of contact
* @param {import('../Models/Contact').Contact} contact
* @returns
*/
Item(contact) {
const displayName =
String(contact.lastname ?? '').toUpperCase() +
' ' +
(contact.firstname ?? '');
return (
<View style={styles.item}>
<TouchableOpacity
onPress={() =>
this.props.navigation.navigate('ContactDetailsScreen', {
action: 'edit',
contactId: item.id,
contactId: contact.id,
})
}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>
{item.name.toUpperCase()} {item.firstname}
{contact.lastname || contact.firstname ? displayName : contact.id}
</Text>
</TouchableOpacity>
<Text style={styles.company}>{item.company}</Text>
<Text style={styles.email}>{item.email}</Text>
<TouchableOpacity onPress={() => this.composeNewEmailTo(contact.email)}>
<Text style={{ ...styles.clickable }}>{contact.email}</Text>
</TouchableOpacity>
<TouchableOpacity
onPress={() =>
contact.phone ? this.callNumberIfSupported(contact.phone) : false
}>
<Text style={{ ...styles.clickable }}>{contact.phone}</Text>
</TouchableOpacity>
<View style={styles.buttons}>
<TouchableOpacity
style={styles.button}
onPress={() => {
this.deleteContactAction(item.id);
this.deleteContactAction(contact);
}}>
<FontAwesome5 name="trash" size={20} color={this.props.mainColor} />
</TouchableOpacity>
@ -192,10 +306,14 @@ class ContactScreen extends React.Component {
onPress={() => {
this.setState({
showTransferContact: true,
contactToTransfer: item,
contactToTransfer: contact,
});
}}>
<FontAwesome5 name="paper-plane" size={20} color={this.props.mainColor} />
<FontAwesome5
name="paper-plane"
size={20}
color={this.props.mainColor}
/>
</TouchableOpacity>
</View>
</View>
@ -213,46 +331,67 @@ class ContactScreen extends React.Component {
sort = 'asc';
}
}
this.setState({ contacts: this.state.contacts.sort(Helpers.compareValues(field, sort)), sortType: sort, sortField: field });
}
HeaderItem() {
return (
<View style={styles.item}>
<TouchableOpacity onPress={() => {
this.sortContacts('name');
}}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>{i18n.t('global.name')} <FontAwesome5 name={'sort'} /></Text>
</TouchableOpacity>
<TouchableOpacity onPress={() => {
this.sortContacts('company');
}}>
<Text style={{ ...styles.clickable, color: this.props.mainColor }}>{i18n.t('global.company')} <FontAwesome5 name={'sort'} /></Text>
</TouchableOpacity>
<Text style={styles.email}>{i18n.t('global.email')}</Text>
<Text style={styles.buttons} />
</View>
);
this.setState({
contacts: this.state.contacts.sort(Helpers.compareValues(field, sort)),
sortType: sort,
sortField: field,
});
}
handleSearchBtn() {
if (this.state.searchTxt.length > 0) {
let obj = this.props.contacts;
let array = Object.keys(obj).map(function (key) { return obj[key]; });
this.setState({ contacts: array.sort(Helpers.compareValues('name', 'asc')), sortType: 'asc', searchTxt: '' });
let array = Object.keys(obj).map(function (key) {
return obj[key];
});
this.setState({
contacts: array.sort(Helpers.compareValues('name', 'asc')),
sortType: 'asc',
searchTxt: '',
});
}
}
handleSearchTxt(text) {
this.setState({ searchTxt: text });
/** @type {Array<import('./../Models/Contact').Contact>} */
const contacts = this.props.contacts;
if (text.length > 0) {
let tmpContactsName = this.props.contacts.filter(item => item.name.toLowerCase().indexOf(text.toLowerCase()) >= 0);
let tmpContactsCompany = this.props.contacts.filter(item => item.company.toLowerCase().indexOf(text.toLowerCase()) >= 0);
let resSearch = Object.assign(tmpContactsName, tmpContactsCompany);
this.setState({ contacts: resSearch.sort(Helpers.compareValues('name', 'asc')), sortType: 'asc' });
const tmpContactsLastname = contacts.filter(
item => item.lastname?.toLowerCase()?.indexOf(text.toLowerCase()) >= 0,
);
const tmpContactsFirstname = contacts.filter(
item => item.firstname?.toLowerCase()?.indexOf(text.toLowerCase()) >= 0,
);
const tmpContactsEmail = contacts.filter(
item => item.email.toLowerCase().indexOf(text.toLowerCase()) >= 0,
);
const tmpContactsPhone = contacts.filter(
item => item.phone?.toLowerCase()?.indexOf(text.toLowerCase()) >= 0,
);
const resSearch = new Map();
tmpContactsLastname.forEach(contact =>
resSearch.set(contact.id, contact),
);
tmpContactsFirstname.forEach(contact =>
resSearch.set(contact.id, contact),
);
tmpContactsEmail.forEach(contact => resSearch.set(contact.id, contact));
tmpContactsPhone.forEach(contact => resSearch.set(contact.id, contact));
this.setState({
contacts: [...resSearch.values()].sort(
Helpers.compareValues('name', 'asc'),
),
sortType: 'asc',
});
} else {
let obj = this.props.contacts;
let array = Object.keys(obj).map(function (key) { return obj[key]; });
this.setState({ contacts: array.sort(Helpers.compareValues('name', 'asc')), sortType: 'asc' });
let array = Object.keys(obj).map(function (key) {
return obj[key];
});
this.setState({
contacts: array.sort(Helpers.compareValues('name', 'asc')),
sortType: 'asc',
});
}
}
@ -269,12 +408,25 @@ class ContactScreen extends React.Component {
init() {
let objContacts = this.props.contacts;
let objDocs = this.props.documents;
let arrayContacts = Object.keys(objContacts).map(function (key) { return objContacts[key]; });
let arrayEmails = Object.keys(objContacts).map(function (key) { return objContacts[key]; });
let arrayDocs = Object.keys(objDocs).map(function (key) { return objDocs[key]; });
let arrayContacts = Object.keys(objContacts).map(function (key) {
return objContacts[key];
});
let arrayEmails = Object.keys(objContacts).map(function (key) {
return objContacts[key];
});
let arrayDocs = Object.keys(objDocs).map(function (key) {
return objDocs[key];
});
const { action } = this.props.route.params;
if (action === 'add') {
this.props.navigation.navigate('ContactDetailsScreen', {
action: 'add',
});
}
this.setState({
contacts: arrayContacts.sort(Helpers.compareValues('name', 'asc')),
contacts: arrayContacts.sort(Helpers.compareValues('timestamp', 'desc')),
sortedDocuments: arrayDocs.sort(Helpers.compareValues('title', 'asc')),
sortedEmails: arrayEmails.sort(Helpers.compareValues('email', 'asc')),
sortType: 'asc',
@ -283,12 +435,8 @@ class ContactScreen extends React.Component {
}
render() {
const { contactAdded, action } = this.props.route.params;
if (action === 'add') {
this.props.navigation.navigate('ContactDetailsScreen', {
action: 'add',
})
}
const { contactAdded } = this.props.route.params;
if (contactAdded === true) {
this.props.navigation.setParams({ contactAdded: false });
showMessage({
@ -299,6 +447,7 @@ class ContactScreen extends React.Component {
}
return (
<View style={styles.container}>
{/* ACTIONS */}
<View
style={{
marginTop: 20,
@ -321,8 +470,18 @@ class ContactScreen extends React.Component {
onPress={() => this.setState({ showSendBrochure: true })}
/>
<View style={{ flexDirection: 'row' }}>
<TextInput placeholder={i18n.t('global.search')} style={styles.inputSearch} value={this.state.searchTxt} onChangeText={(text) => this.handleSearchTxt(text)} />
<TouchableOpacity style={{ ...styles.btnSearch, backgroundColor: this.props.mainColor }} onPress={() => this.handleSearchBtn()}>
<TextInput
placeholder={i18n.t('global.search')}
style={styles.inputSearch}
value={this.state.searchTxt}
onChangeText={text => this.handleSearchTxt(text)}
/>
<TouchableOpacity
style={{
...styles.btnSearch,
backgroundColor: this.props.mainColor,
}}
onPress={() => this.handleSearchBtn()}>
{this.state.searchTxt.length > 0 ? (
<FontAwesome5 name={'times'} size={20} color={'white'} />
) : (
@ -331,6 +490,7 @@ class ContactScreen extends React.Component {
</TouchableOpacity>
</View>
</View>
{/* TABLE view */}
<View style={{ flex: 1, marginTop: 20 }}>
<FlatList
data={this.state.contacts}
@ -339,6 +499,7 @@ class ContactScreen extends React.Component {
keyExtractor={item => item.id.toString()}
/>
</View>
{/* TRANSFERT CONTACT POPUP */}
<Overlay
isVisible={this.state.showTransferContact}
windowBackgroundColor="rgba(255, 255, 255, .9)"
@ -347,19 +508,30 @@ class ContactScreen extends React.Component {
height={300}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text style={{ marginBottom: 10 }}>{i18n.t('contact_s.select_contact')} :</Text>
<Text style={{ marginBottom: 10 }}>
{i18n.t('contact_s.select_contact')} :
</Text>
<Picker
style={{
width: 300,
marginBottom: 15,
paddingLeft: 10,
}}
selectedValue={this.state.selectedTransferUser}
selectedValue={this.state.selectedTransferUserIndex}
onValueChange={(itemValue, itemIndex) => {
this.setState({ selectedTransferUser: itemIndex });
this.setState({ selectedTransferUserIndex: itemIndex });
}}>
{this.props.users.filter(user => user.id !== this.props.currentUser.id).map((item, index) => {
return <Picker.Item label={item.email} value={index} key={item.id.toString()} />;
{this.props.users
.filter(user => user.id !== this.props.currentUser.id)
.sort(Helpers.compareValues('email', 'asc'))
.map((item, index) => {
return (
<Picker.Item
label={item.email}
value={index}
key={item.id.toString()}
/>
);
})}
</Picker>
<View
@ -382,6 +554,7 @@ class ContactScreen extends React.Component {
</View>
</View>
</Overlay>
{/* DELETE CONTACT POPUP */}
<Overlay
isVisible={this.state.showSendBrochure}
windowBackgroundColor="rgba(255, 255, 255, .9)"
@ -417,14 +590,23 @@ class ContactScreen extends React.Component {
onValueChange={(itemValue, itemIndex) => {
if (itemValue !== '-1') {
this.setState({
tmpSendBrochureEmail: this.state.sortedEmails[itemIndex - 1]
.email,
tmpSendBrochureEmail:
this.state.sortedEmails[itemIndex - 1].email,
});
}
}}>
<Picker.Item label={i18n.t('contact_s.contact_list') + ' :'} value="-1" />
<Picker.Item
label={i18n.t('contact_s.contact_list') + ' :'}
value="-1"
/>
{this.state.sortedEmails.map((item, index) => {
return <Picker.Item label={item.email} value={index} key={item.id.toString()} />;
return (
<Picker.Item
label={item.email}
value={index}
key={item.id.toString()}
/>
);
})}
</Picker>
<TextInput
@ -457,7 +639,7 @@ class ContactScreen extends React.Component {
itemValue !== '-1' &&
this.state.sendDocumentList.length < 8
) {
let tmp = this.state.sendDocumentList;
const tmp = this.state.sendDocumentList;
const toPush = this.state.sortedDocuments[itemIndex - 1];
const test = this.state.sendDocumentList.filter(
item => item.id === toPush.id,
@ -470,7 +652,10 @@ class ContactScreen extends React.Component {
}
}
}}>
<Picker.Item label={i18n.t('contact_s.documents_list') + ' :'} value="-1" />
<Picker.Item
label={i18n.t('contact_s.documents_list') + ' :'}
value="-1"
/>
{this.state.sortedDocuments.map((item, index) => {
return (
<Picker.Item
@ -498,7 +683,7 @@ class ContactScreen extends React.Component {
<TouchableOpacity
key={index}
onPress={() => {
let tmp = this.state.sendDocumentList;
const tmp = this.state.sendDocumentList;
tmp.splice(this.props.documents[index], 1);
this.setState({
sendDocumentList: tmp,
@ -545,7 +730,11 @@ class ContactScreen extends React.Component {
})
}
/>
<Button title={i18n.t('global.send')} onPress={() => this.sendBrochure()} color={this.props.mainColor} />
<Button
title={i18n.t('global.send')}
onPress={() => this.sendBrochure()}
color={this.props.mainColor}
/>
</View>
</View>
</Overlay>

View file

@ -1,14 +1,7 @@
import React from 'react';
import {
View,
ScrollView,
TouchableOpacity,
Text,
Image
} from 'react-native';
import { Image, ScrollView, Text, TouchableOpacity, View } from 'react-native';
// Redux
import { connect } from 'react-redux';
import { initDocuments } from '../Store/Actions/documents';
// Treeview
import TreeView from 'react-native-animated-tree-view';
// Icon
@ -23,7 +16,7 @@ function mapStateToProps(state) {
documents: state.documents,
directories: state.directories,
locale: state.locale.locale,
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
@ -63,7 +56,7 @@ class DirectoriesScreen extends React.Component {
this.setState({
documents: this.props.documents.filter(
tmp => tmp.directory === folder.id,
)
),
});
}}
/>
@ -82,7 +75,7 @@ class DirectoriesScreen extends React.Component {
} else if (document.type === 'mp4') {
this.props.navigation.navigate('VideoScreen', { uuid: document.uuid });
} else {
console.log('Inconnu');
console.error('Type de document Inconnu');
}
}
}

View file

@ -1,22 +1,26 @@
import React from 'react';
import { View, ImageBackground, TouchableOpacity, Text, Image } from 'react-native';
import {
Image,
ImageBackground,
Text,
TouchableOpacity,
View,
} from 'react-native';
// Common Styles
import commonStyles from '../../Resources/CommonStyles';
// Redux
import { connect } from 'react-redux';
import { initDocuments } from '../Store/Actions/documents';
import { initContact } from '../Store/Actions/contacts';
import { initDirectories } from '../Store/Actions/directories';
import { initDocuments } from '../Store/Actions/documents';
// SplashScreen
import * as SplashScreen from 'expo-splash-screen';
// Style
import styles from '../../Resources/Styles/HomeStyle';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// FileSytem
import * as FileSystem from 'expo-file-system';
// NetInfo
import NetInfo from '@react-native-community/netinfo';
// Controller
import SyncController from '../Controllers/SyncController';
@ -25,22 +29,21 @@ function mapStateToProps(state) {
btns: state.app.HomeBtns,
directories: state.directories,
locale: state.locale.locale,
currentUser: state.app.currentUser
currentUser: state.app.currentUser,
};
}
const mapDispatchToProps = dispatch => {
return {
initBtns: () => dispatch({ type: 'INIT_HOME_BTNS' }),
initDocuments: (lang, directories) => dispatch(initDocuments(lang, directories)),
initDocuments: (lang, directories) =>
dispatch(initDocuments(lang, directories)),
initContact: currentUser => dispatch(initContact(currentUser)),
initDirectories: (lang, user) => dispatch(initDirectories(lang, user)),
};
};
class HomeScreen extends React.Component {
state = {
lastSyncCall: '1970-01-01',
};
@ -50,6 +53,7 @@ class HomeScreen extends React.Component {
return this.openSync();
}
this.props.initBtns();
console.debug(this.props.currentUser);
this.props.initContact(this.props.currentUser);
this.props.initDirectories(this.props.locale, this.props.currentUser);
this.props.initDocuments(this.props.locale, this.props.directories.global);
@ -57,19 +61,6 @@ class HomeScreen extends React.Component {
SplashScreen.hideAsync();
}
unsubscribe() {
NetInfo.addEventListener(state => {
if (state.isConnected === true) {
let seconds =
Math.abs(new Date(this.state.lastSyncCall) - Date.now()) / 1000;
if (seconds > 30) {
this.setState({ lastSyncCall: Date.now() });
SyncController.needSync(this.openSync.bind(this));
}
}
});
}
openSync() {
this.props.navigation.navigate('SyncScreen', { forceSync: true });
}
@ -77,21 +68,46 @@ class HomeScreen extends React.Component {
render() {
i18n.locale = this.props.locale;
return (
<ImageBackground source={{ uri: FileSystem.documentDirectory + 'BackgroundImage.png' }} style={commonStyles.background} resizeMode='cover'>
<ImageBackground
source={{ uri: FileSystem.documentDirectory + 'BackgroundImage.png' }}
style={commonStyles.background}
resizeMode="cover">
<View style={styles.container}>
{this.renderBtns()}
<TouchableOpacity
key={'OnlyVideos'}
onPress={() => {
this.props.initDocuments(this.props.locale, this.props.directories.global);
this.props.initDocuments(
this.props.locale,
this.props.directories.global,
);
this.props.navigation.navigate('OnlyVideosScreen');
}}
style={styles.button}>
<Image source={{ uri: FileSystem.documentDirectory + 'HomeButtonImage.png' }} style={styles.btnImg} />
<Image
source={{
uri: FileSystem.documentDirectory + 'HomeButtonImage.png',
}}
style={styles.btnImg}
/>
<Text style={styles.btnTxt}>{i18n.t('global.videos')}</Text>
</TouchableOpacity>
<TouchableOpacity key={'Contacts'} onPress={() => this.props.navigation.navigate('ContactScreen')} style={styles.button}>
<Image source={{ uri: FileSystem.documentDirectory + 'HomeButtonImage.png' }} style={styles.btnImg} />
<TouchableOpacity
key={'Contacts'}
onPress={() => {
this.props.initDocuments(
this.props.locale,
this.props.directories.global,
);
this.props.navigation.navigate('ContactScreen');
}}
style={styles.button}>
<Image
source={{
uri: FileSystem.documentDirectory + 'HomeButtonImage.png',
}}
style={styles.btnImg}
/>
<Text style={styles.btnTxt}>{i18n.t('global.contacts')}</Text>
</TouchableOpacity>
</View>
@ -102,16 +118,26 @@ class HomeScreen extends React.Component {
renderBtns() {
let locale = this.props.locale;
let objBtns = this.props.btns;
let array = Object.keys(objBtns).map(function (key) { return objBtns[key]; });
let array = Object.keys(objBtns).map(function (key) {
return objBtns[key];
});
return array.map((item, index) => {
let names = JSON.parse(item.name);
let name = (locale in names) ? names[locale] : names.fr;
let name = locale in names ? names[locale] : names.fr;
return (
<TouchableOpacity key={index} onPress={() => this.openFolder(item.id)} style={styles.button}>
<Image source={{ uri: FileSystem.documentDirectory + 'HomeButtonImage.png' }} style={styles.btnImg} />
<TouchableOpacity
key={index}
onPress={() => this.openFolder(item.id)}
style={styles.button}>
<Image
source={{
uri: FileSystem.documentDirectory + 'HomeButtonImage.png',
}}
style={styles.btnImg}
/>
<Text style={styles.btnTxt}>{name}</Text>
</TouchableOpacity>
)
);
});
}

View file

@ -1,9 +1,17 @@
import React from 'react';
import { ImageBackground, View, Image, Text, TextInput, Button, Alert } from 'react-native';
import {
Alert,
Button,
Image,
ImageBackground,
Text,
TextInput,
View,
} from 'react-native';
// Redux
import { connect } from 'react-redux';
// Sentry
import * as Sentry from "@sentry/react-native";
import * as Sentry from '@sentry/react-native';
// SplashScreen
import * as SplashScreen from 'expo-splash-screen';
// Helpers
@ -15,12 +23,12 @@ import commonStyles from '../../Resources/CommonStyles';
// Style
import styles from '../../Resources/Styles/InstallStyle';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// Controller
import InstallController from '../Controllers/InstallController';
import SyncController from '../Controllers/SyncController';
// Database
import { User, Setting } from '../../Database';
import { Setting, User } from '../../Database';
// FileSytem
import * as FileSystem from 'expo-file-system';
@ -34,15 +42,15 @@ function mapStateToProps(state) {
const mapDispatchToProps = dispatch => {
return {
setIsSetup: () => dispatch({ type: 'SET_ISSETUP' }),
init: () => dispatch({ type: 'INIT' })
init: () => dispatch({ type: 'INIT' }),
};
};
class InstallScreen extends React.Component {
state = {
processing: false,
txtStep: '',
url: "",
}
url: '',
};
componentDidMount() {
SplashScreen.hideAsync();
@ -51,16 +59,21 @@ class InstallScreen extends React.Component {
render() {
i18n.locale = this.props.locale;
return (
<ImageBackground source={require('../../Resources/assets/img/background_ldc.png')} style={commonStyles.background}>
<ImageBackground
source={require('../../Resources/assets/img/background_ldc.png')}
style={commonStyles.background}>
<View style={styles.container}>
<Image source={require('../../Resources/assets/img/logo-square-ldc.png')} style={styles.logo} />
<Image
source={require('../../Resources/assets/img/logo-square-ldc.png')}
style={styles.logo}
/>
<View style={styles.actions}>
<TextInput
keyboardType='url'
autoCapitalize='none'
keyboardType="url"
autoCapitalize="none"
style={commonStyles.textInput}
placeholder={i18n.t("install.enter_url")}
onChangeText={(newText) => this.setState({ url: newText })}
placeholder={i18n.t('install.enter_url')}
onChangeText={newText => this.setState({ url: newText })}
value={this.state.url}
/>
<Button
@ -69,21 +82,26 @@ class InstallScreen extends React.Component {
title={i18n.t('install.install')}
onPress={() => {
if (this.state.url.length === 0) {
Alert.alert(i18n.t("alert.error"), i18n.t("install.enter_url"));
Alert.alert(
i18n.t('alert.error'),
i18n.t('install.enter_url'),
);
} else {
if (Helpers.isUrlValid(this.state.url)) {
// * Ignore ths check on dev, just install.
if (__DEV__ || Helpers.isUrlValid(this.state.url)) {
this.install();
} else {
Alert.alert(i18n.t("alert.error"), i18n.t("install.url_invalid"));
Alert.alert(
i18n.t('alert.error'),
i18n.t('install.url_invalid'),
);
}
}
}}
/>
</View>
<View style={styles.actions}>
<Text>
{this.state.txtStep}
</Text>
<Text>{this.state.txtStep}</Text>
</View>
</View>
</ImageBackground>
@ -93,89 +111,99 @@ class InstallScreen extends React.Component {
async install() {
let url = this.state.url.toLowerCase();
Setting.upsert({ key: 'bo_url', value: url });
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
const isConnected = await SyncController.checkConnection()
.then(state => {
console.debug(state.isConnected);
return state.isConnected;
})
.catch(error => {
console.error(error);
return false;
});
if (!isConnected) {
Alert.alert(
i18n.t('global.warning'),
i18n.t('error.must_be_connected_internet_sync')
i18n.t('error.must_be_connected_internet_sync'),
);
return;
}
this.setState({ processing: true, txtStep: i18n.t("install.get_app_setting") });
const toDL = await InstallController.getConfig(url).then(response => {
this.setState({
processing: true,
txtStep: i18n.t('install.get_app_setting'),
});
const toDL = await InstallController.getConfig(url)
.then(response => {
let toDL = [];
if (response.data) {
if (response.data.status === "OK") {
if (response.data.status === 'OK') {
const rootUrl = url.substring(0, url.lastIndexOf('/'));
_.forEach(response.data.datas, function (value, key) {
switch (key) {
case "MainColor":
case "AppStoreUUID":
case "FormSelect1":
case "FormSelect2":
case "FormCheck":
case 'MainColor':
Setting.upsert({ key: key, value: value });
break;
case "SquaredLogo":
case "RectangleLogo":
case "BackgroundImage":
case "HomeButtonImage":
case 'SquaredLogo':
case 'RectangleLogo':
case 'BackgroundImage':
case 'HomeButtonImage':
toDL.push({
source: url + "/" + value,
dest: FileSystem.documentDirectory + key + '.png'
source: rootUrl + '/' + value,
dest: FileSystem.documentDirectory + key + '.png',
});
break;
}
});
return toDL;
} else {
Alert.alert(i18n.t("alert.error"), i18n.t("error.error_has_occurred"));
Alert.alert(
i18n.t('alert.error'),
i18n.t('error.error_has_occurred'),
);
return false;
}
}
}).catch(function (error) {
})
.catch(function (error) {
Sentry.captureException(error);
Alert.alert(i18n.t("alert.error"), i18n.t("error.error_has_occurred"));
console.error(error);
Alert.alert(i18n.t('alert.error'), i18n.t('error.error_has_occurred'));
return false;
});
if (!toDL) {
this.setState({ processing: false, txtStep: "" });
this.setState({ processing: false, txtStep: '' });
return false;
}
for await (const file of toDL) {
await FileSystem.downloadAsync(
file.source,
file.dest
)
await FileSystem.downloadAsync(file.source, file.dest)
.then(({ uri }) => {
console.log('Finished downloading to ', uri);
console.debug('Finished downloading to ', uri);
})
.catch(error => {
Alert.alert(i18n.t("alert.error"), i18n.t("install.resource_dl_error") + file.dest);
Alert.alert(
i18n.t('alert.error'),
i18n.t('install.resource_dl_error') + file.dest,
);
console.error(error);
return false;
});
}
this.setState({ txtStep: i18n.t("install.get_content_setting") });
this.setState({ txtStep: i18n.t('install.get_content_setting') });
if (InstallController.getAppConfig(url)) {
// getUsers
this.setState({ txtStep: i18n.t('sync_s.updating_users') + '...' });
const resUsers = await SyncController.getUsers().then(res => {
const resUsers = await SyncController.getUsers()
.then(res => {
User.clear();
return res.data;
}).catch(error => {
console.log(error);
})
.catch(error => {
console.error(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
i18n.t('error.error_has_occurred'),
);
return
return;
});
resUsers.forEach(user => {
User.add(user);
@ -184,7 +212,7 @@ class InstallScreen extends React.Component {
this.props.setIsSetup();
this.props.navigation.navigate('LoginScreen');
}
this.setState({ processing: false, txtStep: "" });
this.setState({ processing: false, txtStep: '' });
}
}

View file

@ -1,5 +1,12 @@
import React from 'react';
import { View, ImageBackground, TextInput, Button, Image, Alert } from 'react-native';
import {
Alert,
Button,
Image,
ImageBackground,
TextInput,
View,
} from 'react-native';
// Redux
import { connect } from 'react-redux';
// SplashScreen
@ -9,13 +16,15 @@ import commonStyles from '../../Resources/CommonStyles';
// Style
import styles from '../../Resources/Styles/LoginStyle';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// FileSytem
import * as FileSystem from 'expo-file-system';
// Controller
import LoginController from '../Controllers/LoginController';
// Database
import { Setting } from '../../Database';
import _ from 'lodash';
import { Setting, User } from '../../Database';
import InstallController from '../Controllers/InstallController';
import SyncController from '../Controllers/SyncController';
function mapStateToProps(state) {
@ -23,18 +32,21 @@ function mapStateToProps(state) {
app: state.app,
users: state.users.users,
locale: state.locale.locale,
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
const mapDispatchToProps = dispatch => {
return {
setCurrentUser: () => dispatch({ type: 'SET_CURRENT_USER' }),
setIsSetup: () => dispatch({ type: 'SET_ISSETUP' }),
init: () => dispatch({ type: 'INIT' }),
};
};
class LoginScreen extends React.Component {
state = {
syncWorking: false,
login: '',
password: '',
};
@ -44,13 +56,20 @@ class LoginScreen extends React.Component {
this.props.setCurrentUser(false);
}
SplashScreen.hideAsync();
this.syncUsersIfPossibleAsync();
this.syncAppConfigIfPossibleAsync();
}
render() {
return (
<ImageBackground source={{ uri: FileSystem.documentDirectory + 'BackgroundImage.png' }} style={commonStyles.background}>
<ImageBackground
source={{ uri: FileSystem.documentDirectory + 'BackgroundImage.png' }}
style={commonStyles.background}>
<View style={styles.container}>
<Image source={{ uri: FileSystem.documentDirectory + 'SquaredLogo.png' }} style={styles.logo} />
<Image
source={{ uri: FileSystem.documentDirectory + 'SquaredLogo.png' }}
style={styles.logo}
/>
<View>
<TextInput
style={styles.text}
@ -71,9 +90,12 @@ class LoginScreen extends React.Component {
autoCorrect={false}
/>
<Button
disabled={this.state.syncWorking}
title={i18n.t('global.login')}
onPress={() => this.login(this.state.login.toLowerCase(), this.state.password)}
color={this.props.mainColor}
onPress={() =>
this.login(this.state.login.toLowerCase(), this.state.password)
}
color={!this.state.syncWorking ? this.props.mainColor : 'gray'}
/>
</View>
</View>
@ -83,66 +105,189 @@ class LoginScreen extends React.Component {
async login(login, password) {
if (login === '' || password === '') {
Alert.alert(i18n.t("global.warning"), i18n.t('error.must_fill_login_fields'));
Alert.alert(
i18n.t('global.warning'),
i18n.t('error.must_fill_login_fields'),
);
return;
}
var usersSize = Object.keys(this.props.users).length;
if (usersSize === 0) {
Alert.alert(i18n.t("global.warning"), i18n.t('login_s.missing_users'));
/** @type {Array<import('../Models/User').User>} */
const users = this.props.users;
if (users.length === 0) {
Alert.alert(i18n.t('global.warning'), i18n.t('login_s.missing_users'));
return;
}
let user = this.props.users.filter(tmp => tmp.email === login);
if (user.length === 0) {
const user = users.find(tmp => tmp.email === login);
if (user === undefined) {
Alert.alert(i18n.t('error.error'), i18n.t('error.incorrect_credentials'));
return;
}
user = user[0];
const verified = LoginController.verify(user, password).then(verified => verified);
const verified = await LoginController.verify(user, password);
if (!verified) {
Alert.alert(i18n.t('error.error'), i18n.t('error.incorrect_credentials'));
return;
}
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
const isConnected = await SyncController.checkConnection()
.then(state => {
console.debug(state.isConnected);
return state.isConnected;
})
.catch(error => {
console.debug(error);
return false;
});
const lastUser = Setting.get('lastUser');
// Si on est sur une installation
if (lastUser === false || lastUser == undefined) {
// Si la tablette est connectée à internet pour forcer la synchro
// * Si on est sur une installation
if (lastUser === null) {
console.debug('New Install');
// * Si la tablette est connectée à internet pour forcer la synchro
if (!isConnected) {
Alert.alert(i18n.t('error.error'), i18n.t('error.tablet_not_connected_internet'));
Alert.alert(
i18n.t('error.error'),
i18n.t('error.tablet_not_connected_internet'),
);
return;
}
return this.loginAction(user);
}
// Si on a deja une install
if (lastUser !== false && lastUser !== undefined) {
// Si on a une précédente connexion
// * On a deja eu une install
// * Si on a une précédente connexion
if (lastUser.value === user.id.toString()) {
this.loginAction(user);
} else { // Si le user precedent est different du user courant
console.debug('Was previously logged in');
return this.loginAction(user);
}
// Si le user precedent est different du user courant
// Si user !== last user && last user not synced
if (!SyncController.isSynced()) {
Alert.alert(i18n.t('error.error'), i18n.t('error.tablet_not_synced_last_user'));
if (!SyncController.isSynced(user.id)) {
Alert.alert(
i18n.t('error.error'),
i18n.t('error.tablet_not_synced_last_user'),
);
return;
}
// Si la tablette est connectée à internet pour forcer la synchro
if (!isConnected) {
Alert.alert(i18n.t('error.error'), i18n.t('error.tablet_not_connected_internet'));
Alert.alert(
i18n.t('error.error'),
i18n.t('error.tablet_not_connected_internet'),
);
return;
}
console.debug('New user loggin');
SyncController.setInstalled(true);
this.loginAction(user, true);
}
}
return this.loginAction(user, true);
}
async syncUsersIfPossibleAsync() {
const isConnected = await SyncController.checkConnection();
if (!isConnected.isInternetReachable) {
return;
}
console.debug('sync users ?');
this.setState({ syncWorking: true });
if (InstallController.getAppConfig(SyncController.getUrlBo())) {
// getUsers
const resUsers = await SyncController.getUsers()
.then(res => {
User.clear();
console.debug('got users');
return res.data;
})
.catch(error => {
console.error(error);
this.setState({ syncWorking: false });
return [];
});
if (!resUsers?.length) {
this.setState({ syncWorking: false });
return;
}
resUsers.forEach(user => {
User.add(user);
});
this.setState({ syncWorking: false });
}
return;
}
async syncAppConfigIfPossibleAsync() {
const isConnected = await SyncController.checkConnection();
if (!isConnected.isInternetReachable) {
return;
}
console.debug('sync settings ?');
this.setState({ syncWorking: true });
const url = Setting.get('bo_url')?.value;
if (!url) {
console.warn('url config is wrong');
return;
}
const toDL = await InstallController.getConfig(url)
.then(response => {
const toDLArray = [];
if (response.data) {
if (response.data.status === 'OK') {
console.debug('got settings');
_.forEach(response.data.datas, function (value, key) {
switch (key) {
case 'MainColor':
Setting.upsert({ key: key, value: value });
break;
case 'SquaredLogo':
case 'RectangleLogo':
case 'BackgroundImage':
case 'HomeButtonImage':
toDLArray.push({
source: url + '/' + value,
dest: FileSystem.documentDirectory + key + '.png',
});
break;
}
});
return toDLArray;
} else {
console.debug('got Ko settings');
return false;
}
} else {
console.debug(response);
}
})
.catch(function (error) {
console.error(error);
console.error(error.response);
return [];
});
if (!toDL?.length) {
this.setState({ syncWorking: false });
return false;
}
for await (const file of toDL) {
await FileSystem.downloadAsync(file.source, file.dest)
.then(({ uri }) => {
console.debug('Finished downloading to ', uri);
})
.catch(error => {
console.error(error);
this.setState({ syncWorking: false });
return false;
});
}
this.props.init();
this.props.setIsSetup();
this.setState({ syncWorking: false });
}
/**
* @param {import('../Models/User').User} user
*/
loginAction(user) {
this.setState({ login: '', password: '' });
console.debug('loginAction');
LoginController.login(user);
this.props.setCurrentUser();
}

View file

@ -1,28 +0,0 @@
import React from 'react';
import {
View,
Text,
} from 'react-native';
// Redux
import { connect } from 'react-redux';
// Style
import styles from '../../Resources/Styles/MySpaceStyle';
function mapStateToProps(state) {
return {
documents: state.app.documents,
};
}
class MySpaceScreen extends React.Component {
render() {
return (
<View style={styles.container}>
<Text>Mon Espace</Text>
</View>
);
}
}
export default connect(mapStateToProps)(MySpaceScreen);

View file

@ -1,10 +1,5 @@
import React from 'react';
import {
View,
ScrollView,
TouchableOpacity,
Text,
} from 'react-native';
import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
// Redux
import { connect } from 'react-redux';
// Icons
@ -15,7 +10,7 @@ import styles from '../../Resources/Styles/OnlyVideosStyle';
function mapStateToProps(state) {
return {
documents: state.documents,
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
@ -25,7 +20,9 @@ class OnlyVideosScreen extends React.Component {
};
componentDidMount() {
this.setState({ documents: this.props.documents.filter(tmp => tmp.type === 'mp4') });
this.setState({
documents: this.props.documents.filter(tmp => tmp.type === 'mp4'),
});
}
render() {
@ -35,8 +32,13 @@ class OnlyVideosScreen extends React.Component {
key={document.id.toString()}
style={{ ...styles.file, backgroundColor: this.props.mainColor }}
onPress={() => {
this.props.dispatch({ type: 'SET_CURRENT_OPENED_DOC', data: document });
this.props.navigation.navigate('VideoScreen', { uuid: document.uuid });
this.props.dispatch({
type: 'SET_CURRENT_OPENED_DOC',
data: document,
});
this.props.navigation.navigate('VideoScreen', {
uuid: document.uuid,
});
}}>
{document.type === 'pdf' ? (
<FontAwesome5 name="file-pdf" color={'white'} size={60} />

View file

@ -19,16 +19,16 @@ class PDFScreen extends React.Component {
<Pdf
source={source}
onLoadComplete={(numberOfPages, filePath) => {
//console.log(`number of pages: ${numberOfPages}`);
console.debug(`number of pages: ${numberOfPages}`);
}}
onPageChanged={(page, numberOfPages) => {
//console.log(`current page: ${page}`);
console.debug(`current page: ${page}`);
}}
onError={error => {
console.log(error);
console.error(error);
}}
onPressLink={uri => {
//console.log(`Link presse: ${uri}`);
console.debug(`Link presse: ${uri}`);
}}
style={styles.pdf}
/>

View file

@ -1,16 +1,11 @@
import React from 'react';
import {
View,
ScrollView,
TouchableOpacity,
Text,
} from 'react-native';
import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
// Reduxs
import { connect } from 'react-redux';
// Helpers
import Helpers from "../Lib/Helpers";
import Helpers from '../Lib/Helpers';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// Icons
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
// Style
@ -19,7 +14,7 @@ import styles from '../../Resources/Styles/SearchStyle';
function mapStateToProps(state) {
return {
documents: state.documents,
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
@ -35,16 +30,20 @@ class SearchScreen extends React.Component {
} else if (document.type === 'mp4') {
this.props.navigation.navigate('VideoScreen', { uuid: document.uuid });
} else {
console.log('Inconnu');
console.error('Type de document inconnu');
}
}
componentDidMount() {
const { needle, onlyVideos } = this.props.route.params;
let objDocs = this.props.documents;
let arrayDocs = Object.keys(objDocs).map(function (key) { return objDocs[key]; });
let arrayDocs = Object.keys(objDocs).map(function (key) {
return objDocs[key];
});
let sorted = arrayDocs.sort(Helpers.compareValues('title', 'asc'));
let filtered = sorted.filter(item => item.title.toLowerCase().indexOf(needle.toLowerCase()) >= 0);
let filtered = sorted.filter(
item => item.title.toLowerCase().indexOf(needle.toLowerCase()) >= 0,
);
if (onlyVideos === true) {
filtered = filtered.filter(item => item.type === 'mp4');
}
@ -75,7 +74,9 @@ class SearchScreen extends React.Component {
<ScrollView style={styles.scrollview}>
<View style={styles.filesContainer}>{documentList}</View>
{this.state.documents.length === 0 && (
<Text style={{ textAlign: 'center', marginTop: 50, fontSize: 30 }}>{i18n.t('search_s.no_result')}</Text>
<Text style={{ textAlign: 'center', marginTop: 50, fontSize: 30 }}>
{i18n.t('search_s.no_result')}
</Text>
)}
</ScrollView>
</View>

View file

@ -1,32 +1,39 @@
import React from 'react';
import { View, Button, Alert, Text } from 'react-native';
import { Alert, Button, Linking, Text, View } from 'react-native';
// Redux
import { connect } from 'react-redux';
import { initDirectories } from '../Store/Actions/directories';
import { initContact } from '../Store/Actions/contacts';
import { initDirectories } from '../Store/Actions/directories';
import { initDocuments } from '../Store/Actions/documents';
// Sentry
import * as Sentry from "@sentry/react-native";
import * as Sentry from '@sentry/react-native';
// Style
import styles from '../../Resources/Styles/SyncStyle';
// Translations
import i18n from "../../I18n";
import i18n from '../../I18n';
// Controller
import SyncController from '../Controllers/SyncController';
// Progress
import * as Progress from 'react-native-progress';
// Database
import { User, Contact, Directory, Document, SendBrochure } from '../../Database';
import {
Contact,
Directory,
Document,
Form,
SendBrochure,
User,
} from '../../Database';
// FileSytem
import * as FileSystem from 'expo-file-system';
function mapStateToProps(state) {
return {
syncVersion: state.app.syncVersion,
currentUser: state.app.currentUser,
locale: state.locale.locale,
mainColor: state.app.mainColor,
directories: state.directories
directories: state.directories,
};
}
@ -34,18 +41,12 @@ const mapDispatchToProps = dispatch => {
return {
init: () => dispatch({ type: 'INIT' }),
initUsers: () => dispatch({ type: 'INIT_USERS' }),
initFormularies: () => dispatch({ type: 'INIT_FORMS' }),
initDirectories: (lang, user) => dispatch(initDirectories(lang, user)),
initDocuments: (lang, directories) => dispatch(initDocuments(lang, directories)),
initDocuments: (lang, directories) =>
dispatch(initDocuments(lang, directories)),
initContact: currentUser => dispatch(initContact(currentUser)),
initBtns: () => dispatch({ type: 'INIT_HOME_BTNS' }),
updateVersion: version => dispatch({
type: 'UPDATE_VERSION',
data: version,
}),
updateShowIsActive: value => dispatch({
type: 'UPDATE_SHOW_IS_ACTIVE',
data: value,
})
initBtns: () => dispatch({ type: 'INIT_HOME_BTNS' })
};
};
@ -56,8 +57,7 @@ class SyncScreen extends React.Component {
downloadProgress: 0,
downloadingFile: false,
processing: false,
newApp: false,
forced: false
forced: false,
};
componentDidMount() {
@ -97,125 +97,186 @@ class SyncScreen extends React.Component {
async sync() {
let errorStatus = false;
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
return false;
});
console.debug('Sync');
/**
* @param {Promise<import('@react-native-community/netinfo').NetInfoState>} promise
* @param {(error:any) => void|null} onError
*/
const getCall = (promise, onError = null) => {
if (onError === null) {
/** @param {import('axios').AxiosError} error */
onError = error => {
let message = 'Erreur de la communication serveur';
if (error?.response?.status === 422) {
message =
this.parseValidationErrors(error.response?.data?.errors ?? {}) ||
message;
console.warn(error.response?.data?.errors ?? {});
} else if (error?.response?.status === 419) {
// * CSRF TOKEN MISMATCH (On ne pourrais plus faire d'appels AJAX sans recharger la page)
message = 'Votre session a expiré, la page va être rechargée';
} else if (error?.response?.status === 403) {
// * Access denied
message = "Vous n'êtes pas autorisé a effectuer cette action";
} else {
console.error(error);
}
console.warn(message);
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred'),
);
errorStatus = true;
};
}
return promise.catch(onError);
};
const isConnected = await SyncController.checkConnection().catch(
error => false,
);
if (!isConnected) {
Alert.alert(
i18n.t('global.warning'),
i18n.t('error.must_be_connected_internet_sync')
i18n.t('error.must_be_connected_internet_sync'),
);
return;
}
this.setState({ processing: true });
// getVersion
const resVersion = await SyncController.getVersion().then(res => {
return res.data;
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
);
errorStatus = true
// * --- getUsers
this.setState({
progress: 0.1,
txtStep: i18n.t('sync_s.updating_users') + '...',
});
if (errorStatus) {
return false;
}
this.props.updateVersion(resVersion.version);
this.props.updateShowIsActive(resVersion.ShowIsActive);
this.setState({ newApp: resVersion.newApp });
// getUsers
this.setState({ txtStep: i18n.t('sync_s.updating_users') + '...' });
const resUsers = await SyncController.getUsers().then(res => {
const resUsers = await getCall(
SyncController.getUsers().then(res => {
User.clear();
return res.data;
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
}),
);
errorStatus = true
});
if (errorStatus) {
return false;
}
resUsers.forEach(user => {
User.add(user);
});
// getContacts
this.setState({ progress: 0.1, txtStep: i18n.t('sync_s.updating_contacts') + '...' });
const resContacts = await SyncController.getContacts(this.props.currentUser.id).then(res => {
Contact.clear();
// * --- Contacts Sync
/*
* This is done only for actual app user
- 1 Upsert all contacts
- 2 Delete contacts where to_delete is true
- 3 Get all contacts
*/
this.setState({
progress: 0.2,
txtStep: i18n.t('sync_s.updating_contacts') + '...',
});
// * --- Contacts Sync -- STEP 1
await getCall(SyncController.upsertContacts(this.props.currentUser.id));
if (errorStatus) {
return false;
}
// * --- Contacts Sync -- STEP 2
this.setState({
progress: 0.23,
});
await getCall(SyncController.deleteContacts(this.props.currentUser.id));
if (errorStatus) {
return false;
}
// * --- Contacts Sync -- STEP 3
this.setState({
progress: 0.26,
});
const resContacts = await getCall(
SyncController.getContacts(this.props.currentUser.id).then(res => {
// * Clear Contacts, in order to fetch them all after.
Contact.clear(this.props.currentUser.id);
return res.data;
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
}),
);
errorStatus = true
});
if (errorStatus) {
return false;
}
resContacts.forEach(contact => {
Contact.add(contact);
/** @type {(contact: import('./../Models/Contact').ContactData ) => void} */
const contactMapper = contact => {
// * Stringify complex Fields
contact.data = JSON.stringify(contact.data);
contact.visits = JSON.stringify(contact.visits);
contact.timestamp = new Date(contact.timestamp);
Contact.set(contact);
};
resContacts.forEach(contactMapper);
// * --- sendBrochures
this.setState({
progress: 0.3,
txtStep: i18n.t('sync_s.sending_flyers') + '...',
});
//sendBrochures
this.setState({ progress: 0.2, txtStep: i18n.t('sync_s.sending_flyers') + '...' });
let brochures = SendBrochure.getAll();
const brochures = SendBrochure.getAll();
for (const brochure of brochures) {
await SyncController.sendBrochure(brochure).then(res => {
await getCall(
SyncController.sendBrochure(brochure).then(res => {
SendBrochure.delete(brochure.id);
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred') + ' : Brochures'
}),
);
errorStatus = true;
});
}
if (errorStatus) {
return false;
}
//getDirectories
this.setState({ progress: 0.3, txtStep: i18n.t('sync_s.updating_folders') + '...' });
const resDirectories = await SyncController.getDirectories().then(res => {
// * --- getDirectories
this.setState({
progress: 0.4,
txtStep: i18n.t('sync_s.updating_folders') + '...',
});
const resDirectories = await getCall(
SyncController.getDirectories().then(res => {
Directory.clear();
return res.data;
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
}),
);
errorStatus = true
});
if (errorStatus) {
return false;
}
resDirectories.forEach(dir => {
Directory.add(dir);
});
// getDocuments
this.setState({ progress: 0.4, txtStep: i18n.t('sync_s.updating_docs') + '...' });
const resDocuments = await SyncController.getDocuments().then(res => {
return res.data;
}).catch(error => {
Sentry.captureException(error);
Alert.alert(
i18n.t('error.error'),
i18n.t('error.error_has_occurred')
);
errorStatus = true
// * --- getFormularies
this.setState({
progress: 0.5,
txtStep: i18n.t('sync_s.updating_forms') + '...',
});
const resFormularies = await getCall(
SyncController.getFormularies().then(res => {
Form.clear();
return res.data;
}),
);
if (errorStatus) {
return false;
}
resFormularies.forEach(form => Form.add(form));
// * --- getDocuments
this.setState({
progress: 0.6,
txtStep: i18n.t('sync_s.updating_docs') + '...',
});
const resDocuments = await getCall(
SyncController.getDocuments().then(res => {
return res.data;
}),
);
if (errorStatus) {
return false;
}
@ -224,8 +285,8 @@ class SyncScreen extends React.Component {
Document.update(document);
});
this.downloadDocuments(Document.getAll(), toDelete);
// End
this.setState({ txtStep: i18n.t('sync_s.update_completed') + '.', processing: false });
// * --- End
}
fileProgress() {
@ -235,34 +296,38 @@ class SyncScreen extends React.Component {
}
downloadDocuments(docs, toDelete) {
const version = this.props.syncVersion;
this.getToDL(docs, 0).then(toDownload => {
if (toDownload.length > 0) {
this.setState({ progress: 0.5 });
const docProgress = 0.5 / toDownload.length;
this.setState({ progress: 0.6 });
const docProgress = 0.4 / toDownload.length;
this.download(toDownload, docProgress, 0).then(status => {
if (status === true) {
this.deleteFile(toDelete, 0).then(status => {
this.finishSync(version);
this.deleteFile(toDelete, 0).then(delStatus => {
this.finishSync();
});
} else {
this.setState({ txtStep: i18n.t('error.error_has_occurred') + '.' });
this.setState({
txtStep: i18n.t('error.error_has_occurred') + '.',
});
}
});
} else {
this.deleteFile(toDelete, 0).then(status => {
this.setState({ progress: 1 });
this.finishSync(version);
this.finishSync();
});
}
});
}
async getToDL(docs, i, toDL = []) {
if (docs.length < 1)
if (docs.length < 1) {
return toDL;
}
const item = docs[i];
const { exists, modificationTime } = await FileSystem.getInfoAsync(FileSystem.documentDirectory + item.uuid + '.' + item.type);
const { exists, modificationTime } = await FileSystem.getInfoAsync(
FileSystem.documentDirectory + item.uuid + '.' + item.type,
);
if (exists === false) {
toDL.push(item);
} else {
@ -279,7 +344,10 @@ class SyncScreen extends React.Component {
async deleteFile(docs, i) {
if (docs.length > 0) {
const file = docs[i];
await FileSystem.deleteAsync(FileSystem.documentDirectory + file.uuid + '.' + file.type, { idempotent: true });
await FileSystem.deleteAsync(
FileSystem.documentDirectory + file.uuid + '.' + file.type,
{ idempotent: true },
);
if (i < docs.length - 1) {
return this.deleteFile(docs, i + 1);
}
@ -312,25 +380,32 @@ class SyncScreen extends React.Component {
if (this.state.downloadingFile === false) {
this.setState({ downloadingFile: true });
}
const endpoint = SyncController.getUrlBo() + '/storage/docs/'
const tenantUrl = SyncController.getUrlBo();
const rootUrl = tenantUrl.substring(0, tenantUrl.lastIndexOf('/'));
const tenantId = tenantUrl.match(/[^\/]+$/)[0];
const endpoint = rootUrl + '/storage/docs/' + tenantId + "/";
const doc = documents[i];
this.setState({
txtStep:
i18n.t('sync_s.download') + ' : ' +
i18n.t('sync_s.download') +
' : ' +
doc.title +
' (' +
doc.type.toUpperCase() +
') ...',
});
try {
const uri = `${endpoint}${doc.uuid}.${doc.type}`;
await this.downloadResumable(
endpoint + doc.uuid + "." + doc.type,
endpoint + doc.uuid + '.' + doc.type,
doc.uuid,
doc.type,
).downloadAsync();
const { modificationTime } = await FileSystem.getInfoAsync(FileSystem.documentDirectory + doc.uuid + '.' + doc.type);
const { modificationTime } = await FileSystem.getInfoAsync(
FileSystem.documentDirectory + doc.uuid + '.' + doc.type,
);
SyncController.updateLastModificationDoc(doc.id, modificationTime);
//console.log('Finished downloading to ', uri);
console.debug('Finished downloading to ', uri);
this.setState({ progress: this.state.progress + progress });
if (i < documents.length - 1) {
return this.download(documents, progress, i + 1);
@ -343,7 +418,7 @@ class SyncScreen extends React.Component {
}
}
finishSync(version) {
finishSync() {
this.props.init();
this.props.initUsers();
this.props.initContact(this.props.currentUser);
@ -353,27 +428,32 @@ class SyncScreen extends React.Component {
if (this.state.forced) {
SyncController.setInstalled();
}
SyncController.updateVersion(version);
this.setState({ txtStep: i18n.t('sync_s.update_completed') + '.', processing: false });
if (this.state.newApp === true) {
const appUUID = SyncController.getAppStoreUUID();
const url = 'https://store.ldc.fr' + '/app/' + appUUID;
Alert.alert(
'LDC Store',
i18n.t('sync_s.new_app_version'),
[
{
text: i18n.t('global.cancel'),
onPress: () => console.log('Cancel Pressed'),
style: 'cancel',
},
{ text: i18n.t('sync_s.open_store'), onPress: () => Linking.openURL(url).catch((err) => console.error('An error occurred', err)) },
],
{ cancelable: false },
this.setState({
txtStep: i18n.t('sync_s.update_completed') + '.',
processing: false,
});
}
/**
* Parse error messages for a specific input.
*
* @param {Record<string, Array<string>>} allErrors
* @return {string | null}
*/
parseValidationErrors(allErrors = {}) {
const errorList = Object.values(allErrors);
if (!errorList.length) {
return null;
}
return errorList
.reduce((oldInputErrors, inputErrors) =>
oldInputErrors ? oldInputErrors.concat(inputErrors) : inputErrors,
)
.reduce(
(oldInputString, inputString) =>
(oldInputString ? `${oldInputString}, ` : '') + inputString,
);
}
}
}
export default connect(mapStateToProps, mapDispatchToProps)(SyncScreen);

View file

@ -1,5 +1,5 @@
import React from 'react';
import { View, Dimensions } from 'react-native';
import { Dimensions, View } from 'react-native';
// Reduxs
import { connect } from 'react-redux';
// FileSytem
@ -7,33 +7,44 @@ import * as FileSystem from 'expo-file-system';
// Video
import { ResizeMode } from 'expo-av';
import VideoPlayer from 'expo-video-player';
// Sentry
import * as Sentry from '@sentry/react-native';
function mapStateToProps(state) {
return {
mainColor: state.app.mainColor
mainColor: state.app.mainColor,
};
}
class VideoScreen extends React.Component {
render() {
const { uuid } = this.props.route.params;
let width = Dimensions.get("window").width;
let height = Dimensions.get("window").height;
let width = Dimensions.get('window').width;
let height = Dimensions.get('window').height;
// if portrait
// * If on portrait
if (height > width) {
let tmpHeight = height;
const tmpHeight = height;
height = width - 150;
width = tmpHeight + 100;
} else {
height = height - 100;
}
const videoUri = `${FileSystem.documentDirectory}${uuid}.mp4`;
console.debug({
shouldPlay: true,
resizeMode: ResizeMode.CONTAIN,
source: {
uri: videoUri,
},
});
try {
return (
<View style={{ flex: 1, backgroundColor: 'black' }}>
<VideoPlayer
defaultControlsVisible={true}
fullscreen={{
visible: false
visible: false,
}}
slider={{
minimumTrackTintColor: this.props.mainColor,
@ -41,18 +52,25 @@ class VideoScreen extends React.Component {
}}
style={{
height: height,
width: width
width: width,
}}
videoProps={{
shouldPlay: true,
resizeMode: ResizeMode.CONTAIN,
source: {
uri: FileSystem.documentDirectory + uuid + '.mp4',
uri: videoUri,
},
}}
errorCallback={e => {
console.error(e);
Sentry.captureException(e);
}}
/>
</View>
);
} catch (e) {
console.error(e);
}
}
}

View file

@ -1,11 +1,14 @@
import Realm from "realm";
import Realm from 'realm';
import ContactModel, { ContactsSchema } from "./App/Models/Contact";
import DirectoryModel, { DirectoriesSchema } from "./App/Models/Directory";
import DocumentModel, { DocumentsSchema } from "./App/Models/Document";
import SendBrochureModel, { SendBrochuresSchema } from "./App/Models/SendBrochure";
import SettingModel, { SettingsSchema } from "./App/Models/Setting";
import UserModel, { UsersSchema } from "./App/Models/User";
import ContactModel, { ContactsSchema } from './App/Models/Contact';
import DirectoryModel, { DirectoriesSchema } from './App/Models/Directory';
import DocumentModel, { DocumentsSchema } from './App/Models/Document';
import FormModel, { FormsSchema } from './App/Models/Form';
import SendBrochureModel, {
SendBrochuresSchema,
} from './App/Models/SendBrochure';
import SettingModel, { SettingsSchema } from './App/Models/Setting';
import UserModel, { UsersSchema } from './App/Models/User';
const Database = {
schema: [
@ -14,16 +17,18 @@ const Database = {
DocumentsSchema,
SendBrochuresSchema,
SettingsSchema,
UsersSchema
UsersSchema,
FormsSchema,
],
//encryptionKey: new Int8Array(64)
};
let realm = new Realm(Database);
export let Contact = new ContactModel(realm);
export let Directory = new DirectoryModel(realm);
export let Document = new DocumentModel(realm);
export let SendBrochure = new SendBrochureModel(realm);
export let Setting = new SettingModel(realm);
export let User = new UserModel(realm);
export const Contact = new ContactModel(realm);
export const Directory = new DirectoryModel(realm);
export const Document = new DocumentModel(realm);
export const SendBrochure = new SendBrochureModel(realm);
export const Setting = new SettingModel(realm);
export const User = new UserModel(realm);
export const Form = new FormModel(realm);

View file

@ -1,13 +1,13 @@
import { I18n } from 'i18n-js';
import fr from './Resources/Locales/fr';
import en from './Resources/Locales/en';
import de from './Resources/Locales/de';
import en from './Resources/Locales/en';
import fr from './Resources/Locales/fr';
const i18n = new I18n({
fr: fr,
en: en,
de: de
de: de,
});
i18n.defaultLocale = 'fr';

View file

@ -1,6 +1,6 @@
import { createNavigationContainerRef } from '@react-navigation/native';
export const navigationRef = createNavigationContainerRef()
export const navigationRef = createNavigationContainerRef();
export function navigate(name, params) {
if (navigationRef.isReady()) {

View file

@ -3,7 +3,7 @@ import { StyleSheet } from 'react-native';
const commonStyles = StyleSheet.create({
background: {
flex: 1,
justifyContent: "center"
justifyContent: 'center',
},
textInput: {
height: 40,
@ -12,8 +12,8 @@ const commonStyles = StyleSheet.create({
borderWidth: 1,
marginBottom: 20,
backgroundColor: 'white',
paddingLeft: 10
}
paddingLeft: 10,
},
});
export default commonStyles;

View file

@ -28,7 +28,7 @@
"videos": "Videos",
"contacts": "Kontakt",
"confirmation": "Bestätigung",
"name": "Name",
"lastname": "Name",
"firstname": "Vorname",
"address": "Adresse",
"phone": "Telefonnummer",
@ -48,8 +48,7 @@
"folders": "Ordner",
"video": "Video",
"contact_details": "Kontaktdaten",
"results_search": "Suchergebnisse",
"my_space": "Mein Raum"
"results_search": "Suchergebnisse"
},
"login_s": {
"username": "Benutzername",
@ -62,6 +61,7 @@
"download": "Download",
"update_completed": "Update abgeschlossen",
"updating_docs": "Dokumentaktualisierung",
"updating_forms": "Formulare aktualisieren",
"updating_folders": "Dateien aktualisieren",
"sending_flyers": "Brochure senden",
"updating_contacts": "Kontakt aktualisieren",
@ -79,10 +79,13 @@
"contact_deleted": "Kontakt gelöscht",
"contact_added": "Kontakt hinzugefügt",
"send_flyer": "Senden Sie eine Broschüre",
"select_contact": "Wählen Sie den Kontakt",
"select_contact": "Wählen Sie einen Benutzer aus",
"transfer": "weiterleiten",
"contact_list": "Kontaktliste",
"documents_list": "Liste der Dokumente"
"documents_list": "Liste der Dokumente",
"input_required": "Das Feld %{placeholder} ist erforderlich",
"input_too_long": "Das Feld %{placeholder} ist zu lang",
"input_email": "Das Feld %{placeholder} muss eine gültige E-Mail-Adresse sein"
},
"contact_details_s": {
"visits": "Besuche",
@ -90,12 +93,11 @@
"contact_saved": "Kontakt gespeichert",
"confirm_visit_delete": "Sind Sie sicher, dass Sie diesen Besuch löschen möchten?",
"qrcode_not_vcard_format": "Dieser QRCode ist nicht im vCard-Format",
"customer": "Kunde",
"prospect": "potenzieller Kunde",
"other": "Andere",
"description": "Beschreibung",
"no_visits": "Kein Besuch",
"visit_name": "Besuchsname"
"visit_name": "Besuchsname",
"input_select_please_choose": "Wähle einen Wert",
"input_select_multiple_search": "Suchen"
},
"error": {
"error": "Fehler ",
@ -104,14 +106,14 @@
"incorrect_credentials": "Falsche Anmeldeinformationen",
"must_fill_login_fields": "Sie müssen die Verbindungsfelder ausfüllen",
"invalid_email_address": "Ungültige E-Mail-Adresse",
"invalid_firstname": "Vorname ist ungültig",
"invalid_lastname": "Nachname ist ungültig",
"invalid_phone": "Die Telefonnummer ist ungültig",
"field_required": "Das Feld %{placeholder} ist erforderlich",
"error_has_occurred": "Ein Fehler ist aufgetreten",
"must_be_connected_internet_sync": "Sie müssen mit dem Internet verbunden sein, um die Synchronisierung zu starten",
"incomplete_form": "Unvollständiges Formular",
"fill_all_fields_and_1_doc_min": "Bitte füllen Sie alle Felder, mindestens 1 Dokument und eine gültige E-Mail-Adresse aus.",
"fill_other_field": "Füllen Sie das Beschreibungsfeld für: Andere",
"specify_type_contact": "Bitte geben Sie die Art des Kontakts an",
"invalid_name": "ungültiger Name",
"invalid_firstname": "ungültiger Vorname",
"camera_permission_denied": "Kameraerlaubnis verweigert",
"pending_camera_permission": "Warten auf Kameraerlaubnis"
}

View file

@ -28,7 +28,7 @@
"videos": "Videos",
"contacts": "Contacts",
"confirmation": "Confirmation",
"name": "Lastname",
"lastname": "Lastname",
"firstname": "Firstname",
"address": "Adress",
"phone": "Phone number",
@ -48,8 +48,7 @@
"folders": "Folders",
"video": "Video",
"contact_details": "Contact information",
"results_search": "Search results",
"my_space": "Personal Dashboard"
"results_search": "Search results"
},
"login_s": {
"username": "Username",
@ -62,6 +61,7 @@
"download": "Download",
"update_completed": "Update Done",
"updating_docs": "Updating documents",
"updating_forms": "Updating forms",
"updating_folders": "Updating folders",
"sending_flyers": "Sending documents",
"updating_contacts": "Updating contacts",
@ -79,7 +79,7 @@
"contact_deleted": "Contact deleted",
"contact_added": "Contact added",
"send_flyer": "Send a document",
"select_contact": "Select the contact",
"select_contact": "Select a user",
"transfer": "Transfer",
"contact_list": "Contact List",
"documents_list": "Documents List"
@ -90,12 +90,14 @@
"contact_saved": "Contact saved",
"confirm_visit_delete": "are you sure to delete this visit ?",
"qrcode_not_vcard_format": "This QRCode is not a VCard",
"customer": "Customer",
"prospect": "Prospect",
"other": "Other",
"description": "Description",
"no_visits": "No visits available",
"visit_name": "visits name"
"visit_name": "visits name",
"input_select_please_choose": "Select a value",
"input_select_multiple_search": "Search",
"input_required": "The %{placeholder} field is required",
"input_too_long": "%{placeholder} field is too long",
"input_email": "The %{placeholder} field must be a valid email"
},
"error": {
"error": "Error",
@ -104,14 +106,14 @@
"incorrect_credentials": "Incorrect Credentials",
"must_fill_login_fields": "You must fill the login fields.",
"invalid_email_address": "Invalid E-mail adress",
"invalid_firstname": "Firstname is not valid",
"invalid_lastname": "Lastname is not valid",
"invalid_phone": "Phone is not valid",
"field_required": "The %{placeholder} field is required",
"error_has_occurred": "An error occured",
"must_be_connected_internet_sync": "You must be connected to internet to be able to synchronize",
"incomplete_form": "Incomplete Form",
"fill_all_fields_and_1_doc_min": "Please fill up all the fields, at least one document and a valid e-mail adress",
"fill_other_field": "You must fill the description field for : Other",
"specify_type_contact": "You must specify the contact type",
"invalid_name": "Invalid lastname",
"invalid_firstname": "Invalid firstname",
"camera_permission_denied": "Camera Permission Denied",
"pending_camera_permission": "Waiting for the camera permission"
}

View file

@ -27,7 +27,7 @@
"videos": "Vidéos",
"contacts": "Contacts",
"confirmation": "Confirmation",
"name": "Nom",
"lastname": "Nom",
"firstname": "Prénom",
"address": "Adresse",
"phone": "Téléphone",
@ -47,8 +47,7 @@
"folders": "Dossiers",
"video": "Vidéo",
"contact_details": "Détails du contact",
"results_search": "Résultat(s) de votre recherche",
"my_space": "Mon espace"
"results_search": "Résultat(s) de votre recherche"
},
"login_s": {
"username": "Identifiant",
@ -62,6 +61,7 @@
"download": "Téléchargement",
"update_completed": "Mise à jour effectuée",
"updating_docs": "Mise à jour des documents",
"updating_forms": "Mise à jour des formulaires",
"updating_folders": "Mise à jour des dossiers",
"sending_flyers": "Envoi des brochures",
"updating_contacts": "Mise à jour des contacts",
@ -79,7 +79,7 @@
"contact_deleted": "Contact supprimé",
"contact_added": "Contact ajouté",
"send_flyer": "Envoyer une brochure",
"select_contact": "Sélectionnez le contact",
"select_contact": "Sélectionnez un utilisateur",
"transfer": "Transférer",
"contact_list": "Liste des contacts",
"documents_list": "Liste des documents"
@ -90,12 +90,14 @@
"contact_saved": "Contact enregistré",
"confirm_visit_delete": "Êtes-vous sûr de vouloir supprimer cette visite ?",
"qrcode_not_vcard_format": "Ce QRCode n'est pas au format vCard",
"customer": "Client",
"prospect": "Prospect",
"other": "Autre",
"description": "Description",
"no_visits": "Aucune visites",
"visit_name": "Nom de la visite"
"visit_name": "Nom de la visite",
"input_select_please_choose": "Selectionnez un élément",
"input_select_multiple_search": "Recherche",
"input_required": "Le champ %{placeholder} est obligatoire",
"input_too_long": "Le champ %{placeholder} est trop long",
"input_email": "Le champ %{placeholder} doit être un email valide"
},
"error": {
"error": "Erreur",
@ -104,14 +106,14 @@
"incorrect_credentials": "Identifiants incorrect.",
"must_fill_login_fields": "Vous devez-remplir les champs de connexion.",
"invalid_email_address": "Adresse email invalide",
"invalid_firstname": "Prénom invalide",
"invalid_lastname": "Nom invalide",
"invalid_phone": "Téléphone invalide",
"field_required": "Le champ %{placeholder} est obligatoire",
"error_has_occurred": "Une erreur est survenue",
"must_be_connected_internet_sync": "Vous devez être connecté à internet pour lancer la synchronisation",
"incomplete_form": "Formulaire incomplet",
"fill_all_fields_and_1_doc_min": "Veuillez remplir tous les champs, 1 document minimum et une adresse email valide",
"fill_other_field": "Vous devez remplir le champs description pour : Autre",
"specify_type_contact": "Vous devez préciser le type de contact",
"invalid_name": "Nom invalide",
"invalid_firstname": "Prénom invalide",
"camera_permission_denied": "Permission caméra refusée",
"pending_camera_permission": "En attente de permission caméra"
},

View file

@ -1,4 +1,4 @@
import { StyleSheet, Dimensions } from 'react-native';
import {Dimensions, StyleSheet} from 'react-native';
const {width} = Dimensions.get('window');
const styles = StyleSheet.create({
@ -18,7 +18,7 @@ const styles = StyleSheet.create({
textAlign: 'center',
fontSize: 18,
width: width / 4,
fontWeight: 'bold'
fontWeight: 'bold',
},
company: {
textAlign: 'center',
@ -62,13 +62,13 @@ const styles = StyleSheet.create({
inputSearch: {
backgroundColor: 'white',
width: 200,
paddingLeft: 20
paddingLeft: 20,
},
btnSearch: {
width: 50,
alignItems: 'center',
justifyContent: 'center'
}
justifyContent: 'center',
},
});
export default styles;

View file

@ -29,8 +29,8 @@ const styles = StyleSheet.create({
color: 'white',
fontWeight: 'bold',
fontSize: 18,
padding: 5
}
padding: 5,
},
});
export default styles;

View file

@ -22,18 +22,18 @@ const styles = StyleSheet.create({
marginRight: 50,
width: 400,
height: 80,
borderRadius: 10
borderRadius: 10,
},
btnTxt: {
fontSize: 20
fontSize: 20,
},
btnImg: {
position: 'absolute',
left: 15,
height: 50,
width: 50,
resizeMode: 'stretch'
}
resizeMode: 'stretch',
},
});
export default styles;

View file

@ -9,10 +9,10 @@ const styles = StyleSheet.create({
logo: {
width: 150,
height: 150,
marginBottom: 20
marginBottom: 20,
},
actions: {
marginTop: 20
marginTop: 20,
},
});

View file

@ -9,7 +9,7 @@ const styles = StyleSheet.create({
logo: {
width: 150,
height: 150,
marginBottom: 20
marginBottom: 20,
},
text: {
height: 40,
@ -18,7 +18,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
marginBottom: 20,
backgroundColor: 'white',
paddingLeft: 10
paddingLeft: 10,
},
});

View file

@ -15,10 +15,10 @@ const styles = StyleSheet.create({
drawer: {
container: {
flex: 1,
alignItems: "center",
justifyContent: "space-between",
backgroundColor: "#ffffff",
padding: 20
alignItems: 'center',
justifyContent: 'space-between',
backgroundColor: '#ffffff',
padding: 20,
},
btn: {
borderWidth: 1,
@ -27,12 +27,12 @@ const styles = StyleSheet.create({
justifyContent: 'center',
alignItems: 'center',
padding: 10,
marginBottom: 10
marginBottom: 10,
},
btnText: {
marginLeft: 10
marginLeft: 10,
},
},
}
});
export default styles;

View file

@ -26,8 +26,8 @@ const styles = StyleSheet.create({
color: 'white',
fontWeight: 'bold',
fontSize: 18,
padding: 5
}
padding: 5,
},
});
export default styles;

View file

@ -1,4 +1,4 @@
import { StyleSheet, Dimensions } from 'react-native';
import { Dimensions, StyleSheet } from 'react-native';
const styles = StyleSheet.create({
container: {

View file

@ -26,8 +26,8 @@ const styles = StyleSheet.create({
color: 'white',
fontWeight: 'bold',
fontSize: 18,
padding: 5
}
padding: 5,
},
});
export default styles;

View file

@ -7,8 +7,8 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
btnWrapper: {
marginTop: 20
}
marginTop: 20,
},
});
export default styles;

View file

@ -1,23 +1,23 @@
import { Picker } from '@react-native-picker/picker';
import { ButtonGroup, CheckBox, Overlay } from '@rneui/themed';
import { BarCodeScanner } from 'expo-barcode-scanner';
import React from 'react';
import {
View,
StyleSheet,
Alert,
Button,
ScrollView,
StyleSheet,
Text,
TextInput,
TouchableOpacity,
Text,
Alert,
ScrollView
View,
} from 'react-native';
import { CheckBox, ButtonGroup, Overlay } from '@rneui/themed';
import { connect } from 'react-redux';
import Icon from 'react-native-vector-icons/FontAwesome';
import { showMessage } from 'react-native-flash-message';
import Helpers from "../Controllers/Helpers";
import i18n from "../I18n";
import { BarCodeScanner } from 'expo-barcode-scanner';
import Icon from 'react-native-vector-icons/FontAwesome';
import { connect } from 'react-redux';
import vCard from 'vcard-parser';
import { Picker } from '@react-native-picker/picker';
import Helpers from '../Controllers/Helpers';
import i18n from '../I18n';
function mapStateToProps(state) {
return {
@ -79,7 +79,7 @@ class ContactDetailsScreen extends React.Component {
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: ''
parsedPhone: '',
};
updateContact() {
@ -87,9 +87,8 @@ class ContactDetailsScreen extends React.Component {
const { action } = this.props.route.params;
// On récupère le texte courant
if (this.state.visits.length > 0) {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
}
let type;
if (this.state.clientChecked === true) {
@ -104,22 +103,29 @@ class ContactDetailsScreen extends React.Component {
} else {
error = error.concat(i18n.t('error.specify_type_contact') + '.\n');
}
if (this.state.tmpEmail.length < 5 || !Helpers.isEmailValid(this.state.tmpEmail)) {
if (
this.state.tmpEmail.length < 5 ||
!Helpers.isEmailValid(this.state.tmpEmail)
) {
error = error.concat(i18n.t('error.invalid_email_address') + '.\n');
}
if (this.state.tmpName.length === 0 || !Helpers.isValidRequiredString(this.state.tmpName)) {
if (
this.state.tmpName.length === 0 ||
!Helpers.isValidRequiredString(this.state.tmpName)
) {
error = error.concat(i18n.t('error.invalid_name') + '.\n');
}
if (this.state.tmpFirstname.length === 0 || !Helpers.isValidRequiredString(this.state.tmpFirstname)) {
if (
this.state.tmpFirstname.length === 0 ||
!Helpers.isValidRequiredString(this.state.tmpFirstname)
) {
error = error.concat(i18n.t('error.invalid_firstname') + '.\n');
}
if (error.length > 0) {
Alert.alert(i18n.t('global.warning') + ' !', error, [
{ text: 'OK' },
],
{ cancelable: false },
);
Alert.alert(i18n.t('global.warning') + ' !', error, [{ text: 'OK' }], {
cancelable: false,
});
} else {
const products = [
this.state.p1,
@ -130,7 +136,7 @@ class ContactDetailsScreen extends React.Component {
this.state.p6,
this.state.p7,
this.state.p8,
this.state.p9
this.state.p9,
];
const contact = {
id: Helpers.generateUUID(),
@ -294,7 +300,6 @@ class ContactDetailsScreen extends React.Component {
BarCodeScanner.requestPermissionsAsync().then(res => {
this.setState({ hasPermission: res.status === 'granted' });
});
}
render() {
@ -303,12 +308,15 @@ class ContactDetailsScreen extends React.Component {
if (data.includes('VCARD')) {
let datas = vCard.parse(data);
let tmpDatas = [];
if (datas['n'] !== undefined) {
const nx = Object.assign({ n1: [{ value: datas['n'][0].value[0] }] }, { n2: [{ value: datas['n'][0].value[1] }] });
if (datas.n !== undefined) {
const nx = Object.assign(
{ n1: [{ value: datas.n[0].value[0] }] },
{ n2: [{ value: datas.n[0].value[1] }] },
);
datas = Object.assign(datas, nx);
}
if (datas['adr'] !== undefined) {
let tmp = datas['adr'][0].value;
if (datas.adr !== undefined) {
let tmp = datas.adr[0].value;
let tmpadr = '';
for (let i = 0; i < tmp.length; i++) {
if (tmp[i].length > 0) {
@ -319,17 +327,29 @@ class ContactDetailsScreen extends React.Component {
}
}
}
datas['adr'] = [{ value: tmpadr }];
datas.adr = [{ value: tmpadr }];
}
Object.keys(datas).map((objectKey, index) => {
if (objectKey === 'email' || objectKey === 'adr' || objectKey === 'tel' || objectKey === 'org' || objectKey === 'n1' || objectKey === 'n2') {
if (
objectKey === 'email' ||
objectKey === 'adr' ||
objectKey === 'tel' ||
objectKey === 'org' ||
objectKey === 'n1' ||
objectKey === 'n2'
) {
let value = datas[objectKey][0].value;
if (typeof value === 'string') {
tmpDatas.push(value);
}
}
});
this.setState({ parsedType: 'vcard', parsedDatas: tmpDatas, showQRcodevCard: false, showDynContact: true })
this.setState({
parsedType: 'vcard',
parsedDatas: tmpDatas,
showQRcodevCard: false,
showDynContact: true,
});
} else {
Alert.alert(i18n.t('contact_details_s.qrcode_not_vcard_format'));
}
@ -389,22 +409,41 @@ class ContactDetailsScreen extends React.Component {
</View>
<View style={{ flexDirection: 'row' }}>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpName}
placeholder={i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpName: text })}
/>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpFirstname}
placeholder={i18n.t('global.firstname') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.firstname') +
' (' +
i18n.t('global.required') +
')'
}
onChangeText={text => this.setState({ tmpFirstname: text })}
/>
</View>
<TextInput
style={styles.input}
value={this.state.tmpEmail}
placeholder={i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpEmail: text })}
autoCapitalize={'none'}
autoCorrect={false}
@ -433,7 +472,12 @@ class ContactDetailsScreen extends React.Component {
/>
<View style={{ flexDirection: 'row' }}>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect1}
style={styles.select}
@ -442,33 +486,107 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect1: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-1.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-1.c1')} value="commerce-de-detail" />
<Picker.Item label={i18n.t('custom.select-1.c2')} value={'home-service-freezer-center'} />
<Picker.Item label={i18n.t('custom.select-1.c3')} value={'restauration-service-a-table'} />
<Picker.Item label={i18n.t('custom.select-1.c4')} value={'fast-food-et-snacking'} />
<Picker.Item label={i18n.t('custom.select-1.c5')} value={'cafetaria-self-service'} />
<Picker.Item label={i18n.t('custom.select-1.c6')} value={'societe-de-restauration'} />
<Picker.Item label={i18n.t('custom.select-1.c7')} value={'restauration-gre-a-gre-cuisine-centrale'} />
<Picker.Item label={i18n.t('custom.select-1.c8')} value={'distributeur-independant'} />
<Picker.Item label={i18n.t('custom.select-1.c9')} value={'boulangerie-patisserie'} />
<Picker.Item label={i18n.t('custom.select-1.c10')} value={'pai'} />
<Picker.Item label={i18n.t('custom.select-1.c11')} value={'destockeur'} />
<Picker.Item label={i18n.t('custom.select-1.c12')} value={'commerce-halal'} />
<Picker.Item label={i18n.t('custom.select-1.c13')} value={'restauration-d-hebergement'} />
<Picker.Item label={i18n.t('custom.select-1.c14')} value={'centrale-restauration-commerciale'} />
<Picker.Item label={i18n.t('custom.select-1.c15')} value={'restauration-evenementielle-et-parc'} />
<Picker.Item label={i18n.t('custom.select-1.c16')} value={'restauration-de-transport'} />
<Picker.Item label={i18n.t('custom.select-1.c17')} value={'marche-public'} />
<Picker.Item label={i18n.t('custom.select-1.c18')} value={'cash'} />
<Picker.Item label={i18n.t('custom.select-1.c19')} value={'distributeur-national'} />
<Picker.Item label={i18n.t('custom.select-1.c20')} value={'rungis'} />
<Picker.Item label={i18n.t('custom.select-1.c21')} value={'abbatoir'} />
<Picker.Item label={i18n.t('custom.select-1.c22')} value={'autre'} />
<Picker.Item
label={i18n.t('custom.select-1.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-1.c1')}
value="commerce-de-detail"
/>
<Picker.Item
label={i18n.t('custom.select-1.c2')}
value={'home-service-freezer-center'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c3')}
value={'restauration-service-a-table'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c4')}
value={'fast-food-et-snacking'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c5')}
value={'cafetaria-self-service'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c6')}
value={'societe-de-restauration'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c7')}
value={'restauration-gre-a-gre-cuisine-centrale'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c8')}
value={'distributeur-independant'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c9')}
value={'boulangerie-patisserie'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c10')}
value={'pai'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c11')}
value={'destockeur'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c12')}
value={'commerce-halal'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c13')}
value={'restauration-d-hebergement'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c14')}
value={'centrale-restauration-commerciale'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c15')}
value={'restauration-evenementielle-et-parc'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c16')}
value={'restauration-de-transport'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c17')}
value={'marche-public'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c18')}
value={'cash'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c19')}
value={'distributeur-national'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c20')}
value={'rungis'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c21')}
value={'abbatoir'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c22')}
value={'autre'}
/>
</Picker>
</View>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect2}
style={styles.select}
@ -477,19 +595,58 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect2: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-2.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-2.c1')} value={'celvia-dinde'} />
<Picker.Item label={i18n.t('custom.select-2.c2')} value={'celvia-elabores'} />
<Picker.Item label={i18n.t('custom.select-2.c3')} value={'celvia-serent'} />
<Picker.Item label={i18n.t('custom.select-2.c4')} value={'procanar'} />
<Picker.Item label={i18n.t('custom.select-2.c5')} value={'celtys'} />
<Picker.Item label={i18n.t('custom.select-2.c6')} value={'farmor'} />
<Picker.Item label={i18n.t('custom.select-2.c7')} value={'robichon'} />
<Picker.Item label={i18n.t('custom.select-2.c8')} value={'les-volailles-de-keranna'} />
<Picker.Item label={i18n.t('custom.select-2.c9')} value={'bosher-volaille'} />
<Picker.Item label={i18n.t('custom.select-2.c10')} value={'ldc-bretagne'} />
<Picker.Item label={i18n.t('custom.select-2.c11')} value={'doux-farmor'} />
<Picker.Item label={i18n.t('custom.select-2.c12')} value={'favreau'} />
<Picker.Item
label={i18n.t('custom.select-2.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-2.c1')}
value={'celvia-dinde'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c2')}
value={'celvia-elabores'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c3')}
value={'celvia-serent'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c4')}
value={'procanar'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c5')}
value={'celtys'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c6')}
value={'farmor'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c7')}
value={'robichon'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c8')}
value={'les-volailles-de-keranna'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c9')}
value={'bosher-volaille'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c10')}
value={'ldc-bretagne'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c11')}
value={'doux-farmor'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c12')}
value={'favreau'}
/>
</Picker>
</View>
</View>
@ -532,7 +689,10 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flex: 1, margin: 5 }}>
<View style={{ flex: 1 }}>
<ButtonGroup
buttons={[i18n.t('contact_details_s.visits'), i18n.t('contact_details_s.notes')]}
buttons={[
i18n.t('contact_details_s.visits'),
i18n.t('contact_details_s.notes'),
]}
selectedButtonStyle={{ backgroundColor: '#ea4f52' }}
containerStyle={{ height: 30 }}
selectedIndex={this.state.selectedIndex}
@ -543,14 +703,23 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flexDirection: 'row' }}>
{this.state.visits.length > 0 && (
<View style={{ flex: 2, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{
zIndex: 1,
position: 'absolute',
right: 25,
top: 20,
}}
/>
<Picker
style={styles.select}
selectedValue={this.state.selectedVisit}
onValueChange={(itemValue, itemIndex) => {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
this.setState({
visits: this.state.visits,
selectedVisit: itemIndex,
@ -558,7 +727,9 @@ class ContactDetailsScreen extends React.Component {
});
}}>
{this.state.visits.map((item, index) => {
return <Picker.Item label={item.title} value={index} />;
return (
<Picker.Item label={item.title} value={index} />
);
})}
</Picker>
</View>
@ -621,13 +792,22 @@ class ContactDetailsScreen extends React.Component {
/>
)}
</View>
<View style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
<View
style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
{this.state.action === 'add' && (
<>
<Button title="QRCode vCard" onPress={() => this.setState({ showQRcodevCard: true })} color={'#ea4f52'} />
<Button
title="QRCode vCard"
onPress={() => this.setState({ showQRcodevCard: true })}
color={'#ea4f52'}
/>
</>
)}
<Button title={i18n.t('global.save')} onPress={() => this.updateContact()} color={'#ea4f52'} />
<Button
title={i18n.t('global.save')}
onPress={() => this.updateContact()}
color={'#ea4f52'}
/>
</View>
</View>
<Overlay
@ -638,7 +818,9 @@ class ContactDetailsScreen extends React.Component {
height={300}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text style={{ marginBottom: 10 }}>{i18n.t('contact_details_s.visit_name')} :</Text>
<Text style={{ marginBottom: 10 }}>
{i18n.t('contact_details_s.visit_name')} :
</Text>
<TextInput
placeholder={i18n.t('contact_details_s.visit_name')}
value={this.state.newVisitTitle}
@ -663,7 +845,11 @@ class ContactDetailsScreen extends React.Component {
onPress={() => this.setState({ showNewVisit: false })}
color={'#ea4f52'}
/>
<Button title={i18n.t('global.add')} onPress={() => this.newVisit()} color={'#ea4f52'} />
<Button
title={i18n.t('global.add')}
onPress={() => this.newVisit()}
color={'#ea4f52'}
/>
</View>
</View>
</Overlay>
@ -673,10 +859,13 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={300}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
{this.state.hasPermission === true && (
<BarCodeScanner
onBarCodeScanned={this.state.scanned ? undefined : handleBarCodeScanned}
onBarCodeScanned={
this.state.scanned ? undefined : handleBarCodeScanned
}
barCodeTypes={[BarCodeScanner.Constants.BarCodeType.qr]}
style={{ flex: 1, width: 380, height: 200 }}
/>
@ -696,10 +885,18 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showQRcodevCard: false, scanned: false })}
onPress={() =>
this.setState({ showQRcodevCard: false, scanned: false })
}
color={'#ea4f52'}
/>
{this.state.scanned && <Button title={i18n.t('global.retry')} onPress={() => this.setState({ scanned: false })} color={'#ea4f52'} />}
{this.state.scanned && (
<Button
title={i18n.t('global.retry')}
onPress={() => this.setState({ scanned: false })}
color={'#ea4f52'}
/>
)}
</View>
</View>
</Overlay>
@ -709,9 +906,16 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={400}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'space-evenly' }}>
<View
style={{
flex: 1,
alignItems: 'center',
justifyContent: 'space-evenly',
}}>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.name')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.name')}
</Text>
<Picker
selectedValue={this.state.parsedName}
style={{ height: 50, width: 250 }}
@ -719,13 +923,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedName: itemValue });
}}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.firstname')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.firstname')}
</Text>
<Picker
selectedValue={this.state.parsedFirstname}
style={{ height: 50, width: 250 }}
@ -733,13 +946,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedFirstname: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.email')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.email')}
</Text>
<Picker
selectedValue={this.state.parsedEmail}
style={{ height: 50, width: 250 }}
@ -747,13 +969,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedEmail: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.company')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.company')}
</Text>
<Picker
selectedValue={this.state.parsedCompany}
style={{ height: 50, width: 250 }}
@ -761,13 +992,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedCompany: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.address')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.address')}
</Text>
<Picker
selectedValue={this.state.parsedAddress}
style={{ height: 50, width: 250 }}
@ -775,13 +1015,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedAddress: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.phone')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.phone')}
</Text>
<Picker
selectedValue={this.state.parsedPhone}
style={{ height: 50, width: 250 }}
@ -789,8 +1038,15 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedPhone: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
@ -803,12 +1059,24 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showDynContact: false, scanned: false, parsedName: '', parsedFirstname: '', parsedEmail: '', parsedCompany: '', parsedAddress: '', parsedPhone: '' })}
onPress={() =>
this.setState({
showDynContact: false,
scanned: false,
parsedName: '',
parsedFirstname: '',
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: '',
})
}
color={'#ea4f52'}
/>
<Button
title={i18n.t('global.next')}
onPress={() => this.setState({
onPress={() =>
this.setState({
tmpName: this.state.parsedName,
tmpFirstname: this.state.parsedFirstname,
tmpEmail: this.state.parsedEmail,
@ -823,7 +1091,8 @@ class ContactDetailsScreen extends React.Component {
parsedPhone: '',
showDynContact: false,
scanned: false,
})}
})
}
color={'#ea4f52'}
/>
</View>

View file

@ -1,23 +1,23 @@
import { Picker } from '@react-native-picker/picker';
import { ButtonGroup, CheckBox, Overlay } from '@rneui/themed';
import { BarCodeScanner } from 'expo-barcode-scanner';
import React from 'react';
import {
View,
StyleSheet,
Alert,
Button,
ScrollView,
StyleSheet,
Text,
TextInput,
TouchableOpacity,
Text,
Alert,
ScrollView
View,
} from 'react-native';
import { CheckBox, ButtonGroup, Overlay } from '@rneui/themed';
import { connect } from 'react-redux';
import Icon from 'react-native-vector-icons/FontAwesome';
import { showMessage } from 'react-native-flash-message';
import Helpers from "../Controllers/Helpers";
import i18n from "../I18n";
import { BarCodeScanner } from 'expo-barcode-scanner';
import Icon from 'react-native-vector-icons/FontAwesome';
import { connect } from 'react-redux';
import vCard from 'vcard-parser';
import { Picker } from '@react-native-picker/picker';
import Helpers from '../Controllers/Helpers';
import i18n from '../I18n';
function mapStateToProps(state) {
return {
@ -79,7 +79,7 @@ class ContactDetailsScreen extends React.Component {
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: ''
parsedPhone: '',
};
updateContact() {
@ -87,9 +87,8 @@ class ContactDetailsScreen extends React.Component {
const { action } = this.props.route.params;
// On récupère le texte courant
if (this.state.visits.length > 0) {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
}
let type;
if (this.state.clientChecked === true) {
@ -104,7 +103,10 @@ class ContactDetailsScreen extends React.Component {
} else {
error = error.concat(i18n.t('error.specify_type_contact') + '.\n');
}
if (this.state.tmpEmail.length < 5 || !Helpers.isEmailValid(this.state.tmpEmail)) {
if (
this.state.tmpEmail.length < 5 ||
!Helpers.isEmailValid(this.state.tmpEmail)
) {
error = error.concat(i18n.t('error.invalid_email_address') + '.\n');
}
if (this.state.tmpName.length === 0) {
@ -115,11 +117,9 @@ class ContactDetailsScreen extends React.Component {
}
if (error.length > 0) {
Alert.alert(i18n.t('global.warning') + ' !', error, [
{ text: 'OK' },
],
{ cancelable: false },
);
Alert.alert(i18n.t('global.warning') + ' !', error, [{ text: 'OK' }], {
cancelable: false,
});
} else {
const products = [
this.state.p1,
@ -130,7 +130,7 @@ class ContactDetailsScreen extends React.Component {
this.state.p6,
this.state.p7,
this.state.p8,
this.state.p9
this.state.p9,
];
const contact = {
id: Helpers.generateUUID(),
@ -294,7 +294,6 @@ class ContactDetailsScreen extends React.Component {
BarCodeScanner.requestPermissionsAsync().then(res => {
this.setState({ hasPermission: res.status === 'granted' });
});
}
render() {
@ -303,12 +302,15 @@ class ContactDetailsScreen extends React.Component {
if (data.includes('VCARD')) {
let datas = vCard.parse(data);
let tmpDatas = [];
if (datas['n'] !== undefined) {
const nx = Object.assign({ n1: [{ value: datas['n'][0].value[0] }] }, { n2: [{ value: datas['n'][0].value[1] }] });
if (datas.n !== undefined) {
const nx = Object.assign(
{ n1: [{ value: datas.n[0].value[0] }] },
{ n2: [{ value: datas.n[0].value[1] }] },
);
datas = Object.assign(datas, nx);
}
if (datas['adr'] !== undefined) {
let tmp = datas['adr'][0].value;
if (datas.adr !== undefined) {
let tmp = datas.adr[0].value;
let tmpadr = '';
for (let i = 0; i < tmp.length; i++) {
if (tmp[i].length > 0) {
@ -319,17 +321,29 @@ class ContactDetailsScreen extends React.Component {
}
}
}
datas['adr'] = [{ value: tmpadr }];
datas.adr = [{ value: tmpadr }];
}
Object.keys(datas).map((objectKey, index) => {
if (objectKey === 'email' || objectKey === 'adr' || objectKey === 'tel' || objectKey === 'org' || objectKey === 'n1' || objectKey === 'n2') {
if (
objectKey === 'email' ||
objectKey === 'adr' ||
objectKey === 'tel' ||
objectKey === 'org' ||
objectKey === 'n1' ||
objectKey === 'n2'
) {
let value = datas[objectKey][0].value;
if (typeof value === 'string') {
tmpDatas.push(value);
}
}
});
this.setState({ parsedType: 'vcard', parsedDatas: tmpDatas, showQRcodevCard: false, showDynContact: true })
this.setState({
parsedType: 'vcard',
parsedDatas: tmpDatas,
showQRcodevCard: false,
showDynContact: true,
});
} else {
Alert.alert(i18n.t('contact_details_s.qrcode_not_vcard_format'));
}
@ -389,22 +403,41 @@ class ContactDetailsScreen extends React.Component {
</View>
<View style={{ flexDirection: 'row' }}>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpName}
placeholder={i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpName: text })}
/>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpFirstname}
placeholder={i18n.t('global.firstname') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.firstname') +
' (' +
i18n.t('global.required') +
')'
}
onChangeText={text => this.setState({ tmpFirstname: text })}
/>
</View>
<TextInput
style={styles.input}
value={this.state.tmpEmail}
placeholder={i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpEmail: text })}
autoCapitalize={'none'}
autoCorrect={false}
@ -433,7 +466,12 @@ class ContactDetailsScreen extends React.Component {
/>
<View style={{ flexDirection: 'row' }}>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect1}
style={styles.select}
@ -442,33 +480,107 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect1: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-1.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-1.c1')} value="commerce-de-detail" />
<Picker.Item label={i18n.t('custom.select-1.c2')} value={'home-service-freezer-center'} />
<Picker.Item label={i18n.t('custom.select-1.c3')} value={'restauration-service-a-table'} />
<Picker.Item label={i18n.t('custom.select-1.c4')} value={'fast-food-et-snacking'} />
<Picker.Item label={i18n.t('custom.select-1.c5')} value={'cafetaria-self-service'} />
<Picker.Item label={i18n.t('custom.select-1.c6')} value={'societe-de-restauration'} />
<Picker.Item label={i18n.t('custom.select-1.c7')} value={'restauration-gre-a-gre-cuisine-centrale'} />
<Picker.Item label={i18n.t('custom.select-1.c8')} value={'distributeur-independant'} />
<Picker.Item label={i18n.t('custom.select-1.c9')} value={'boulangerie-patisserie'} />
<Picker.Item label={i18n.t('custom.select-1.c10')} value={'pai'} />
<Picker.Item label={i18n.t('custom.select-1.c11')} value={'destockeur'} />
<Picker.Item label={i18n.t('custom.select-1.c12')} value={'commerce-halal'} />
<Picker.Item label={i18n.t('custom.select-1.c13')} value={'restauration-d-hebergement'} />
<Picker.Item label={i18n.t('custom.select-1.c14')} value={'centrale-restauration-commerciale'} />
<Picker.Item label={i18n.t('custom.select-1.c15')} value={'restauration-evenementielle-et-parc'} />
<Picker.Item label={i18n.t('custom.select-1.c16')} value={'restauration-de-transport'} />
<Picker.Item label={i18n.t('custom.select-1.c17')} value={'marche-public'} />
<Picker.Item label={i18n.t('custom.select-1.c18')} value={'cash'} />
<Picker.Item label={i18n.t('custom.select-1.c19')} value={'distributeur-national'} />
<Picker.Item label={i18n.t('custom.select-1.c20')} value={'rungis'} />
<Picker.Item label={i18n.t('custom.select-1.c21')} value={'abbatoir'} />
<Picker.Item label={i18n.t('custom.select-1.c22')} value={'autre'} />
<Picker.Item
label={i18n.t('custom.select-1.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-1.c1')}
value="commerce-de-detail"
/>
<Picker.Item
label={i18n.t('custom.select-1.c2')}
value={'home-service-freezer-center'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c3')}
value={'restauration-service-a-table'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c4')}
value={'fast-food-et-snacking'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c5')}
value={'cafetaria-self-service'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c6')}
value={'societe-de-restauration'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c7')}
value={'restauration-gre-a-gre-cuisine-centrale'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c8')}
value={'distributeur-independant'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c9')}
value={'boulangerie-patisserie'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c10')}
value={'pai'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c11')}
value={'destockeur'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c12')}
value={'commerce-halal'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c13')}
value={'restauration-d-hebergement'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c14')}
value={'centrale-restauration-commerciale'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c15')}
value={'restauration-evenementielle-et-parc'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c16')}
value={'restauration-de-transport'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c17')}
value={'marche-public'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c18')}
value={'cash'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c19')}
value={'distributeur-national'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c20')}
value={'rungis'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c21')}
value={'abbatoir'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c22')}
value={'autre'}
/>
</Picker>
</View>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect2}
style={styles.select}
@ -477,19 +589,58 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect2: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-2.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-2.c1')} value={'celvia-dinde'} />
<Picker.Item label={i18n.t('custom.select-2.c2')} value={'celvia-elabores'} />
<Picker.Item label={i18n.t('custom.select-2.c3')} value={'celvia-serent'} />
<Picker.Item label={i18n.t('custom.select-2.c4')} value={'procanar'} />
<Picker.Item label={i18n.t('custom.select-2.c5')} value={'celtys'} />
<Picker.Item label={i18n.t('custom.select-2.c6')} value={'farmor'} />
<Picker.Item label={i18n.t('custom.select-2.c7')} value={'robichon'} />
<Picker.Item label={i18n.t('custom.select-2.c8')} value={'les-volailles-de-keranna'} />
<Picker.Item label={i18n.t('custom.select-2.c9')} value={'bosher-volaille'} />
<Picker.Item label={i18n.t('custom.select-2.c10')} value={'ldc-bretagne'} />
<Picker.Item label={i18n.t('custom.select-2.c11')} value={'doux-farmor'} />
<Picker.Item label={i18n.t('custom.select-2.c12')} value={'favreau'} />
<Picker.Item
label={i18n.t('custom.select-2.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-2.c1')}
value={'celvia-dinde'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c2')}
value={'celvia-elabores'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c3')}
value={'celvia-serent'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c4')}
value={'procanar'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c5')}
value={'celtys'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c6')}
value={'farmor'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c7')}
value={'robichon'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c8')}
value={'les-volailles-de-keranna'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c9')}
value={'bosher-volaille'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c10')}
value={'ldc-bretagne'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c11')}
value={'doux-farmor'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c12')}
value={'favreau'}
/>
</Picker>
</View>
</View>
@ -532,7 +683,10 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flex: 1, margin: 5 }}>
<View style={{ flex: 1 }}>
<ButtonGroup
buttons={[i18n.t('contact_details_s.visits'), i18n.t('contact_details_s.notes')]}
buttons={[
i18n.t('contact_details_s.visits'),
i18n.t('contact_details_s.notes'),
]}
selectedButtonStyle={{ backgroundColor: '#ea4f52' }}
containerStyle={{ height: 30 }}
selectedIndex={this.state.selectedIndex}
@ -543,14 +697,23 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flexDirection: 'row' }}>
{this.state.visits.length > 0 && (
<View style={{ flex: 2, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{
zIndex: 1,
position: 'absolute',
right: 25,
top: 20,
}}
/>
<Picker
style={styles.select}
selectedValue={this.state.selectedVisit}
onValueChange={(itemValue, itemIndex) => {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
this.setState({
visits: this.state.visits,
selectedVisit: itemIndex,
@ -558,7 +721,9 @@ class ContactDetailsScreen extends React.Component {
});
}}>
{this.state.visits.map((item, index) => {
return <Picker.Item label={item.title} value={index} />;
return (
<Picker.Item label={item.title} value={index} />
);
})}
</Picker>
</View>
@ -621,13 +786,22 @@ class ContactDetailsScreen extends React.Component {
/>
)}
</View>
<View style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
<View
style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
{this.state.action === 'add' && (
<>
<Button title="QRCode vCard" onPress={() => this.setState({ showQRcodevCard: true })} color={'#ea4f52'} />
<Button
title="QRCode vCard"
onPress={() => this.setState({ showQRcodevCard: true })}
color={'#ea4f52'}
/>
</>
)}
<Button title={i18n.t('global.save')} onPress={() => this.updateContact()} color={'#ea4f52'} />
<Button
title={i18n.t('global.save')}
onPress={() => this.updateContact()}
color={'#ea4f52'}
/>
</View>
</View>
<Overlay
@ -638,7 +812,9 @@ class ContactDetailsScreen extends React.Component {
height={300}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text style={{ marginBottom: 10 }}>{i18n.t('contact_details_s.visit_name')} :</Text>
<Text style={{ marginBottom: 10 }}>
{i18n.t('contact_details_s.visit_name')} :
</Text>
<TextInput
placeholder={i18n.t('contact_details_s.visit_name')}
value={this.state.newVisitTitle}
@ -663,7 +839,11 @@ class ContactDetailsScreen extends React.Component {
onPress={() => this.setState({ showNewVisit: false })}
color={'#ea4f52'}
/>
<Button title={i18n.t('global.add')} onPress={() => this.newVisit()} color={'#ea4f52'} />
<Button
title={i18n.t('global.add')}
onPress={() => this.newVisit()}
color={'#ea4f52'}
/>
</View>
</View>
</Overlay>
@ -673,10 +853,13 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={300}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
{this.state.hasPermission === true && (
<BarCodeScanner
onBarCodeScanned={this.state.scanned ? undefined : handleBarCodeScanned}
onBarCodeScanned={
this.state.scanned ? undefined : handleBarCodeScanned
}
barCodeTypes={[BarCodeScanner.Constants.BarCodeType.qr]}
style={{ flex: 1, width: 380, height: 200 }}
/>
@ -696,10 +879,18 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showQRcodevCard: false, scanned: false })}
onPress={() =>
this.setState({ showQRcodevCard: false, scanned: false })
}
color={'#ea4f52'}
/>
{this.state.scanned && <Button title={i18n.t('global.retry')} onPress={() => this.setState({ scanned: false })} color={'#ea4f52'} />}
{this.state.scanned && (
<Button
title={i18n.t('global.retry')}
onPress={() => this.setState({ scanned: false })}
color={'#ea4f52'}
/>
)}
</View>
</View>
</Overlay>
@ -709,9 +900,16 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={400}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'space-evenly' }}>
<View
style={{
flex: 1,
alignItems: 'center',
justifyContent: 'space-evenly',
}}>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.name')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.name')}
</Text>
<Picker
selectedValue={this.state.parsedName}
style={{ height: 50, width: 250 }}
@ -719,13 +917,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedName: itemValue });
}}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.firstname')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.firstname')}
</Text>
<Picker
selectedValue={this.state.parsedFirstname}
style={{ height: 50, width: 250 }}
@ -733,13 +940,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedFirstname: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.email')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.email')}
</Text>
<Picker
selectedValue={this.state.parsedEmail}
style={{ height: 50, width: 250 }}
@ -747,13 +963,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedEmail: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.company')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.company')}
</Text>
<Picker
selectedValue={this.state.parsedCompany}
style={{ height: 50, width: 250 }}
@ -761,13 +986,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedCompany: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.address')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.address')}
</Text>
<Picker
selectedValue={this.state.parsedAddress}
style={{ height: 50, width: 250 }}
@ -775,13 +1009,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedAddress: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.phone')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.phone')}
</Text>
<Picker
selectedValue={this.state.parsedPhone}
style={{ height: 50, width: 250 }}
@ -789,8 +1032,15 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedPhone: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
@ -803,12 +1053,24 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showDynContact: false, scanned: false, parsedName: '', parsedFirstname: '', parsedEmail: '', parsedCompany: '', parsedAddress: '', parsedPhone: '' })}
onPress={() =>
this.setState({
showDynContact: false,
scanned: false,
parsedName: '',
parsedFirstname: '',
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: '',
})
}
color={'#ea4f52'}
/>
<Button
title={i18n.t('global.next')}
onPress={() => this.setState({
onPress={() =>
this.setState({
tmpName: this.state.parsedName,
tmpFirstname: this.state.parsedFirstname,
tmpEmail: this.state.parsedEmail,
@ -823,7 +1085,8 @@ class ContactDetailsScreen extends React.Component {
parsedPhone: '',
showDynContact: false,
scanned: false,
})}
})
}
color={'#ea4f52'}
/>
</View>

View file

@ -1,23 +1,23 @@
import { ButtonGroup, CheckBox, Overlay } from '@rneui/themed';
import { BarCodeScanner } from 'expo-barcode-scanner';
import React from 'react';
import {
View,
StyleSheet,
Button,
TextInput,
Picker,
TouchableOpacity,
Text,
Alert,
ScrollView
Button,
Picker,
ScrollView,
StyleSheet,
Text,
TextInput,
TouchableOpacity,
View,
} from 'react-native';
import { CheckBox, ButtonGroup, Overlay } from '@rneui/themed';
import { connect } from 'react-redux';
import Icon from 'react-native-vector-icons/FontAwesome';
import { showMessage } from 'react-native-flash-message';
import Helpers from "../Controllers/Helpers";
import i18n from "../I18n";
import { BarCodeScanner } from 'expo-barcode-scanner';
import Icon from 'react-native-vector-icons/FontAwesome';
import { connect } from 'react-redux';
import vCard from 'vcard-parser';
import Helpers from '../Controllers/Helpers';
import i18n from '../I18n';
function mapStateToProps(state) {
return {
@ -79,7 +79,7 @@ class ContactDetailsScreen extends React.Component {
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: ''
parsedPhone: '',
};
updateContact() {
@ -87,9 +87,8 @@ class ContactDetailsScreen extends React.Component {
const { action } = this.props.route.params;
// On récupère le texte courant
if (this.state.visits.length > 0) {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
}
let type;
if (this.state.clientChecked === true) {
@ -104,7 +103,10 @@ class ContactDetailsScreen extends React.Component {
} else {
error = error.concat(i18n.t('error.specify_type_contact') + '.\n');
}
if (this.state.tmpEmail.length < 5 || !Helpers.isEmailValid(this.state.tmpEmail)) {
if (
this.state.tmpEmail.length < 5 ||
!Helpers.isEmailValid(this.state.tmpEmail)
) {
error = error.concat(i18n.t('error.invalid_email_address') + '.\n');
}
if (this.state.tmpName.length === 0) {
@ -115,11 +117,9 @@ class ContactDetailsScreen extends React.Component {
}
if (error.length > 0) {
Alert.alert(i18n.t('global.warning') + ' !', error, [
{ text: 'OK' },
],
{ cancelable: false },
);
Alert.alert(i18n.t('global.warning') + ' !', error, [{ text: 'OK' }], {
cancelable: false,
});
} else {
const products = [
this.state.p1,
@ -130,7 +130,7 @@ class ContactDetailsScreen extends React.Component {
this.state.p6,
this.state.p7,
this.state.p8,
this.state.p9
this.state.p9,
];
const contact = {
id: Helpers.generateUUID(),
@ -278,7 +278,7 @@ class ContactDetailsScreen extends React.Component {
p6: tmp[5],
p7: tmp[6],
p8: tmp[7],
p9: tmp[8]
p9: tmp[8],
});
}
}
@ -293,7 +293,6 @@ class ContactDetailsScreen extends React.Component {
BarCodeScanner.requestPermissionsAsync().then(res => {
this.setState({ hasPermission: res.status === 'granted' });
});
}
render() {
@ -302,12 +301,15 @@ class ContactDetailsScreen extends React.Component {
if (data.includes('VCARD')) {
let datas = vCard.parse(data);
let tmpDatas = [];
if (datas['n'] !== undefined) {
const nx = Object.assign({ n1: [{ value: datas['n'][0].value[0] }] }, { n2: [{ value: datas['n'][0].value[1] }] });
if (datas.n !== undefined) {
const nx = Object.assign(
{ n1: [{ value: datas.n[0].value[0] }] },
{ n2: [{ value: datas.n[0].value[1] }] },
);
datas = Object.assign(datas, nx);
}
if (datas['adr'] !== undefined) {
let tmp = datas['adr'][0].value;
if (datas.adr !== undefined) {
let tmp = datas.adr[0].value;
let tmpadr = '';
for (let i = 0; i < tmp.length; i++) {
if (tmp[i].length > 0) {
@ -318,17 +320,29 @@ class ContactDetailsScreen extends React.Component {
}
}
}
datas['adr'] = [{ value: tmpadr }];
datas.adr = [{ value: tmpadr }];
}
Object.keys(datas).map((objectKey, index) => {
if (objectKey === 'email' || objectKey === 'adr' || objectKey === 'tel' || objectKey === 'org' || objectKey === 'n1' || objectKey === 'n2') {
if (
objectKey === 'email' ||
objectKey === 'adr' ||
objectKey === 'tel' ||
objectKey === 'org' ||
objectKey === 'n1' ||
objectKey === 'n2'
) {
let value = datas[objectKey][0].value;
if (typeof value === 'string') {
tmpDatas.push(value);
}
}
});
this.setState({ parsedType: 'vcard', parsedDatas: tmpDatas, showQRcodevCard: false, showDynContact: true })
this.setState({
parsedType: 'vcard',
parsedDatas: tmpDatas,
showQRcodevCard: false,
showDynContact: true,
});
} else {
Alert.alert(i18n.t('contact_details_s.qrcode_not_vcard_format'));
}
@ -388,22 +402,41 @@ class ContactDetailsScreen extends React.Component {
</View>
<View style={{ flexDirection: 'row' }}>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpName}
placeholder={i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.name') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpName: text })}
/>
<TextInput
style={{ backgroundColor: 'white', margin: 10, padding: 10, flex: 1 }}
style={{
backgroundColor: 'white',
margin: 10,
padding: 10,
flex: 1,
}}
value={this.state.tmpFirstname}
placeholder={i18n.t('global.firstname') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.firstname') +
' (' +
i18n.t('global.required') +
')'
}
onChangeText={text => this.setState({ tmpFirstname: text })}
/>
</View>
<TextInput
style={styles.input}
value={this.state.tmpEmail}
placeholder={i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'}
placeholder={
i18n.t('global.email') + ' (' + i18n.t('global.required') + ')'
}
onChangeText={text => this.setState({ tmpEmail: text })}
autoCapitalize={'none'}
autoCorrect={false}
@ -432,7 +465,12 @@ class ContactDetailsScreen extends React.Component {
/>
<View style={{ flexDirection: 'row' }}>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect1}
style={styles.select}
@ -441,19 +479,51 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect1: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-1.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-1.c1')} value={'pole-sable'} />
<Picker.Item label={i18n.t('custom.select-1.c2')} value={'snv'} />
<Picker.Item label={i18n.t('custom.select-1.c3')} value={'pole-sud-est'} />
<Picker.Item label={i18n.t('custom.select-1.c4')} value={'aquitaine'} />
<Picker.Item label={i18n.t('custom.select-1.c5')} value={'sbv'} />
<Picker.Item label={i18n.t('custom.select-1.c6')} value={'arrive'} />
<Picker.Item label={i18n.t('custom.select-1.c7')} value={'plusieurs-filiales'} />
<Picker.Item label={i18n.t('custom.select-1.c8')} value={'autre'} />
<Picker.Item
label={i18n.t('custom.select-1.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-1.c1')}
value={'pole-sable'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c2')}
value={'snv'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c3')}
value={'pole-sud-est'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c4')}
value={'aquitaine'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c5')}
value={'sbv'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c6')}
value={'arrive'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c7')}
value={'plusieurs-filiales'}
/>
<Picker.Item
label={i18n.t('custom.select-1.c8')}
value={'autre'}
/>
</Picker>
</View>
<View style={{ flex: 1, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }}
/>
<Picker
selectedValue={this.state.tmpSelect2}
style={styles.select}
@ -462,14 +532,38 @@ class ContactDetailsScreen extends React.Component {
this.setState({ tmpSelect2: itemValue });
}
}}>
<Picker.Item label={i18n.t('custom.select-2.title')} value="0" />
<Picker.Item label={i18n.t('custom.select-2.c1')} value={'commerce-de-detail'} />
<Picker.Item label={i18n.t('custom.select-2.c2')} value={'restauration-commerciale'} />
<Picker.Item label={i18n.t('custom.select-2.c3')} value={'restauration-collective'} />
<Picker.Item label={i18n.t('custom.select-2.c4')} value={'grossiste-distributeur-cash'} />
<Picker.Item label={i18n.t('custom.select-2.c5')} value={'pai'} />
<Picker.Item label={i18n.t('custom.select-2.c6')} value={'home-freezer-center'} />
<Picker.Item label={i18n.t('custom.select-2.c7')} value={'autres'} />
<Picker.Item
label={i18n.t('custom.select-2.title')}
value="0"
/>
<Picker.Item
label={i18n.t('custom.select-2.c1')}
value={'commerce-de-detail'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c2')}
value={'restauration-commerciale'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c3')}
value={'restauration-collective'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c4')}
value={'grossiste-distributeur-cash'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c5')}
value={'pai'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c6')}
value={'home-freezer-center'}
/>
<Picker.Item
label={i18n.t('custom.select-2.c7')}
value={'autres'}
/>
</Picker>
</View>
</View>
@ -547,7 +641,10 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flex: 1, margin: 5 }}>
<View style={{ flex: 1 }}>
<ButtonGroup
buttons={[i18n.t('contact_details_s.visits'), i18n.t('contact_details_s.notes')]}
buttons={[
i18n.t('contact_details_s.visits'),
i18n.t('contact_details_s.notes'),
]}
selectedButtonStyle={{ backgroundColor: '#ea4f52' }}
containerStyle={{ height: 30 }}
selectedIndex={this.state.selectedIndex}
@ -558,14 +655,23 @@ class ContactDetailsScreen extends React.Component {
<View style={{ flexDirection: 'row' }}>
{this.state.visits.length > 0 && (
<View style={{ flex: 2, flexDirection: 'row' }}>
<Icon name="sort-down" size={20} color={'black'} style={{ zIndex: 1, position: 'absolute', right: 25, top: 20 }} />
<Icon
name="sort-down"
size={20}
color={'black'}
style={{
zIndex: 1,
position: 'absolute',
right: 25,
top: 20,
}}
/>
<Picker
style={styles.select}
selectedValue={this.state.selectedVisit}
onValueChange={(itemValue, itemIndex) => {
this.state.visits[
this.state.selectedVisit
].note = this.state.tmpVisitNote;
this.state.visits[this.state.selectedVisit].note =
this.state.tmpVisitNote;
this.setState({
visits: this.state.visits,
selectedVisit: itemIndex,
@ -573,7 +679,9 @@ class ContactDetailsScreen extends React.Component {
});
}}>
{this.state.visits.map((item, index) => {
return <Picker.Item label={item.title} value={index} />;
return (
<Picker.Item label={item.title} value={index} />
);
})}
</Picker>
</View>
@ -636,13 +744,22 @@ class ContactDetailsScreen extends React.Component {
/>
)}
</View>
<View style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
<View
style={{ flexDirection: 'row', justifyContent: 'space-evenly' }}>
{this.state.action === 'add' && (
<>
<Button title="QRCode vCard" onPress={() => this.setState({ showQRcodevCard: true })} color={'#ea4f52'} />
<Button
title="QRCode vCard"
onPress={() => this.setState({ showQRcodevCard: true })}
color={'#ea4f52'}
/>
</>
)}
<Button title={i18n.t('global.save')} onPress={() => this.updateContact()} color={'#ea4f52'} />
<Button
title={i18n.t('global.save')}
onPress={() => this.updateContact()}
color={'#ea4f52'}
/>
</View>
</View>
<Overlay
@ -653,7 +770,9 @@ class ContactDetailsScreen extends React.Component {
height={300}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text style={{ marginBottom: 10 }}>{i18n.t('contact_details_s.visit_name')} :</Text>
<Text style={{ marginBottom: 10 }}>
{i18n.t('contact_details_s.visit_name')} :
</Text>
<TextInput
placeholder={i18n.t('contact_details_s.visit_name')}
value={this.state.newVisitTitle}
@ -678,7 +797,11 @@ class ContactDetailsScreen extends React.Component {
onPress={() => this.setState({ showNewVisit: false })}
color={'#ea4f52'}
/>
<Button title={i18n.t('global.add')} onPress={() => this.newVisit()} color={'#ea4f52'} />
<Button
title={i18n.t('global.add')}
onPress={() => this.newVisit()}
color={'#ea4f52'}
/>
</View>
</View>
</Overlay>
@ -688,10 +811,13 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={300}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<View
style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
{this.state.hasPermission === true && (
<BarCodeScanner
onBarCodeScanned={this.state.scanned ? undefined : handleBarCodeScanned}
onBarCodeScanned={
this.state.scanned ? undefined : handleBarCodeScanned
}
barCodeTypes={[BarCodeScanner.Constants.BarCodeType.qr]}
style={{ flex: 1, width: 380, height: 200 }}
/>
@ -711,10 +837,18 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showQRcodevCard: false, scanned: false })}
onPress={() =>
this.setState({ showQRcodevCard: false, scanned: false })
}
color={'#ea4f52'}
/>
{this.state.scanned && <Button title={i18n.t('global.retry')} onPress={() => this.setState({ scanned: false })} color={'#ea4f52'} />}
{this.state.scanned && (
<Button
title={i18n.t('global.retry')}
onPress={() => this.setState({ scanned: false })}
color={'#ea4f52'}
/>
)}
</View>
</View>
</Overlay>
@ -724,9 +858,16 @@ class ContactDetailsScreen extends React.Component {
overlayBackgroundColor="white"
width={400}
height={400}>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'space-evenly' }}>
<View
style={{
flex: 1,
alignItems: 'center',
justifyContent: 'space-evenly',
}}>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.name')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.name')}
</Text>
<Picker
selectedValue={this.state.parsedName}
style={{ height: 50, width: 250 }}
@ -734,13 +875,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedName: itemValue });
}}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.firstname')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.firstname')}
</Text>
<Picker
selectedValue={this.state.parsedFirstname}
style={{ height: 50, width: 250 }}
@ -748,13 +898,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedFirstname: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.email')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.email')}
</Text>
<Picker
selectedValue={this.state.parsedEmail}
style={{ height: 50, width: 250 }}
@ -762,13 +921,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedEmail: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.company')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.company')}
</Text>
<Picker
selectedValue={this.state.parsedCompany}
style={{ height: 50, width: 250 }}
@ -776,13 +944,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedCompany: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.address')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.address')}
</Text>
<Picker
selectedValue={this.state.parsedAddress}
style={{ height: 50, width: 250 }}
@ -790,13 +967,22 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedAddress: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
<Text style={{ flex: 1, paddingLeft: 10 }}>{i18n.t('global.phone')}</Text>
<Text style={{ flex: 1, paddingLeft: 10 }}>
{i18n.t('global.phone')}
</Text>
<Picker
selectedValue={this.state.parsedPhone}
style={{ height: 50, width: 250 }}
@ -804,8 +990,15 @@ class ContactDetailsScreen extends React.Component {
this.setState({ parsedPhone: itemValue })
}>
<Picker.Item label="" value="0" key={0} />
{this.state.parsedType === 'vcard' && this.state.parsedDatas.map((item, index) => {
return <Picker.Item label={item} value={item} key={(index + 1).toString()} />;
{this.state.parsedType === 'vcard' &&
this.state.parsedDatas.map((item, index) => {
return (
<Picker.Item
label={item}
value={item}
key={(index + 1).toString()}
/>
);
})}
</Picker>
</View>
@ -818,12 +1011,24 @@ class ContactDetailsScreen extends React.Component {
}}>
<Button
title={i18n.t('global.cancel')}
onPress={() => this.setState({ showDynContact: false, scanned: false, parsedName: '', parsedFirstname: '', parsedEmail: '', parsedCompany: '', parsedAddress: '', parsedPhone: '' })}
onPress={() =>
this.setState({
showDynContact: false,
scanned: false,
parsedName: '',
parsedFirstname: '',
parsedEmail: '',
parsedCompany: '',
parsedAddress: '',
parsedPhone: '',
})
}
color={'#ea4f52'}
/>
<Button
title={i18n.t('global.next')}
onPress={() => this.setState({
onPress={() =>
this.setState({
tmpName: this.state.parsedName,
tmpFirstname: this.state.parsedFirstname,
tmpEmail: this.state.parsedEmail,
@ -838,7 +1043,8 @@ class ContactDetailsScreen extends React.Component {
parsedPhone: '',
showDynContact: false,
scanned: false,
})}
})
}
color={'#ea4f52'}
/>
</View>

File diff suppressed because it is too large Load diff