@axelor/aos-mobile-hr 7.2.1 → 7.2.3
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/employee-api.d.ts +3 -0
- package/lib/api/employee-api.js +38 -0
- package/lib/api/employee-api.js.map +1 -0
- package/lib/api/index.d.ts +3 -0
- package/lib/api/index.js +3 -0
- package/lib/api/index.js.map +1 -1
- package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.d.ts +4 -1
- package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.js +22 -3
- package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.js.map +1 -1
- package/lib/components/molecules/ExpenseDetailsValidationButton/ExpenseDetailsValidationButton.js +1 -1
- package/lib/components/molecules/ExpenseDetailsValidationButton/ExpenseDetailsValidationButton.js.map +1 -1
- package/lib/components/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.js +8 -4
- package/lib/components/molecules/ExpenseLineDetailCard/ExpenseLineDetailCard.js.map +1 -1
- package/lib/components/templates/ExpenseHeader/ExpenseHeader.js +2 -1
- package/lib/components/templates/ExpenseHeader/ExpenseHeader.js.map +1 -1
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.d.ts +6 -0
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js +46 -0
- package/lib/components/templates/ExpenseLineSwitchAdd/ExpenseLineSwitchAdd.js.map +1 -0
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.d.ts +5 -3
- package/lib/components/templates/ExpenseLineTypeSwitch/ExpenseLineTypeSwitch.js +11 -9
- 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 +1 -0
- package/lib/components/templates/index.js +1 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/features/asyncFunctions-index.d.ts +3 -0
- package/lib/features/asyncFunctions-index.js +3 -0
- package/lib/features/asyncFunctions-index.js.map +1 -1
- package/lib/features/distanceSlice.js +2 -0
- package/lib/features/distanceSlice.js.map +1 -1
- package/lib/features/employeeSlice.d.ts +13 -0
- package/lib/features/employeeSlice.js +47 -0
- package/lib/features/employeeSlice.js.map +1 -0
- package/lib/features/expenseLineSlice.js +56 -30
- 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/features/index.d.ts +1 -0
- package/lib/features/index.js +1 -0
- package/lib/features/index.js.map +1 -1
- package/lib/i18n/en.json +7 -2
- package/lib/i18n/fr.json +7 -2
- package/lib/models/objectFields.js +1 -0
- package/lib/models/objectFields.js.map +1 -1
- package/lib/models/sortFields.js +2 -2
- package/lib/models/sortFields.js.map +1 -1
- package/lib/screens/ExpenseDetailsScreen.js +2 -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 +9 -6
- package/lib/screens/ExpenseListScreen.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,47 @@
|
|
|
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 { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
19
|
+
import { handlerApiCall } from '@axelor/aos-mobile-core';
|
|
20
|
+
import { searchManagedEmployee as _searchManagedEmployee } from '../api/employee-api';
|
|
21
|
+
export const searchManagedEmployee = createAsyncThunk('employee/searchManagedEmployee', async function (data, { getState }) {
|
|
22
|
+
return handlerApiCall({
|
|
23
|
+
fetchFunction: _searchManagedEmployee,
|
|
24
|
+
data,
|
|
25
|
+
action: 'Hr_SliceAction_SearchManagedEmployee',
|
|
26
|
+
getState,
|
|
27
|
+
responseOptions: { isArrayResponse: true, returnTotal: true },
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
const initialState = {
|
|
31
|
+
managedEmployeeTotal: 0,
|
|
32
|
+
};
|
|
33
|
+
const employeeSlice = createSlice({
|
|
34
|
+
name: 'employee',
|
|
35
|
+
initialState,
|
|
36
|
+
extraReducers: builder => {
|
|
37
|
+
builder.addCase(searchManagedEmployee.pending, state => {
|
|
38
|
+
state.loading = true;
|
|
39
|
+
});
|
|
40
|
+
builder.addCase(searchManagedEmployee.fulfilled, (state, action) => {
|
|
41
|
+
state.loading = false;
|
|
42
|
+
state.managedEmployeeTotal = action.payload;
|
|
43
|
+
});
|
|
44
|
+
},
|
|
45
|
+
});
|
|
46
|
+
export const employeeReducer = employeeSlice.reducer;
|
|
47
|
+
//# sourceMappingURL=employeeSlice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"employeeSlice.js","sourceRoot":"","sources":["../../src/features/employeeSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,qBAAqB,IAAI,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAEpF,MAAM,CAAC,MAAM,qBAAqB,GAAG,gBAAgB,CACnD,gCAAgC,EAChC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,sBAAsB;QACrC,IAAI;QACJ,MAAM,EAAE,sCAAsC;QAC9C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAC;KAC5D,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,oBAAoB,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,aAAa,GAAG,WAAW,CAAC;IAChC,IAAI,EAAE,UAAU;IAChB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACrD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACjE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,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 }) {
|
|
@@ -89,12 +109,12 @@ export const updateExpenseLine = createAsyncThunk('expenseLine/updateExpenseLine
|
|
|
89
109
|
responseOptions: { isArrayResponse: false },
|
|
90
110
|
}).then(() => {
|
|
91
111
|
return handlerApiCall({
|
|
92
|
-
fetchFunction: data?.
|
|
112
|
+
fetchFunction: data?.expenseId == null
|
|
93
113
|
? _searchExpenseLines
|
|
94
114
|
: data.mode === ExpenseLine.modes.general
|
|
95
115
|
? _searchGeneralExpenseLines
|
|
96
116
|
: _searchKilometricExpenseLines,
|
|
97
|
-
action: data?.
|
|
117
|
+
action: data?.expenseId == null
|
|
98
118
|
? 'Hr_SliceAction_FetchExpenseLines'
|
|
99
119
|
: data?.mode === ExpenseLine.modes.general
|
|
100
120
|
? 'Hr_SliceAction_SearchGeneralExpenseLines'
|
|
@@ -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":"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"}
|
|
@@ -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":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,EACd,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,IAAI,mBAAmB,EACzC,eAAe,IAAI,gBAAgB,EACnC,uBAAuB,IAAI,wBAAwB,EACnD,UAAU,EACV,aAAa,IAAI,cAAc,EAC/B,aAAa,IAAI,cAAc,EAC/B,WAAW,IAAI,YAAY,EAC3B,eAAe,IAAI,gBAAgB,EACnC,aAAa,IAAI,cAAc,GAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAgB,CAC3C,uBAAuB,EACvB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,cAAc;QAC7B,IAAI;QACJ,MAAM,EAAE,8BAA8B;QACtC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC;SACC,IAAI,CAAC,GAAG,EAAE;QACT,OAAO,cAAc,CAAC;YACpB,aAAa,EAAE,gBAAgB;YAC/B,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC;YAC3B,MAAM,EAAE,+BAA+B;YACvC,QAAQ;YACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;SACzC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE;QACV,QAAQ,CAAC,gBAAgB,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACP,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAgB,CACzC,qBAAqB,EACrB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,YAAY;QAC3B,IAAI;QACJ,MAAM,EAAE,4BAA4B;QACpC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,UAAU;gBACzB,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAC;gBACjC,MAAM,EAAE,iCAAiC;gBACzC,QAAQ;gBACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;aAC1C,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,gBAAgB;gBAC/B,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC;gBAC3B,MAAM,EAAE,+BAA+B;gBACvC,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,eAAe,GAAG,gBAAgB,CAC7C,yBAAyB,EACzB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,gBAAgB;QAC/B,IAAI;QACJ,MAAM,EAAE,gCAAgC;QACxC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,UAAU;gBACzB,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAC;gBACjC,MAAM,EAAE,iCAAiC;gBACzC,QAAQ;gBACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;aAC1C,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;YAChD,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,wBAAwB;gBACvC,IAAI,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAC;gBACvB,MAAM,EAAE,uCAAuC;gBAC/C,QAAQ;gBACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;aACzC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,cAAc,CAAC;gBACpB,aAAa,EAAE,gBAAgB;gBAC/B,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC;gBAC3B,MAAM,EAAE,+BAA+B;gBACvC,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,aAAa,GAAG,gBAAgB,CAC3C,uBAAuB,EACvB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,cAAc;QAC7B,IAAI;QACJ,MAAM,EAAE,8BAA8B;QACtC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,OAAO,cAAc,CAAC;YACpB,aAAa,EAAE,UAAU;YACzB,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAC;YACjC,MAAM,EAAE,iCAAiC;YACzC,QAAQ;YACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;SAC1C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAgB,CAC3C,uBAAuB,EACvB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,cAAc;QAC7B,IAAI;QACJ,MAAM,EAAE,8BAA8B;QACtC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,OAAO,cAAc,CAAC;YACpB,aAAa,EAAE,gBAAgB;YAC/B,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC;YAC3B,MAAM,EAAE,+BAA+B;YACvC,QAAQ;YACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;SACzC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACZ,QAAQ,CAAC,gBAAgB,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC,CAAC;YAClD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAChD,4BAA4B,EAC5B,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mCAAmC;QAC3C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAC7C,yBAAyB,EACzB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,gBAAgB;QAC/B,IAAI;QACJ,MAAM,EAAE,+BAA+B;QACvC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,gBAAgB,CACrD,iCAAiC,EACjC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,wBAAwB;QACvC,IAAI;QACJ,MAAM,EAAE,uCAAuC;QAC/C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC;KACrE,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,0BAA0B,EAC1B,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,UAAU;QACzB,IAAI;QACJ,MAAM,EAAE,iCAAiC;QACzC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,IAAI;IACb,gBAAgB,EAAE,EAAE;IAEpB,gBAAgB,EAAE,IAAI;IACtB,oBAAoB,EAAE,KAAK;IAC3B,kBAAkB,EAAE,KAAK;IACzB,aAAa,EAAE,EAAE;IAEjB,wBAAwB,EAAE,IAAI;IAC9B,4BAA4B,EAAE,KAAK;IACnC,0BAA0B,EAAE,KAAK;IACjC,qBAAqB,EAAE,EAAE;IACzB,4BAA4B,EAAE,CAAC;IAE/B,cAAc,EAAE,IAAI;IACpB,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,YAAY,GAAG,WAAW,CAAC;IAC/B,IAAI,EAAE,SAAS;IACf,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,eAAe,EAAE;YACrD,OAAO,EAAE,kBAAkB;YAC3B,WAAW,EAAE,sBAAsB;YACnC,SAAS,EAAE,oBAAoB;YAC/B,IAAI,EAAE,eAAe;SACtB,CAAC,CAAC;QACH,4BAA4B,CAC1B,OAAO,EACP,uBAAuB,EACvB;YACE,OAAO,EAAE,0BAA0B;YACnC,WAAW,EAAE,8BAA8B;YAC3C,SAAS,EAAE,4BAA4B;YACvC,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,8BAA8B;SACtC,EACD;YACE,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAClD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9D,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1D,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5D,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;YAC7B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACvD,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzD,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC/B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACvD,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzD,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC/B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE;gBAChC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;aAC7B;iBAAM;gBACL,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACvD,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE;gBAChC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC7B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC/B,KAAK,CAAC,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,aAAa,EAAE;oBAC3D,MAAM,CAAC,OAAO;iBACf,CAAC,CAAC;aACJ;iBAAM;gBACL,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC;gBAC/B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzD,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE;gBAChC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;aAC7B;iBAAM;gBACL,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE;gBAChC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC7B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC/B,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;oBACvD,KAAK,CAAC,qBAAqB,GAAG,iBAAiB,CAC7C,KAAK,CAAC,qBAAqB,EAC3B,CAAC,MAAM,CAAC,OAAO,CAAC,CACjB,CAAC;iBACH;qBAAM;oBACL,KAAK,CAAC,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,aAAa,EAAE;wBAC3D,MAAM,CAAC,OAAO;qBACf,CAAC,CAAC;iBACJ;aACF;iBAAM,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC9D,KAAK,CAAC,wBAAwB,GAAG,KAAK,CAAC;gBACvC,KAAK,CAAC,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC;aAC9C;iBAAM;gBACL,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC;gBAC/B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACvD,KAAK,CAAC,8BAA8B,GAAG,IAAI,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzD,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;YAC7B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;gBACvD,KAAK,CAAC,qBAAqB,GAAG,iBAAiB,CAC7C,KAAK,CAAC,qBAAqB,EAC3B,CAAC,MAAM,CAAC,OAAO,CAAC,CACjB,CAAC;aACH;iBAAM;gBACL,KAAK,CAAC,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,aAAa,EAAE;oBAC3D,MAAM,CAAC,OAAO;iBACf,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"expenseSlice.js","sourceRoot":"","sources":["../../src/features/expenseSlice.js"],"names":[],"mappings":"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"}
|
package/lib/features/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { currencyReducer as currency } from "./currencySlice";
|
|
2
2
|
export { distanceReducer as distance } from "./distanceSlice";
|
|
3
|
+
export { employeeReducer as employee } from "./employeeSlice";
|
|
3
4
|
export { expenseConfigReducer as expenseConfig } from "./expenseConfigSlice";
|
|
4
5
|
export { expenseLineReducer as expenseLine } from "./expenseLineSlice";
|
|
5
6
|
export { expenseReducer as expense } from "./expenseSlice";
|
package/lib/features/index.js
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
export { currencyReducer as currency } from './currencySlice';
|
|
19
19
|
export { distanceReducer as distance } from './distanceSlice';
|
|
20
|
+
export { employeeReducer as employee } from './employeeSlice';
|
|
20
21
|
export { expenseConfigReducer as expenseConfig } from './expenseConfigSlice';
|
|
21
22
|
export { expenseLineReducer as expenseLine } from './expenseLineSlice';
|
|
22
23
|
export { expenseReducer as expense } from './expenseSlice';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/features/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,oBAAoB,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAC,cAAc,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAC,2BAA2B,IAAI,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAC,cAAc,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/features/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,oBAAoB,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAC,cAAc,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAC,2BAA2B,IAAI,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAC,cAAc,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC"}
|
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",
|
|
@@ -22,6 +23,7 @@
|
|
|
22
23
|
"Hr_General": "General",
|
|
23
24
|
"Hr_Kilometric": "Kilometric",
|
|
24
25
|
"Hr_ExpenseNumber": "Expense n°",
|
|
26
|
+
"Hr_GroundForRefusal": "Ground for refusal",
|
|
25
27
|
"Hr_TotalATI": "Total A.T.I.",
|
|
26
28
|
"Hr_TotalTax": "Total tax",
|
|
27
29
|
"Hr_Currency": "Currency",
|
|
@@ -42,6 +44,7 @@
|
|
|
42
44
|
"Hr_Refuse": "Refuse",
|
|
43
45
|
"Hr_ReasonRefusal": "Reason for refusal",
|
|
44
46
|
"Hr_CityNotFound": "At least one of the two cities could not be located.",
|
|
47
|
+
"Hr_KilometerUnit": "km",
|
|
45
48
|
"Hr_SliceAction_FetchExpenseLines": "fetch expense lines",
|
|
46
49
|
"Hr_SliceAction_SearchDraftExpense": "fetch draft expenses",
|
|
47
50
|
"Hr_SliceAction_FetchExpense": "fetch expenses",
|
|
@@ -61,8 +64,10 @@
|
|
|
61
64
|
"Hr_SliceAction_SendExpense": "send expense",
|
|
62
65
|
"Hr_SliceAction_ValidateExpense": "validate expense",
|
|
63
66
|
"Hr_SliceAction_RefuseExpense": "refuse expense",
|
|
64
|
-
"
|
|
67
|
+
"Hr_SliceAction_DeleteOrphanExpenseLine": "delete orphan expense line",
|
|
68
|
+
"Hr_SliceAction_DeleteExpenseLine": "delete expense line",
|
|
65
69
|
"Hr_SliceAction_FetchCurrencies": "fetch currencies",
|
|
66
70
|
"Hr_SliceAction_FetchExpenseConfig": "fetch expense config",
|
|
67
|
-
"Hr_SliceAction_GetDistance": "get distance"
|
|
71
|
+
"Hr_SliceAction_GetDistance": "get distance",
|
|
72
|
+
"Hr_SliceAction_SearchManagedEmployee": "search managed employee"
|
|
68
73
|
}
|
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",
|
|
@@ -22,6 +23,7 @@
|
|
|
22
23
|
"Hr_General": "Généraux",
|
|
23
24
|
"Hr_Kilometric": "Kilométriques",
|
|
24
25
|
"Hr_ExpenseNumber": "Note de frais n°",
|
|
26
|
+
"Hr_GroundForRefusal": "Motif de refus",
|
|
25
27
|
"Hr_TotalATI": "Total TTC",
|
|
26
28
|
"Hr_TotalTax": "Montant TVA",
|
|
27
29
|
"Hr_Currency": "Devise",
|
|
@@ -42,6 +44,7 @@
|
|
|
42
44
|
"Hr_Refuse": "Refuser",
|
|
43
45
|
"Hr_ReasonRefusal": "Motif de refus",
|
|
44
46
|
"Hr_CityNotFound": "Au moins une des deux villes n'a pas pu être localisée.",
|
|
47
|
+
"Hr_KilometerUnit": "km",
|
|
45
48
|
"Hr_SliceAction_FetchExpenseLines": "récupération des lignes de frais",
|
|
46
49
|
"Hr_SliceAction_SearchDraftExpense": "récupération des notes de frais brouillon",
|
|
47
50
|
"Hr_SliceAction_FetchExpense": "récupération des notes de frais",
|
|
@@ -61,8 +64,10 @@
|
|
|
61
64
|
"Hr_SliceAction_SendExpense": "envoie de la note de frais",
|
|
62
65
|
"Hr_SliceAction_ValidateExpense": "validation de la note de frais",
|
|
63
66
|
"Hr_SliceAction_RefuseExpense": "refus de la note de frais",
|
|
64
|
-
"
|
|
67
|
+
"Hr_SliceAction_DeleteOrphanExpenseLine": "suppression d'une ligne de frais orpheline",
|
|
68
|
+
"Hr_SliceAction_DeleteExpenseLine": "suppression d'une ligne de frais",
|
|
65
69
|
"Hr_SliceAction_FetchCurrencies": "récupération des devises",
|
|
66
70
|
"Hr_SliceAction_FetchExpenseConfig": "récupération de la configuration des notes de frais",
|
|
67
|
-
"Hr_SliceAction_GetDistance": "récupération de la distance"
|
|
71
|
+
"Hr_SliceAction_GetDistance": "récupération de la distance",
|
|
72
|
+
"Hr_SliceAction_SearchManagedEmployee": "récupération des employés gérés"
|
|
68
73
|
}
|
|
@@ -28,6 +28,7 @@ export const hr_modelAPI = {
|
|
|
28
28
|
expenseSeq: schemaContructor.string(),
|
|
29
29
|
period: schemaContructor.subObject('code'),
|
|
30
30
|
inTaxTotal: schemaContructor.string(),
|
|
31
|
+
groundForRefusal: schemaContructor.string(),
|
|
31
32
|
employee: schemaContructor
|
|
32
33
|
.subObject()
|
|
33
34
|
.concat(schemaContructor.object({ managerUser: schemaContructor.subObject() })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../src/models/objectFields.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../src/models/objectFields.ts"],"names":[],"mappings":"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"}
|
package/lib/models/sortFields.js
CHANGED
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
*/
|
|
18
18
|
export const hr_sortFields = {
|
|
19
19
|
hr_currency: ['name'],
|
|
20
|
-
hr_expense: ['createdOn'],
|
|
21
|
-
hr_expenseLines: ['expenseDate', 'createdOn'],
|
|
20
|
+
hr_expense: ['-createdOn'],
|
|
21
|
+
hr_expenseLines: ['-expenseDate', '-createdOn'],
|
|
22
22
|
hr_expenseType: ['name', 'fullName'],
|
|
23
23
|
hr_kilomectricAllowParam: ['name', 'code'],
|
|
24
24
|
hr_project: ['name', 'fullName'],
|
|
@@ -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';
|
|
@@ -72,7 +72,7 @@ const ExpenseDetailsScreen = ({ route, navigation }) => {
|
|
|
72
72
|
return (<Screen removeSpaceOnTop={true} fixedItems={<ExpenseDetailsValidationButton expense={expense} mode={expenseMode}/>}>
|
|
73
73
|
<HeaderContainer expandableFilter={false} fixedItems={<View>
|
|
74
74
|
<ExpenseHeader />
|
|
75
|
-
<
|
|
75
|
+
<ExpenseLineSwitchAdd mode={mode} onChangeSwicth={setMode}/>
|
|
76
76
|
</View>}/>
|
|
77
77
|
<AnomalyList objectName="expense" objectId={expense.id}/>
|
|
78
78
|
<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
|
},
|