@axelor/aos-mobile-hr 7.2.3 → 7.2.4
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/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js +6 -4
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js.map +1 -1
- package/lib/components/templates/ExpenseLineTypeDisplay/ExpenseLineTypeDisplay.d.ts +6 -0
- package/lib/components/templates/ExpenseLineTypeDisplay/ExpenseLineTypeDisplay.js +91 -0
- package/lib/components/templates/ExpenseLineTypeDisplay/ExpenseLineTypeDisplay.js.map +1 -0
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.d.ts +3 -1
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.js +7 -21
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.js.map +1 -1
- package/lib/components/templates/index.d.ts +1 -0
- package/lib/components/templates/index.js +1 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/i18n/en.json +1 -0
- package/lib/i18n/fr.json +1 -0
- package/lib/screens/ExpenseDetailsScreen.js +2 -0
- package/lib/screens/ExpenseDetailsScreen.js.map +1 -1
- package/lib/screens/ExpenseListScreen.js +2 -8
- package/lib/screens/ExpenseListScreen.js.map +1 -1
- package/package.json +3 -3
|
@@ -19,14 +19,14 @@ import React, { useMemo } from 'react';
|
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { useNavigation, useSelector } from '@axelor/aos-mobile-core';
|
|
21
21
|
import { CircleButton } from '@axelor/aos-mobile-ui';
|
|
22
|
-
import
|
|
22
|
+
import ExpenseLineTypeDisplay from '../ExpenseLineTypeDisplay/ExpenseLineTypeDisplay';
|
|
23
23
|
import { Expense } from '../../../types';
|
|
24
24
|
const ExpenseLineSwitchAdd = ({ mode, onChangeSwicth, }) => {
|
|
25
25
|
const navigation = useNavigation();
|
|
26
26
|
const { expense } = useSelector((state) => state.expense);
|
|
27
27
|
const isAddButton = useMemo(() => expense.statusSelect === Expense.statusSelect.Draft, [expense]);
|
|
28
28
|
return (<View style={styles.container}>
|
|
29
|
-
<
|
|
29
|
+
<ExpenseLineTypeDisplay onChange={onChangeSwicth} isAddButton={isAddButton}/>
|
|
30
30
|
{isAddButton && (<CircleButton size={38} iconName="plus" onPress={() => navigation.navigate('ExpenseLineFormScreen', {
|
|
31
31
|
idExpense: expense?.id,
|
|
32
32
|
versionExpense: expense?.version,
|
|
@@ -37,9 +37,11 @@ const ExpenseLineSwitchAdd = ({ mode, onChangeSwicth, }) => {
|
|
|
37
37
|
const styles = StyleSheet.create({
|
|
38
38
|
container: {
|
|
39
39
|
flexDirection: 'row',
|
|
40
|
-
justifyContent: 'center',
|
|
41
40
|
alignItems: 'center',
|
|
42
|
-
marginTop:
|
|
41
|
+
marginTop: 15,
|
|
42
|
+
justifyContent: 'space-between',
|
|
43
|
+
marginHorizontal: 24,
|
|
44
|
+
marginBottom: 10,
|
|
43
45
|
},
|
|
44
46
|
});
|
|
45
47
|
export default ExpenseLineSwitchAdd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLineSwitchAdd.js","sourceRoot":"","sources":["../../../../src/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"ExpenseLineSwitchAdd.js","sourceRoot":"","sources":["../../../../src/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,sBAAsB,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAOvC,MAAM,oBAAoB,GAAG,CAAC,EAC5B,IAAI,EACJ,cAAc,GACY,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE7D,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,KAAK,EACzD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,sBAAsB,CACrB,QAAQ,CAAC,CAAC,cAAc,CAAC,CACzB,WAAW,CAAC,CAAC,WAAW,CAAC,EAE3B;MAAA,CAAC,WAAW,IAAI,CACd,CAAC,YAAY,CACX,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,QAAQ,CAAC,MAAM,CACf,OAAO,CAAC,CAAC,GAAG,EAAE,CACZ,UAAU,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gBAC3C,SAAS,EAAE,OAAO,EAAE,EAAE;gBACtB,cAAc,EAAE,OAAO,EAAE,OAAO;gBAChC,WAAW,EAAE,IAAI;aAClB,CAAC,CACH,EACD,CACH,CACH;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,SAAS,EAAE,EAAE;QACb,cAAc,EAAE,eAAe;QAC/B,gBAAgB,EAAE,EAAE;QACpB,YAAY,EAAE,EAAE;KACjB;CACF,CAAC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2023 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
19
|
+
import { StyleSheet, View } from 'react-native';
|
|
20
|
+
import { useThemeColor, NumberBubble, Text } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { useSelector, useTranslator } from '@axelor/aos-mobile-core';
|
|
22
|
+
import { ExpenseLine } from '../../../types';
|
|
23
|
+
import { ExpenseLineTypeSwitch } from '../../templates';
|
|
24
|
+
const ExpenseLineTypeDisplay = ({ isAddButton, onChange, }) => {
|
|
25
|
+
const I18n = useTranslator();
|
|
26
|
+
const Colors = useThemeColor();
|
|
27
|
+
const { totalNumberExpenseGeneral, totalNumberExpenseKilomectric } = useSelector((state) => state.expenseLine);
|
|
28
|
+
const isGeneral = useMemo(() => totalNumberExpenseGeneral > 0, [totalNumberExpenseGeneral]);
|
|
29
|
+
const isKilometric = useMemo(() => totalNumberExpenseKilomectric > 0, [totalNumberExpenseKilomectric]);
|
|
30
|
+
const displayToggle = useMemo(() => {
|
|
31
|
+
return isGeneral && isKilometric;
|
|
32
|
+
}, [isGeneral, isKilometric]);
|
|
33
|
+
const hasExpenseLines = useMemo(() => {
|
|
34
|
+
return isGeneral || isKilometric;
|
|
35
|
+
}, [isGeneral, isKilometric]);
|
|
36
|
+
const modeTitle = useMemo(() => {
|
|
37
|
+
if (isGeneral) {
|
|
38
|
+
return I18n.t('Hr_General');
|
|
39
|
+
}
|
|
40
|
+
else if (isKilometric) {
|
|
41
|
+
return I18n.t('Hr_Kilometric');
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
return I18n.t('Hr_NoExpenseLine');
|
|
45
|
+
}
|
|
46
|
+
}, [isGeneral, isKilometric, I18n]);
|
|
47
|
+
useEffect(() => {
|
|
48
|
+
if (hasExpenseLines) {
|
|
49
|
+
onChange(_mode => {
|
|
50
|
+
return isKilometric
|
|
51
|
+
? ExpenseLine.modes.kilometric
|
|
52
|
+
: ExpenseLine.modes.general;
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
}, [hasExpenseLines, isKilometric, onChange]);
|
|
56
|
+
const renderToggle = useCallback(() => {
|
|
57
|
+
return (<ExpenseLineTypeSwitch onChange={onChange} isAddButton={isAddButton} totalNumberExpenseGeneral={totalNumberExpenseGeneral} totalNumberExpenseKilomectric={totalNumberExpenseKilomectric}/>);
|
|
58
|
+
}, [
|
|
59
|
+
isAddButton,
|
|
60
|
+
onChange,
|
|
61
|
+
totalNumberExpenseGeneral,
|
|
62
|
+
totalNumberExpenseKilomectric,
|
|
63
|
+
]);
|
|
64
|
+
const renderTitle = useCallback(() => {
|
|
65
|
+
return (<View style={styles.containerTitle}>
|
|
66
|
+
<Text writingType="title">{modeTitle}</Text>
|
|
67
|
+
{hasExpenseLines && (<NumberBubble number={isGeneral
|
|
68
|
+
? totalNumberExpenseGeneral
|
|
69
|
+
: totalNumberExpenseKilomectric} color={Colors.inverseColor} isNeutralBackground={true} style={styles.bubbleStyle}/>)}
|
|
70
|
+
</View>);
|
|
71
|
+
}, [
|
|
72
|
+
modeTitle,
|
|
73
|
+
hasExpenseLines,
|
|
74
|
+
isGeneral,
|
|
75
|
+
totalNumberExpenseGeneral,
|
|
76
|
+
totalNumberExpenseKilomectric,
|
|
77
|
+
Colors.inverseColor,
|
|
78
|
+
]);
|
|
79
|
+
return displayToggle ? renderToggle() : renderTitle();
|
|
80
|
+
};
|
|
81
|
+
const styles = StyleSheet.create({
|
|
82
|
+
containerTitle: {
|
|
83
|
+
flexDirection: 'row',
|
|
84
|
+
alignItems: 'center',
|
|
85
|
+
},
|
|
86
|
+
bubbleStyle: {
|
|
87
|
+
marginLeft: 10,
|
|
88
|
+
},
|
|
89
|
+
});
|
|
90
|
+
export default ExpenseLineTypeDisplay;
|
|
91
|
+
//# sourceMappingURL=ExpenseLineTypeDisplay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExpenseLineTypeDisplay.js","sourceRoot":"","sources":["../../../../src/components/templates/ExpenseLineTypeDisplay/ExpenseLineTypeDisplay.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
interface ExpenseLineTypeSwitchProps {
|
|
2
2
|
isAddButton?: boolean;
|
|
3
3
|
onChange: (mode: any) => void;
|
|
4
|
+
totalNumberExpenseGeneral: number;
|
|
5
|
+
totalNumberExpenseKilomectric: number;
|
|
4
6
|
}
|
|
5
|
-
declare const ExpenseLineTypeSwitch: ({ isAddButton, onChange, }: ExpenseLineTypeSwitchProps) => JSX.Element;
|
|
7
|
+
declare const ExpenseLineTypeSwitch: ({ isAddButton, onChange, totalNumberExpenseGeneral, totalNumberExpenseKilomectric, }: ExpenseLineTypeSwitchProps) => JSX.Element;
|
|
6
8
|
export default ExpenseLineTypeSwitch;
|
|
@@ -15,29 +15,16 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, {
|
|
18
|
+
import React, { useMemo } from 'react';
|
|
19
19
|
import { StyleSheet } from 'react-native';
|
|
20
|
-
import { ToggleSwitch,
|
|
21
|
-
import {
|
|
22
|
-
import { searchGeneralExpenseLines, searchKilometricExpenseLines, } from '../../../features/expenseLineSlice';
|
|
20
|
+
import { ToggleSwitch, useThemeColor, NumberBubble } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { useTranslator } from '@axelor/aos-mobile-core';
|
|
23
22
|
import { ExpenseLine } from '../../../types';
|
|
24
|
-
const ExpenseLineTypeSwitch = ({ isAddButton = false, onChange, }) => {
|
|
23
|
+
const ExpenseLineTypeSwitch = ({ isAddButton = false, onChange, totalNumberExpenseGeneral, totalNumberExpenseKilomectric, }) => {
|
|
25
24
|
const I18n = useTranslator();
|
|
26
25
|
const Colors = useThemeColor();
|
|
27
|
-
const dispatch = useDispatch();
|
|
28
|
-
const { expense } = useSelector((state) => state.expense);
|
|
29
|
-
const { totalNumberExpenseGeneral, totalNumberExpenseKilomectric } = useSelector((state) => state.expenseLine);
|
|
30
|
-
const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
|
|
31
26
|
const styles = useMemo(() => getStyles(isAddButton), [isAddButton]);
|
|
32
|
-
|
|
33
|
-
dispatch(searchKilometricExpenseLines({ expenseId: expense?.id, page: 0 }));
|
|
34
|
-
dispatch(searchGeneralExpenseLines({ expenseId: expense?.id, page: 0 }));
|
|
35
|
-
}, [dispatch, expense]);
|
|
36
|
-
return (<ToggleSwitch styleContainer={[
|
|
37
|
-
commonStyles.filter,
|
|
38
|
-
commonStyles.filterSize,
|
|
39
|
-
styles.toggleContainer,
|
|
40
|
-
]} styleToogle={styles.toggle} leftTitle={I18n.t('Hr_General')} rightTitle={I18n.t('Hr_Kilometric')} leftElement={<NumberBubble style={styles.indicator} number={totalNumberExpenseGeneral} color={Colors.inverseColor} isNeutralBackground={true}/>} rigthElement={<NumberBubble style={styles.indicator} number={totalNumberExpenseKilomectric} color={Colors.inverseColor} isNeutralBackground={true}/>} onSwitch={() => {
|
|
27
|
+
return (<ToggleSwitch styleContainer={styles.toggleContainer} styleToogle={styles.toggle} leftTitle={I18n.t('Hr_General')} rightTitle={I18n.t('Hr_Kilometric')} leftElement={<NumberBubble style={styles.indicator} number={totalNumberExpenseGeneral} color={Colors.inverseColor} isNeutralBackground={true}/>} rigthElement={<NumberBubble style={styles.indicator} number={totalNumberExpenseKilomectric} color={Colors.inverseColor} isNeutralBackground={true}/>} onSwitch={() => {
|
|
41
28
|
onChange(_mode => {
|
|
42
29
|
return _mode === ExpenseLine.modes.general
|
|
43
30
|
? ExpenseLine.modes.kilometric
|
|
@@ -47,12 +34,11 @@ const ExpenseLineTypeSwitch = ({ isAddButton = false, onChange, }) => {
|
|
|
47
34
|
};
|
|
48
35
|
const getStyles = isAddButton => StyleSheet.create({
|
|
49
36
|
toggleContainer: {
|
|
50
|
-
width: isAddButton ? '
|
|
37
|
+
width: isAddButton ? '88%' : '100%',
|
|
38
|
+
margin: 0,
|
|
51
39
|
},
|
|
52
40
|
toggle: {
|
|
53
41
|
width: isAddButton ? '55%' : '54%',
|
|
54
|
-
height: 40,
|
|
55
|
-
borderRadius: 13,
|
|
56
42
|
justifyContent: 'flex-start',
|
|
57
43
|
paddingLeft: '5%',
|
|
58
44
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLineTypeSwitch.js","sourceRoot":"","sources":["../../../../src/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,
|
|
1
|
+
{"version":3,"file":"ExpenseLineTypeSwitch.js","sourceRoot":"","sources":["../../../../src/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,YAAY,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAS3C,MAAM,qBAAqB,GAAG,CAAC,EAC7B,WAAW,GAAG,KAAK,EACnB,QAAQ,EACR,yBAAyB,EACzB,6BAA6B,GACF,EAAE,EAAE;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAEpE,OAAO,CACL,CAAC,YAAY,CACX,cAAc,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CACvC,WAAW,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAC3B,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAChC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CACpC,WAAW,CAAC,CACV,CAAC,YAAY,CACX,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAClC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,mBAAmB,CAAC,CAAC,IAAI,CAAC,EAC1B,CACH,CACD,YAAY,CAAC,CACX,CAAC,YAAY,CACX,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,MAAM,CAAC,CAAC,6BAA6B,CAAC,CACtC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,mBAAmB,CAAC,CAAC,IAAI,CAAC,EAC1B,CACH,CACD,QAAQ,CAAC,CAAC,GAAG,EAAE;YACb,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACf,OAAO,KAAK,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO;oBACxC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU;oBAC9B,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,CAC9B,UAAU,CAAC,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;QACnC,MAAM,EAAE,CAAC;KACV;IACD,MAAM,EAAE;QACN,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;QAClC,cAAc,EAAE,YAAY;QAC5B,WAAW,EAAE,IAAI;KAClB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,IAAI;KACZ;CACF,CAAC,CAAC;AAEL,eAAe,qBAAqB,CAAC"}
|
|
@@ -4,6 +4,7 @@ export { default as CurrencySearchBar } from "./CurrencySearchBar/CurrencySearch
|
|
|
4
4
|
export { default as DistanceIncrement } from "./DistanceIncrement/DistanceIncrement";
|
|
5
5
|
export { default as ExpenseHeader } from "./ExpenseHeader/ExpenseHeader";
|
|
6
6
|
export { default as ExpenseLineSwitchAdd } from "./ExpenseLineSwitchAdd/ExpenseLineSwitchAdd";
|
|
7
|
+
export { default as ExpenseLineTypeDisplay } from "./ExpenseLineTypeDisplay/ExpenseLineTypeDisplay";
|
|
7
8
|
export { default as ExpenseLineTypeSwitch } from "./ExpenseLineTypeSwitch/ExpenseLineTypeSwitch";
|
|
8
9
|
export { default as ExpenseTypeSearchBar } from "./ExpenseTypeSearchBar/ExpenseTypeSearchBar";
|
|
9
10
|
export { default as ExpenseWaitingValidationSearchBar } from "./ExpenseWaitingValidationSearchBar/ExpenseWaitingValidationSearchBar";
|
|
@@ -21,6 +21,7 @@ export { default as CurrencySearchBar } from './CurrencySearchBar/CurrencySearch
|
|
|
21
21
|
export { default as DistanceIncrement } from './DistanceIncrement/DistanceIncrement';
|
|
22
22
|
export { default as ExpenseHeader } from './ExpenseHeader/ExpenseHeader';
|
|
23
23
|
export { default as ExpenseLineSwitchAdd } from './ExpenseLineSwitchAdd/ExpenseLineSwitchAdd';
|
|
24
|
+
export { default as ExpenseLineTypeDisplay } from './ExpenseLineTypeDisplay/ExpenseLineTypeDisplay';
|
|
24
25
|
export { default as ExpenseLineTypeSwitch } from './ExpenseLineTypeSwitch/ExpenseLineTypeSwitch';
|
|
25
26
|
export { default as ExpenseTypeSearchBar } from './ExpenseTypeSearchBar/ExpenseTypeSearchBar';
|
|
26
27
|
export { default as ExpenseWaitingValidationSearchBar } from './ExpenseWaitingValidationSearchBar/ExpenseWaitingValidationSearchBar';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAC,OAAO,IAAI,qBAAqB,EAAC,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAC,OAAO,IAAI,iCAAiC,EAAC,MAAM,uEAAuE,CAAC;AACnI,OAAO,EAAC,OAAO,IAAI,6BAA6B,EAAC,MAAM,+DAA+D,CAAC;AACvH,OAAO,EAAC,OAAO,IAAI,0BAA0B,EAAC,MAAM,yDAAyD,CAAC;AAC9G,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAC,OAAO,IAAI,sBAAsB,EAAC,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAC,OAAO,IAAI,qBAAqB,EAAC,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAC,OAAO,IAAI,iCAAiC,EAAC,MAAM,uEAAuE,CAAC;AACnI,OAAO,EAAC,OAAO,IAAI,6BAA6B,EAAC,MAAM,+DAA+D,CAAC;AACvH,OAAO,EAAC,OAAO,IAAI,0BAA0B,EAAC,MAAM,yDAAyD,CAAC;AAC9G,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC"}
|
package/lib/i18n/en.json
CHANGED
package/lib/i18n/fr.json
CHANGED
|
@@ -32,6 +32,8 @@ const ExpenseDetailsScreen = ({ route, navigation }) => {
|
|
|
32
32
|
const [mode, setMode] = useState(ExpenseLine.modes.general);
|
|
33
33
|
useEffect(() => {
|
|
34
34
|
dispatch(fetchExpenseById({ ExpenseId: idExpense }));
|
|
35
|
+
dispatch(searchKilometricExpenseLines({ expenseId: idExpense, page: 0 }));
|
|
36
|
+
dispatch(searchGeneralExpenseLines({ expenseId: idExpense, page: 0 }));
|
|
35
37
|
}, [dispatch, idExpense]);
|
|
36
38
|
const ObjectToDisplay = useMemo(() => {
|
|
37
39
|
if (mode === ExpenseLine.modes.general) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseDetailsScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseDetailsScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,8BAA8B,EAC9B,aAAa,EACb,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAErC,MAAM,oBAAoB,GAAG,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC,EAAE,EAAE;IACnD,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IAC9C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,EACJ,yBAAyB,EACzB,6BAA6B,EAC7B,2BAA2B,EAC3B,sBAAsB,EACtB,4BAA4B,EAC5B,gCAAgC,EAChC,8BAA8B,EAC9B,yBAAyB,GAC1B,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE5C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,gBAAgB,CAAC,EAAC,SAAS,EAAE,SAAS,EAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ExpenseDetailsScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseDetailsScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { View, StyleSheet } from 'react-native';
|
|
20
|
-
import { Screen, ScrollList, HeaderContainer, ToggleSwitch,
|
|
20
|
+
import { Screen, ScrollList, HeaderContainer, ToggleSwitch, useThemeColor, Picker, NumberBubble, } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useDispatch, useSelector, useTranslator } from '@axelor/aos-mobile-core';
|
|
22
22
|
import { ExpenseCard, ExpenseWaitingValidationSearchBar } from '../components';
|
|
23
23
|
import { searchExpenseToValidate, searchMyExpense, sendExpense, validateExpense, } from '../features/expenseSlice';
|
|
@@ -32,7 +32,6 @@ const ExpenseListScreen = ({ navigation }) => {
|
|
|
32
32
|
const { managedEmployeeTotal } = useSelector(state => state.employee);
|
|
33
33
|
const [mode, setMode] = useState(Expense.mode.personnal);
|
|
34
34
|
const [selectedStatus, setSelectedStatus] = useState(null);
|
|
35
|
-
const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
|
|
36
35
|
const expenseStatusListItems = useMemo(() => {
|
|
37
36
|
return Expense.getStatusList(Colors, I18n);
|
|
38
37
|
}, [Colors, I18n]);
|
|
@@ -106,7 +105,7 @@ const ExpenseListScreen = ({ navigation }) => {
|
|
|
106
105
|
const filteredList = useMemo(() => filterOnStatus(ObjectToDisplay.list), [ObjectToDisplay.list, filterOnStatus]);
|
|
107
106
|
return (<Screen removeSpaceOnTop={true}>
|
|
108
107
|
<HeaderContainer expandableFilter={false} fixedItems={<View style={styles.headerContainer}>
|
|
109
|
-
{(user?.employee?.hrManager || managedEmployeeTotal > 0) && (<ToggleSwitch
|
|
108
|
+
{(user?.employee?.hrManager || managedEmployeeTotal > 0) && (<ToggleSwitch leftTitle={I18n.t('Hr_MyExpenses')} rightTitle={I18n.t('Hr_ToValidate')} rigthElement={<NumberBubble style={styles.indicator} number={totalNumberExpenseToValidate} color={Colors.cautionColor} isNeutralBackground={true}/>} onSwitch={() => setMode(_mode => {
|
|
110
109
|
setSelectedStatus(null);
|
|
111
110
|
return _mode === Expense.mode.personnal
|
|
112
111
|
? Expense.mode.validation
|
|
@@ -127,11 +126,6 @@ const styles = StyleSheet.create({
|
|
|
127
126
|
headerContainer: {
|
|
128
127
|
alignItems: 'center',
|
|
129
128
|
},
|
|
130
|
-
toggle: {
|
|
131
|
-
width: '54%',
|
|
132
|
-
height: 38,
|
|
133
|
-
borderRadius: 13,
|
|
134
|
-
},
|
|
135
129
|
indicator: {
|
|
136
130
|
position: 'absolute',
|
|
137
131
|
right: '5%',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseListScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseListScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,MAAM,EACN,UAAU,EACV,eAAe,EACf,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"ExpenseListScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseListScreen.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-hr",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.4",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"react-i18next": "^11.18.6"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@axelor/aos-mobile-core": "7.2.
|
|
32
|
-
"@axelor/aos-mobile-ui": "7.2.
|
|
31
|
+
"@axelor/aos-mobile-core": "7.2.4",
|
|
32
|
+
"@axelor/aos-mobile-ui": "7.2.4",
|
|
33
33
|
"@reduxjs/toolkit": "^1.8.5"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|