@axelor/aos-mobile-core 8.1.2 → 8.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/apiProviders/Action/ActionApiProvider.d.ts +1 -1
- package/lib/apiProviders/Action/GatewayActionApi.d.ts +1 -1
- package/lib/apiProviders/Action/GatewayActionApi.js +2 -2
- package/lib/apiProviders/Action/GatewayActionApi.js.map +1 -1
- package/lib/apiProviders/utils.js +5 -2
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/ContextsProvider.js +4 -1
- package/lib/app/ContextsProvider.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.js +40 -2
- package/lib/auth/hooks/use-auth-headers.js.map +1 -1
- package/lib/auth/screens/SettingsScreen.js +4 -1
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/components/external/PlanningView/AgendaItemDisplay.d.ts +8 -0
- package/lib/components/external/PlanningView/AgendaItemDisplay.js +77 -0
- package/lib/components/external/PlanningView/AgendaItemDisplay.js.map +1 -0
- package/lib/components/external/PlanningView/DayDisplay.d.ts +5 -0
- package/lib/components/external/PlanningView/DayDisplay.js +59 -0
- package/lib/components/external/PlanningView/DayDisplay.js.map +1 -0
- package/lib/components/external/PlanningView/MonthDisplay.d.ts +6 -0
- package/lib/components/external/PlanningView/MonthDisplay.js +46 -0
- package/lib/components/external/PlanningView/MonthDisplay.js.map +1 -0
- package/lib/components/external/PlanningView/NavigationButton.d.ts +7 -0
- package/lib/components/external/PlanningView/NavigationButton.js +35 -0
- package/lib/components/external/PlanningView/NavigationButton.js.map +1 -0
- package/lib/components/external/PlanningView/PlanningView.js +39 -106
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/external/PlanningView/agenda.helpers.d.ts +7 -2
- package/lib/components/external/PlanningView/agenda.helpers.js +60 -8
- package/lib/components/external/PlanningView/agenda.helpers.js.map +1 -1
- package/lib/components/organisms/SignatureInput/SignatureInput.d.ts +8 -2
- package/lib/components/organisms/SignatureInput/SignatureInput.js +49 -23
- package/lib/components/organisms/SignatureInput/SignatureInput.js.map +1 -1
- package/lib/features/mailMessageSlice.d.ts +1 -1
- package/lib/features/mailMessageSlice.js +7 -30
- package/lib/features/mailMessageSlice.js.map +1 -1
- package/lib/forms/studio/display.helpers.js +3 -0
- package/lib/forms/studio/display.helpers.js.map +1 -1
- package/lib/i18n/translations/en.json +26 -0
- package/lib/i18n/translations/fr.json +26 -0
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/loader/ProcessProvider.d.ts +30 -0
- package/lib/loader/ProcessProvider.js +211 -0
- package/lib/loader/ProcessProvider.js.map +1 -0
- package/lib/loader/ProcessStorage.d.ts +18 -0
- package/lib/loader/ProcessStorage.js +95 -0
- package/lib/loader/ProcessStorage.js.map +1 -0
- package/lib/loader/components/atoms/ProcessCard/ProcessCard.d.ts +15 -0
- package/lib/loader/components/atoms/ProcessCard/ProcessCard.js +69 -0
- package/lib/loader/components/atoms/ProcessCard/ProcessCard.js.map +1 -0
- package/lib/loader/components/atoms/index.d.ts +1 -0
- package/lib/loader/components/atoms/index.js +19 -0
- package/lib/loader/components/atoms/index.js.map +1 -0
- package/lib/loader/components/index.d.ts +2 -0
- package/lib/loader/components/index.js +20 -0
- package/lib/loader/components/index.js.map +1 -0
- package/lib/loader/components/organisms/LoaderPopup/LoaderPopup.d.ts +13 -0
- package/lib/loader/components/organisms/LoaderPopup/LoaderPopup.js +104 -0
- package/lib/loader/components/organisms/LoaderPopup/LoaderPopup.js.map +1 -0
- package/lib/loader/components/organisms/index.d.ts +1 -0
- package/lib/loader/components/organisms/index.js +19 -0
- package/lib/loader/components/organisms/index.js.map +1 -0
- package/lib/loader/helpers.d.ts +5 -0
- package/lib/loader/helpers.js +59 -0
- package/lib/loader/helpers.js.map +1 -0
- package/lib/loader/hooks.d.ts +6 -0
- package/lib/loader/hooks.js +50 -0
- package/lib/loader/hooks.js.map +1 -0
- package/lib/loader/index.d.ts +6 -0
- package/lib/loader/index.js +24 -0
- package/lib/loader/index.js.map +1 -0
- package/lib/loader/types.d.ts +26 -0
- package/lib/loader/types.js +24 -0
- package/lib/loader/types.js.map +1 -0
- package/lib/screens/ProcessListScreen.d.ts +3 -0
- package/lib/screens/ProcessListScreen.js +75 -0
- package/lib/screens/ProcessListScreen.js.map +1 -0
- package/lib/screens/index.d.ts +11 -0
- package/lib/screens/index.js +8 -0
- package/lib/screens/index.js.map +1 -1
- package/lib/utils/agenda.d.ts +7 -1
- package/lib/utils/agenda.js +12 -7
- package/lib/utils/agenda.js.map +1 -1
- package/lib/utils/date.d.ts +1 -0
- package/lib/utils/date.js +9 -4
- package/lib/utils/date.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -15,13 +15,17 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useCallback, useMemo, useState } from 'react';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import {
|
|
20
|
+
import { SwitchCard, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useSelector } from 'react-redux';
|
|
22
|
-
import { Agenda } from 'react-native-calendars';
|
|
23
|
-
import { createAgendaItems, createAgendaSchedule, getShortName, isToday, mapEntryToItem, shouldRenderDetailsCard, } from './agenda.helpers';
|
|
22
|
+
import { Agenda, LocaleConfig, } from 'react-native-calendars';
|
|
24
23
|
import { useTranslator } from '../../../i18n';
|
|
24
|
+
import { createAgendaItems, createAgendaSchedule, DAYS, filterMarkedDates, mapEntryToItem, MONTHS, shouldRenderDetailsCard, } from './agenda.helpers';
|
|
25
|
+
import MonthDisplay from './MonthDisplay';
|
|
26
|
+
import DayDisplay from './DayDisplay';
|
|
27
|
+
import AgendaItemDisplay from './AgendaItemDisplay';
|
|
28
|
+
import NavigationButton from './NavigationButton';
|
|
25
29
|
const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayItem, fetchbyMonth, loading = false, itemList = [], changeWeekButton = true, returnToDayButton = true, manageAssignment = false, }) => {
|
|
26
30
|
const Colors = useThemeColor();
|
|
27
31
|
const I18n = useTranslator();
|
|
@@ -29,7 +33,7 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
29
33
|
const [fetchDate, setFetchDate] = useState();
|
|
30
34
|
const [currentDate, setCurrentDate] = useState(new Date().toISOString());
|
|
31
35
|
const [assigned, setAssigned] = useState(true);
|
|
32
|
-
const filterOnUserAssigned = useCallback(list => {
|
|
36
|
+
const filterOnUserAssigned = useCallback((list) => {
|
|
33
37
|
if (!Array.isArray(list) || list.length === 0) {
|
|
34
38
|
return [];
|
|
35
39
|
}
|
|
@@ -42,22 +46,24 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
42
46
|
}
|
|
43
47
|
}
|
|
44
48
|
}, [assigned, manageAssignment, userId]);
|
|
49
|
+
useEffect(() => {
|
|
50
|
+
LocaleConfig.locales = {
|
|
51
|
+
default: {
|
|
52
|
+
monthNames: MONTHS.map(_m => I18n.t(_m)),
|
|
53
|
+
monthNamesShort: MONTHS.map(_m => I18n.t(_m)),
|
|
54
|
+
dayNames: DAYS.map(_d => I18n.t(_d)),
|
|
55
|
+
dayNamesShort: DAYS.map(_d => I18n.t(_d)),
|
|
56
|
+
today: I18n.t('Base_Calendar_Today'),
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
LocaleConfig.defaultLocale = 'default';
|
|
60
|
+
}, [I18n]);
|
|
45
61
|
const _agendaItems = useMemo(() => createAgendaItems(filterOnUserAssigned(itemList), I18n), [filterOnUserAssigned, itemList, I18n]);
|
|
46
62
|
const agendaItems = useMemo(() => createAgendaSchedule(_agendaItems, numberMonthsAroundToday), [_agendaItems, numberMonthsAroundToday]);
|
|
47
|
-
const styles = useMemo(() => getStyles(
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return (<View style={styles.day}>
|
|
52
|
-
<Text style={[styles.dayNum, today]}>{date.getDate()}</Text>
|
|
53
|
-
<Text style={[styles.dayText, today]}>
|
|
54
|
-
{getShortName(date, 'en')}
|
|
55
|
-
</Text>
|
|
56
|
-
</View>);
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
return <View style={styles.day}/>;
|
|
60
|
-
}
|
|
63
|
+
const styles = useMemo(() => getStyles(manageAssignment), [manageAssignment]);
|
|
64
|
+
const markedDots = useMemo(() => filterMarkedDates(agendaItems), [agendaItems]);
|
|
65
|
+
const renderDate = (date) => {
|
|
66
|
+
return <DayDisplay date={date}/>;
|
|
61
67
|
};
|
|
62
68
|
const renderEmptyDate = () => {
|
|
63
69
|
return <View style={styles.emptyDate}/>;
|
|
@@ -67,29 +73,14 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
67
73
|
if (agendaItem == null) {
|
|
68
74
|
return null;
|
|
69
75
|
}
|
|
70
|
-
const { id,
|
|
76
|
+
const { id, date, isNewMonth } = agendaItem;
|
|
77
|
+
if (isNewMonth) {
|
|
78
|
+
return <MonthDisplay key={id} date={date} isFirst={isFirst}/>;
|
|
79
|
+
}
|
|
71
80
|
const _renderComponent = shouldRenderDetailsCard(agendaItem)
|
|
72
81
|
? renderItem
|
|
73
82
|
: renderFullDayItem;
|
|
74
|
-
|
|
75
|
-
return (<View style={[styles.dayItem, isFirst ? {} : null]}>
|
|
76
|
-
<Text>{id}</Text>
|
|
77
|
-
</View>);
|
|
78
|
-
}
|
|
79
|
-
return (<View key={id}>
|
|
80
|
-
{isFirst ? <HorizontalRule style={styles.horizontalRule}/> : null}
|
|
81
|
-
<View style={isFirst ? styles.firstItemContainer : styles.containerListItem}>
|
|
82
|
-
<View style={styles.containerTime}>
|
|
83
|
-
{!isFullDayEvent && (<>
|
|
84
|
-
<Text style={styles.centerText}>{startHour}</Text>
|
|
85
|
-
<Text style={styles.centerText}>{endHour}</Text>
|
|
86
|
-
</>)}
|
|
87
|
-
</View>
|
|
88
|
-
<View style={styles.renderContainer}>
|
|
89
|
-
{_renderComponent(agendaItem)}
|
|
90
|
-
</View>
|
|
91
|
-
</View>
|
|
92
|
-
</View>);
|
|
83
|
+
return (<AgendaItemDisplay key={id} isFirst={isFirst} agendaItem={agendaItem} renderComponent={_renderComponent}/>);
|
|
93
84
|
};
|
|
94
85
|
const handleLoadItemsForMonth = useCallback((date) => {
|
|
95
86
|
const _date = new Date(date.year, date.month, date.day);
|
|
@@ -109,16 +100,19 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
109
100
|
var lastWeek = new Date(firstDay.getTime() - 7 * 24 * 60 * 60 * 1000);
|
|
110
101
|
setCurrentDate(lastWeek.toISOString());
|
|
111
102
|
};
|
|
112
|
-
return (<View style={
|
|
103
|
+
return (<View style={[
|
|
104
|
+
styles.agendaContainer,
|
|
105
|
+
{ backgroundColor: Colors.backgroundColor },
|
|
106
|
+
]}>
|
|
113
107
|
<View style={styles.headerPlanning}>
|
|
114
108
|
{manageAssignment && (<SwitchCard title={I18n.t('Base_AssignedToMe')} style={styles.switchCard} defaultValue={assigned} onToggle={() => setAssigned(!assigned)}/>)}
|
|
115
109
|
<View style={styles.headerButton}>
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
110
|
+
<NavigationButton visible={changeWeekButton} icon="arrow-left" onPress={lastWeekBtnOnPress}/>
|
|
111
|
+
<NavigationButton visible={returnToDayButton} icon="calendar-event" onPress={todayBtnOnPress}/>
|
|
112
|
+
<NavigationButton visible={changeWeekButton} icon="arrow-right" onPress={nextWeekBtnOnPress}/>
|
|
119
113
|
</View>
|
|
120
114
|
</View>
|
|
121
|
-
<Agenda onDayPress={date => setCurrentDate(date.dateString)} selected={currentDate} items={agendaItems} loadItemsForMonth={handleLoadItemsForMonth} pastScrollRange={numberMonthsAroundToday} futureScrollRange={numberMonthsAroundToday} renderItem={renderDayItem} renderDay={renderDate} renderEmptyDate={renderEmptyDate} onRefresh={() => fetchbyMonth(fetchDate)} refreshing={loading} theme={{
|
|
115
|
+
<Agenda onDayPress={date => setCurrentDate(date.dateString)} selected={currentDate} items={agendaItems} markedDates={markedDots} firstDay={1} loadItemsForMonth={handleLoadItemsForMonth} pastScrollRange={numberMonthsAroundToday} futureScrollRange={numberMonthsAroundToday} renderItem={renderDayItem} renderDay={renderDate} renderEmptyDate={renderEmptyDate} onRefresh={() => fetchbyMonth(fetchDate)} refreshing={loading} theme={{
|
|
122
116
|
todayTextColor: Colors.text,
|
|
123
117
|
calendarBackground: Colors.backgroundColor,
|
|
124
118
|
indicatorColor: Colors.primaryColor.background,
|
|
@@ -138,73 +132,12 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
138
132
|
}} current={currentDate} key={currentDate}/>
|
|
139
133
|
</View>);
|
|
140
134
|
};
|
|
141
|
-
const getStyles = (
|
|
135
|
+
const getStyles = (manageAssignment) => StyleSheet.create({
|
|
142
136
|
agendaContainer: {
|
|
143
137
|
height: '100%',
|
|
144
|
-
backgroundColor: Colors.backgroundColor,
|
|
145
138
|
},
|
|
146
139
|
emptyDate: {
|
|
147
|
-
height: 15,
|
|
148
140
|
flex: 1,
|
|
149
|
-
paddingTop: 30,
|
|
150
|
-
},
|
|
151
|
-
dayItem: {
|
|
152
|
-
flex: 1,
|
|
153
|
-
borderRadius: 5,
|
|
154
|
-
padding: 10,
|
|
155
|
-
marginRight: 10,
|
|
156
|
-
marginTop: 17,
|
|
157
|
-
},
|
|
158
|
-
dayNum: {
|
|
159
|
-
fontSize: 28,
|
|
160
|
-
fontWeight: '200',
|
|
161
|
-
color: Colors.text,
|
|
162
|
-
},
|
|
163
|
-
dayText: {
|
|
164
|
-
fontSize: 14,
|
|
165
|
-
color: Colors.text,
|
|
166
|
-
backgroundColor: Colors.background,
|
|
167
|
-
marginTop: -5,
|
|
168
|
-
},
|
|
169
|
-
day: {
|
|
170
|
-
width: 63,
|
|
171
|
-
alignItems: 'center',
|
|
172
|
-
justifyContent: 'flex-start',
|
|
173
|
-
marginTop: 32,
|
|
174
|
-
},
|
|
175
|
-
today: {
|
|
176
|
-
color: Colors.primaryColor.background,
|
|
177
|
-
},
|
|
178
|
-
containerTime: {
|
|
179
|
-
flexDirection: 'column',
|
|
180
|
-
width: '15%',
|
|
181
|
-
},
|
|
182
|
-
containerListItem: {
|
|
183
|
-
flexDirection: 'row',
|
|
184
|
-
marginTop: 15,
|
|
185
|
-
width: '100%',
|
|
186
|
-
},
|
|
187
|
-
firstItemContainer: {
|
|
188
|
-
flexDirection: 'row',
|
|
189
|
-
marginTop: '5%',
|
|
190
|
-
},
|
|
191
|
-
renderContainer: {
|
|
192
|
-
alignSelf: 'flex-end',
|
|
193
|
-
marginLeft: 5,
|
|
194
|
-
width: '80%',
|
|
195
|
-
},
|
|
196
|
-
centerText: {
|
|
197
|
-
textAlign: 'center',
|
|
198
|
-
},
|
|
199
|
-
horizontalRule: {
|
|
200
|
-
marginTop: 10,
|
|
201
|
-
width: '60%',
|
|
202
|
-
alignSelf: 'center',
|
|
203
|
-
},
|
|
204
|
-
circleButton: {
|
|
205
|
-
marginHorizontal: 5,
|
|
206
|
-
marginTop: 5,
|
|
207
|
-
width: 40,
|
|
208
141
|
},
|
|
209
142
|
headerPlanning: {
|
|
210
143
|
flexDirection: 'row',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { AgendaEntry, AgendaSchedule } from 'react-native-calendars';
|
|
2
2
|
import { TranslatorProps } from '../../../i18n';
|
|
3
3
|
export declare const EMPTY_TIME = "-";
|
|
4
|
+
export declare const MONTHS: string[];
|
|
5
|
+
export declare const DAYS: string[];
|
|
4
6
|
export interface AgendaEvent {
|
|
5
7
|
id: string;
|
|
6
8
|
startDate: string;
|
|
@@ -10,6 +12,7 @@ export interface AgendaEvent {
|
|
|
10
12
|
export interface AgendaItem {
|
|
11
13
|
id: string;
|
|
12
14
|
date: string | Date;
|
|
15
|
+
isNewMonth?: boolean;
|
|
13
16
|
startHour?: string | Date;
|
|
14
17
|
endHour?: string | Date;
|
|
15
18
|
isFullDayEvent?: Boolean;
|
|
@@ -17,7 +20,9 @@ export interface AgendaItem {
|
|
|
17
20
|
}
|
|
18
21
|
export declare function mapEntryToItem(agendaItem: AgendaEntry, itemList: AgendaItem[]): AgendaItem;
|
|
19
22
|
export declare function createAgendaSchedule(items: AgendaItem[], monthsAroundDate: number): AgendaSchedule;
|
|
20
|
-
export declare function getShortName(date:
|
|
21
|
-
export declare function
|
|
23
|
+
export declare function getShortName(date: Date): string;
|
|
24
|
+
export declare function getMonthName(date: string | Date): string;
|
|
25
|
+
export declare function isStartOfMonth(date: Date | string): boolean;
|
|
22
26
|
export declare const createAgendaItems: (list: AgendaEvent[], I18n: TranslatorProps) => any[];
|
|
23
27
|
export declare const shouldRenderDetailsCard: (event: AgendaItem) => boolean;
|
|
28
|
+
export declare const filterMarkedDates: (agendaItems: AgendaSchedule) => any;
|
|
@@ -17,9 +17,39 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { formatTime, diffDate, sameDate, incrementDate } from '../../../utils';
|
|
19
19
|
export const EMPTY_TIME = '-';
|
|
20
|
+
const START_OF_MONTH_DOTS = 'startOfMonth';
|
|
21
|
+
export const MONTHS = [
|
|
22
|
+
'Base_MonthLong_January',
|
|
23
|
+
'Base_MonthLong_February',
|
|
24
|
+
'Base_MonthLong_March',
|
|
25
|
+
'Base_MonthLong_April',
|
|
26
|
+
'Base_MonthLong_May',
|
|
27
|
+
'Base_MonthLong_June',
|
|
28
|
+
'Base_MonthLong_July',
|
|
29
|
+
'Base_MonthLong_August',
|
|
30
|
+
'Base_MonthLong_September',
|
|
31
|
+
'Base_MonthLong_October',
|
|
32
|
+
'Base_MonthLong_November',
|
|
33
|
+
'Base_MonthLong_December',
|
|
34
|
+
];
|
|
35
|
+
export const DAYS = [
|
|
36
|
+
'Base_Day_Sun',
|
|
37
|
+
'Base_Day_Mon',
|
|
38
|
+
'Base_Day_Tue',
|
|
39
|
+
'Base_Day_Wed',
|
|
40
|
+
'Base_Day_Thu',
|
|
41
|
+
'Base_Day_Fri',
|
|
42
|
+
'Base_Day_Sat',
|
|
43
|
+
];
|
|
20
44
|
export function mapEntryToItem(agendaItem, itemList) {
|
|
21
|
-
const
|
|
22
|
-
return
|
|
45
|
+
const _item = itemList.find((item) => item.id === agendaItem.name);
|
|
46
|
+
return {
|
|
47
|
+
id: agendaItem.name,
|
|
48
|
+
date: agendaItem.day,
|
|
49
|
+
data: {},
|
|
50
|
+
...(_item ?? {}),
|
|
51
|
+
isNewMonth: agendaItem.name.includes(START_OF_MONTH_DOTS),
|
|
52
|
+
};
|
|
23
53
|
}
|
|
24
54
|
function mapItemToEntry(item) {
|
|
25
55
|
return { name: '' + item?.id, height: 80, day: (item?.date).toString() };
|
|
@@ -61,7 +91,19 @@ function generateAgendaItems(monthsAroundDate) {
|
|
|
61
91
|
const todayDate = new Date();
|
|
62
92
|
const dateArray = getAllDatesFromDate(monthsAroundDate, todayDate);
|
|
63
93
|
const agendaItems = {};
|
|
64
|
-
dateArray.forEach((date) =>
|
|
94
|
+
dateArray.forEach((date) => {
|
|
95
|
+
if (isStartOfMonth(date)) {
|
|
96
|
+
const _d = addDays(date, -1);
|
|
97
|
+
agendaItems[formatDate(_d)] = [
|
|
98
|
+
{
|
|
99
|
+
day: _d,
|
|
100
|
+
name: `${_d.getFullYear()}-${_d.getMonth() + 1}-${START_OF_MONTH_DOTS}`,
|
|
101
|
+
height: undefined,
|
|
102
|
+
},
|
|
103
|
+
];
|
|
104
|
+
}
|
|
105
|
+
agendaItems[formatDate(date)] = [];
|
|
106
|
+
});
|
|
65
107
|
return agendaItems;
|
|
66
108
|
}
|
|
67
109
|
export function createAgendaSchedule(items, monthsAroundDate) {
|
|
@@ -73,13 +115,16 @@ export function createAgendaSchedule(items, monthsAroundDate) {
|
|
|
73
115
|
});
|
|
74
116
|
return agendaSchedule;
|
|
75
117
|
}
|
|
76
|
-
export function getShortName(date
|
|
77
|
-
return
|
|
118
|
+
export function getShortName(date) {
|
|
119
|
+
return DAYS[date.getDay()];
|
|
120
|
+
}
|
|
121
|
+
export function getMonthName(date) {
|
|
122
|
+
const _d = addDays(date, 1);
|
|
123
|
+
return MONTHS[_d.getMonth()];
|
|
78
124
|
}
|
|
79
|
-
export function
|
|
125
|
+
export function isStartOfMonth(date) {
|
|
80
126
|
const d = new Date(date);
|
|
81
|
-
|
|
82
|
-
return sameDate(d, today);
|
|
127
|
+
return d.getDate() === 1;
|
|
83
128
|
}
|
|
84
129
|
export const createAgendaItems = (list, I18n) => {
|
|
85
130
|
if (list == null || list.length === 0) {
|
|
@@ -147,4 +192,11 @@ export const shouldRenderDetailsCard = (event) => {
|
|
|
147
192
|
(isLastItemOfEvent && eventDate <= today) ||
|
|
148
193
|
isDayEvent);
|
|
149
194
|
};
|
|
195
|
+
export const filterMarkedDates = (agendaItems) => {
|
|
196
|
+
const nonTechnicalDates = Object.entries(agendaItems).map(([_d, items]) => {
|
|
197
|
+
const _list = items.filter(({ name }) => !name.includes(START_OF_MONTH_DOTS));
|
|
198
|
+
return [_d, { marked: _list.length > 0 }];
|
|
199
|
+
});
|
|
200
|
+
return Object.fromEntries(nonTechnicalDates);
|
|
201
|
+
};
|
|
150
202
|
//# sourceMappingURL=agenda.helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
2
|
+
interface SignatureInputProps {
|
|
3
3
|
style?: any;
|
|
4
4
|
title?: string;
|
|
5
5
|
defaultValue?: any;
|
|
@@ -12,5 +12,11 @@ declare const SignatureInput: ({ style, title, defaultValue, readonly, required,
|
|
|
12
12
|
canvaSize?: any;
|
|
13
13
|
returnBase64String?: boolean;
|
|
14
14
|
iconSize?: number;
|
|
15
|
-
|
|
15
|
+
/**
|
|
16
|
+
* Use this option to use this widget inside a scrollable view to avoid conflicts.
|
|
17
|
+
* Default value is false.
|
|
18
|
+
*/
|
|
19
|
+
popup?: boolean;
|
|
20
|
+
}
|
|
21
|
+
declare const SignatureInput: ({ style, title, defaultValue, readonly, required, onChange, enableFileSelection, enablePicture, cameraKey, canvaSize, returnBase64String, iconSize, popup, }: SignatureInputProps) => React.JSX.Element;
|
|
16
22
|
export default SignatureInput;
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
19
|
-
import { Dimensions, StyleSheet, View } from 'react-native';
|
|
19
|
+
import { Dimensions, Modal, StyleSheet, View } from 'react-native';
|
|
20
20
|
import Signature from 'react-native-signature-canvas';
|
|
21
21
|
import { checkNullString, Icon, Text, getCommonStyles, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { handleDocumentSelection } from '../../../tools';
|
|
@@ -26,23 +26,26 @@ import { showToastMessage } from '../../../utils';
|
|
|
26
26
|
import { AOSImage } from '../../organisms';
|
|
27
27
|
import PictureIcon from './PictureIcon';
|
|
28
28
|
const CANVA_HEIGHT = 300;
|
|
29
|
-
const
|
|
29
|
+
const POPUP_INPUT_HEIGHT = 100;
|
|
30
|
+
const SignatureInput = ({ style, title, defaultValue, readonly = false, required = false, onChange = () => { }, enableFileSelection = true, enablePicture = true, cameraKey = 'signature_answer', canvaSize = Dimensions.get('window').width * 0.75, returnBase64String = false, iconSize = 25, popup = false, }) => {
|
|
30
31
|
const ref = useRef();
|
|
31
32
|
const Colors = useThemeColor();
|
|
32
33
|
const { baseUrl, jsessionId, token } = useSelector((state) => state.auth);
|
|
33
34
|
const [unsavedChanges, setUnsavedChanges] = useState(false);
|
|
34
|
-
const [editSignature, setEditSignature] = useState(
|
|
35
|
+
const [editSignature, setEditSignature] = useState(false);
|
|
36
|
+
const [popupIsOpen, setPopupIsOpen] = useState(false);
|
|
35
37
|
useEffect(() => {
|
|
36
|
-
setEditSignature(
|
|
38
|
+
setEditSignature(false);
|
|
37
39
|
}, [defaultValue?.id, readonly]);
|
|
38
40
|
const _required = useMemo(() => required && defaultValue?.id == null, [required, defaultValue?.id]);
|
|
39
41
|
const canvaStyle = useMemo(() => getCanvaStyles(Colors.screenBackgroundColor), [Colors]);
|
|
40
42
|
const commonStyles = useMemo(() => getCommonStyles(Colors, _required), [Colors, _required]);
|
|
41
43
|
const styles = useMemo(() => getStyles(Colors, canvaSize, _required), [Colors, canvaSize, _required]);
|
|
42
44
|
const handleClose = useCallback(() => {
|
|
45
|
+
popup && setPopupIsOpen(false);
|
|
43
46
|
setEditSignature(false);
|
|
44
47
|
setUnsavedChanges(false);
|
|
45
|
-
}, []);
|
|
48
|
+
}, [popup]);
|
|
46
49
|
const handleSave = useCallback(() => {
|
|
47
50
|
ref.current.readSignature();
|
|
48
51
|
}, []);
|
|
@@ -118,28 +121,44 @@ const SignatureInput = ({ style, title, defaultValue, readonly = false, required
|
|
|
118
121
|
styles.contentContainer,
|
|
119
122
|
unsavedChanges ? commonStyles.inputFocused : null,
|
|
120
123
|
], [commonStyles, styles, unsavedChanges]);
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
<
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
<
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
<Icon name="check-lg" size={iconSize} touchable={unsavedChanges} color={unsavedChanges
|
|
124
|
+
const renderSignatureCanva = () => {
|
|
125
|
+
return (<View style={containerStyle}>
|
|
126
|
+
<View style={styles.signatureContainer}>
|
|
127
|
+
<Signature webStyle={canvaStyle} backgroundColor={Colors.screenBackgroundColor} dataURL={returnBase64String ? defaultValue : null} ref={ref} onOK={handleSignature} onBegin={() => setUnsavedChanges(true)} autoClear={false}/>
|
|
128
|
+
</View>
|
|
129
|
+
<View style={styles.iconContainer}>
|
|
130
|
+
<Icon name="x-lg" size={iconSize} touchable={true} onPress={handleClose} style={styles.icon}/>
|
|
131
|
+
<View style={styles.icon}/>
|
|
132
|
+
<Icon name="upload" size={iconSize} style={styles.icon} touchable={true} visible={enableFileSelection} onPress={() => handleDocumentSelection(handleUpload)}/>
|
|
133
|
+
{enablePicture && (<PictureIcon style={styles.icon} size={iconSize} cameraKey={cameraKey} onChange={handleUpload}/>)}
|
|
134
|
+
<Icon name="eraser" size={iconSize} touchable={true} onPress={handleClear} style={styles.icon}/>
|
|
135
|
+
<Icon name="check-lg" size={iconSize} touchable={unsavedChanges} color={unsavedChanges
|
|
134
136
|
? Colors.successColor.background
|
|
135
137
|
: Colors.secondaryColor.background} onPress={handleSave} style={styles.icon}/>
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
138
|
+
</View>
|
|
139
|
+
</View>);
|
|
140
|
+
};
|
|
141
|
+
return (<View style={[styles.container, style]}>
|
|
142
|
+
{!checkNullString(title) && <Text style={styles.title}>{title}</Text>}
|
|
143
|
+
{editSignature &&
|
|
144
|
+
(popup ? (<Modal visible={popupIsOpen} transparent animationType="fade">
|
|
145
|
+
<View style={styles.modalBackground}>{renderSignatureCanva()}</View>
|
|
146
|
+
</Modal>) : (renderSignatureCanva()))}
|
|
147
|
+
{(!editSignature || popup) && (<View style={containerStyle}>
|
|
148
|
+
<View style={[
|
|
149
|
+
styles.signatureContainer,
|
|
150
|
+
popup && { height: POPUP_INPUT_HEIGHT },
|
|
151
|
+
]}>
|
|
152
|
+
<AOSImage imageSize={[
|
|
153
|
+
styles.signatureContainer,
|
|
154
|
+
popup && { height: POPUP_INPUT_HEIGHT },
|
|
155
|
+
]} metaFile={returnBase64String ? null : defaultValue} defaultIconSize={popup ? POPUP_INPUT_HEIGHT * 0.5 : canvaSize * 0.5} enableImageViewer={true} resizeMode="contain"/>
|
|
140
156
|
</View>
|
|
141
157
|
{!readonly && (<View style={styles.iconContainer}>
|
|
142
|
-
<Icon name="vector-pen" size={iconSize} touchable={true} onPress={() =>
|
|
158
|
+
<Icon name="vector-pen" size={iconSize} touchable={true} onPress={() => {
|
|
159
|
+
popup && setPopupIsOpen(true);
|
|
160
|
+
setEditSignature(true);
|
|
161
|
+
}} style={styles.icon}/>
|
|
143
162
|
<Icon name="trash3-fill" visible={defaultValue?.id != null} size={iconSize} touchable={true} color={Colors.errorColor.background} onPress={handleFileDelete} style={styles.icon}/>
|
|
144
163
|
</View>)}
|
|
145
164
|
</View>)}
|
|
@@ -170,6 +189,7 @@ const getStyles = (Colors, canvaSize, required) => StyleSheet.create({
|
|
|
170
189
|
justifyContent: 'flex-start',
|
|
171
190
|
alignItems: 'center',
|
|
172
191
|
height: '100%',
|
|
192
|
+
marginLeft: 5,
|
|
173
193
|
},
|
|
174
194
|
icon: {
|
|
175
195
|
marginVertical: 5,
|
|
@@ -177,6 +197,12 @@ const getStyles = (Colors, canvaSize, required) => StyleSheet.create({
|
|
|
177
197
|
title: {
|
|
178
198
|
marginLeft: 10,
|
|
179
199
|
},
|
|
200
|
+
modalBackground: {
|
|
201
|
+
flex: 1,
|
|
202
|
+
justifyContent: 'center',
|
|
203
|
+
alignItems: 'center',
|
|
204
|
+
backgroundColor: 'rgba(0,0,0,0.5)',
|
|
205
|
+
},
|
|
180
206
|
});
|
|
181
207
|
const getCanvaStyles = (backgroundColor) => {
|
|
182
208
|
return `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignatureInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/SignatureInput/SignatureInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"SignatureInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/SignatureInput/SignatureInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,10 @@ export const markAllMailMessageAsRead: import("@reduxjs/toolkit").AsyncThunk<{
|
|
|
14
14
|
}, void, import("@reduxjs/toolkit/dist/createAsyncThunk").AsyncThunkConfig>;
|
|
15
15
|
export const mailMessagesReducer: import("redux").Reducer<{
|
|
16
16
|
loading: boolean;
|
|
17
|
-
loadingFollowers: boolean;
|
|
18
17
|
moreLoading: boolean;
|
|
19
18
|
isListEnd: boolean;
|
|
20
19
|
mailMessagesList: any[];
|
|
20
|
+
loadingFollowers: boolean;
|
|
21
21
|
modelFollowersList: any[];
|
|
22
22
|
reload: boolean;
|
|
23
23
|
reloadFollowers: boolean;
|