@axelor/aos-mobile-core 6.5.1 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/login-api.d.ts +4 -1
- package/lib/api/login-api.js +5 -2
- package/lib/api/login-api.js.map +1 -1
- package/lib/api/mail-message-api.js +3 -1
- package/lib/api/mail-message-api.js.map +1 -1
- package/lib/api/mobile-config-api.js +3 -1
- package/lib/api/mobile-config-api.js.map +1 -1
- package/lib/api/traceback-api.d.ts +1 -1
- package/lib/api/traceback-api.js +5 -3
- package/lib/api/traceback-api.js.map +1 -1
- package/lib/apiProviders/Action/ActionApiProvider.d.ts +1 -0
- package/lib/apiProviders/Action/AosActionApi.d.ts +1 -0
- package/lib/apiProviders/Action/AosActionApi.js +14 -5
- package/lib/apiProviders/Action/AosActionApi.js.map +1 -1
- package/lib/apiProviders/Action/GatewayActionApi.d.ts +1 -0
- package/lib/apiProviders/Action/GatewayActionApi.js +18 -15
- package/lib/apiProviders/Action/GatewayActionApi.js.map +1 -1
- package/lib/apiProviders/Action/index.d.ts +1 -1
- package/lib/apiProviders/Action/utils.d.ts +10 -1
- package/lib/apiProviders/Model/AopModelApi.d.ts +14 -7
- package/lib/apiProviders/Model/AopModelApi.js +21 -8
- package/lib/apiProviders/Model/AopModelApi.js.map +1 -1
- package/lib/apiProviders/Model/GatewayModelApi.d.ts +18 -7
- package/lib/apiProviders/Model/GatewayModelApi.js +37 -22
- package/lib/apiProviders/Model/GatewayModelApi.js.map +1 -1
- package/lib/apiProviders/Model/ModelApiProvider.d.ts +16 -10
- package/lib/apiProviders/Model/utils.d.ts +6 -1
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js +2 -1
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js.map +1 -1
- package/lib/apiProviders/config.d.ts +4 -0
- package/lib/apiProviders/config.js +22 -0
- package/lib/apiProviders/config.js.map +1 -0
- package/lib/apiProviders/index.d.ts +1 -1
- package/lib/apiProviders/index.js +1 -1
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/apiProviders/utils.d.ts +8 -1
- package/lib/apiProviders/utils.js +55 -7
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Application.d.ts +8 -1
- package/lib/app/Application.js +9 -2
- package/lib/app/Application.js.map +1 -1
- package/lib/app/ContextedApplication.d.ts +3 -2
- package/lib/app/ContextedApplication.js +14 -8
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/app/ContextsProvider.d.ts +5 -2
- package/lib/app/ContextsProvider.js +7 -4
- package/lib/app/ContextsProvider.js.map +1 -1
- package/lib/app/RootNavigator.d.ts +1 -2
- package/lib/app/RootNavigator.js +25 -33
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/auth/api/config-api.js +10 -11
- package/lib/auth/api/config-api.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.js +35 -2
- package/lib/auth/hooks/use-auth-headers.js.map +1 -1
- package/lib/auth/i18n/en.json +14 -1
- package/lib/auth/i18n/fr.json +13 -0
- package/lib/auth/screens/SettingsScreen.d.ts +1 -2
- package/lib/auth/screens/SettingsScreen.js +14 -9
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/auth/screens/UserScreen.d.ts +1 -2
- package/lib/auth/screens/UserScreen.js +13 -10
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Camera/Camera.js +6 -3
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/external/CameraScanner/CameraScanner.js +6 -3
- package/lib/components/external/CameraScanner/CameraScanner.js.map +1 -1
- package/lib/components/external/PlanningView/PlanningView.d.ts +3 -1
- package/lib/components/external/PlanningView/PlanningView.js +35 -4
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/external/Scanner/Scanner.js +21 -17
- package/lib/components/external/Scanner/Scanner.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.d.ts +2 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +20 -12
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/molecules/ErrorText/ErrorText.d.ts +2 -1
- package/lib/components/molecules/ErrorText/ErrorText.js +8 -2
- package/lib/components/molecules/ErrorText/ErrorText.js.map +1 -1
- package/lib/components/molecules/HeaderBand/HeaderBand.d.ts +8 -0
- package/lib/components/molecules/HeaderBand/HeaderBand.js +51 -0
- package/lib/components/molecules/HeaderBand/HeaderBand.js.map +1 -0
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.d.ts +2 -1
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js +13 -4
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js.map +1 -1
- package/lib/components/molecules/LoginButton/LoginButton.d.ts +2 -1
- package/lib/components/molecules/LoginButton/LoginButton.js +8 -4
- package/lib/components/molecules/LoginButton/LoginButton.js.map +1 -1
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.d.ts +4 -0
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js +44 -0
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js.map +1 -0
- package/lib/components/molecules/index.d.ts +2 -0
- package/lib/components/molecules/index.js +2 -0
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +8 -4
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/HeaderBandList/HeaderBandList.d.ts +2 -0
- package/lib/components/organisms/HeaderBandList/HeaderBandList.js +36 -0
- package/lib/components/organisms/HeaderBandList/HeaderBandList.js.map +1 -0
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +3 -3
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js.map +1 -1
- package/lib/components/organisms/LogoImage/LogoImage.d.ts +4 -2
- package/lib/components/organisms/LogoImage/LogoImage.js +34 -22
- package/lib/components/organisms/LogoImage/LogoImage.js.map +1 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.d.ts +2 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.js +8 -5
- package/lib/components/organisms/PasswordInput/PasswordInput.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.d.ts +9 -2
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +10 -3
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/components/organisms/SessionButtons/SessionButtons.d.ts +17 -0
- package/lib/components/organisms/SessionButtons/SessionButtons.js +90 -0
- package/lib/components/organisms/SessionButtons/SessionButtons.js.map +1 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.d.ts +8 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.js +36 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.js.map +1 -0
- package/lib/components/organisms/UrlInput/UrlInput.d.ts +3 -1
- package/lib/components/organisms/UrlInput/UrlInput.js +6 -4
- package/lib/components/organisms/UrlInput/UrlInput.js.map +1 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.d.ts +3 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.js +6 -4
- package/lib/components/organisms/UsernameInput/UsernameInput.js.map +1 -1
- package/lib/components/organisms/index.d.ts +3 -1
- package/lib/components/organisms/index.js +3 -1
- package/lib/components/organisms/index.js.map +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +4 -5
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.d.ts +10 -0
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js +171 -0
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js.map +1 -0
- package/lib/components/templates/PopupSession/PopupSession.d.ts +8 -0
- package/lib/components/templates/PopupSession/PopupSession.js +135 -0
- package/lib/components/templates/PopupSession/PopupSession.js.map +1 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.d.ts +7 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.js +107 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.js.map +1 -0
- package/lib/components/templates/index.d.ts +3 -0
- package/lib/components/templates/index.js +3 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/config/RouterProvider.d.ts +8 -0
- package/lib/config/RouterProvider.js +49 -0
- package/lib/config/RouterProvider.js.map +1 -0
- package/lib/config/index.d.ts +1 -0
- package/lib/config/index.js +19 -0
- package/lib/config/index.js.map +1 -0
- package/lib/config/routes.d.ts +28 -0
- package/lib/config/routes.js +39 -0
- package/lib/config/routes.js.map +1 -0
- package/lib/features/authSlice.d.ts +30 -13
- package/lib/features/authSlice.js +36 -7
- package/lib/features/authSlice.js.map +1 -1
- package/lib/header/HeaderActionsProvider.js +1 -1
- package/lib/header/HeaderActionsProvider.js.map +1 -1
- package/lib/header/HeaderBandContext.d.ts +10 -0
- package/lib/header/HeaderBandContext.js +58 -0
- package/lib/header/HeaderBandContext.js.map +1 -0
- package/lib/header/header-band-context.helper.d.ts +5 -0
- package/lib/header/header-band-context.helper.js +44 -0
- package/lib/header/header-band-context.helper.js.map +1 -0
- package/lib/header/index.d.ts +3 -1
- package/lib/header/index.js +2 -0
- package/lib/header/index.js.map +1 -1
- package/lib/header/types.d.ts +10 -0
- package/lib/i18n/translations/en.json +3 -1
- package/lib/i18n/translations/fr.json +3 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +1 -2
- package/lib/navigator/Navigator.js +14 -4
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.d.ts +1 -2
- package/lib/navigator/drawer/DrawerContent.js +12 -6
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/Header.js +6 -3
- package/lib/navigator/drawer/Header.js.map +1 -1
- package/lib/navigator/drawer/MenuIconButton.js +6 -2
- package/lib/navigator/drawer/MenuIconButton.js.map +1 -1
- package/lib/navigator/module.helper.js +1 -1
- package/lib/navigator/module.helper.js.map +1 -1
- package/lib/screens/LoginScreen.js +76 -52
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/SessionManagementScreen.d.ts +4 -0
- package/lib/screens/SessionManagementScreen.js +97 -0
- package/lib/screens/SessionManagementScreen.js.map +1 -0
- package/lib/sessions/SessionStorage.d.ts +22 -0
- package/lib/sessions/SessionStorage.js +93 -0
- package/lib/sessions/SessionStorage.js.map +1 -0
- package/lib/sessions/hook.d.ts +5 -0
- package/lib/sessions/hook.js +37 -0
- package/lib/sessions/hook.js.map +1 -0
- package/lib/sessions/index.d.ts +4 -0
- package/lib/sessions/index.js +22 -0
- package/lib/sessions/index.js.map +1 -0
- package/lib/sessions/type.d.ts +7 -0
- package/lib/{utils/storage-keys.js → sessions/type.js} +1 -1
- package/lib/sessions/type.js.map +1 -0
- package/lib/sessions/utils.d.ts +4 -0
- package/lib/sessions/utils.js +34 -0
- package/lib/sessions/utils.js.map +1 -0
- package/lib/utils/api.js +1 -3
- package/lib/utils/api.js.map +1 -1
- package/lib/utils/filter.js +6 -8
- package/lib/utils/filter.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/list.d.ts +0 -1
- package/lib/utils/list.js +0 -13
- package/lib/utils/list.js.map +1 -1
- package/lib/utils/object.js +1 -1
- package/lib/utils/object.js.map +1 -1
- package/lib/utils/string.js +2 -2
- package/lib/utils/string.js.map +1 -1
- package/package.json +5 -5
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.d.ts +0 -19
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.js +0 -58
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.js.map +0 -1
- package/lib/utils/storage-keys.d.ts +0 -1
- package/lib/utils/storage-keys.js.map +0 -1
package/lib/auth/i18n/fr.json
CHANGED
|
@@ -8,10 +8,23 @@
|
|
|
8
8
|
"Auth_Warning": "Attention",
|
|
9
9
|
"Auth_CannotOpenFile": "Impossible d'ouvrir le fichier",
|
|
10
10
|
"Auth_Close": "Fermer",
|
|
11
|
+
"Auth_Session": "Session",
|
|
12
|
+
"Auth_Session_Name": "Nom de la session",
|
|
13
|
+
"Auth_Save_Session": "Sauvegarder la session",
|
|
14
|
+
"Auth_Change_Session": "Changer de session",
|
|
15
|
+
"Auth_Saved_Sessions": "Sessions enregistrées",
|
|
16
|
+
"Auth_Session_Name_Aleary_Exist": "Ce nom de session existe déjà",
|
|
17
|
+
"Auth_Create_Session": "Créer une session",
|
|
18
|
+
"Auth_No_Active_Session": "Aucune session active",
|
|
19
|
+
"Auth_Choose_Session": "Choisir une session",
|
|
20
|
+
"Auth_Delete_Session": "Supprimer la session",
|
|
21
|
+
"Auth_InfoSession": "Pour vous connecter à l'application mobile, vous devez créer une session en indiquant l'url de votre instance ainsi que votre nom d'utilisateur et votre mot de passe. Une fois que vous aurez créé votre première session, vous pourrez vous connecter plus facilement en saisissant uniquement le mot de passe. Vous pouvez également gérer un ensemble de sessions.",
|
|
22
|
+
"Auth_Dev_Mode": "Environnement de test",
|
|
11
23
|
"User_User": "Utilisateur",
|
|
12
24
|
"User_VirtualKeyboardConfig": "Cacher le clavier virtuel",
|
|
13
25
|
"User_ShowFilter": "Afficher les filtres",
|
|
14
26
|
"User_ColorForColorBlind": "Mode daltonien",
|
|
27
|
+
"User_Show_Drawer_Subtitles": "Afficher les sous titres des modules",
|
|
15
28
|
"User_SendTranslations": "Envoyer les traductions",
|
|
16
29
|
"User_UserProfile": "Profil utilisateur",
|
|
17
30
|
"User_Settings": "Paramètres",
|
|
@@ -23,16 +23,18 @@ import { useDispatch, useSelector } from 'react-redux';
|
|
|
23
23
|
import { getTranslations, selectLanguage, useTranslator } from '../../i18n';
|
|
24
24
|
import { showToastMessage } from '../../utils';
|
|
25
25
|
import { disable, enable, useEffectOnline, useOnline, } from '../../features/onlineSlice';
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const { showFilter, hideVirtualKeyboard, setActivityIndicator, toggleFilterConfig, toggleVirtualKeyboardConfig, } = useConfig();
|
|
29
|
-
const language = useSelector(selectLanguage);
|
|
30
|
-
const { baseUrl } = useSelector(state => state.auth);
|
|
26
|
+
import { ApiProviderConfig } from '../../apiProviders/config';
|
|
27
|
+
const SettingsScreen = ({ children }) => {
|
|
31
28
|
const Colors = useThemeColor();
|
|
32
29
|
const I18n = useTranslator();
|
|
33
30
|
const Theme = useTheme();
|
|
34
31
|
const online = useOnline();
|
|
35
32
|
const dispatch = useDispatch();
|
|
33
|
+
const { showFilter, hideVirtualKeyboard, setActivityIndicator, toggleFilterConfig, toggleVirtualKeyboardConfig, setShowSubtitles, showSubtitles, } = useConfig();
|
|
34
|
+
const language = useSelector(selectLanguage);
|
|
35
|
+
const { message } = useSelector(state => state.config);
|
|
36
|
+
const { user } = useSelector(state => state.user);
|
|
37
|
+
const { baseUrl } = useSelector(state => state.auth);
|
|
36
38
|
useEffect(() => {
|
|
37
39
|
if (message) {
|
|
38
40
|
showToastMessage({ type: 'success', position: 'bottom', text1: message });
|
|
@@ -41,7 +43,7 @@ const SettingsScreen = ({ route, children }) => {
|
|
|
41
43
|
}
|
|
42
44
|
}, [message, dispatch, setActivityIndicator]);
|
|
43
45
|
const handleToggleConnection = useCallback(state => {
|
|
44
|
-
if (state) {
|
|
46
|
+
if (!state) {
|
|
45
47
|
dispatch(enable());
|
|
46
48
|
}
|
|
47
49
|
else {
|
|
@@ -57,6 +59,9 @@ const SettingsScreen = ({ route, children }) => {
|
|
|
57
59
|
Theme.desactivateColorBlind();
|
|
58
60
|
}
|
|
59
61
|
}, [Theme]);
|
|
62
|
+
const handleToggleSubtitles = useCallback(state => {
|
|
63
|
+
setShowSubtitles(state);
|
|
64
|
+
}, [setShowSubtitles]);
|
|
60
65
|
const handleSendTranslations = useCallback(() => {
|
|
61
66
|
setActivityIndicator(true);
|
|
62
67
|
const translations = getTranslations(language);
|
|
@@ -67,10 +72,10 @@ const SettingsScreen = ({ route, children }) => {
|
|
|
67
72
|
<SwitchCard title={I18n.t('User_ShowFilter')} defaultValue={showFilter} onToggle={toggleFilterConfig}/>
|
|
68
73
|
<SwitchCard title={I18n.t('User_VirtualKeyboardConfig')} defaultValue={hideVirtualKeyboard} onToggle={toggleVirtualKeyboardConfig}/>
|
|
69
74
|
<SwitchCard title={I18n.t('User_ColorForColorBlind')} defaultValue={Theme.isColorBlind} onToggle={handleToggleColorBlind}/>
|
|
70
|
-
<SwitchCard title={I18n.t('User_BlockConnection')} defaultValue={!online.isEnabled} onToggle={handleToggleConnection}/>
|
|
75
|
+
{ApiProviderConfig.allowConnectionBlock && (<SwitchCard title={I18n.t('User_BlockConnection')} defaultValue={!online.isEnabled} onToggle={handleToggleConnection}/>)}
|
|
76
|
+
<SwitchCard title={I18n.t('User_Show_Drawer_Subtitles')} defaultValue={showSubtitles} onToggle={handleToggleSubtitles}/>
|
|
71
77
|
{children}
|
|
72
|
-
{
|
|
73
|
-
route.params.user.group.code !== 'admins' ? null : (<RightIconButton icon={<Icon name="chevron-right" color={Colors.primaryColor.background}/>} style={styles.RightIconButton} title={I18n.t('User_SendTranslations')} onPress={handleSendTranslations}/>)}
|
|
78
|
+
{user?.group?.code !== 'admins' ? null : (<RightIconButton icon={<Icon name="chevron-right" color={Colors.primaryColor.background}/>} style={styles.RightIconButton} title={I18n.t('User_SendTranslations')} onPress={handleSendTranslations}/>)}
|
|
74
79
|
</View>
|
|
75
80
|
<View style={styles.footerContainer}>
|
|
76
81
|
<Text>{`${I18n.t('Base_ConnectedOn')}:`}</Text>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/SettingsScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAC,MAAM,OAAO,CAAC;AACpD,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EACL,MAAM,EACN,UAAU,EACV,SAAS,EACT,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,aAAa,EACb,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,OAAO,EACP,MAAM,EACN,eAAe,EACf,SAAS,GACV,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"SettingsScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/SettingsScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -24,17 +24,17 @@ import { fetchCompanies } from '../features/companySlice';
|
|
|
24
24
|
import { fetchLanguages } from '../features/languageSlice';
|
|
25
25
|
import { changeActiveCompany, updateActiveUser, fetchActiveUser, } from '../features/userSlice';
|
|
26
26
|
import { fetchBaseConfig, fetchMobileSettings } from '../features/configSlice';
|
|
27
|
-
const UserScreen = ({ children
|
|
28
|
-
const { companyList } = useSelector(state => state.company);
|
|
29
|
-
const { userId, baseUrl } = useSelector(state => state.auth);
|
|
30
|
-
const { languageList } = useSelector(state => state.language);
|
|
31
|
-
const { loading, baseConfig } = useSelector(state => state.config);
|
|
32
|
-
const { loadingUser, user, canModifyCompany } = useSelector(state => state.user);
|
|
27
|
+
const UserScreen = ({ children }) => {
|
|
33
28
|
const Theme = useTheme();
|
|
34
29
|
const Colors = useThemeColor();
|
|
35
30
|
const I18n = useTranslator();
|
|
36
|
-
const { setFilterConfig, setVirtualKeyboardConfig } = useConfig();
|
|
37
31
|
const dispatch = useDispatch();
|
|
32
|
+
const { companyList } = useSelector(state => state.company);
|
|
33
|
+
const { userId, baseUrl } = useSelector(state => state.auth);
|
|
34
|
+
const { languageList } = useSelector(state => state.language);
|
|
35
|
+
const { baseConfig } = useSelector(state => state.config);
|
|
36
|
+
const { user, canModifyCompany } = useSelector(state => state.user);
|
|
37
|
+
const { setFilterConfig, setVirtualKeyboardConfig } = useConfig();
|
|
38
38
|
useEffect(() => {
|
|
39
39
|
dispatch(fetchActiveUser(userId));
|
|
40
40
|
dispatch(fetchCompanies());
|
|
@@ -43,7 +43,7 @@ const UserScreen = ({ children, navigation }) => {
|
|
|
43
43
|
dispatch(fetchMobileSettings());
|
|
44
44
|
}, [dispatch, userId]);
|
|
45
45
|
useEffect(() => {
|
|
46
|
-
const SMALL_SCREEN_HEIGHT =
|
|
46
|
+
const SMALL_SCREEN_HEIGHT = 300;
|
|
47
47
|
DeviceInfo.getManufacturer().then(manufacturer => setVirtualKeyboardConfig(manufacturer === 'Zebra Technologies'));
|
|
48
48
|
setFilterConfig(Dimensions.get('window').height > SMALL_SCREEN_HEIGHT);
|
|
49
49
|
}, [setFilterConfig, setVirtualKeyboardConfig]);
|
|
@@ -64,7 +64,7 @@ const UserScreen = ({ children, navigation }) => {
|
|
|
64
64
|
const updateLanguage = useCallback(language => {
|
|
65
65
|
dispatch(updateActiveUser({ id: user.id, language, version: user.version }));
|
|
66
66
|
}, [dispatch, user]);
|
|
67
|
-
return (<Screen style={styles.container}
|
|
67
|
+
return (<Screen style={styles.container}>
|
|
68
68
|
<ScrollView>
|
|
69
69
|
<View style={styles.imageContainer}>
|
|
70
70
|
<ImageBubble style={styles.imageIcon} imageSize={Dimensions.get('window').width * 0.3} defaultIconSize={60} source={{
|
|
@@ -77,7 +77,7 @@ const UserScreen = ({ children, navigation }) => {
|
|
|
77
77
|
</View>
|
|
78
78
|
{baseConfig?.enableMultiCompany && (<Picker title={I18n.t('User_ActiveCompany')} listItems={companyList} labelField="name" valueField="id" onValueChange={updateActiveCompany} isValueItem={true} disabled={!canModifyCompany} disabledValue={user?.activeCompany?.name}/>)}
|
|
79
79
|
{children}
|
|
80
|
-
{languageList
|
|
80
|
+
{languageList?.length > 1 && (<Picker title={I18n.t('User_Language')} defaultValue={user.language} listItems={languageList} labelField="name" valueField="code" onValueChange={updateLanguage} emptyValue={false}/>)}
|
|
81
81
|
{!Theme.isColorBlind && Theme.themes?.length !== 1 && (<Picker title={I18n.t('User_Theme')} defaultValue={Theme.activeTheme?.key} listItems={Theme.themes} labelField="name" valueField="key" onValueChange={handleChangeTheme} emptyValue={false}/>)}
|
|
82
82
|
</ScrollView>
|
|
83
83
|
</Screen>);
|
|
@@ -98,6 +98,9 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
98
98
|
width: Dimensions.get('window').width * 0.1,
|
|
99
99
|
height: Dimensions.get('window').width * 0.1,
|
|
100
100
|
elevation: 5,
|
|
101
|
+
shadowOpacity: 0.5,
|
|
102
|
+
shadowColor: Colors.secondaryColor.background,
|
|
103
|
+
shadowOffset: { width: 0, height: 0 },
|
|
101
104
|
},
|
|
102
105
|
textUser: {
|
|
103
106
|
fontSize: 16,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EACL,IAAI,EACJ,WAAW,EACX,MAAM,EACN,MAAM,EACN,UAAU,EACV,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE7E,MAAM,UAAU,GAAG,CAAC,EAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -115,18 +115,21 @@ const Camera = () => {
|
|
|
115
115
|
</View>);
|
|
116
116
|
};
|
|
117
117
|
const styles = StyleSheet.create({
|
|
118
|
+
container: {
|
|
119
|
+
zIndex: 700,
|
|
120
|
+
},
|
|
118
121
|
captureButton: {
|
|
119
122
|
position: 'absolute',
|
|
120
123
|
top: Dimensions.get('window').height - SAFE_AREA_PADDING.paddingBottom * 2,
|
|
121
124
|
left: Dimensions.get('window').width / 2 - SAFE_AREA_PADDING.paddingLeft,
|
|
122
|
-
zIndex:
|
|
125
|
+
zIndex: 850,
|
|
123
126
|
},
|
|
124
127
|
camera: {
|
|
125
128
|
height: Dimensions.get('window').height,
|
|
126
129
|
width: Dimensions.get('window').width,
|
|
127
130
|
position: 'absolute',
|
|
128
131
|
top: 0,
|
|
129
|
-
zIndex:
|
|
132
|
+
zIndex: 750,
|
|
130
133
|
},
|
|
131
134
|
button: {
|
|
132
135
|
marginBottom: CONTENT_SPACING,
|
|
@@ -141,7 +144,7 @@ const styles = StyleSheet.create({
|
|
|
141
144
|
position: 'absolute',
|
|
142
145
|
right: SAFE_AREA_PADDING.paddingRight,
|
|
143
146
|
top: SAFE_AREA_PADDING.paddingTop,
|
|
144
|
-
zIndex:
|
|
147
|
+
zIndex: 800,
|
|
145
148
|
},
|
|
146
149
|
});
|
|
147
150
|
export default Camera;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.js"],"names":[],"mappings":"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"}
|
|
@@ -61,21 +61,24 @@ const CameraScanner = () => {
|
|
|
61
61
|
if (!hasPermission && !isActive) {
|
|
62
62
|
return null;
|
|
63
63
|
}
|
|
64
|
-
return (<View>
|
|
64
|
+
return (<View style={styles.container}>
|
|
65
65
|
<Icon name="times" size={24} color={Colors.primaryColor.background} touchable={true} onPress={handleClose} style={styles.icon}/>
|
|
66
66
|
<PackageCamera style={styles.camera} device={device} isActive={true} frameProcessor={frameProcessor} frameProcessorFps={5}/>
|
|
67
67
|
</View>);
|
|
68
68
|
};
|
|
69
69
|
const styles = StyleSheet.create({
|
|
70
|
+
container: {
|
|
71
|
+
zIndex: 700,
|
|
72
|
+
},
|
|
70
73
|
camera: {
|
|
71
74
|
height: Dimensions.get('screen').height,
|
|
72
75
|
width: Dimensions.get('window').width,
|
|
73
76
|
position: 'absolute',
|
|
74
77
|
top: 0,
|
|
75
|
-
zIndex:
|
|
78
|
+
zIndex: 750,
|
|
76
79
|
},
|
|
77
80
|
icon: {
|
|
78
|
-
zIndex:
|
|
81
|
+
zIndex: 800,
|
|
79
82
|
position: 'absolute',
|
|
80
83
|
right: 30,
|
|
81
84
|
top: 60,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraScanner.js","sourceRoot":"","sources":["../../../../src/components/external/CameraScanner/CameraScanner.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,MAAM,IAAI,aAAa,EACvB,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,aAAa,EAAE,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,wBAAwB,GACzB,MAAM,sCAAsC,CAAC;AAE9C,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAC,GAAG,wBAAwB,EAAE,CAAC;IACzD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAC5B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,GAAG,eAAe,CAChD,CAAC,aAAa,CAAC,WAAW,CAAC,EAC3B;QACE,aAAa,EAAE,IAAI;KACpB,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,OAAO,CAAC,EAAE;QACR,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,QAAQ,CACN,WAAW,CAAC;gBACV,KAAK,EAAE,UAAU,CACf,OAAO,CAAC,YAAY,EACpB,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAC9B;gBACD,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;aACpC,CAAC,CACH,CAAC;SACH;IACH,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACnC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;YACvB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE;YACZ,CAAC,KAAK,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,uBAAuB,EAAE,CAAC;gBAC7D,gBAAgB,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;YAC5C,CAAC,CAAC,EAAE,CAAC;SACN;QAED,OAAO,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,IAAI,CAAC,aAAa,IAAI,CAAC,QAAQ,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"CameraScanner.js","sourceRoot":"","sources":["../../../../src/components/external/CameraScanner/CameraScanner.js"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ interface PlanningProps {
|
|
|
7
7
|
renderItem?: (item: AgendaItem) => React.ReactNode;
|
|
8
8
|
renderFullDayItem?: (item: AgendaItem) => React.ReactNode;
|
|
9
9
|
itemList?: AgendaEvent[];
|
|
10
|
+
changeWeekButton: boolean;
|
|
11
|
+
returnToDayButton: boolean;
|
|
10
12
|
}
|
|
11
|
-
declare const PlanningView: ({ numberMonthsAroundToday, renderItem, renderFullDayItem, fetchbyMonth, loading, itemList, }: PlanningProps) => JSX.Element;
|
|
13
|
+
declare const PlanningView: ({ numberMonthsAroundToday, renderItem, renderFullDayItem, fetchbyMonth, loading, itemList, changeWeekButton, returnToDayButton, }: PlanningProps) => JSX.Element;
|
|
12
14
|
export default PlanningView;
|
|
@@ -17,16 +17,17 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import { HorizontalRule, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
20
|
+
import { CircleButton, HorizontalRule, Text, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { Agenda } from 'react-native-calendars';
|
|
22
22
|
import { createAgendaItems, createAgendaSchedule, getShortName, isToday, mapEntryToItem, shouldRenderDetailsCard, } from './agenda.helpers';
|
|
23
23
|
import { useTranslator } from '../../../i18n';
|
|
24
|
-
const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayItem, fetchbyMonth, loading = false, itemList = [], }) => {
|
|
24
|
+
const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayItem, fetchbyMonth, loading = false, itemList = [], changeWeekButton = true, returnToDayButton = true, }) => {
|
|
25
25
|
const Colors = useThemeColor();
|
|
26
26
|
const I18n = useTranslator();
|
|
27
27
|
const _agendaItems = useMemo(() => createAgendaItems(itemList, I18n), [itemList, I18n]);
|
|
28
28
|
const agendaItems = useMemo(() => createAgendaSchedule(_agendaItems, numberMonthsAroundToday), [_agendaItems, numberMonthsAroundToday]);
|
|
29
29
|
const [fetchDate, setFetchDate] = useState();
|
|
30
|
+
const [currentDate, setCurrentDate] = useState(new Date().toISOString());
|
|
30
31
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
31
32
|
const renderDate = date => {
|
|
32
33
|
const today = date && isToday(date) ? styles.today : undefined;
|
|
@@ -79,8 +80,26 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
79
80
|
setFetchDate(_date);
|
|
80
81
|
fetchbyMonth(_date);
|
|
81
82
|
}, [fetchbyMonth]);
|
|
83
|
+
const todayBtnOnPress = () => {
|
|
84
|
+
setCurrentDate(new Date().toISOString());
|
|
85
|
+
};
|
|
86
|
+
const nextWeekBtnOnPress = () => {
|
|
87
|
+
var firstDay = new Date(currentDate);
|
|
88
|
+
var nextWeek = new Date(firstDay.getTime() + 7 * 24 * 60 * 60 * 1000);
|
|
89
|
+
setCurrentDate(nextWeek.toISOString());
|
|
90
|
+
};
|
|
91
|
+
const lastWeekBtnOnPress = () => {
|
|
92
|
+
var firstDay = new Date(currentDate);
|
|
93
|
+
var lastWeek = new Date(firstDay.getTime() - 7 * 24 * 60 * 60 * 1000);
|
|
94
|
+
setCurrentDate(lastWeek.toISOString());
|
|
95
|
+
};
|
|
82
96
|
return (<View style={styles.agendaContainer}>
|
|
83
|
-
<
|
|
97
|
+
<View style={styles.headerPlanning}>
|
|
98
|
+
{changeWeekButton && (<CircleButton style={styles.circleButton} iconName="arrow-left" onPress={lastWeekBtnOnPress} size={30}/>)}
|
|
99
|
+
{returnToDayButton && (<CircleButton style={styles.circleButton} iconName="calendar-day" onPress={todayBtnOnPress} size={30}/>)}
|
|
100
|
+
{changeWeekButton && (<CircleButton style={styles.circleButton} iconName="arrow-right" onPress={nextWeekBtnOnPress} size={30}/>)}
|
|
101
|
+
</View>
|
|
102
|
+
<Agenda onDayPress={date => setCurrentDate(date.dateString)} selected={currentDate} items={agendaItems} loadItemsForMonth={handleLoadItemsForMonth} pastScrollRange={numberMonthsAroundToday} futureScrollRange={numberMonthsAroundToday} renderItem={renderDayItem} renderDay={renderDate} renderEmptyDate={renderEmptyDate} onRefresh={() => fetchbyMonth(fetchDate)} refreshing={loading} theme={{
|
|
84
103
|
todayTextColor: Colors.text,
|
|
85
104
|
calendarBackground: Colors.backgroundColor,
|
|
86
105
|
indicatorColor: Colors.primaryColor.background,
|
|
@@ -97,12 +116,13 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
97
116
|
agendaTodayColor: Colors.primaryColor.background_light,
|
|
98
117
|
agendaKnobColor: Colors.secondaryColor.background,
|
|
99
118
|
todayBackgroundColor: Colors.secondaryColor.background_light,
|
|
100
|
-
}}/>
|
|
119
|
+
}} current={currentDate} key={currentDate}/>
|
|
101
120
|
</View>);
|
|
102
121
|
};
|
|
103
122
|
const getStyles = Colors => StyleSheet.create({
|
|
104
123
|
agendaContainer: {
|
|
105
124
|
height: '100%',
|
|
125
|
+
backgroundColor: Colors.backgroundColor,
|
|
106
126
|
},
|
|
107
127
|
emptyDate: {
|
|
108
128
|
height: 15,
|
|
@@ -162,6 +182,17 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
162
182
|
width: '60%',
|
|
163
183
|
alignSelf: 'center',
|
|
164
184
|
},
|
|
185
|
+
circleButton: {
|
|
186
|
+
marginHorizontal: 5,
|
|
187
|
+
marginTop: 5,
|
|
188
|
+
width: 50 + 50 * (1 / 3),
|
|
189
|
+
},
|
|
190
|
+
headerPlanning: {
|
|
191
|
+
flexDirection: 'row',
|
|
192
|
+
alignItems: 'center',
|
|
193
|
+
alignContent: 'flex-end',
|
|
194
|
+
alignSelf: 'flex-end',
|
|
195
|
+
},
|
|
165
196
|
});
|
|
166
197
|
export default PlanningView;
|
|
167
198
|
//# sourceMappingURL=PlanningView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { useEffect } from 'react';
|
|
19
|
-
import { DeviceEventEmitter } from 'react-native';
|
|
19
|
+
import { DeviceEventEmitter, Platform } from 'react-native';
|
|
20
20
|
import { useDispatch } from 'react-redux';
|
|
21
21
|
import { registerBroadcastReceiver } from 'react-native-datawedge-intents';
|
|
22
22
|
import { scanValue, useScannerSelector } from '../../../features/scannerSlice';
|
|
@@ -45,24 +45,28 @@ const Scanner = () => {
|
|
|
45
45
|
const { isEnabled } = useScannerSelector();
|
|
46
46
|
const dispatch = useDispatch();
|
|
47
47
|
useEffect(() => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
48
|
+
if (Platform.OS !== 'ios') {
|
|
49
|
+
registerBroadcastReceiver({
|
|
50
|
+
filterActions: [
|
|
51
|
+
'com.aosmobile.zebra.ACTION',
|
|
52
|
+
'com.symbol.datawedge.api.RESULT_ACTION',
|
|
53
|
+
],
|
|
54
|
+
filterCategories: ['android.intent.category.DEFAULT'],
|
|
55
|
+
});
|
|
56
|
+
}
|
|
55
57
|
}, []);
|
|
56
58
|
useEffect(() => {
|
|
57
|
-
if (
|
|
58
|
-
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
59
|
+
if (Platform.OS !== 'ios') {
|
|
60
|
+
if (isEnabled) {
|
|
61
|
+
const listener = DeviceEventEmitter.addListener('datawedge_broadcast_intent', intent => {
|
|
62
|
+
const { labelType, value } = castIntent(intent);
|
|
63
|
+
const formattedValue = formatScan(value, labelType);
|
|
64
|
+
dispatch(scanValue(formattedValue));
|
|
65
|
+
});
|
|
66
|
+
return () => {
|
|
67
|
+
listener.remove();
|
|
68
|
+
};
|
|
69
|
+
}
|
|
66
70
|
}
|
|
67
71
|
}, [dispatch, isEnabled]);
|
|
68
72
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/components/external/Scanner/Scanner.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAAC,kBAAkB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/components/external/Scanner/Scanner.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,EAAC,kBAAkB,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,SAAS,EAAE,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAE7E,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAE1C,SAAS,UAAU,CAAC,YAAY,EAAE,WAAW;IAC3C,IAAI,WAAW,KAAK,cAAc,EAAE;QAClC,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAClC;SAAM;QACL,OAAO,YAAY,CAAC;KACrB;AACH,CAAC;AAED,MAAM,IAAI,GAAG;IACX,UAAU,EAAE,iCAAiC;IAC7C,kBAAkB,EAAE,yCAAyC;IAC7D,WAAW,EAAE,kCAAkC;CAChD,CAAC;AAEF,SAAS,UAAU,CAAC,MAAM;IACxB,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/C,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,GAAG,GAAG,EAAE;IACnB,MAAM,EAAC,SAAS,EAAC,GAAG,kBAAkB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;YACzB,yBAAyB,CAAC;gBACxB,aAAa,EAAE;oBACb,4BAA4B;oBAC5B,wCAAwC;iBACzC;gBACD,gBAAgB,EAAE,CAAC,iCAAiC,CAAC;aACtD,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;YACzB,IAAI,SAAS,EAAE;gBACb,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAC7C,4BAA4B,EAC5B,MAAM,CAAC,EAAE;oBACP,MAAM,EAAC,SAAS,EAAE,KAAK,EAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;oBAC9C,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;oBAEpD,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;gBACtC,CAAC,CACF,CAAC;gBAEF,OAAO,GAAG,EAAE;oBACV,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,CAAC,CAAC;aACH;SACF;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAE1B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -13,6 +13,7 @@ interface StopwatchProps {
|
|
|
13
13
|
onPause: () => void;
|
|
14
14
|
onStop: () => void;
|
|
15
15
|
onCancel?: () => void;
|
|
16
|
+
useObjectStatus?: boolean;
|
|
16
17
|
}
|
|
17
|
-
declare const Stopwatch: ({ startTime, status, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, }: StopwatchProps) => JSX.Element;
|
|
18
|
+
declare const Stopwatch: ({ startTime, status, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
|
|
18
19
|
export default Stopwatch;
|
|
@@ -21,14 +21,20 @@ import { Card, Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
|
21
21
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
22
22
|
import { StopwatchType } from '../../../types';
|
|
23
23
|
import { Timer } from '../../external';
|
|
24
|
-
const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFormat, disable = false, disablePlay = false, disablePause = false, disableStop = false, disableCancel = false, hideCancel = false, style, onPlay = () => { }, onPause = () => { }, onStop = () => { }, onCancel = () => { }, }) => {
|
|
24
|
+
const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFormat, disable = false, disablePlay = false, disablePause = false, disableStop = false, disableCancel = false, hideCancel = false, style, onPlay = () => { }, onPause = () => { }, onStop = () => { }, onCancel = () => { }, useObjectStatus = false, }) => {
|
|
25
25
|
const Colors = useThemeColor();
|
|
26
26
|
const I18n = useTranslator();
|
|
27
27
|
const [state, setState] = useState(status);
|
|
28
28
|
const [time, setTime] = useState(startTime);
|
|
29
|
+
const stopwatchStatus = useMemo(() => {
|
|
30
|
+
if (useObjectStatus) {
|
|
31
|
+
return status;
|
|
32
|
+
}
|
|
33
|
+
return state;
|
|
34
|
+
}, [state, status, useObjectStatus]);
|
|
29
35
|
const borderStyle = useMemo(() => {
|
|
30
|
-
return getStyles(StopwatchType.getStatusBorderColor(
|
|
31
|
-
}, [Colors,
|
|
36
|
+
return getStyles(StopwatchType.getStatusBorderColor(stopwatchStatus, Colors)).border;
|
|
37
|
+
}, [Colors, stopwatchStatus]);
|
|
32
38
|
const handlePlayBtn = () => {
|
|
33
39
|
setState(StopwatchType.status.InProgress);
|
|
34
40
|
onPlay();
|
|
@@ -49,24 +55,26 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
|
|
|
49
55
|
return (<Card style={[styles.container, borderStyle, style]}>
|
|
50
56
|
<View style={styles.row}>
|
|
51
57
|
<Text style={styles.status}>
|
|
52
|
-
{StopwatchType.getStatus(
|
|
58
|
+
{StopwatchType.getStatus(stopwatchStatus, I18n)}
|
|
53
59
|
</Text>
|
|
54
60
|
<Icon name="stopwatch" size={18} style={styles.icon}/>
|
|
55
61
|
</View>
|
|
56
62
|
<View style={styles.row}>
|
|
57
63
|
<View style={styles.btnContainer}>
|
|
58
|
-
{
|
|
64
|
+
{stopwatchStatus !== StopwatchType.status.InProgress && (<Icon name="play" size={25} disabled={disable ||
|
|
59
65
|
disablePlay ||
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
{
|
|
66
|
+
stopwatchStatus === StopwatchType.status.InProgress ||
|
|
67
|
+
stopwatchStatus === StopwatchType.status.Finished} touchable={true} onPress={handlePlayBtn} style={styles.btn}/>)}
|
|
68
|
+
{stopwatchStatus === StopwatchType.status.InProgress && (<Icon name="pause" size={25} disabled={disable || disablePause} touchable={true} onPress={handlePauseBtn} style={styles.btn}/>)}
|
|
63
69
|
<Icon name="power-off" size={25} disabled={disable ||
|
|
64
70
|
disableStop ||
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
{!hideCancel && (<Icon name="undo" size={25} disabled={disable ||
|
|
71
|
+
stopwatchStatus === StopwatchType.status.Ready ||
|
|
72
|
+
stopwatchStatus === StopwatchType.status.Finished} touchable={true} onPress={handleStopBtn} style={styles.btn}/>
|
|
73
|
+
{!hideCancel && (<Icon name="undo" size={25} disabled={disable ||
|
|
74
|
+
disableCancel ||
|
|
75
|
+
stopwatchStatus === StopwatchType.status.Ready} touchable={true} onPress={handleCancelBtn} style={styles.btn}/>)}
|
|
68
76
|
</View>
|
|
69
|
-
<Timer time={time} onCount={setTime} style={styles.timer} isPaused={
|
|
77
|
+
<Timer time={time} onCount={setTime} style={styles.timer} isPaused={stopwatchStatus !== StopwatchType.status.InProgress} timerFormat={timerFormat}/>
|
|
70
78
|
</View>
|
|
71
79
|
</Card>);
|
|
72
80
|
};
|