@axelor/aos-mobile-hr 8.5.26 → 8.5.27
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/leave-api.d.ts +2 -1
- package/lib/api/leave-api.js +10 -3
- package/lib/api/leave-api.js.map +1 -1
- package/lib/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.d.ts +2 -1
- package/lib/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.js +16 -3
- package/lib/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.js.map +1 -1
- package/lib/i18n/en.json +1 -1
- package/lib/i18n/fr.json +1 -1
- package/lib/screens/leaveRequests/CompleteRequestScreen.js +32 -11
- package/lib/screens/leaveRequests/CompleteRequestScreen.js.map +1 -1
- package/lib/screens/leaveRequests/LeaveListScreen.d.ts +1 -1
- package/lib/screens/leaveRequests/LeaveListScreen.js +16 -28
- package/lib/screens/leaveRequests/LeaveListScreen.js.map +1 -1
- package/lib/screens/leaveRequests/index.d.ts +1 -1
- package/package.json +3 -3
package/lib/api/leave-api.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export function fetchLeave({ userId, selectedStatus, page, companyId, filterDomain, }: {
|
|
1
|
+
export function fetchLeave({ userId, selectedStatus, leaveIds, page, companyId, filterDomain, }: {
|
|
2
2
|
userId: any;
|
|
3
3
|
selectedStatus: any;
|
|
4
|
+
leaveIds: any;
|
|
4
5
|
page?: number;
|
|
5
6
|
companyId: any;
|
|
6
7
|
filterDomain: any;
|
package/lib/api/leave-api.js
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { createStandardFetch, createStandardSearch, formatRequestBody, getActionApi, getSearchCriterias, getTypes, } from '@axelor/aos-mobile-core';
|
|
19
|
-
const createLeaveCriteria = (userId, selectedStatus) => {
|
|
19
|
+
const createLeaveCriteria = (userId, selectedStatus, leaveIds) => {
|
|
20
20
|
const criteria = [
|
|
21
21
|
{
|
|
22
22
|
fieldName: 'employee.user.id',
|
|
@@ -36,6 +36,13 @@ const createLeaveCriteria = (userId, selectedStatus) => {
|
|
|
36
36
|
value: selectedStatus,
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
+
if (Array.isArray(leaveIds) && leaveIds.length > 0) {
|
|
40
|
+
criteria.push({
|
|
41
|
+
fieldName: 'id',
|
|
42
|
+
operator: 'in',
|
|
43
|
+
value: leaveIds,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
39
46
|
return criteria;
|
|
40
47
|
};
|
|
41
48
|
const createLeaveToValidateCriteria = (searchValue, user) => {
|
|
@@ -57,10 +64,10 @@ const createLeaveToValidateCriteria = (searchValue, user) => {
|
|
|
57
64
|
}
|
|
58
65
|
return criteria;
|
|
59
66
|
};
|
|
60
|
-
export async function fetchLeave({ userId, selectedStatus, page = 0, companyId, filterDomain, }) {
|
|
67
|
+
export async function fetchLeave({ userId, selectedStatus, leaveIds, page = 0, companyId, filterDomain, }) {
|
|
61
68
|
return createStandardSearch({
|
|
62
69
|
model: 'com.axelor.apps.hr.db.LeaveRequest',
|
|
63
|
-
criteria: createLeaveCriteria(userId, selectedStatus),
|
|
70
|
+
criteria: createLeaveCriteria(userId, selectedStatus, leaveIds),
|
|
64
71
|
fieldKey: 'hr_leave',
|
|
65
72
|
sortKey: 'hr_leave',
|
|
66
73
|
page,
|
package/lib/api/leave-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"leave-api.js","sourceRoot":"","sources":["../../src/api/leave-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAEjC,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"leave-api.js","sourceRoot":"","sources":["../../src/api/leave-api.js"],"names":[],"mappings":"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"}
|
package/lib/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ interface CompleteRequestQuantityCardProps {
|
|
|
5
5
|
cancelLeave: () => void;
|
|
6
6
|
newLine: any;
|
|
7
7
|
toDate: string;
|
|
8
|
+
missingQty: number;
|
|
8
9
|
}
|
|
9
|
-
declare const CompleteRequestQuantityCard: ({ leaveQty, setLeaveQty, cancelLeave, newLine, toDate, }: CompleteRequestQuantityCardProps) => React.JSX.Element;
|
|
10
|
+
declare const CompleteRequestQuantityCard: ({ leaveQty, setLeaveQty, cancelLeave, newLine, toDate, missingQty, }: CompleteRequestQuantityCardProps) => React.JSX.Element;
|
|
10
11
|
export default CompleteRequestQuantityCard;
|
|
@@ -19,7 +19,7 @@ import React, { useEffect, useMemo, useState } from 'react';
|
|
|
19
19
|
import { useTranslator, useTypes } from '@axelor/aos-mobile-core';
|
|
20
20
|
import { QuantityCard, Text, useDigitFormat } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { fetchLeaveReasonAvailability } from '../../../api/leave-api';
|
|
22
|
-
const CompleteRequestQuantityCard = ({ leaveQty, setLeaveQty, cancelLeave, newLine, toDate, }) => {
|
|
22
|
+
const CompleteRequestQuantityCard = ({ leaveQty, setLeaveQty, cancelLeave, newLine, toDate, missingQty, }) => {
|
|
23
23
|
const I18n = useTranslator();
|
|
24
24
|
const { LeaveReason } = useTypes();
|
|
25
25
|
const formatNumber = useDigitFormat();
|
|
@@ -35,10 +35,23 @@ const CompleteRequestQuantityCard = ({ leaveQty, setLeaveQty, cancelLeave, newLi
|
|
|
35
35
|
toDate,
|
|
36
36
|
leaveReasonId: newLine.id,
|
|
37
37
|
})
|
|
38
|
-
.then(
|
|
38
|
+
.then(qty => {
|
|
39
|
+
setAvailableQty(qty);
|
|
40
|
+
const isNewSelection = newLine.qty == null;
|
|
41
|
+
if (isNewSelection && qty > 0 && missingQty > 0) {
|
|
42
|
+
setLeaveQty(Math.min(qty, missingQty));
|
|
43
|
+
}
|
|
44
|
+
})
|
|
39
45
|
.catch(() => setAvailableQty(0));
|
|
40
46
|
}
|
|
41
|
-
}, [
|
|
47
|
+
}, [
|
|
48
|
+
isExceptionalLeave,
|
|
49
|
+
missingQty,
|
|
50
|
+
newLine.id,
|
|
51
|
+
newLine.qty,
|
|
52
|
+
setLeaveQty,
|
|
53
|
+
toDate,
|
|
54
|
+
]);
|
|
42
55
|
return (<QuantityCard labelQty={I18n.t('Hr_Quantity')} defaultValue={leaveQty} onValueChange={setLeaveQty} editable={true} actionQty={true} iconName="x-lg" onPressActionQty={cancelLeave} isBigButton={true} translator={I18n.t}>
|
|
43
56
|
<Text fontSize={16}>{`${I18n.t('Hr_LeaveReason')} : ${newLine.name}`}</Text>
|
|
44
57
|
<Text fontSize={16}>
|
package/lib/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompleteRequestQuantityCard.js","sourceRoot":"","sources":["../../../../src/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAC,YAAY,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAC,4BAA4B,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"CompleteRequestQuantityCard.js","sourceRoot":"","sources":["../../../../src/components/templates/CompleteRequestQuantityCard/CompleteRequestQuantityCard.tsx"],"names":[],"mappings":"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"}
|
package/lib/i18n/en.json
CHANGED
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"Hr_LeaveReason": "Leave reason",
|
|
101
101
|
"Hr_Quantity": "Quantity",
|
|
102
102
|
"Hr_AvailableQty": "Available quantity : {{availableQty}}",
|
|
103
|
-
"
|
|
103
|
+
"Hr_NeededQuantity": "Quantity to be filled",
|
|
104
104
|
"Hr_ExceedingQuantity": "Exceeding quantity",
|
|
105
105
|
"Hr_ReturnToDraftStatus": "Return to draft status",
|
|
106
106
|
"Hr_InvalidHalfDaySelection": "For a single-day leave, the 'endOn' value must be greater than the 'startOn' value.",
|
package/lib/i18n/fr.json
CHANGED
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"Hr_LeaveReason": "Motif",
|
|
101
101
|
"Hr_Quantity": "Quantité",
|
|
102
102
|
"Hr_AvailableQty": "Quantité disponible : {{availableQty}}",
|
|
103
|
-
"
|
|
103
|
+
"Hr_NeededQuantity": "Quantité à compléter",
|
|
104
104
|
"Hr_ExceedingQuantity": "Quantité en trop",
|
|
105
105
|
"Hr_ReturnToDraftStatus": "Retourner à l'état brouillon",
|
|
106
106
|
"Hr_InvalidHalfDaySelection": "Pour une journée unique, la sélection matin/après-midi de fin de congé doit être supérieure à celle de début.",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet } from 'react-native';
|
|
20
|
-
import { PeriodInput, useDispatch, usePermitted, useTranslator, useTypeHelpers, useTypes, } from '@axelor/aos-mobile-core';
|
|
20
|
+
import { PeriodInput, useDispatch, useNavigation, usePermitted, useTranslator, useTypeHelpers, useTypes, } from '@axelor/aos-mobile-core';
|
|
21
21
|
import { FormInput, KeyboardAvoidingScrollView, Label, Screen, ViewAllEditList, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { CompleteRequestButtons, CompleteRequestQuantityCard, LeaveReasonSearchBar, LeaveStartEndOn, } from '../../components';
|
|
23
23
|
import { createLeaveRequest } from '../../features/leaveSlice';
|
|
@@ -27,6 +27,7 @@ const CompleteRequestScreen = ({}) => {
|
|
|
27
27
|
const { LeaveReason, LeaveRequest } = useTypes();
|
|
28
28
|
const { getItemTitle } = useTypeHelpers();
|
|
29
29
|
const dispatch = useDispatch();
|
|
30
|
+
const navigation = useNavigation();
|
|
30
31
|
const { canCreate } = usePermitted({
|
|
31
32
|
modelName: 'com.axelor.apps.hr.db.LeaveRequest',
|
|
32
33
|
});
|
|
@@ -82,6 +83,33 @@ const CompleteRequestScreen = ({}) => {
|
|
|
82
83
|
});
|
|
83
84
|
handleReset();
|
|
84
85
|
};
|
|
86
|
+
const navigateToCreatedLeaves = useCallback((createdLeaves) => {
|
|
87
|
+
if (createdLeaves.length === 1) {
|
|
88
|
+
navigation.navigate('LeaveDetailsScreen', {
|
|
89
|
+
leaveId: createdLeaves[0].leaveRequestId,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
else if (createdLeaves.length > 1) {
|
|
93
|
+
navigation.navigate('LeaveListScreen', {
|
|
94
|
+
leaveIds: createdLeaves.map(({ leaveRequestId }) => leaveRequestId),
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
}, [navigation]);
|
|
98
|
+
const handleFinish = useCallback(() => {
|
|
99
|
+
dispatch(createLeaveRequest({
|
|
100
|
+
fromDate,
|
|
101
|
+
startOnSelect: startOn,
|
|
102
|
+
lines,
|
|
103
|
+
})).then(res => navigateToCreatedLeaves(res?.payload?.leaveRequestResponseList ?? []));
|
|
104
|
+
resetDefaultStates();
|
|
105
|
+
}, [
|
|
106
|
+
dispatch,
|
|
107
|
+
fromDate,
|
|
108
|
+
lines,
|
|
109
|
+
navigateToCreatedLeaves,
|
|
110
|
+
resetDefaultStates,
|
|
111
|
+
startOn,
|
|
112
|
+
]);
|
|
85
113
|
const handleEditLine = useCallback((line) => {
|
|
86
114
|
setNewLine(line);
|
|
87
115
|
setLeaveQty(line.qty);
|
|
@@ -104,19 +132,12 @@ const CompleteRequestScreen = ({}) => {
|
|
|
104
132
|
if (!canCreate) {
|
|
105
133
|
return (<Label style={styles.label} type="danger" message={I18n.t('Base_NoPermForCreate')}/>);
|
|
106
134
|
}
|
|
107
|
-
return (<Screen fixedItems={<CompleteRequestButtons leaveQty={leaveQty} hasNewLine={!!newLine} hasLines={lines.length > 0} isFinishDisabled={!fromDate || !toDate || !startOn || !endOn || missingQty !== 0} onAddPress={handleAddLine} onFinishPress={
|
|
108
|
-
dispatch(createLeaveRequest({
|
|
109
|
-
fromDate,
|
|
110
|
-
startOnSelect: startOn,
|
|
111
|
-
lines,
|
|
112
|
-
}));
|
|
113
|
-
resetDefaultStates();
|
|
114
|
-
}}/>}>
|
|
135
|
+
return (<Screen fixedItems={<CompleteRequestButtons leaveQty={leaveQty} hasNewLine={!!newLine} hasLines={lines.length > 0} isFinishDisabled={!fromDate || !toDate || !startOn || !endOn || missingQty !== 0} onAddPress={handleAddLine} onFinishPress={handleFinish}/>}>
|
|
115
136
|
<KeyboardAvoidingScrollView keyboardOffset={{ ios: 70, android: 100 }} style={styles.container}>
|
|
116
137
|
<PeriodInput startDateConfig={{ date: fromDate, onDateChange: setFromDate }} endDateConfig={{ date: toDate, onDateChange: setToDate }}/>
|
|
117
138
|
<LeaveStartEndOn startOn={startOn} endOn={endOn} onStartOnChange={setStartOn} onEndOnChange={setEndOn}/>
|
|
118
139
|
<ViewAllEditList title={I18n.t('Hr_Distribution')} lines={lines} currentLineId={isEditionMode ? newLine.id : null} setLines={setLines} handleEditLine={handleEditLine} translator={I18n.t}/>
|
|
119
|
-
{missingQty !== 0 && (<Label style={styles.label} message={`${I18n.t(missingQty > 0 ? '
|
|
140
|
+
{missingQty !== 0 && (<Label style={styles.label} message={`${I18n.t(missingQty > 0 ? 'Hr_NeededQuantity' : 'Hr_ExceedingQuantity')} : ${Math.abs(missingQty)} ${I18n.t('Hr_TimeUnit_Days')}`} type="error"/>)}
|
|
120
141
|
{!newLine && (<LeaveReasonSearchBar showTitle={false} defaultValue={newLine} onChange={leaveReason => leaveReason != null &&
|
|
121
142
|
setNewLine({
|
|
122
143
|
id: leaveReason.id,
|
|
@@ -124,7 +145,7 @@ const CompleteRequestScreen = ({}) => {
|
|
|
124
145
|
unitName: getItemTitle(LeaveReason?.unitSelect, leaveReason.unitSelect),
|
|
125
146
|
leaveReasonTypeSelect: leaveReason.leaveReasonTypeSelect,
|
|
126
147
|
})}/>)}
|
|
127
|
-
{newLine && (<CompleteRequestQuantityCard leaveQty={leaveQty} setLeaveQty={setLeaveQty} cancelLeave={handleReset} newLine={newLine} toDate={toDate}/>)}
|
|
148
|
+
{newLine && (<CompleteRequestQuantityCard leaveQty={leaveQty} setLeaveQty={setLeaveQty} cancelLeave={handleReset} newLine={newLine} toDate={toDate} missingQty={missingQty}/>)}
|
|
128
149
|
{newLine && (<FormInput title={I18n.t('Hr_Comments')} defaultValue={comment} onChange={setComment} multiline adjustHeightWithLines/>)}
|
|
129
150
|
</KeyboardAvoidingScrollView>
|
|
130
151
|
</Screen>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompleteRequestScreen.js","sourceRoot":"","sources":["../../../src/screens/leaveRequests/CompleteRequestScreen.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CompleteRequestScreen.js","sourceRoot":"","sources":["../../../src/screens/leaveRequests/CompleteRequestScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,51 +16,42 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useMemo, useState } from 'react';
|
|
19
|
-
import {
|
|
20
|
-
import { Screen
|
|
19
|
+
import { SearchListView, useDispatch, useNavigation, useSelector, } from '@axelor/aos-mobile-core';
|
|
20
|
+
import { Screen } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { LeaveActionCard, LeaveFilters } from '../../components';
|
|
22
22
|
import { fetchLeave, fetchLeaveToValidate, sendLeave, validateLeave, } from '../../features/leaveSlice';
|
|
23
23
|
import { Leave } from '../../types';
|
|
24
|
-
const LeaveListScreen = ({}) => {
|
|
25
|
-
const
|
|
24
|
+
const LeaveListScreen = ({ route }) => {
|
|
25
|
+
const { leaveIds } = route?.params ?? {};
|
|
26
26
|
const navigation = useNavigation();
|
|
27
27
|
const dispatch = useDispatch();
|
|
28
|
-
const { activeFilter } = useActiveFilter();
|
|
29
28
|
const [mode, setMode] = useState(Leave.mode.myLeaves);
|
|
30
29
|
const [selectedStatus, setSelectedStatus] = useState(null);
|
|
31
30
|
const { user } = useSelector(state => state.user);
|
|
32
31
|
const { loadingMyLeave, moreLoadingMyLeave, isListEndMyLeave, myLeaveList, loadingLeaveToValidate, moreLoadingLeaveToValidate, isListEndLeaveToValidate, leaveToValidateList, } = useSelector(state => state.hr_leave);
|
|
33
|
-
const fetchLeaveAPI = useCallback((page = 0) => {
|
|
34
|
-
dispatch(fetchLeave({
|
|
35
|
-
userId: user?.id,
|
|
36
|
-
selectedStatus,
|
|
37
|
-
page,
|
|
38
|
-
companyId: user.activeCompany?.id,
|
|
39
|
-
filterDomain: activeFilter,
|
|
40
|
-
}));
|
|
41
|
-
}, [activeFilter, dispatch, selectedStatus, user.activeCompany?.id, user?.id]);
|
|
42
32
|
const getActionParams = useCallback((item) => ({
|
|
43
33
|
leaveRequestId: item.id,
|
|
44
34
|
version: item.version,
|
|
45
35
|
userId: user?.id,
|
|
46
36
|
user: user,
|
|
47
37
|
selectedStatus,
|
|
38
|
+
leaveIds,
|
|
48
39
|
companyId: user.activeCompany?.id,
|
|
49
|
-
}), [selectedStatus, user]);
|
|
40
|
+
}), [leaveIds, selectedStatus, user]);
|
|
50
41
|
const sendLeaveAPI = useCallback((item) => {
|
|
51
42
|
dispatch(sendLeave(getActionParams(item)));
|
|
52
43
|
}, [dispatch, getActionParams]);
|
|
53
44
|
const validateLeaveApi = useCallback((item) => {
|
|
54
45
|
dispatch(validateLeave(getActionParams(item)));
|
|
55
46
|
}, [dispatch, getActionParams]);
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
user,
|
|
59
|
-
|
|
47
|
+
const sliceFunctionData = useMemo(() => mode === Leave.mode.myLeaves
|
|
48
|
+
? {
|
|
49
|
+
userId: user?.id,
|
|
50
|
+
selectedStatus,
|
|
51
|
+
leaveIds,
|
|
60
52
|
companyId: user.activeCompany?.id,
|
|
61
|
-
|
|
62
|
-
})
|
|
63
|
-
}, [activeFilter, dispatch, user]);
|
|
53
|
+
}
|
|
54
|
+
: { user, companyId: user.activeCompany?.id }, [leaveIds, mode, selectedStatus, user]);
|
|
64
55
|
const listToDisplay = useMemo(() => {
|
|
65
56
|
if (mode === Leave.mode.myLeaves) {
|
|
66
57
|
return {
|
|
@@ -68,7 +59,7 @@ const LeaveListScreen = ({}) => {
|
|
|
68
59
|
loading: loadingMyLeave,
|
|
69
60
|
moreLoading: moreLoadingMyLeave,
|
|
70
61
|
isListEnd: isListEndMyLeave,
|
|
71
|
-
|
|
62
|
+
sliceFunction: fetchLeave,
|
|
72
63
|
};
|
|
73
64
|
}
|
|
74
65
|
else {
|
|
@@ -77,7 +68,7 @@ const LeaveListScreen = ({}) => {
|
|
|
77
68
|
loading: loadingLeaveToValidate,
|
|
78
69
|
moreLoading: moreLoadingLeaveToValidate,
|
|
79
70
|
isListEnd: isListEndLeaveToValidate,
|
|
80
|
-
|
|
71
|
+
sliceFunction: fetchLeaveToValidate,
|
|
81
72
|
};
|
|
82
73
|
}
|
|
83
74
|
}, [
|
|
@@ -86,16 +77,13 @@ const LeaveListScreen = ({}) => {
|
|
|
86
77
|
loadingMyLeave,
|
|
87
78
|
moreLoadingMyLeave,
|
|
88
79
|
isListEndMyLeave,
|
|
89
|
-
fetchLeaveAPI,
|
|
90
80
|
leaveToValidateList,
|
|
91
81
|
loadingLeaveToValidate,
|
|
92
82
|
moreLoadingLeaveToValidate,
|
|
93
83
|
isListEndLeaveToValidate,
|
|
94
|
-
fetchLeaveToValidateAPI,
|
|
95
84
|
]);
|
|
96
85
|
return (<Screen removeSpaceOnTop={true}>
|
|
97
|
-
<
|
|
98
|
-
<ScrollList loadingList={listToDisplay.loading} data={listToDisplay.list} renderItem={({ item }) => (<LeaveActionCard mode={mode} leave={item} onPress={() => navigation.navigate('LeaveDetailsScreen', { leaveId: item.id })} onEdit={() => navigation.navigate('LeaveFormScreen', { leaveId: item.id })} onSend={() => sendLeaveAPI(item)} onValidate={() => validateLeaveApi(item)}/>)} fetchData={listToDisplay.functionApi} moreLoading={listToDisplay.moreLoading} isListEnd={listToDisplay.isListEnd} translator={I18n.t}/>
|
|
86
|
+
<SearchListView list={listToDisplay.list} loading={listToDisplay.loading} moreLoading={listToDisplay.moreLoading} isListEnd={listToDisplay.isListEnd} sliceFunction={listToDisplay.sliceFunction} sliceFunctionData={sliceFunctionData} displaySearchBar={false} expandableFilter={false} fixedItems={<LeaveFilters mode={mode} onChangeMode={setMode} onChangeStatus={setSelectedStatus}/>} renderListItem={({ item }) => (<LeaveActionCard mode={mode} leave={item} onPress={() => navigation.navigate('LeaveDetailsScreen', { leaveId: item.id })} onEdit={() => navigation.navigate('LeaveFormScreen', { leaveId: item.id })} onSend={() => sendLeaveAPI(item)} onValidate={() => validateLeaveApi(item)}/>)}/>
|
|
99
87
|
</Screen>);
|
|
100
88
|
};
|
|
101
89
|
export default LeaveListScreen;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeaveListScreen.js","sourceRoot":"","sources":["../../../src/screens/leaveRequests/LeaveListScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"LeaveListScreen.js","sourceRoot":"","sources":["../../../src/screens/leaveRequests/LeaveListScreen.tsx"],"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": "8.5.
|
|
3
|
+
"version": "8.5.27",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"repository": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"react-native": "0.79.6"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@axelor/aos-mobile-core": "8.5.
|
|
36
|
-
"@axelor/aos-mobile-ui": "8.5.
|
|
35
|
+
"@axelor/aos-mobile-core": "8.5.27",
|
|
36
|
+
"@axelor/aos-mobile-ui": "8.5.27",
|
|
37
37
|
"@reduxjs/toolkit": "2.9.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|