diff --git a/screens/Planning/PlanningScreen.js b/screens/Planning/PlanningScreen.js index 10194cc..b5cc293 100644 --- a/screens/Planning/PlanningScreen.js +++ b/screens/Planning/PlanningScreen.js @@ -5,6 +5,7 @@ import {BackHandler, View} from 'react-native'; import i18n from "i18n-js"; import {LocaleConfig} from 'react-native-calendars'; import WebDataManager from "../../utils/WebDataManager"; +import type {eventObject} from "../../utils/PlanningEventManager"; import PlanningEventManager from '../../utils/PlanningEventManager'; import {Avatar, Divider, List} from 'react-native-paper'; import CustomAgenda from "../../components/CustomAgenda"; @@ -150,7 +151,7 @@ export default class PlanningScreen extends React.Component { this.setState({calendarShowing: isCalendarOpened}); } - getRenderItem(item: Object) { + getRenderItem(item: eventObject) { const onPress = this.props.navigation.navigate.bind(this, 'PlanningDisplayScreen', {data: item}); if (item.logo !== null) { return ( diff --git a/screens/Tetris/Tetromino.js b/screens/Tetris/Tetromino.js index 6483e98..19359af 100644 --- a/screens/Tetris/Tetromino.js +++ b/screens/Tetris/Tetromino.js @@ -1,3 +1,5 @@ +// @flow + export default class Tetromino { static types = { diff --git a/utils/DateManager.js b/utils/DateManager.js index fa22494..3ca46ee 100644 --- a/utils/DateManager.js +++ b/utils/DateManager.js @@ -1,3 +1,5 @@ +// @flow + import i18n from 'i18n-js'; export default class DateManager { diff --git a/utils/PlanningEventManager.js b/utils/PlanningEventManager.js index 0cc31c2..8198751 100644 --- a/utils/PlanningEventManager.js +++ b/utils/PlanningEventManager.js @@ -1,3 +1,17 @@ +// @flow + +export type eventObject = { + id: number, + title: string, + logo: string, + date_begin: string, + date_end: string, + description: string, + club: string, + category_id: number, + url: string, +}; + export default class PlanningEventManager { // Regex used to check date string validity @@ -20,10 +34,10 @@ export default class PlanningEventManager { * @param event2Date Event 2 date in format YYYY-MM-DD HH:MM:SS * @return {boolean} */ - static isEventBefore(event1Date: ?string, event2Date: ?string) { + static isEventBefore(event1Date: string, event2Date: string) { let date1 = PlanningEventManager.stringToDate(event1Date); let date2 = PlanningEventManager.stringToDate(event2Date); - if (date1 !== undefined && date2 !== undefined) + if (date1 !== null && date2 !== null) return date1 < date2; else return false; @@ -34,13 +48,13 @@ export default class PlanningEventManager { * YYYY-MM-DD HH:MM:SS * * @param dateString The string to get the date from - * @return {string|undefined} Date in format YYYY:MM:DD or undefined if given string is invalid + * @return {string|null} Date in format YYYY:MM:DD or null if given string is invalid */ - static getDateOnlyString(dateString: ?string) { + static getDateOnlyString(dateString: string) { if (PlanningEventManager.isEventDateStringFormatValid(dateString)) return dateString.split(" ")[0]; else - return undefined; + return null; } /** @@ -61,9 +75,9 @@ export default class PlanningEventManager { * Accepted format: YYYY-MM-DD HH:MM:SS * * @param dateString The string to convert - * @return {Date|undefined} The date object or undefined if the given string is invalid + * @return {Date|null} The date object or null if the given string is invalid */ - static stringToDate(dateString: ?string): Date | undefined { + static stringToDate(dateString: string): Date | null { let date = new Date(); if (PlanningEventManager.isEventDateStringFormatValid(dateString)) { let stringArray = dateString.split(' '); @@ -81,7 +95,7 @@ export default class PlanningEventManager { 0, ); } else - date = undefined; + date = null; return date; } @@ -116,12 +130,12 @@ export default class PlanningEventManager { * @param end End time in YYYY-MM-DD HH:MM:SS format * @return {string} Formatted string or "/ - /" on error */ - static getFormattedEventTime(start: ?string, end: ?string): string { + static getFormattedEventTime(start: string, end: string): string { let formattedStr = '/ - /'; let startDate = PlanningEventManager.stringToDate(start); let endDate = PlanningEventManager.stringToDate(end); - if (startDate !== undefined && endDate !== undefined && startDate.getTime() !== endDate.getTime()) { + if (startDate !== null && endDate !== null && startDate.getTime() !== endDate.getTime()) { formattedStr = String(startDate.getHours()).padStart(2, '0') + ':' + String(startDate.getMinutes()).padStart(2, '0') + ' - '; if (endDate.getFullYear() > startDate.getFullYear() @@ -131,7 +145,7 @@ export default class PlanningEventManager { else formattedStr += String(endDate.getHours()).padStart(2, '0') + ':' + String(endDate.getMinutes()).padStart(2, '0'); - } else if (startDate !== undefined) + } else if (startDate !== null) formattedStr = String(startDate.getHours()).padStart(2, '0') + ':' + String(startDate.getMinutes()).padStart(2, '0'); @@ -163,32 +177,30 @@ export default class PlanningEventManager { let end = new Date(new Date().setMonth(new Date().getMonth() + numberOfMonths + 1)); let daysOfYear = {}; for (let d = new Date(); d <= end; d.setDate(d.getDate() + 1)) { - daysOfYear[ - PlanningEventManager.getDateOnlyString( - PlanningEventManager.dateToString(new Date(d)) - )] = [] + const dateString = PlanningEventManager.getDateOnlyString( + PlanningEventManager.dateToString(new Date(d))); + if (dateString !== null) + daysOfYear[dateString] = [] } return daysOfYear; } - static generateEventAgenda(eventList: Array, numberOfMonths: number) { + static generateEventAgenda(eventList: Array, numberOfMonths: number) { let agendaItems = PlanningEventManager.generateEmptyCalendar(numberOfMonths); for (let i = 0; i < eventList.length; i++) { - console.log(PlanningEventManager.getDateOnlyString(eventList[i]["date_begin"])); - console.log(eventList[i]["date_begin"]); - if (PlanningEventManager.getDateOnlyString(eventList[i]["date_begin"]) !== undefined) { - this.pushEventInOrder(agendaItems, eventList[i], PlanningEventManager.getDateOnlyString(eventList[i]["date_begin"])); - } + const dateString = PlanningEventManager.getDateOnlyString(eventList[i].date_begin); + if (dateString !== null) + this.pushEventInOrder(agendaItems, eventList[i], dateString); } return agendaItems; } - static pushEventInOrder(agendaItems: Object, event: Object, startDate: string) { + static pushEventInOrder(agendaItems: Object, event: eventObject, startDate: string) { if (agendaItems[startDate].length === 0) agendaItems[startDate].push(event); else { for (let i = 0; i < agendaItems[startDate].length; i++) { - if (PlanningEventManager.isEventBefore(event["date_begin"], agendaItems[startDate][i]["date_begin"])) { + if (PlanningEventManager.isEventBefore(event.date_begin, agendaItems[startDate][i].date_end)) { agendaItems[startDate].splice(i, 0, event); break; } else if (i === agendaItems[startDate].length - 1) { diff --git a/utils/WebDataManager.js b/utils/WebDataManager.js index 2ee84cc..8db8e2a 100644 --- a/utils/WebDataManager.js +++ b/utils/WebDataManager.js @@ -1,3 +1,4 @@ +// @flow /** * Class used to get json data from the web @@ -8,7 +9,7 @@ export default class WebDataManager { lastDataFetched: Object = {}; - constructor(url) { + constructor(url: string) { this.FETCH_URL = url; } diff --git a/utils/__test__/PlanningEventManager.test.js b/utils/__test__/PlanningEventManager.test.js index 67e0424..11ea11e 100644 --- a/utils/__test__/PlanningEventManager.test.js +++ b/utils/__test__/PlanningEventManager.test.js @@ -35,13 +35,13 @@ test('isEventDateStringFormatValid', () => { test('stringToDate', () => { let testDate = new Date(); - expect(PlanningEventManager.stringToDate(undefined)).toBeUndefined(); - expect(PlanningEventManager.stringToDate("")).toBeUndefined(); - expect(PlanningEventManager.stringToDate("garbage")).toBeUndefined(); - expect(PlanningEventManager.stringToDate("2020-03-21")).toBeUndefined(); - expect(PlanningEventManager.stringToDate("09:00:00")).toBeUndefined(); - expect(PlanningEventManager.stringToDate("2020-03-21 09:g0:00")).toBeUndefined(); - expect(PlanningEventManager.stringToDate("2020-03-21 09:g0:")).toBeUndefined(); + expect(PlanningEventManager.stringToDate(undefined)).toBeNull(); + expect(PlanningEventManager.stringToDate("")).toBeNull(); + expect(PlanningEventManager.stringToDate("garbage")).toBeNull(); + expect(PlanningEventManager.stringToDate("2020-03-21")).toBeNull(); + expect(PlanningEventManager.stringToDate("09:00:00")).toBeNull(); + expect(PlanningEventManager.stringToDate("2020-03-21 09:g0:00")).toBeNull(); + expect(PlanningEventManager.stringToDate("2020-03-21 09:g0:")).toBeNull(); testDate.setFullYear(2020, 2, 21); testDate.setHours(9, 0, 0, 0); expect(PlanningEventManager.stringToDate("2020-03-21 09:00:00")).toEqual(testDate); @@ -75,10 +75,10 @@ test('getFormattedEventTime', () => { test('getDateOnlyString', () => { expect(PlanningEventManager.getDateOnlyString("2020-03-21 09:00:00")).toBe("2020-03-21"); expect(PlanningEventManager.getDateOnlyString("2021-12-15 09:00:00")).toBe("2021-12-15"); - expect(PlanningEventManager.getDateOnlyString("2021-12-o5 09:00:00")).toBeUndefined(); - expect(PlanningEventManager.getDateOnlyString("2021-12-15 09:")).toBeUndefined(); - expect(PlanningEventManager.getDateOnlyString("2021-12-15")).toBeUndefined(); - expect(PlanningEventManager.getDateOnlyString("garbage")).toBeUndefined(); + expect(PlanningEventManager.getDateOnlyString("2021-12-o5 09:00:00")).toBeNull(); + expect(PlanningEventManager.getDateOnlyString("2021-12-15 09:")).toBeNull(); + expect(PlanningEventManager.getDateOnlyString("2021-12-15")).toBeNull(); + expect(PlanningEventManager.getDateOnlyString("garbage")).toBeNull(); }); test('isEventBefore', () => {