@axelor/aos-mobile-hr 8.0.4 → 8.0.6
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/timer-api.js +7 -3
- package/lib/api/timer-api.js.map +1 -1
- package/lib/components/molecules/TimerStopwatch/TimerStopwatch.js +17 -2
- package/lib/components/molecules/TimerStopwatch/TimerStopwatch.js.map +1 -1
- package/lib/components/templates/TimerListAlert/TimerListAlert.d.ts +2 -1
- package/lib/components/templates/TimerListAlert/TimerListAlert.js +15 -7
- package/lib/components/templates/TimerListAlert/TimerListAlert.js.map +1 -1
- package/lib/features/expenseLineSlice.js +8 -0
- package/lib/features/expenseLineSlice.js.map +1 -1
- package/lib/features/timerSlice.d.ts +16 -2
- package/lib/features/timerSlice.js +8 -4
- package/lib/features/timerSlice.js.map +1 -1
- package/lib/hooks/use-hr-header-actions.js +3 -1
- package/lib/hooks/use-hr-header-actions.js.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/screens/expense/ExpenseLinesListScreen.d.ts +2 -1
- package/lib/screens/expense/ExpenseLinesListScreen.js +6 -4
- package/lib/screens/expense/ExpenseLinesListScreen.js.map +1 -1
- package/lib/screens/timesheet/TimerFormScreen.js +13 -4
- package/lib/screens/timesheet/TimerFormScreen.js.map +1 -1
- package/package.json +3 -3
package/lib/api/timer-api.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 { axiosApiProvider, createStandardFetch, createStandardSearch, getEndOfDay, getSearchCriterias, getStartOfDay, } from '@axelor/aos-mobile-core';
|
|
18
|
+
import { axiosApiProvider, createStandardFetch, createStandardSearch, getDateZonesISOString, getEndOfDay, getSearchCriterias, getStartOfDay, } from '@axelor/aos-mobile-core';
|
|
19
19
|
import { Time } from '../types';
|
|
20
20
|
const createTimerCriteria = (searchValue, userId, fromDate, toDate) => {
|
|
21
21
|
const criteria = [
|
|
@@ -129,13 +129,17 @@ export async function getNumberTimerByDate({ userId, date }) {
|
|
|
129
129
|
export async function createTimer({ timer }) {
|
|
130
130
|
return axiosApiProvider.post({
|
|
131
131
|
url: 'ws/aos/timesheet/timer/',
|
|
132
|
-
data: timer
|
|
132
|
+
data: timer.startDateTime != null
|
|
133
|
+
? { ...timer, startDateTime: getDateZonesISOString(timer.startDateTime) }
|
|
134
|
+
: timer,
|
|
133
135
|
});
|
|
134
136
|
}
|
|
135
137
|
export async function updateTimer({ timer }) {
|
|
136
138
|
return axiosApiProvider.put({
|
|
137
139
|
url: `ws/aos/timesheet/timer/update/${timer.id}`,
|
|
138
|
-
data: timer
|
|
140
|
+
data: timer.startDateTime != null
|
|
141
|
+
? { ...timer, startDateTime: getDateZonesISOString(timer.startDateTime) }
|
|
142
|
+
: timer,
|
|
139
143
|
});
|
|
140
144
|
}
|
|
141
145
|
export async function updateTimerStatus({ timerId, version, toStatus }) {
|
package/lib/api/timer-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer-api.js","sourceRoot":"","sources":["../../src/api/timer-api.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"timer-api.js","sourceRoot":"","sources":["../../src/api/timer-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,kBAAkB,EAClB,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,IAAI,EAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,mBAAmB,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG;QACf,kBAAkB,CAAC,UAAU,EAAE,WAAW,CAAC;QAC3C;YACE,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd;QACD;YACE,SAAS,EAAE,yBAAyB;YACpC,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC;IAEF,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;QACtC,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAElD,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,OAAO;iBACf;aACF;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,MAAM,CAAC,EAAE;IACzC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,QAAQ,CAAC,IAAI,CAAC;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;aACpC;YACD;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;aAChC;SACF;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;IACvD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,CAAC,IAAI,CAAC;QACZ,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,cAAc;aACtB;YACD;gBACE,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,YAAY;aACpB;SACF;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,WAAW,GAAG,IAAI,EAClB,MAAM,EACN,QAAQ,EACR,MAAM,EACN,IAAI,GAAG,CAAC,GACT;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC;QACpE,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,UAAU;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAC,OAAO,EAAC;IAC5C,OAAO,mBAAmB,CAAC;QACzB,KAAK,EAAE,+BAA+B;QACtC,EAAE,EAAE,OAAO;QACX,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,MAAM,EAAC;IAC7C,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,yBAAyB,CAAC,MAAM,CAAC;QAC3C,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,gBAAgB;QACzB,oBAAoB,EAAE,CAAC;QACvB,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC;IACvD,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,+BAA+B,CAAC,MAAM,EAAE,IAAI,CAAC;QACvD,QAAQ,EAAE,UAAU;QACpB,oBAAoB,EAAE,IAAI;QAC1B,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,KAAK,EAAC;IACvC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EACF,KAAK,CAAC,aAAa,IAAI,IAAI;YACzB,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,EAAC;YACvE,CAAC,CAAC,KAAK;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,KAAK,EAAC;IACvC,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,iCAAiC,KAAK,CAAC,EAAE,EAAE;QAChD,IAAI,EACF,KAAK,CAAC,aAAa,IAAI,IAAI;YACzB,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,EAAC;YACvE,CAAC,CAAC,KAAK;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAC;IAClE,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,iCAAiC,OAAO,EAAE;QAC/C,IAAI,EAAE;YACJ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,OAAO,EAAC;IACzC,OAAO,gBAAgB,CAAC,MAAM,CAAC;QAC7B,GAAG,EAAE,yCAAyC,OAAO,EAAE;KACxD,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -19,6 +19,8 @@ import React, { useCallback, useEffect, useState } from 'react';
|
|
|
19
19
|
import { StyleSheet } from 'react-native';
|
|
20
20
|
import { calculateDiff, Stopwatch, useDispatch, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
|
|
21
21
|
import { createTimer, updateTimerStatus } from '../../../features/timerSlice';
|
|
22
|
+
import { Time } from '../../../types';
|
|
23
|
+
import { TimerListAlert } from '../../templates';
|
|
22
24
|
const DEFAULT_TIME = 0;
|
|
23
25
|
const TIMER_STATUS = {
|
|
24
26
|
Draft: 1,
|
|
@@ -32,6 +34,8 @@ const TimerStopwatch = ({ style = null, defaultValue = null, objectState, }) =>
|
|
|
32
34
|
const dispatch = useDispatch();
|
|
33
35
|
const [time, setTime] = useState(DEFAULT_TIME);
|
|
34
36
|
const [status, setStatus] = useState(DEFAULT_STATUS);
|
|
37
|
+
const [isAlertVisible, setIsAlertVisible] = useState(false);
|
|
38
|
+
const { timesheet: timesheetConfig } = useSelector((state) => state.appConfig);
|
|
35
39
|
const { userId } = useSelector((state) => state.auth);
|
|
36
40
|
const createTimerAPI = useCallback(() => {
|
|
37
41
|
const _timer = {
|
|
@@ -50,7 +54,13 @@ const TimerStopwatch = ({ style = null, defaultValue = null, objectState, }) =>
|
|
|
50
54
|
timerId: defaultValue?.timerId,
|
|
51
55
|
version: defaultValue?.version,
|
|
52
56
|
toStatus: toStatus,
|
|
53
|
-
}))
|
|
57
|
+
})).then(res => {
|
|
58
|
+
const _timer = res?.payload?.payload?.[0];
|
|
59
|
+
if (toStatus === 'stop' &&
|
|
60
|
+
_timer?.statusSelect === Time.statusSelect.Completed) {
|
|
61
|
+
setIsAlertVisible(true);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
54
64
|
}, [defaultValue, dispatch, userId]);
|
|
55
65
|
const getTimerState = useCallback(() => {
|
|
56
66
|
const _status = defaultValue?.status ?? DEFAULT_STATUS;
|
|
@@ -66,7 +76,12 @@ const TimerStopwatch = ({ style = null, defaultValue = null, objectState, }) =>
|
|
|
66
76
|
useEffect(() => {
|
|
67
77
|
getTimerState();
|
|
68
78
|
}, [getTimerState]);
|
|
69
|
-
return (
|
|
79
|
+
return (<>
|
|
80
|
+
<Stopwatch style={[styles.container, style]} startTime={time} status={status} getTimerState={getTimerState} timerFormat={I18n.t('Hr_TimerFormat')} onPlay={() => defaultValue?.timerId
|
|
81
|
+
? updateTimerStatusAPI('start')
|
|
82
|
+
: createTimerAPI()} disablePlay={!objectState?.product} onPause={() => updateTimerStatusAPI('pause')} onStop={() => updateTimerStatusAPI('stop')} onCancel={() => updateTimerStatusAPI('reset')} useObjectStatus/>
|
|
83
|
+
<TimerListAlert isAlertVisible={!timesheetConfig?.isMultipleTimerEnabled && isAlertVisible} setIsAlertVisible={setIsAlertVisible} defaultTimerId={defaultValue?.timerId}/>
|
|
84
|
+
</>);
|
|
70
85
|
};
|
|
71
86
|
const styles = StyleSheet.create({
|
|
72
87
|
container: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimerStopwatch.js","sourceRoot":"","sources":["../../../../src/components/molecules/TimerStopwatch/TimerStopwatch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,aAAa,EACb,SAAS,EACT,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"TimerStopwatch.js","sourceRoot":"","sources":["../../../../src/components/molecules/TimerStopwatch/TimerStopwatch.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
interface TimerListAlertProps {
|
|
2
2
|
isAlertVisible: boolean;
|
|
3
3
|
setIsAlertVisible: (visible: boolean) => void;
|
|
4
|
+
defaultTimerId?: number;
|
|
4
5
|
}
|
|
5
|
-
declare const TimerListAlert: ({ isAlertVisible, setIsAlertVisible, }: TimerListAlertProps) => JSX.Element;
|
|
6
|
+
declare const TimerListAlert: ({ isAlertVisible, setIsAlertVisible, defaultTimerId, }: TimerListAlertProps) => JSX.Element;
|
|
6
7
|
export default TimerListAlert;
|
|
@@ -25,7 +25,7 @@ import { fetchTimerDateInterval } from '../../../features/timerSlice';
|
|
|
25
25
|
import { addTimerTimesheet, createTimesheet, } from '../../../features/timesheetSlice';
|
|
26
26
|
import { fetchDraftTimesheet } from '../../../api/timesheet-api';
|
|
27
27
|
import { formatSecondsToHours } from '../../../utils';
|
|
28
|
-
const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
28
|
+
const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, defaultTimerId, }) => {
|
|
29
29
|
const I18n = useTranslator();
|
|
30
30
|
const Colors = useThemeColor();
|
|
31
31
|
const navigation = useNavigation();
|
|
@@ -37,7 +37,7 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
37
37
|
const [toDate, setToDate] = useState(new Date());
|
|
38
38
|
const [errorKey, setErrorKey] = useState(null);
|
|
39
39
|
const [selectedTimers, setSelectedTimers] = useState([]);
|
|
40
|
-
const isConfirmButtonDisabled = useMemo(() => errorKey || selectedTimers.length === 0, [errorKey, selectedTimers]);
|
|
40
|
+
const isConfirmButtonDisabled = useMemo(() => errorKey || !Array.isArray(selectedTimers) || selectedTimers.length === 0, [errorKey, selectedTimers]);
|
|
41
41
|
const fetchTimerDateIntervalAPI = useCallback((page = 0) => {
|
|
42
42
|
dispatch(fetchTimerDateInterval({
|
|
43
43
|
userId: userId,
|
|
@@ -46,6 +46,11 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
46
46
|
page: page,
|
|
47
47
|
}));
|
|
48
48
|
}, [dispatch, fromDate, toDate, userId]);
|
|
49
|
+
useEffect(() => {
|
|
50
|
+
if (defaultTimerId && isAlertVisible) {
|
|
51
|
+
setSelectedTimers([{ id: defaultTimerId }]);
|
|
52
|
+
}
|
|
53
|
+
}, [defaultTimerId, isAlertVisible]);
|
|
49
54
|
useEffect(() => {
|
|
50
55
|
if (timesheet == null && fromDate && toDate) {
|
|
51
56
|
if (getStartOfDay(fromDate) <= getEndOfDay(toDate)) {
|
|
@@ -64,6 +69,9 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
64
69
|
setErrorKey('Hr_DateIntervalError');
|
|
65
70
|
}
|
|
66
71
|
}
|
|
72
|
+
else {
|
|
73
|
+
setErrorKey(null);
|
|
74
|
+
}
|
|
67
75
|
}, [fromDate, timesheet, toDate, userId]);
|
|
68
76
|
const renderChexboxItem = ({ item }) => {
|
|
69
77
|
return (<TimeDetailCard statusSelect={item.statusSelect} project={item.project?.name} date={item.startDateTime} duration={formatSecondsToHours(item.duration)} durationUnit="hours" isSmallCard isActions={false}/>);
|
|
@@ -97,7 +105,7 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
97
105
|
resetStates();
|
|
98
106
|
navigation.navigate('TimesheetListScreen');
|
|
99
107
|
};
|
|
100
|
-
return (<Alert style={styles.alert} visible={isAlertVisible} title={I18n.t('Hr_SelectTimers')} cancelButtonConfig={{
|
|
108
|
+
return (<Alert style={!defaultTimerId && styles.alert} visible={isAlertVisible} title={I18n.t('Hr_SelectTimers')} cancelButtonConfig={{
|
|
101
109
|
onPress: resetStates,
|
|
102
110
|
}} confirmButtonConfig={{
|
|
103
111
|
width: 50,
|
|
@@ -106,7 +114,7 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
106
114
|
onPress: handleConfirm,
|
|
107
115
|
}} translator={I18n.t}>
|
|
108
116
|
{(timesheet || !(fromDate && toDate)) && (<DraftTimesheetPicker style={styles.picker} onChange={_timesheet => {
|
|
109
|
-
setSelectedTimers([]);
|
|
117
|
+
!defaultTimerId && setSelectedTimers([]);
|
|
110
118
|
setTimesheet(_timesheet);
|
|
111
119
|
setFromDate(new Date(_timesheet.fromDate));
|
|
112
120
|
setToDate(new Date(_timesheet.toDate));
|
|
@@ -114,15 +122,15 @@ const TimerListAlert = ({ isAlertVisible, setIsAlertVisible, }) => {
|
|
|
114
122
|
{errorKey && (<Label message={I18n.t(errorKey)} iconName="exclamation-triangle-fill" color={Colors.errorColor}/>)}
|
|
115
123
|
<View style={styles.dateIntervalContainer}>
|
|
116
124
|
<DateInput style={styles.dateInput} title={I18n.t('Hr_StartDate')} mode="date" nullable popup defaultDate={fromDate} onDateChange={date => {
|
|
117
|
-
setSelectedTimers([]);
|
|
125
|
+
!defaultTimerId && setSelectedTimers([]);
|
|
118
126
|
setFromDate(date);
|
|
119
127
|
}} readonly={timesheet} required={timesheet == null}/>
|
|
120
128
|
<DateInput style={styles.dateInput} title={I18n.t('Hr_EndDate')} mode="date" nullable popup defaultDate={toDate} onDateChange={date => {
|
|
121
|
-
setSelectedTimers([]);
|
|
129
|
+
!defaultTimerId && setSelectedTimers([]);
|
|
122
130
|
setToDate(date);
|
|
123
131
|
}} readonly={timesheet} required={timesheet == null}/>
|
|
124
132
|
</View>
|
|
125
|
-
<CheckboxScrollList styleTopCheckbox={styles.topCheckbox} loadingList={loadingTimerDateInterval} data={timerDateIntervalList} onCheckedChange={setSelectedTimers} renderItem={renderChexboxItem} fetchData={fetchTimerDateIntervalAPI} moreLoading={moreLoadingTimerDateInterval} isListEnd={isListEndTimerDateInterval} translator={I18n.t}/>
|
|
133
|
+
{!defaultTimerId && (<CheckboxScrollList styleTopCheckbox={styles.topCheckbox} loadingList={loadingTimerDateInterval} data={timerDateIntervalList} onCheckedChange={setSelectedTimers} renderItem={renderChexboxItem} fetchData={fetchTimerDateIntervalAPI} moreLoading={moreLoadingTimerDateInterval} isListEnd={isListEndTimerDateInterval} translator={I18n.t}/>)}
|
|
126
134
|
</Alert>);
|
|
127
135
|
};
|
|
128
136
|
const styles = StyleSheet.create({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimerListAlert.js","sourceRoot":"","sources":["../../../../src/components/templates/TimerListAlert/TimerListAlert.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,WAAW,EACX,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,EACL,kBAAkB,EAClB,KAAK,EACL,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,oBAAoB,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EACL,iBAAiB,EACjB,eAAe,GAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TimerListAlert.js","sourceRoot":"","sources":["../../../../src/components/templates/TimerListAlert/TimerListAlert.tsx"],"names":[],"mappings":"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"}
|
|
@@ -183,6 +183,7 @@ const expenseLineSlice = createSlice({
|
|
|
183
183
|
});
|
|
184
184
|
builder.addCase(deleteExpenseLine.fulfilled, (state, action) => {
|
|
185
185
|
if (action?.meta?.arg?.expenseId == null) {
|
|
186
|
+
state.loadingExpenseLine = false;
|
|
186
187
|
state.expenseLineList = action.payload;
|
|
187
188
|
}
|
|
188
189
|
});
|
|
@@ -199,8 +200,15 @@ const expenseLineSlice = createSlice({
|
|
|
199
200
|
});
|
|
200
201
|
builder.addCase(updateExpenseLine.fulfilled, (state, action) => {
|
|
201
202
|
if (action?.meta?.arg?.expenseId == null) {
|
|
203
|
+
state.loadingExpenseLine = false;
|
|
202
204
|
state.expenseLineList = action.payload;
|
|
203
205
|
}
|
|
206
|
+
else if (action?.meta?.arg?.mode === ExpenseLine.modes.general) {
|
|
207
|
+
state.loadingGeneralExpenseLine = false;
|
|
208
|
+
}
|
|
209
|
+
else if (action?.meta?.arg?.mode === ExpenseLine.modes.kilometric) {
|
|
210
|
+
state.loadingKilometricExpenseLine = false;
|
|
211
|
+
}
|
|
204
212
|
});
|
|
205
213
|
},
|
|
206
214
|
});
|
|
@@ -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,iBAAiB,IAAI,kBAAkB,EACvC,iBAAiB,IAAI,kBAAkB,EACvC,kBAAkB,IAAI,mBAAmB,EACzC,yBAAyB,IAAI,0BAA0B,EACvD,4BAA4B,IAAI,6BAA6B,EAC7D,iBAAiB,IAAI,kBAAkB,GACxC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAErC,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,EAAE,QAAQ,EAAC;IACxC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,kBAAkB;QACjC,IAAI;QACJ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,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,MAAM,EAAE,kCAAkC;gBAC1C,QAAQ;gBACR,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC;gBAC5B,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;aACzC,CAAC,CAAC;SACJ;IACH,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,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,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,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;iBAAM,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;gBAChE,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC;aACxC;iBAAM,IAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE;gBACnE,KAAK,CAAC,4BAA4B,GAAG,IAAI,CAAC;aAC3C;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;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"expenseLineSlice.js","sourceRoot":"","sources":["../../src/features/expenseLineSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ export const fetchTimerById: import("@reduxjs/toolkit").AsyncThunk<any, void, {
|
|
|
28
28
|
fulfilledMeta?: unknown;
|
|
29
29
|
rejectedMeta?: unknown;
|
|
30
30
|
}>;
|
|
31
|
-
export const fetchActiveTimer: import("@reduxjs/toolkit").AsyncThunk<
|
|
31
|
+
export const fetchActiveTimer: import("@reduxjs/toolkit").AsyncThunk<boolean, void, {
|
|
32
32
|
state?: unknown;
|
|
33
33
|
dispatch?: import("redux").Dispatch<import("redux").AnyAction>;
|
|
34
34
|
extra?: unknown;
|
|
@@ -58,7 +58,21 @@ export const updateTimer: import("@reduxjs/toolkit").AsyncThunk<void, void, {
|
|
|
58
58
|
fulfilledMeta?: unknown;
|
|
59
59
|
rejectedMeta?: unknown;
|
|
60
60
|
}>;
|
|
61
|
-
export const updateTimerStatus: import("@reduxjs/toolkit").AsyncThunk<
|
|
61
|
+
export const updateTimerStatus: import("@reduxjs/toolkit").AsyncThunk<import("@reduxjs/toolkit").PayloadAction<any, string, {
|
|
62
|
+
arg: void;
|
|
63
|
+
requestId: string;
|
|
64
|
+
requestStatus: "fulfilled";
|
|
65
|
+
}, never> | import("@reduxjs/toolkit").PayloadAction<unknown, string, {
|
|
66
|
+
arg: void;
|
|
67
|
+
requestId: string;
|
|
68
|
+
requestStatus: "rejected";
|
|
69
|
+
aborted: boolean;
|
|
70
|
+
condition: boolean;
|
|
71
|
+
} & ({
|
|
72
|
+
rejectedWithValue: true;
|
|
73
|
+
} | ({
|
|
74
|
+
rejectedWithValue: false;
|
|
75
|
+
} & {})), import("@reduxjs/toolkit").SerializedError>, void, {
|
|
62
76
|
state?: unknown;
|
|
63
77
|
dispatch?: import("redux").Dispatch<import("redux").AnyAction>;
|
|
64
78
|
extra?: unknown;
|
|
@@ -53,7 +53,13 @@ export const fetchActiveTimer = createAsyncThunk('hr_timer/fetchActiveTimer', as
|
|
|
53
53
|
getState,
|
|
54
54
|
responseOptions: { isArrayResponse: false },
|
|
55
55
|
}).then(res => {
|
|
56
|
-
|
|
56
|
+
if (res?.id != null) {
|
|
57
|
+
dispatch(fetchTimerById({ timerId: res.id }));
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
57
63
|
});
|
|
58
64
|
});
|
|
59
65
|
export const createTimer = createAsyncThunk('hr_timer/createTimer', async function (data = {}, { getState, dispatch }) {
|
|
@@ -98,9 +104,7 @@ export const updateTimerStatus = createAsyncThunk('hr_timer/updateTimerStatus',
|
|
|
98
104
|
.then(() => {
|
|
99
105
|
dispatch(fetchTimerById({ timerId: data.timerId }));
|
|
100
106
|
})
|
|
101
|
-
.then(() => {
|
|
102
|
-
dispatch(fetchTimer({ userId: data.userId, page: 0 }));
|
|
103
|
-
});
|
|
107
|
+
.then(() => dispatch(fetchTimer({ userId: data.userId, page: 0 })));
|
|
104
108
|
});
|
|
105
109
|
export const deleteTimer = createAsyncThunk('hr_timer/deleteTimer', async function (data = {}, { getState, dispatch }) {
|
|
106
110
|
return handlerApiCall({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timerSlice.js","sourceRoot":"","sources":["../../src/features/timerSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,cAAc,EACd,4BAA4B,GAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,WAAW,IAAI,YAAY,EAC3B,WAAW,IAAI,YAAY,EAC3B,gBAAgB,IAAI,iBAAiB,EACrC,UAAU,IAAI,WAAW,EACzB,cAAc,IAAI,eAAe,EACjC,WAAW,IAAI,YAAY,EAC3B,iBAAiB,IAAI,kBAAkB,GACxC,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CACxC,qBAAqB,EACrB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,WAAW;QAC1B,IAAI;QACJ,MAAM,EAAE,2BAA2B;QACnC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CACpD,iCAAiC,EACjC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,WAAW;QAC1B,IAAI;QACJ,MAAM,EAAE,uCAAuC;QAC/C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,yBAAyB,EACzB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,eAAe;QAC9B,IAAI;QACJ,MAAM,EAAE,+BAA+B;QACvC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,2BAA2B,EAC3B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IACxC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,iBAAiB;QAChC,IAAI;QACJ,MAAM,EAAE,iCAAiC;QACzC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACZ,QAAQ,CAAC,cAAc,CAAC,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"timerSlice.js","sourceRoot":"","sources":["../../src/features/timerSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,cAAc,EACd,4BAA4B,GAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,WAAW,IAAI,YAAY,EAC3B,WAAW,IAAI,YAAY,EAC3B,gBAAgB,IAAI,iBAAiB,EACrC,UAAU,IAAI,WAAW,EACzB,cAAc,IAAI,eAAe,EACjC,WAAW,IAAI,YAAY,EAC3B,iBAAiB,IAAI,kBAAkB,GACxC,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CACxC,qBAAqB,EACrB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,WAAW;QAC1B,IAAI;QACJ,MAAM,EAAE,2BAA2B;QACnC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CACpD,iCAAiC,EACjC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,WAAW;QAC1B,IAAI;QACJ,MAAM,EAAE,uCAAuC;QAC/C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,yBAAyB,EACzB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,eAAe;QAC9B,IAAI;QACJ,MAAM,EAAE,+BAA+B;QACvC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,2BAA2B,EAC3B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IACxC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,iBAAiB;QAChC,IAAI;QACJ,MAAM,EAAE,iCAAiC;QACzC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACZ,IAAI,GAAG,EAAE,EAAE,IAAI,IAAI,EAAE;YACnB,QAAQ,CAAC,cAAc,CAAC,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAgB,CACzC,sBAAsB,EACtB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,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,CAAC,EAAE;QACZ,QAAQ,CACN,iBAAiB,CAAC;YAChB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,QAAQ,EAAE,OAAO;SAClB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAgB,CACzC,sBAAsB,EACtB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,YAAY;QAC3B,IAAI;QACJ,MAAM,EAAE,4BAA4B;QACpC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC;SACC,IAAI,CAAC,GAAG,EAAE;QACT,QAAQ,CAAC,cAAc,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,EAAE;QACT,QAAQ,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACP,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,4BAA4B,EAC5B,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,EAAC;KAC1C,CAAC;SACC,IAAI,CAAC,GAAG,EAAE;QACT,QAAQ,CAAC,cAAc,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAgB,CACzC,sBAAsB,EACtB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC;IAC7C,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,YAAY;QAC3B,IAAI;QACJ,MAAM,EAAE,4BAA4B;QACpC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,QAAQ,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,YAAY,EAAE,IAAI;IAClB,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,EAAE;IAEb,wBAAwB,EAAE,IAAI;IAC9B,4BAA4B,EAAE,KAAK;IACnC,0BAA0B,EAAE,KAAK;IACjC,qBAAqB,EAAE,EAAE;IAEzB,eAAe,EAAE,IAAI;IACrB,eAAe,EAAE,KAAK;IACtB,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,UAAU,GAAG,WAAW,CAAC;IAC7B,IAAI,EAAE,UAAU;IAChB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,UAAU,EAAE;YAChD,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QACH,4BAA4B,CAAC,OAAO,EAAE,sBAAsB,EAAE;YAC5D,OAAO,EAAE,0BAA0B;YACnC,WAAW,EAAE,8BAA8B;YAC3C,SAAS,EAAE,4BAA4B;YACvC,IAAI,EAAE,uBAAuB;SAC9B,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC3C,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAC5C,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAClD,IAAI,KAAK,CAAC,eAAe,EAAE;gBACzB,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC9C,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1D,IAAI,KAAK,CAAC,eAAe,EAAE;gBACzB,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;aAC/B;YACD,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;YAC9B,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YAC/C,IAAI,KAAK,CAAC,eAAe,EAAE;gBACzB,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC"}
|
|
@@ -106,6 +106,7 @@ const useActiveTimerAction = () => {
|
|
|
106
106
|
const Colors = useThemeColor();
|
|
107
107
|
const I18n = useTranslator();
|
|
108
108
|
const navigation = useNavigation();
|
|
109
|
+
const { timesheet: timesheetConfig } = useSelector(state => state.appConfig);
|
|
109
110
|
useEffect(() => {
|
|
110
111
|
headerActionsProvider.registerModel('hr_active_timer', {
|
|
111
112
|
actions: [
|
|
@@ -117,9 +118,10 @@ const useActiveTimerAction = () => {
|
|
|
117
118
|
iconColor: Colors.primaryColor.background,
|
|
118
119
|
onPress: () => navigation.navigate('TimerFormScreen', { isCreation: true }),
|
|
119
120
|
showInHeader: true,
|
|
121
|
+
hideIf: !timesheetConfig?.isMultipleTimerEnabled,
|
|
120
122
|
},
|
|
121
123
|
],
|
|
122
124
|
});
|
|
123
|
-
}, [Colors, I18n, navigation]);
|
|
125
|
+
}, [Colors, I18n, navigation, timesheetConfig?.isMultipleTimerEnabled]);
|
|
124
126
|
};
|
|
125
127
|
//# sourceMappingURL=use-hr-header-actions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-hr-header-actions.js","sourceRoot":"","sources":["../../src/hooks/use-hr-header-actions.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"use-hr-header-actions.js","sourceRoot":"","sources":["../../src/hooks/use-hr-header-actions.js"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,MAAM,CAAC,MAAM,QAAQ,GAAW;IAC9B,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,OAAO;IACjB,IAAI,EAAE,gBAAgB;IACtB,gBAAgB,EAAE;QAChB,UAAU,EAAE,uBAAuB;QACnC,aAAa,EAAE,OAAO;KACvB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE;YAC3B,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,IAAI;SAChB;QACD,mBAAmB,EAAE;YACnB,KAAK,EAAE,gBAAgB;YACvB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,uBAAuB;YAC/B,gBAAgB,EAAE;gBAChB,UAAU,EAAE,uBAAuB;gBACnC,aAAa,EAAE,OAAO;aACvB;SACF;QACD,cAAc,EAAE;YACd,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,iBAAiB;YACzB,gBAAgB,EAAE;gBAChB,UAAU,EAAE,uBAAuB;gBACnC,aAAa,EAAE,OAAO;aACvB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,MAAM,CAAC,MAAM,QAAQ,GAAW;IAC9B,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,OAAO;IACjB,IAAI,EAAE,gBAAgB;IACtB,gBAAgB,EAAE;QAChB,UAAU,EAAE,uBAAuB;QACnC,aAAa,EAAE,OAAO;KACvB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE;YAC3B,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,IAAI;SAChB;QACD,mBAAmB,EAAE;YACnB,KAAK,EAAE,gBAAgB;YACvB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,uBAAuB;YAC/B,gBAAgB,EAAE;gBAChB,UAAU,EAAE,uBAAuB;gBACnC,aAAa,EAAE,OAAO;aACvB;SACF;QACD,cAAc,EAAE;YACd,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,iBAAiB;YACzB,gBAAgB,EAAE;gBAChB,UAAU,EAAE,uBAAuB;gBACnC,aAAa,EAAE,OAAO;aACvB;YACD,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,sBAAsB;SAC1D;QACD,kBAAkB,EAAE;YAClB,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,qBAAqB;YAC7B,gBAAgB,EAAE;gBAChB,UAAU,EAAE,uBAAuB;gBACnC,aAAa,EAAE,OAAO;aACvB;SACF;QACD,yBAAyB,EAAE;YACzB,KAAK,EAAE,aAAa;YACpB,SAAS,EAAE,IAAI;SAChB;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,wBAAwB;SACjC;QACD,gBAAgB,EAAE;YAChB,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE,mBAAmB;SAC5B;KACF;IACD,OAAO,EAAE;QACP,GAAG,cAAc;QACjB,GAAG,gBAAgB;KACpB;IACD,QAAQ,EAAE,EAAC,GAAG,UAAU,EAAC;IACzB,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,WAAW,EAAC;QAC9B,UAAU,EAAE,EAAC,GAAG,aAAa,EAAC;QAC9B,YAAY,EAAE,EAAC,GAAG,eAAe,EAAC;QAClC,aAAa,EAAE,EAAC,GAAG,gBAAgB,EAAC;QACpC,eAAe,EAAE,YAAY;KAC9B;IACD,cAAc,EAAE,CAAC,YAAY,EAAE,cAAc,CAAC;CAC/C,CAAC;AAEF,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,iCAAiC,CAAC;AAChD,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
|
|
@@ -21,7 +21,7 @@ import { CameraButton, headerActionsProvider, useDispatch, useSelector, useTrans
|
|
|
21
21
|
import { fetchExpenseLine } from '../../features/expenseLineSlice';
|
|
22
22
|
import { DateSeparator, ExpenseAddPopup, ExpenseLineDetailCard, ExpenseLineValidationButton, } from '../../components';
|
|
23
23
|
import { getNumberExpenseLineByDateApi } from '../../api';
|
|
24
|
-
const ExpenseLinesListScreen = ({ navigation }) => {
|
|
24
|
+
const ExpenseLinesListScreen = ({ navigation, customOnUpload = null }) => {
|
|
25
25
|
const Colors = useThemeColor();
|
|
26
26
|
const I18n = useTranslator();
|
|
27
27
|
const dispatch = useDispatch();
|
|
@@ -98,9 +98,11 @@ const ExpenseLinesListScreen = ({ navigation }) => {
|
|
|
98
98
|
})} onLongPress={() => handleModeChange(item.id)} onItemSelection={() => handleItemSelection(item.id)} isSelectionMode={isSelectionMode} isSelected={selectedItems.includes(item.id)}/>)} fetchData={fetchExpenseLineAPI} moreLoading={moreLoading} isListEnd={isListEnd} translator={I18n.t} separatorCondition={(prevItem, currentItem) => prevItem.expenseDate > currentItem.expenseDate} fetchTopIndicator={currentItem => ({
|
|
99
99
|
title: currentItem.expenseDate,
|
|
100
100
|
})} customTopSeparator={<DateSeparator fetchNumberOfItems={getNumberExpenseLineByDateApi}/>}/>
|
|
101
|
-
{!isSelectionMode && (<CameraButton cameraKey="expense-line_justication_picture" onUpload={
|
|
102
|
-
|
|
103
|
-
|
|
101
|
+
{!isSelectionMode && (<CameraButton cameraKey="expense-line_justication_picture" onUpload={customOnUpload != null
|
|
102
|
+
? customOnUpload
|
|
103
|
+
: _file => navigation.navigate('ExpenseLineFormScreen', {
|
|
104
|
+
justificationMetaFile: _file,
|
|
105
|
+
})} getFileName={({ user, extension, dateTime }) => `Expense_${user.name}_${dateTime}.${extension}`}/>)}
|
|
104
106
|
<ExpenseAddPopup visible={addPopupIsVisible} onClose={() => {
|
|
105
107
|
setAddPopupIsVisible(false);
|
|
106
108
|
handleCancelButton();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpenseLinesListScreen.js","sourceRoot":"","sources":["../../../src/screens/expense/ExpenseLinesListScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,EACL,aAAa,EACb,eAAe,EACf,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,6BAA6B,EAAC,MAAM,WAAW,CAAC;AAExD,MAAM,sBAAsB,GAAG,CAAC,EAAC,UAAU,EAAC,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"ExpenseLinesListScreen.js","sourceRoot":"","sources":["../../../src/screens/expense/ExpenseLinesListScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -26,13 +26,21 @@ const TimerFormScreen = ({ route }) => {
|
|
|
26
26
|
const dispatch = useDispatch();
|
|
27
27
|
const { setActivityIndicator } = useConfig();
|
|
28
28
|
const [creation, setCreation] = useState(isCreation ?? false);
|
|
29
|
+
const { timesheet: timesheetConfig } = useSelector(state => state.appConfig);
|
|
29
30
|
const { user } = useSelector(state => state.user);
|
|
30
31
|
const { timer, loadingCreation } = useSelector(state => state.hr_timer);
|
|
31
32
|
useEffect(() => {
|
|
32
|
-
if (isFocused
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
if (isFocused) {
|
|
34
|
+
if (!timesheetConfig?.isMultipleTimerEnabled) {
|
|
35
|
+
dispatch(fetchActiveTimer({ userId: user?.id })).then(res => {
|
|
36
|
+
setCreation(!res?.payload);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
else if (!creation && !loadingCreation) {
|
|
40
|
+
idTimerToUpdate
|
|
41
|
+
? dispatch(fetchTimerById({ timerId: idTimerToUpdate }))
|
|
42
|
+
: dispatch(fetchActiveTimer({ userId: user?.id }));
|
|
43
|
+
}
|
|
36
44
|
}
|
|
37
45
|
}, [
|
|
38
46
|
creation,
|
|
@@ -40,6 +48,7 @@ const TimerFormScreen = ({ route }) => {
|
|
|
40
48
|
idTimerToUpdate,
|
|
41
49
|
isFocused,
|
|
42
50
|
loadingCreation,
|
|
51
|
+
timesheetConfig?.isMultipleTimerEnabled,
|
|
43
52
|
user?.id,
|
|
44
53
|
]);
|
|
45
54
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimerFormScreen.js","sourceRoot":"","sources":["../../../src/screens/timesheet/TimerFormScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAChD,OAAO,EACL,QAAQ,EACR,OAAO,EACP,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,2BAA2B,CAAC;AAEnC,MAAM,eAAe,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IAClC,MAAM,UAAU,GAAG,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC;IAC7C,MAAM,eAAe,GAAG,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAC,oBAAoB,EAAC,GAAG,SAAS,EAAE,CAAC;IAE3C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;IAE9D,MAAM,EAAC,IAAI,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,EAAC,KAAK,EAAE,eAAe,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"TimerFormScreen.js","sourceRoot":"","sources":["../../../src/screens/timesheet/TimerFormScreen.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": "8.0.
|
|
3
|
+
"version": "8.0.6",
|
|
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": "8.0.
|
|
32
|
-
"@axelor/aos-mobile-ui": "8.0.
|
|
31
|
+
"@axelor/aos-mobile-core": "8.0.6",
|
|
32
|
+
"@axelor/aos-mobile-ui": "8.0.6",
|
|
33
33
|
"@reduxjs/toolkit": "^1.8.5"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|