@axelor/aos-mobile-hr 7.2.2 → 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/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.js +7 -3
- package/lib/components/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.js.map +1 -1
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.d.ts +6 -0
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js +48 -0
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js.map +1 -0
- 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 +7 -3
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.js +13 -26
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.js.map +1 -1
- package/lib/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js +7 -9
- package/lib/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js.map +1 -1
- package/lib/components/templates/index.d.ts +2 -0
- package/lib/components/templates/index.js +2 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/features/expenseLineSlice.js +54 -28
- package/lib/features/expenseLineSlice.js.map +1 -1
- package/lib/features/expenseSlice.js +39 -17
- package/lib/features/expenseSlice.js.map +1 -1
- package/lib/i18n/en.json +4 -1
- package/lib/i18n/fr.json +4 -1
- package/lib/models/sortFields.js +1 -1
- package/lib/models/sortFields.js.map +1 -1
- package/lib/screens/ExpenseDetailsScreen.js +4 -2
- package/lib/screens/ExpenseDetailsScreen.js.map +1 -1
- package/lib/screens/ExpenseLineFormScreen.js +30 -6
- package/lib/screens/ExpenseLineFormScreen.js.map +1 -1
- package/lib/screens/ExpenseLinesListScreen.js +21 -4
- package/lib/screens/ExpenseLinesListScreen.js.map +1 -1
- package/lib/screens/ExpenseListScreen.js +2 -8
- package/lib/screens/ExpenseListScreen.js.map +1 -1
- package/package.json +3 -3
|
@@ -53,8 +53,12 @@ const ExpenseLineDetailCard = ({ style, item, expense, onEdit, onLongPress, onIt
|
|
|
53
53
|
})
|
|
54
54
|
: 0, [isSelectionMode, translateXAnim]);
|
|
55
55
|
const handleDelete = useCallback(() => {
|
|
56
|
-
dispatch(deleteExpenseLine({
|
|
57
|
-
|
|
56
|
+
dispatch(deleteExpenseLine({
|
|
57
|
+
ExpenseLineId: item.id,
|
|
58
|
+
userId: userId,
|
|
59
|
+
expenseId: expense?.id,
|
|
60
|
+
}));
|
|
61
|
+
}, [dispatch, expense?.id, item.id, userId]);
|
|
58
62
|
const handleShowFile = async () => {
|
|
59
63
|
await openFileInExternalApp({
|
|
60
64
|
fileName: item.justificationMetaFile?.fileName,
|
|
@@ -81,7 +85,7 @@ const ExpenseLineDetailCard = ({ style, item, expense, onEdit, onLongPress, onIt
|
|
|
81
85
|
{expense == null ||
|
|
82
86
|
expense.statusSelect === Expense.statusSelect.Draft ? (<View style={styles.iconContainer}>
|
|
83
87
|
<CardIconButton iconName={'pencil-alt'} iconColor={Colors.secondaryColor_dark.background} onPress={onEdit} style={styles.cardIconButton}/>
|
|
84
|
-
|
|
88
|
+
<CardIconButton iconName={'trash-alt'} iconColor={Colors.errorColor.background} onPress={handleDelete} style={styles.cardIconButton}/>
|
|
85
89
|
</View>) : null}
|
|
86
90
|
</View>
|
|
87
91
|
</Animated.View>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLineDetailCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACxD,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,aAAa,EACb,WAAW,EACX,WAAW,EACX,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AAErE,MAAM,qBAAqB,GAAG,CAAC,EAC7B,KAAK,EACL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,WAAW,EACX,eAAe,EACf,eAAe,EACf,UAAU,GACX,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,MAAM,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7E,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,EAAU,CAAC;IAEvD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAE7D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE;gBAC9B,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,GAAG;gBACb,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC,KAAK,EAAE,CAAC;SACZ;aAAM;YACL,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE;gBAC9B,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,GAAG;gBACb,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC,KAAK,EAAE,CAAC;SACZ;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;IAEtC,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CACH,eAAe;QACb,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC;YACzB,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;YACnB,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;SAC3B,CAAC;QACJ,CAAC,CAAC,CAAC,EACP,CAAC,eAAe,EAAE,cAAc,CAAC,CAClC,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;QACpC,QAAQ,CACL,iBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"ExpenseLineDetailCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
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, { useMemo } from 'react';
|
|
19
|
+
import { StyleSheet, View } from 'react-native';
|
|
20
|
+
import { useNavigation, useSelector } from '@axelor/aos-mobile-core';
|
|
21
|
+
import { CircleButton } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import ExpenseLineTypeDisplay from '../ExpenseLineTypeDisplay/ExpenseLineTypeDisplay';
|
|
23
|
+
import { Expense } from '../../../types';
|
|
24
|
+
const ExpenseLineSwitchAdd = ({ mode, onChangeSwicth, }) => {
|
|
25
|
+
const navigation = useNavigation();
|
|
26
|
+
const { expense } = useSelector((state) => state.expense);
|
|
27
|
+
const isAddButton = useMemo(() => expense.statusSelect === Expense.statusSelect.Draft, [expense]);
|
|
28
|
+
return (<View style={styles.container}>
|
|
29
|
+
<ExpenseLineTypeDisplay onChange={onChangeSwicth} isAddButton={isAddButton}/>
|
|
30
|
+
{isAddButton && (<CircleButton size={38} iconName="plus" onPress={() => navigation.navigate('ExpenseLineFormScreen', {
|
|
31
|
+
idExpense: expense?.id,
|
|
32
|
+
versionExpense: expense?.version,
|
|
33
|
+
modeExpense: mode,
|
|
34
|
+
})}/>)}
|
|
35
|
+
</View>);
|
|
36
|
+
};
|
|
37
|
+
const styles = StyleSheet.create({
|
|
38
|
+
container: {
|
|
39
|
+
flexDirection: 'row',
|
|
40
|
+
alignItems: 'center',
|
|
41
|
+
marginTop: 15,
|
|
42
|
+
justifyContent: 'space-between',
|
|
43
|
+
marginHorizontal: 24,
|
|
44
|
+
marginBottom: 10,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
export default ExpenseLineSwitchAdd;
|
|
48
|
+
//# sourceMappingURL=ExpenseLineSwitchAdd.js.map
|
|
@@ -0,0 +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,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,4 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
interface ExpenseLineTypeSwitchProps {
|
|
2
|
+
isAddButton?: boolean;
|
|
3
|
+
onChange: (mode: any) => void;
|
|
4
|
+
totalNumberExpenseGeneral: number;
|
|
5
|
+
totalNumberExpenseKilomectric: number;
|
|
6
|
+
}
|
|
7
|
+
declare const ExpenseLineTypeSwitch: ({ isAddButton, onChange, totalNumberExpenseGeneral, totalNumberExpenseKilomectric, }: ExpenseLineTypeSwitchProps) => JSX.Element;
|
|
4
8
|
export default ExpenseLineTypeSwitch;
|
|
@@ -15,28 +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 = ({ onChange }) => {
|
|
23
|
+
const ExpenseLineTypeSwitch = ({ isAddButton = false, onChange, totalNumberExpenseGeneral, totalNumberExpenseKilomectric, }) => {
|
|
25
24
|
const I18n = useTranslator();
|
|
26
25
|
const Colors = useThemeColor();
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
const { totalNumberExpenseGeneral, totalNumberExpenseKilomectric } = useSelector((state) => state.expenseLine);
|
|
30
|
-
const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
|
|
31
|
-
useEffect(() => {
|
|
32
|
-
dispatch(searchKilometricExpenseLines({ expenseId: expense?.id, page: 0 }));
|
|
33
|
-
dispatch(searchGeneralExpenseLines({ expenseId: expense?.id, page: 0 }));
|
|
34
|
-
}, [dispatch, expense?.id]);
|
|
35
|
-
return (<ToggleSwitch styleContainer={[
|
|
36
|
-
commonStyles.filter,
|
|
37
|
-
commonStyles.filterSize,
|
|
38
|
-
styles.toogleContainer,
|
|
39
|
-
]} 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={() => {
|
|
26
|
+
const styles = useMemo(() => getStyles(isAddButton), [isAddButton]);
|
|
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={() => {
|
|
40
28
|
onChange(_mode => {
|
|
41
29
|
return _mode === ExpenseLine.modes.general
|
|
42
30
|
? ExpenseLine.modes.kilometric
|
|
@@ -44,16 +32,15 @@ const ExpenseLineTypeSwitch = ({ onChange }) => {
|
|
|
44
32
|
});
|
|
45
33
|
}}/>);
|
|
46
34
|
};
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
width: '89%',
|
|
35
|
+
const getStyles = isAddButton => StyleSheet.create({
|
|
36
|
+
toggleContainer: {
|
|
37
|
+
width: isAddButton ? '88%' : '100%',
|
|
38
|
+
margin: 0,
|
|
52
39
|
},
|
|
53
40
|
toggle: {
|
|
54
|
-
width: '54%',
|
|
55
|
-
|
|
56
|
-
|
|
41
|
+
width: isAddButton ? '55%' : '54%',
|
|
42
|
+
justifyContent: 'flex-start',
|
|
43
|
+
paddingLeft: '5%',
|
|
57
44
|
},
|
|
58
45
|
indicator: {
|
|
59
46
|
position: 'absolute',
|
|
@@ -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"}
|
package/lib/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
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, { useCallback,
|
|
18
|
+
import React, { useCallback, useEffect } from 'react';
|
|
19
19
|
import { displayItemName, useDispatch, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
20
20
|
import { AutoCompleteSearch } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { searchKilometricAllowParam } from '../../../features/kilometricAllowParamSlice';
|
|
@@ -64,15 +64,13 @@ const KilometricAllowParamSearchBarAux = ({ style = null, title = 'Hr_Kilometric
|
|
|
64
64
|
}),
|
|
65
65
|
}));
|
|
66
66
|
}, [dispatch, user, expenseDate]);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
useEffect(() => {
|
|
68
|
+
if (Array.isArray(kilometricAllowParamList) &&
|
|
69
|
+
kilometricAllowParamList.length === 1) {
|
|
70
|
+
onChange(kilometricAllowParamList[0]);
|
|
71
71
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}, [defaultValue, kilometricAllowParamList, onChange]);
|
|
75
|
-
return (<AutoCompleteSearch style={style} title={I18n.t(title)} objectList={kilometricAllowParamList} value={defaultKap} required={required} readonly={readonly} onChangeValue={onChange} fetchData={searchKilometricAllowParamAPI} displayValue={displayItemName} placeholder={title} showDetailsPopup={true} loadingList={loadingKilometricAllowParam} moreLoading={moreLoadingKilometricAllowParam} isListEnd={isListEndKilometricAllowParam} navigate={false} oneFilter={false} isFocus={false}/>);
|
|
72
|
+
}, [kilometricAllowParamList, onChange]);
|
|
73
|
+
return (<AutoCompleteSearch style={style} title={I18n.t(title)} objectList={kilometricAllowParamList} value={defaultValue} required={required} readonly={readonly} onChangeValue={onChange} fetchData={searchKilometricAllowParamAPI} displayValue={displayItemName} placeholder={title} showDetailsPopup={true} loadingList={loadingKilometricAllowParam} moreLoading={moreLoadingKilometricAllowParam} isListEnd={isListEndKilometricAllowParam} navigate={false} oneFilter={false} isFocus={false}/>);
|
|
76
74
|
};
|
|
77
75
|
const KilometricAllowParamSearchBar = ({ style = null, title = 'Hr_KilometricAllowParam', defaultValue = null, onChange = () => { }, readonly = false, required = false, }) => {
|
|
78
76
|
return (<KilometricAllowParamSearchBarAux style={style} title={title} defaultValue={defaultValue} onChange={onChange} readonly={readonly} required={required}/>);
|
package/lib/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KilometricAllowParamSearchBar.js","sourceRoot":"","sources":["../../../../src/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"KilometricAllowParamSearchBar.js","sourceRoot":"","sources":["../../../../src/components/templates/KilometricAllowParamSearchBar/KilometricAllowParamSearchBar.js"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ export { default as CityFormInput } from "./CityFormInput/CityFormInput";
|
|
|
3
3
|
export { default as CurrencySearchBar } from "./CurrencySearchBar/CurrencySearchBar";
|
|
4
4
|
export { default as DistanceIncrement } from "./DistanceIncrement/DistanceIncrement";
|
|
5
5
|
export { default as ExpenseHeader } from "./ExpenseHeader/ExpenseHeader";
|
|
6
|
+
export { default as ExpenseLineSwitchAdd } from "./ExpenseLineSwitchAdd/ExpenseLineSwitchAdd";
|
|
7
|
+
export { default as ExpenseLineTypeDisplay } from "./ExpenseLineTypeDisplay/ExpenseLineTypeDisplay";
|
|
6
8
|
export { default as ExpenseLineTypeSwitch } from "./ExpenseLineTypeSwitch/ExpenseLineTypeSwitch";
|
|
7
9
|
export { default as ExpenseTypeSearchBar } from "./ExpenseTypeSearchBar/ExpenseTypeSearchBar";
|
|
8
10
|
export { default as ExpenseWaitingValidationSearchBar } from "./ExpenseWaitingValidationSearchBar/ExpenseWaitingValidationSearchBar";
|
|
@@ -20,6 +20,8 @@ export { default as CityFormInput } from './CityFormInput/CityFormInput';
|
|
|
20
20
|
export { default as CurrencySearchBar } from './CurrencySearchBar/CurrencySearchBar';
|
|
21
21
|
export { default as DistanceIncrement } from './DistanceIncrement/DistanceIncrement';
|
|
22
22
|
export { default as ExpenseHeader } from './ExpenseHeader/ExpenseHeader';
|
|
23
|
+
export { default as ExpenseLineSwitchAdd } from './ExpenseLineSwitchAdd/ExpenseLineSwitchAdd';
|
|
24
|
+
export { default as ExpenseLineTypeDisplay } from './ExpenseLineTypeDisplay/ExpenseLineTypeDisplay';
|
|
23
25
|
export { default as ExpenseLineTypeSwitch } from './ExpenseLineTypeSwitch/ExpenseLineTypeSwitch';
|
|
24
26
|
export { default as ExpenseTypeSearchBar } from './ExpenseTypeSearchBar/ExpenseTypeSearchBar';
|
|
25
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,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"}
|
|
@@ -19,6 +19,8 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
|
19
19
|
import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
|
|
20
20
|
import { searchExpenseLines as _searchExpenseLines, searchGeneralExpenseLines as _searchGeneralExpenseLines, searchKilometricExpenseLines as _searchKilometricExpenseLines, createExpenseLine as _createExpenseLine, updateExpenseLine as _updateExpenseLine, deleteExpenseLine as _deleteExpenseLine, } from '../api/expense-line-api';
|
|
21
21
|
import { ExpenseLine } from '../types';
|
|
22
|
+
import { fetchExpenseById } from './expenseSlice';
|
|
23
|
+
import { updateExpense } from './expenseSlice';
|
|
22
24
|
export const fetchExpenseLine = createAsyncThunk('expenseLine/fetchExpenseLine', async function (data, { getState }) {
|
|
23
25
|
return handlerApiCall({
|
|
24
26
|
fetchFunction: _searchExpenseLines,
|
|
@@ -46,38 +48,56 @@ export const searchGeneralExpenseLines = createAsyncThunk('expenseLine/searchGen
|
|
|
46
48
|
responseOptions: { isArrayResponse: true, resturnTotalWithData: true },
|
|
47
49
|
});
|
|
48
50
|
});
|
|
49
|
-
export const deleteExpenseLine = createAsyncThunk('expenseLine/deleteExpenseLine', async function (data = {}, { getState }) {
|
|
51
|
+
export const deleteExpenseLine = createAsyncThunk('expenseLine/deleteExpenseLine', async function (data = {}, { getState, dispatch }) {
|
|
50
52
|
return handlerApiCall({
|
|
51
53
|
fetchFunction: _deleteExpenseLine,
|
|
52
54
|
data,
|
|
53
|
-
action:
|
|
55
|
+
action: data?.expenseId != null
|
|
56
|
+
? 'Hr_SliceAction_DeleteExpenseLine'
|
|
57
|
+
: 'Hr_SliceAction_DeleteOrphanExpenseLine',
|
|
54
58
|
getState,
|
|
55
59
|
responseOptions: { isArrayResponse: false, showToast: true },
|
|
56
60
|
}).then(() => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
if (data?.expenseId != null) {
|
|
62
|
+
dispatch(fetchExpenseById({ ExpenseId: data?.expenseId }));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
return handlerApiCall({
|
|
66
|
+
fetchFunction: _searchExpenseLines,
|
|
67
|
+
data: { userId: data?.userId },
|
|
68
|
+
action: 'Hr_SliceAction_FetchExpenseLines',
|
|
69
|
+
getState,
|
|
70
|
+
responseOptions: { isArrayResponse: true },
|
|
71
|
+
});
|
|
72
|
+
}
|
|
64
73
|
});
|
|
65
74
|
});
|
|
66
|
-
export const createExpenseLine = createAsyncThunk('expenseLine/createExpenseLine', async function (data = {}, { getState }) {
|
|
75
|
+
export const createExpenseLine = createAsyncThunk('expenseLine/createExpenseLine', async function (data = {}, { getState, dispatch }) {
|
|
67
76
|
return handlerApiCall({
|
|
68
77
|
fetchFunction: _createExpenseLine,
|
|
69
78
|
data,
|
|
70
79
|
action: 'Hr_SliceAction_CreateExpenseLine',
|
|
71
80
|
getState,
|
|
72
81
|
responseOptions: { isArrayResponse: false, showToast: true },
|
|
73
|
-
}).then(
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
82
|
+
}).then(res => {
|
|
83
|
+
if (data?.idExpense == null) {
|
|
84
|
+
return handlerApiCall({
|
|
85
|
+
fetchFunction: _searchExpenseLines,
|
|
86
|
+
data: { userId: data?.userId },
|
|
87
|
+
action: 'Hr_SliceAction_FetchExpenseLines',
|
|
88
|
+
getState,
|
|
89
|
+
responseOptions: { isArrayResponse: true },
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
dispatch(updateExpense({
|
|
94
|
+
isLineCreation: true,
|
|
95
|
+
expenseId: data?.idExpense,
|
|
96
|
+
version: data?.versionExpense,
|
|
97
|
+
userId: data?.userId,
|
|
98
|
+
expenseLineIdList: [res.expenseLineId],
|
|
99
|
+
}));
|
|
100
|
+
}
|
|
81
101
|
});
|
|
82
102
|
});
|
|
83
103
|
export const updateExpenseLine = createAsyncThunk('expenseLine/updateExpenseLine', async function (data, { getState }) {
|
|
@@ -107,17 +127,17 @@ export const updateExpenseLine = createAsyncThunk('expenseLine/updateExpenseLine
|
|
|
107
127
|
});
|
|
108
128
|
const initialState = {
|
|
109
129
|
loadingExpenseLine: true,
|
|
110
|
-
moreLoading:
|
|
111
|
-
isListEnd:
|
|
130
|
+
moreLoading: true,
|
|
131
|
+
isListEnd: true,
|
|
112
132
|
expenseLineList: [],
|
|
113
133
|
loadingGeneralExpenseLine: true,
|
|
114
|
-
moreLoadingGeneralExpenseLine:
|
|
115
|
-
isListEndGeneralExpenseLine:
|
|
134
|
+
moreLoadingGeneralExpenseLine: true,
|
|
135
|
+
isListEndGeneralExpenseLine: true,
|
|
116
136
|
generalExpenseLineList: [],
|
|
117
137
|
totalNumberExpenseGeneral: 0,
|
|
118
138
|
loadingKilometricExpenseLine: true,
|
|
119
|
-
moreLoadingKilometricExpenseLine:
|
|
120
|
-
isListEndKilometricExpenseLine:
|
|
139
|
+
moreLoadingKilometricExpenseLine: true,
|
|
140
|
+
isListEndKilometricExpenseLine: true,
|
|
121
141
|
kilometricExpenseLineList: [],
|
|
122
142
|
totalNumberExpenseKilomectric: 0,
|
|
123
143
|
};
|
|
@@ -150,14 +170,20 @@ const expenseLineSlice = createSlice({
|
|
|
150
170
|
manageTotal: true,
|
|
151
171
|
});
|
|
152
172
|
builder.addCase(createExpenseLine.pending, (state, action) => {
|
|
153
|
-
|
|
173
|
+
if (action?.meta?.arg?.idExpense == null) {
|
|
174
|
+
state.loadingExpenseLine = true;
|
|
175
|
+
}
|
|
154
176
|
});
|
|
155
177
|
builder.addCase(createExpenseLine.fulfilled, (state, action) => {
|
|
156
|
-
|
|
157
|
-
|
|
178
|
+
if (action?.meta?.arg?.idExpense == null) {
|
|
179
|
+
state.loadingExpenseLine = false;
|
|
180
|
+
state.expenseLineList = action.payload;
|
|
181
|
+
}
|
|
158
182
|
});
|
|
159
183
|
builder.addCase(deleteExpenseLine.fulfilled, (state, action) => {
|
|
160
|
-
|
|
184
|
+
if (action?.meta?.arg?.expenseId == null) {
|
|
185
|
+
state.expenseLineList = action.payload;
|
|
186
|
+
}
|
|
161
187
|
});
|
|
162
188
|
builder.addCase(updateExpenseLine.fulfilled, (state, action) => {
|
|
163
189
|
if (action?.meta?.arg?.expenseId == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expenseLineSlice.js","sourceRoot":"","sources":["../../src/features/expenseLineSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,IAAI,mBAAmB,EACzC,yBAAyB,IAAI,0BAA0B,EACvD,4BAA4B,IAAI,6BAA6B,EAC7D,iBAAiB,IAAI,kBAAkB,EACvC,iBAAiB,IAAI,kBAAkB,EACvC,iBAAiB,IAAI,kBAAkB,GACxC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"expenseLineSlice.js","sourceRoot":"","sources":["../../src/features/expenseLineSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,IAAI,mBAAmB,EACzC,yBAAyB,IAAI,0BAA0B,EACvD,4BAA4B,IAAI,6BAA6B,EAC7D,iBAAiB,IAAI,kBAAkB,EACvC,iBAAiB,IAAI,kBAAkB,EACvC,iBAAiB,IAAI,kBAAkB,GACxC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AACrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,8BAA8B,EAC9B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,gBAAgB,CAC1D,0CAA0C,EAC1C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,6BAA6B;QAC5C,IAAI;QACJ,MAAM,EAAE,6CAA6C;QACrD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC;KACrE,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,gBAAgB,CACvD,uCAAuC,EACvC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,0BAA0B;QACzC,IAAI;QACJ,MAAM,EAAE,0CAA0C;QAClD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC;KACrE,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,+BAA+B,EAC/B,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,kBAAkB;QACjC,IAAI;QACJ,MAAM,EACJ,IAAI,EAAE,SAAS,IAAI,IAAI;YACrB,CAAC,CAAC,kCAAkC;YACpC,CAAC,CAAC,wCAAwC;QAC9C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE;YAC3B,QAAQ,CAAC,gBAAgB,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,mBAAmB;gBAClC,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC;gBAC5B,MAAM,EAAE,kCAAkC;gBAC1C,QAAQ;gBACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;aACzC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,+BAA+B,EAC/B,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,kBAAkB;QACjC,IAAI;QACJ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACZ,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE;YAC3B,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,mBAAmB;gBAClC,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC;gBAC5B,MAAM,EAAE,kCAAkC;gBAC1C,QAAQ;gBACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;aACzC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CACN,aAAa,CAAC;gBACZ,cAAc,EAAE,IAAI;gBACpB,SAAS,EAAE,IAAI,EAAE,SAAS;gBAC1B,OAAO,EAAE,IAAI,EAAE,cAAc;gBAC7B,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,iBAAiB,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;aACvC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,+BAA+B,EAC/B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,kBAAkB;QACjC,IAAI;QACJ,MAAM,EAAE,2CAA2C;QACnD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,OAAO,cAAc,CAAC;YACpB,aAAa,EACX,IAAI,EAAE,SAAS,IAAI,IAAI;gBACrB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO;oBACzC,CAAC,CAAC,0BAA0B;oBAC5B,CAAC,CAAC,6BAA6B;YACnC,MAAM,EACJ,IAAI,EAAE,SAAS,IAAI,IAAI;gBACrB,CAAC,CAAC,kCAAkC;gBACpC,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO;oBAC1C,CAAC,CAAC,0CAA0C;oBAC5C,CAAC,CAAC,6CAA6C;YACnD,QAAQ;YACR,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC;YACvD,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;SACzC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,kBAAkB,EAAE,IAAI;IACxB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,EAAE;IAEnB,yBAAyB,EAAE,IAAI;IAC/B,6BAA6B,EAAE,IAAI;IACnC,2BAA2B,EAAE,IAAI;IACjC,sBAAsB,EAAE,EAAE;IAC1B,yBAAyB,EAAE,CAAC;IAE5B,4BAA4B,EAAE,IAAI;IAClC,gCAAgC,EAAE,IAAI;IACtC,8BAA8B,EAAE,IAAI;IACpC,yBAAyB,EAAE,EAAE;IAC7B,6BAA6B,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC;IACnC,IAAI,EAAE,aAAa;IACnB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,EAAE;YACtD,OAAO,EAAE,oBAAoB;YAC7B,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,iBAAiB;SACxB,CAAC,CAAC;QACH,4BAA4B,CAC1B,OAAO,EACP,4BAA4B,EAC5B;YACE,OAAO,EAAE,8BAA8B;YACvC,WAAW,EAAE,kCAAkC;YAC/C,SAAS,EAAE,gCAAgC;YAC3C,IAAI,EAAE,2BAA2B;YACjC,KAAK,EAAE,+BAA+B;SACvC,EACD;YACE,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;QACF,4BAA4B,CAC1B,OAAO,EACP,yBAAyB,EACzB;YACE,OAAO,EAAE,2BAA2B;YACpC,WAAW,EAAE,+BAA+B;YAC5C,SAAS,EAAE,6BAA6B;YACxC,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,2BAA2B;SACnC,EACD;YACE,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI,EAAE;gBACxC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7D,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI,EAAE;gBACxC,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACjC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7D,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI,EAAE;gBACxC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7D,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI,EAAE;gBACxC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;iBAAM;gBACL,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;oBACzD,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC;oBACxC,KAAK,CAAC,sBAAsB,GAAG,MAAM,CAAC,OAAO,CAAC;iBAC/C;gBACD,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE;oBAC5D,KAAK,CAAC,4BAA4B,GAAG,KAAK,CAAC;oBAC3C,KAAK,CAAC,yBAAyB,GAAG,MAAM,CAAC,OAAO,CAAC;iBAClD;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC"}
|
|
@@ -132,16 +132,27 @@ export const updateExpense = createAsyncThunk('expense/updateExpense', async fun
|
|
|
132
132
|
getState,
|
|
133
133
|
responseOptions: { isArrayResponse: false },
|
|
134
134
|
}).then(() => {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
135
|
+
if (data?.isLineCreation) {
|
|
136
|
+
return handlerApiCall({
|
|
137
|
+
fetchFunction: getExpense,
|
|
138
|
+
data: { ExpenseId: data.expenseId },
|
|
139
|
+
action: 'Hr_SliceAction_FetchExpenseById',
|
|
140
|
+
getState,
|
|
141
|
+
responseOptions: { isArrayResponse: false },
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
return handlerApiCall({
|
|
146
|
+
fetchFunction: _searchMyExpense,
|
|
147
|
+
data: { userId: data.userId },
|
|
148
|
+
action: 'Hr_SliceAction_FetchMyExpense',
|
|
149
|
+
getState,
|
|
150
|
+
responseOptions: { isArrayResponse: true },
|
|
151
|
+
}).then(res => {
|
|
152
|
+
dispatch(fetchExpenseLine({ userId: data.userId }));
|
|
153
|
+
return res;
|
|
154
|
+
});
|
|
155
|
+
}
|
|
145
156
|
});
|
|
146
157
|
});
|
|
147
158
|
export const searchExpenseDraft = createAsyncThunk('expense/searchExpenseDraft', async function (data = {}, { getState }) {
|
|
@@ -184,12 +195,12 @@ const initialState = {
|
|
|
184
195
|
loading: true,
|
|
185
196
|
expenseDraftList: [],
|
|
186
197
|
loadingMyExpense: true,
|
|
187
|
-
moreLoadingMyExpense:
|
|
188
|
-
isListEndMyExpense:
|
|
198
|
+
moreLoadingMyExpense: true,
|
|
199
|
+
isListEndMyExpense: true,
|
|
189
200
|
myExpenseList: [],
|
|
190
201
|
loadingExpenseToValidate: true,
|
|
191
|
-
moreLoadingExpenseToValidate:
|
|
192
|
-
isListEndExpenseToValidate:
|
|
202
|
+
moreLoadingExpenseToValidate: true,
|
|
203
|
+
isListEndExpenseToValidate: true,
|
|
193
204
|
expenseToValidateList: [],
|
|
194
205
|
totalNumberExpenseToValidate: 0,
|
|
195
206
|
loadingExpense: true,
|
|
@@ -236,11 +247,22 @@ const expenseSlice = createSlice({
|
|
|
236
247
|
state.myExpenseList = action.payload;
|
|
237
248
|
});
|
|
238
249
|
builder.addCase(updateExpense.pending, (state, action) => {
|
|
239
|
-
|
|
250
|
+
if (action?.meta?.arg?.isLineCreation) {
|
|
251
|
+
state.loadingExpense = true;
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
state.loadingMyExpense = true;
|
|
255
|
+
}
|
|
240
256
|
});
|
|
241
257
|
builder.addCase(updateExpense.fulfilled, (state, action) => {
|
|
242
|
-
|
|
243
|
-
|
|
258
|
+
if (action?.meta?.arg?.isLineCreation) {
|
|
259
|
+
state.loadingExpense = false;
|
|
260
|
+
state.expense = action.payload;
|
|
261
|
+
}
|
|
262
|
+
else {
|
|
263
|
+
state.loadingMyExpense = false;
|
|
264
|
+
state.myExpenseList = action.payload;
|
|
265
|
+
}
|
|
244
266
|
});
|
|
245
267
|
builder.addCase(sendExpense.pending, (state, action) => {
|
|
246
268
|
if (action?.meta?.arg?.onExpense) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expenseSlice.js","sourceRoot":"","sources":["../../src/features/expenseSlice.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"expenseSlice.js","sourceRoot":"","sources":["../../src/features/expenseSlice.js"],"names":[],"mappings":"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"}
|
package/lib/i18n/en.json
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
"Hr_ExpenseLines": "Expense lines",
|
|
7
7
|
"Hr_NewExpenseLine": "New expense line",
|
|
8
8
|
"Hr_NewExpense": "Create a new expense",
|
|
9
|
+
"Hr_OpenSelectionMode": "Open selection mode",
|
|
9
10
|
"Hr_KilomectricTypeSelect_OneWay": "One-Way",
|
|
10
11
|
"Hr_KilomectricTypeSelect_RoundTrip": "Round Trip",
|
|
11
12
|
"Hr_ExpenseStatus_Draft": "Draft",
|
|
@@ -20,6 +21,7 @@
|
|
|
20
21
|
"Hr_Status": "Status",
|
|
21
22
|
"Hr_Employee": "Employee",
|
|
22
23
|
"Hr_General": "General",
|
|
24
|
+
"Hr_NoExpenseLine": "No expense line",
|
|
23
25
|
"Hr_Kilometric": "Kilometric",
|
|
24
26
|
"Hr_ExpenseNumber": "Expense n°",
|
|
25
27
|
"Hr_GroundForRefusal": "Ground for refusal",
|
|
@@ -63,7 +65,8 @@
|
|
|
63
65
|
"Hr_SliceAction_SendExpense": "send expense",
|
|
64
66
|
"Hr_SliceAction_ValidateExpense": "validate expense",
|
|
65
67
|
"Hr_SliceAction_RefuseExpense": "refuse expense",
|
|
66
|
-
"
|
|
68
|
+
"Hr_SliceAction_DeleteOrphanExpenseLine": "delete orphan expense line",
|
|
69
|
+
"Hr_SliceAction_DeleteExpenseLine": "delete expense line",
|
|
67
70
|
"Hr_SliceAction_FetchCurrencies": "fetch currencies",
|
|
68
71
|
"Hr_SliceAction_FetchExpenseConfig": "fetch expense config",
|
|
69
72
|
"Hr_SliceAction_GetDistance": "get distance",
|
package/lib/i18n/fr.json
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
"Hr_Expenses": "Notes de frais",
|
|
7
7
|
"Hr_NewExpenseLine": "Nouvelle ligne de frais",
|
|
8
8
|
"Hr_NewExpense": "Créer une nouvelle note de frais",
|
|
9
|
+
"Hr_OpenSelectionMode": "Ouvrir le mode de sélection",
|
|
9
10
|
"Hr_KilomectricTypeSelect_OneWay": "Aller-simple",
|
|
10
11
|
"Hr_KilomectricTypeSelect_RoundTrip": "Aller-retour",
|
|
11
12
|
"Hr_ExpenseStatus_Draft": "Brouillon",
|
|
@@ -20,6 +21,7 @@
|
|
|
20
21
|
"Hr_Status": "Statut",
|
|
21
22
|
"Hr_Employee": "Employé",
|
|
22
23
|
"Hr_General": "Généraux",
|
|
24
|
+
"Hr_NoExpenseLine": "Pas de ligne de frais",
|
|
23
25
|
"Hr_Kilometric": "Kilométriques",
|
|
24
26
|
"Hr_ExpenseNumber": "Note de frais n°",
|
|
25
27
|
"Hr_GroundForRefusal": "Motif de refus",
|
|
@@ -63,7 +65,8 @@
|
|
|
63
65
|
"Hr_SliceAction_SendExpense": "envoie de la note de frais",
|
|
64
66
|
"Hr_SliceAction_ValidateExpense": "validation de la note de frais",
|
|
65
67
|
"Hr_SliceAction_RefuseExpense": "refus de la note de frais",
|
|
66
|
-
"
|
|
68
|
+
"Hr_SliceAction_DeleteOrphanExpenseLine": "suppression d'une ligne de frais orpheline",
|
|
69
|
+
"Hr_SliceAction_DeleteExpenseLine": "suppression d'une ligne de frais",
|
|
67
70
|
"Hr_SliceAction_FetchCurrencies": "récupération des devises",
|
|
68
71
|
"Hr_SliceAction_FetchExpenseConfig": "récupération de la configuration des notes de frais",
|
|
69
72
|
"Hr_SliceAction_GetDistance": "récupération de la distance",
|
package/lib/models/sortFields.js
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
export const hr_sortFields = {
|
|
19
19
|
hr_currency: ['name'],
|
|
20
|
-
hr_expense: ['createdOn'],
|
|
20
|
+
hr_expense: ['-createdOn'],
|
|
21
21
|
hr_expenseLines: ['-expenseDate', '-createdOn'],
|
|
22
22
|
hr_expenseType: ['name', 'fullName'],
|
|
23
23
|
hr_kilomectricAllowParam: ['name', 'code'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortFields.js","sourceRoot":"","sources":["../../src/models/sortFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,MAAM,CAAC,MAAM,aAAa,GAAe;IACvC,WAAW,EAAE,CAAC,MAAM,CAAC;IACrB,UAAU,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"sortFields.js","sourceRoot":"","sources":["../../src/models/sortFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,MAAM,CAAC,MAAM,aAAa,GAAe;IACvC,WAAW,EAAE,CAAC,MAAM,CAAC;IACrB,UAAU,EAAE,CAAC,YAAY,CAAC;IAC1B,eAAe,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC;IAC/C,cAAc,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;IACpC,wBAAwB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAC1C,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;CACjC,CAAC"}
|
|
@@ -19,7 +19,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
|
19
19
|
import { View } from 'react-native';
|
|
20
20
|
import { Screen, ScrollList, HeaderContainer } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { AnomalyList, useDispatch, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
22
|
-
import { ExpenseDetailsValidationButton, ExpenseHeader, ExpenseLineDetailCard,
|
|
22
|
+
import { ExpenseDetailsValidationButton, ExpenseHeader, ExpenseLineDetailCard, ExpenseLineSwitchAdd, } from '../components';
|
|
23
23
|
import { fetchExpenseById } from '../features/expenseSlice';
|
|
24
24
|
import { searchGeneralExpenseLines, searchKilometricExpenseLines, } from '../features/expenseLineSlice';
|
|
25
25
|
import { ExpenseLine } from '../types';
|
|
@@ -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) {
|
|
@@ -72,7 +74,7 @@ const ExpenseDetailsScreen = ({ route, navigation }) => {
|
|
|
72
74
|
return (<Screen removeSpaceOnTop={true} fixedItems={<ExpenseDetailsValidationButton expense={expense} mode={expenseMode}/>}>
|
|
73
75
|
<HeaderContainer expandableFilter={false} fixedItems={<View>
|
|
74
76
|
<ExpenseHeader />
|
|
75
|
-
<
|
|
77
|
+
<ExpenseLineSwitchAdd mode={mode} onChangeSwicth={setMode}/>
|
|
76
78
|
</View>}/>
|
|
77
79
|
<AnomalyList objectName="expense" objectId={expense.id}/>
|
|
78
80
|
<ScrollList loadingList={ObjectToDisplay.loading} data={ObjectToDisplay.list} renderItem={({ item }) => (<ExpenseLineDetailCard expense={expense} item={item} onEdit={() => navigation.navigate('ExpenseLineFormScreen', {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ExpenseDetailsScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseDetailsScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ import { updateExpenseDate } from '../features/kilometricAllowParamSlice';
|
|
|
24
24
|
import { fetchExpenseConfig } from '../features/expenseConfigSlice';
|
|
25
25
|
import { needUpdateDistance, resetDistance, updateFromCity, updateToCity, } from '../features/distanceSlice';
|
|
26
26
|
const ExpenseLineFormScreen = ({ route, navigation }) => {
|
|
27
|
-
const { expenseLine, idExpense, justificationMetaFile } = route?.params;
|
|
27
|
+
const { expenseLine, idExpense, versionExpense, modeExpense, justificationMetaFile, } = route?.params;
|
|
28
28
|
const I18n = useTranslator();
|
|
29
29
|
const _dispatch = useDispatch();
|
|
30
30
|
const { user } = useSelector(state => state.user);
|
|
@@ -54,9 +54,21 @@ const ExpenseLineFormScreen = ({ route, navigation }) => {
|
|
|
54
54
|
expenseLineType: _expenseLine.manageMode,
|
|
55
55
|
companyId: user?.activeCompany?.id,
|
|
56
56
|
};
|
|
57
|
-
dispatch(createExpenseLine({
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
dispatch(createExpenseLine({
|
|
58
|
+
expenseLine: dataToSend,
|
|
59
|
+
idExpense: idExpense,
|
|
60
|
+
versionExpense: versionExpense,
|
|
61
|
+
userId: user?.id,
|
|
62
|
+
}));
|
|
63
|
+
navigation.goBack();
|
|
64
|
+
}, [
|
|
65
|
+
idExpense,
|
|
66
|
+
navigation,
|
|
67
|
+
user?.activeCompany?.id,
|
|
68
|
+
user?.employee?.id,
|
|
69
|
+
user?.id,
|
|
70
|
+
versionExpense,
|
|
71
|
+
]);
|
|
60
72
|
const updateExpenseLineAPI = useCallback((_expenseLine, dispatch) => {
|
|
61
73
|
dispatch(needUpdateDistance(false));
|
|
62
74
|
const mode = ExpenseLine.getExpenseMode(expenseLine);
|
|
@@ -106,7 +118,7 @@ const ExpenseLineFormScreen = ({ route, navigation }) => {
|
|
|
106
118
|
const defaultValue = useMemo(() => {
|
|
107
119
|
const _defaultDate = new Date().toISOString().split('T')[0];
|
|
108
120
|
const _default = {
|
|
109
|
-
manageMode: ExpenseLine.modes.general,
|
|
121
|
+
manageMode: modeExpense || ExpenseLine.modes.general,
|
|
110
122
|
hideToggle: false,
|
|
111
123
|
expenseDate: _defaultDate,
|
|
112
124
|
companyName: user.activeCompany?.name,
|
|
@@ -173,6 +185,7 @@ const ExpenseLineFormScreen = ({ route, navigation }) => {
|
|
|
173
185
|
_dispatch,
|
|
174
186
|
expenseLine,
|
|
175
187
|
justificationMetaFile,
|
|
188
|
+
modeExpense,
|
|
176
189
|
user.activeCompany?.name,
|
|
177
190
|
]);
|
|
178
191
|
return (<FormView defaultValue={defaultValue} actions={[
|
|
@@ -181,7 +194,18 @@ const ExpenseLineFormScreen = ({ route, navigation }) => {
|
|
|
181
194
|
type: 'create',
|
|
182
195
|
needValidation: true,
|
|
183
196
|
needRequiredFields: true,
|
|
184
|
-
hideIf: () => expenseLine != null,
|
|
197
|
+
hideIf: () => expenseLine != null || idExpense != null,
|
|
198
|
+
customAction: ({ dispatch, objectState }) => {
|
|
199
|
+
return createExpenseLineAPI(objectState, dispatch);
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
{
|
|
203
|
+
key: 'create-and-link-expenseLine',
|
|
204
|
+
type: 'custom',
|
|
205
|
+
titleKey: 'Base_Add',
|
|
206
|
+
needValidation: true,
|
|
207
|
+
needRequiredFields: true,
|
|
208
|
+
hideIf: () => expenseLine != null || idExpense == null,
|
|
185
209
|
customAction: ({ dispatch, objectState }) => {
|
|
186
210
|
return createExpenseLineAPI(objectState, dispatch);
|
|
187
211
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLineFormScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseLineFormScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,GACb,MAAM,2BAA2B,CAAC;AAEnC,MAAM,qBAAqB,GAAG,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC,EAAE,EAAE;IACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"ExpenseLineFormScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseLineFormScreen.js"],"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 React, { useCallback, useEffect, useState } from 'react';
|
|
19
|
-
import { Screen, ScrollList, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
19
|
+
import { DoubleIcon, Screen, ScrollList, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
20
20
|
import { CameraButton, headerActionsProvider, useDispatch, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
21
21
|
import { fetchExpenseLine } from '../features/expenseLineSlice';
|
|
22
22
|
import { ExpenseAddPopup, ExpenseLineDetailCard, ExpenseLineValidationButton, } from '../components';
|
|
@@ -51,7 +51,7 @@ const ExpenseLinesListScreen = ({ navigation }) => {
|
|
|
51
51
|
actions: [
|
|
52
52
|
{
|
|
53
53
|
key: 'newExpenseLines',
|
|
54
|
-
order:
|
|
54
|
+
order: 20,
|
|
55
55
|
iconName: 'plus',
|
|
56
56
|
hideIf: isSelectionMode,
|
|
57
57
|
title: I18n.t('Hr_NewExpenseLine'),
|
|
@@ -59,13 +59,30 @@ const ExpenseLinesListScreen = ({ navigation }) => {
|
|
|
59
59
|
onPress: () => navigation.navigate('ExpenseLineFormScreen', {}),
|
|
60
60
|
showInHeader: true,
|
|
61
61
|
},
|
|
62
|
+
{
|
|
63
|
+
key: 'openSelectionMode',
|
|
64
|
+
order: 10,
|
|
65
|
+
iconName: 'user',
|
|
66
|
+
hideIf: isSelectionMode,
|
|
67
|
+
title: I18n.t('Hr_OpenSelectionMode'),
|
|
68
|
+
onPress: handleModeChange,
|
|
69
|
+
showInHeader: true,
|
|
70
|
+
customComponent: (<DoubleIcon topIconConfig={{
|
|
71
|
+
name: 'plus',
|
|
72
|
+
color: Colors.primaryColor.background,
|
|
73
|
+
size: 16,
|
|
74
|
+
}} bottomIconConfig={{
|
|
75
|
+
name: 'credit-card',
|
|
76
|
+
color: Colors.secondaryColor_dark.background,
|
|
77
|
+
}} predefinedPosition={'top-right'} topIconPosition={{ top: -9 }}/>),
|
|
78
|
+
},
|
|
62
79
|
],
|
|
63
80
|
});
|
|
64
81
|
}, [Colors, I18n, navigation, isSelectionMode]);
|
|
65
|
-
const handleModeChange = itemId => {
|
|
82
|
+
const handleModeChange = (itemId = null) => {
|
|
66
83
|
setIsSelectionMode(current => {
|
|
67
84
|
const mode = !current;
|
|
68
|
-
if (mode) {
|
|
85
|
+
if (mode && itemId != null) {
|
|
69
86
|
setSelectedItems([itemId]);
|
|
70
87
|
}
|
|
71
88
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLinesListScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseLinesListScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"ExpenseLinesListScreen.js","sourceRoot":"","sources":["../../src/screens/ExpenseLinesListScreen.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": {
|