Feature/cdhk 174

src/actions/allEvents.js

@@ -0,0 +1,21 @@
+import {ADD_EVENT, CLEAR_EVENTS} from '../constants/reducer_constants/allEvents';
+
+export function clearAllEvents () {
+	const action = {
+		type: CLEAR_EVENTS
+	};
+
+	return action;
+}
+
+export function addEvents (event) {
+	const action = {
+		type: ADD_EVENT,
+		event
+	}; 
+
+	return action;
+}
+
+
+

src/actions/index.js

@@ -3,6 +3,8 @@ import {
 	SET_SELECTED_SCHEDULE, 
 	SET_UNAVAILABLE_HOURS,
 	SET_SCHOOL_INFORMATION,
+	SET_SELECTED_CALENDAR,
+	UPDATE_NFE, 
 	SET_LANGUAGE,
 	SET_BOTTOM_STRINGS,
 	SET_IMG, 
@@ -25,7 +27,6 @@ import {
 	DELETE_COURSE,
 	DELETE_GENERATED_CALENDAR, 
 	UPDATE_FE, 
-	UPDATE_NFE, 
 	UPDATE_COURSE, 
 	CLEAR_GENERATED_CALENDAR,
 	CLEAR_CALENDAR,
@@ -43,6 +44,7 @@ import {
 	CLEAR_DASHBOARD_DATA,
 } from '../constants';
 
+export *  from './allEvents';
 
 /*** UPDATE ***/
 export function updateFixedEvents (index, event) {
@@ -249,6 +251,15 @@ export function setSchoolInformation (info) {
 	return action;
 }
 
+export function setSelectedCalendar(index) {
+	const action = {
+		type: SET_SELECTED_CALENDAR,
+		index
+	};
+
+	return action;
+}
+
 export function setLanguage (language) {
 	const action = {
 		type: SET_LANGUAGE,
@@ -257,6 +268,7 @@ export function setLanguage (language) {
 
 	return action;
 }
+
 export function setDashboardData (data) {
 	const action = {
 		type: SET_DASHBOARD_DATA,
@@ -422,4 +434,4 @@ export function clearBottomString () {
 	};
 
 	return action;
-}
+}

src/components/screens/Dashboard.js

@@ -104,7 +104,7 @@ class Dashboard extends React.PureComponent {
 	}
 
 	componentDidMount() {
-		this.setState({isVisible: true});     
+		this.setState({isVisible: true});
 		this.willFocusSubscription = this.props.navigation.addListener(
 			'willFocus',
 			() => {

src/components/screens/Home.js

@@ -10,6 +10,7 @@ import updateNavigation from '../NavigationHelper';
 import { bindActionCreators } from 'redux';
 import { googleSignIn, googleIsSignedIn, googleGetCurrentUserInfo } from '../../services/google_identity';
 import { createCalendar, getCalendarID2 } from '../../services/service';
+import { storeUserInfoService, updateUser } from '../../services/api/storage_services';
 import { homeStyles as styles } from '../../styles';
 import { getStrings } from '../../services/helper';
 
@@ -33,27 +34,52 @@ class Home extends React.PureComponent {
 	 * Sets the user information
 	 */
 	setUser = (userInfo) => {
-		this.props.logonUser(userInfo);	
+		this.props.logonUser(userInfo);
+		storeUserInfoService(userInfo)
+			.then(res => res.json())
+			.then((success) => {
+				if (success) {
+					this.props.logonUser(userInfo);
+					this.setCalendar().then(id => {
+						updateUser({values:[id], columns:['CALENDARID']});
+						this.props.navigation.navigate(DashboardNavigator);	
+					});
+				} else {
+					alert('There was an error setting Users data');
+				}
+			})
+			.catch((err) => {
+				console.log('err', err);
+			});
 	}
 
 	/**
 	 * Creates the Kalend calendar in the user's Google Account
 	 */
 	setCalendar() {
-		getCalendarID2().then(data => {
-			if (data.calendarID === undefined) {
-				createCalendar().then(data => {
-					this.props.setCalendarID(data.calendarID);
-					this.props.setCalendarColor(data.calendarColor);
-					this.props.navigation.navigate(DashboardNavigator);
+		return new Promise( async (resolve, reject) =>  {
+			await getCalendarID2()
+				.then( data => {
+					if (data.calendarID === undefined) {
+						createCalendar()
+							.then(id => {
+								this.props.setCalendarID(id);
+								this.props.setCalendarColor(data.calendarColor);
+								resolve(id);
+							});
+					} else {
+
+						this.props.setCalendarID(data.calendarID);
+						this.props.setCalendarColor(data.calendarColor);
+						resolve(data.calendarID);
+					}
+				}).catch(err => {
+					reject(err);
+					alert(err);
 				});
-			} else {
-				this.props.setCalendarID(data.calendarID);
-				this.props.setCalendarColor(data.calendarColor);
-				this.props.navigation.navigate(DashboardNavigator);
-			}
 		});
-	}
+	}	
+
 
 	/**
 	 * Log In the user with their Google Account
@@ -75,18 +101,19 @@ class Home extends React.PureComponent {
 					googleGetCurrentUserInfo().then((userInfo) => {
 						if (userInfo !== undefined) {
 							this.setUser(userInfo);
-							this.setCalendar();
 						}
 						googleSignIn().then((userInfo) => {
 							if (userInfo !== null) {
 								this.setUser(userInfo);
-								this.setCalendar();
 							}
 							this.state.clicked = false;
 						});
 					});
 				} else {
-					this.setCalendar();
+					this.setCalendar().then(id => {
+						updateUser({values:[id], columns:['CALENDARID']});	
+					});
+					this.props.navigation.navigate(DashboardNavigator);
 				}
 			});
 		}
@@ -120,7 +147,6 @@ class Home extends React.PureComponent {
 									color={GoogleSigninButton.Color.Light} 
 									onPress={this.signIn} />
 							</View>
-
 							<TouchableOpacity style={styles.cdhSection}
 								onPress={ ()=>{
 									Linking.openURL('https://cdhstudio.ca/fr');

src/components/screens/ReviewEvent.js

@@ -3,11 +3,13 @@ import { StatusBar, ScrollView, View, Text, TouchableOpacity, Platform,Alert } f
 import { FAB } from 'react-native-paper';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import { connect } from 'react-redux';
-import { deleteCourse, deleteFixedEvent, deleteNonFixedEvent, clearGeneratedCalendars, clearGeneratedNonFixedEvents, clearCourse, clearFixedEvents, setNavigationScreen } from '../../actions';
+import { deleteCourse, deleteFixedEvent, deleteNonFixedEvent, clearGeneratedCalendars, clearGeneratedNonFixedEvents, addEvents, clearCourse, clearFixedEvents, setNavigationScreen } from '../../actions';
 import { SchoolScheduleRoute, FixedEventRoute, NonFixedEventRoute, ScheduleCreationRoute, SchoolInformationRoute, CourseRoute } from '../../constants/screenNames';
 import EventOverview from '../EventOverview';
 import updateNavigation from '../NavigationHelper';
 import { store } from '../../store';
+import { bindActionCreators } from 'redux';
+import { storeGeneratedCalendars } from '../../services/api/storage_services';
 import { reviewEventStyles as styles, white, blue, statusBlueColor } from '../../styles';
 import { insertFixedEventsToGoogle } from '../../services/service';
 import { getStrings } from '../../services/helper';
@@ -188,8 +190,8 @@ class ReviewEvent extends React.PureComponent {
 	 * Goes to the appropriate Schedule Creation Screen
 	 */
 	navigateCreationScreen = () => {
-		this.props.dispatch(clearGeneratedCalendars());
-		this.props.dispatch(clearGeneratedNonFixedEvents());
+		this.props.clearGeneratedCalendars();
+		this.props.clearGeneratedNonFixedEvents();
 
 		if (this.state.schoolScheduleData.length == 0 && this.state.nonFixedEventData.length == 0 && this.state.fixedEventData.length == 0 ) {
 			Alert.alert(
@@ -203,29 +205,34 @@ class ReviewEvent extends React.PureComponent {
 			return;
 		}
 
-		if (this.state.nonFixedEventData.length == 0) {
-			insertFixedEventsToGoogle()
-				.then(() => {
-					this.props.dispatch(clearCourse());
-					this.props.dispatch(clearFixedEvents());
-					this.props.dispatch(setNavigationScreen({successfullyInsertedEvents: true}));
-					this.props.navigation.pop();
-				})
-				.catch(err => {
-					if (err) {
-						Alert.alert(
-							this.strings.error,
-							err,
-							[
-								{text: this.strings.ok},
-							],
-							{cancelable: false}
-						);
-					}
-				});
-		} else {
-			this.props.navigation.navigate(ScheduleCreationRoute, {title: getStrings().ScheduleCreation.title});
-		}
+		insertFixedEventsToGoogle()
+			.then((promises) => {
+				if (this.state.nonFixedEventData.length == 0) {
+					storeGeneratedCalendars(promises).then(success => {
+						if(success) {
+							this.props.clearCourse();
+							this.props.clearFixedEvents();
+							this.props.setNavigationScreen({successfullyInsertedEvents: true});
+							this.props.navigation.pop();
+						}
+					});
+				} else {
+					this.props.navigation.navigate(ScheduleCreationRoute, {title: getStrings().ScheduleCreation.title});	
+				}			
+			})
+			.catch(err => {
+				console.log('err', err);
+				if (err) {
+					Alert.alert(
+						this.strings.error,
+						err,
+						[
+							{text: this.strings.ok},
+						],
+						{cancelable: false}
+					);
+				}
+			});
 	}
 
 	render() {
@@ -359,4 +366,9 @@ function mapStateToProps(state) {
 	};
 }
 
-export default connect(mapStateToProps, null)(ReviewEvent);
+
+let mapDispatchToProps = (dispatch) => {
+	return bindActionCreators({ addEvents, clearGeneratedNonFixedEvents, clearGeneratedCalendars, clearCourse, clearFixedEvents, setNavigationScreen}, dispatch);
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(ReviewEvent);

src/components/screens/ScheduleCreation.js

@@ -3,8 +3,10 @@ import { StatusBar, BackHandler, Alert, Text, View, Platform } from 'react-nativ
 import * as Progress from 'react-native-progress';
 import { Surface } from 'react-native-paper';
 import { HeaderBackButton } from 'react-navigation';
-import { generateCalendars, setUserInfo, insertFixedEventsToGoogle } from '../../services/service';
+import { generateCalendars, setUserInfo } from '../../services/service';
 import { connect } from 'react-redux';
+import { addEvents } from '../../actions';
+import { bindActionCreators } from 'redux';
 import { DashboardNavigator, ScheduleSelectionRoute, ReviewEventRoute } from '../../constants/screenNames';
 import { scheduleCreateStyles as styles, dark_blue, white } from '../../styles';
 import updateNavigation from '../NavigationHelper';
@@ -39,29 +41,10 @@ class ScheduleCreation extends React.PureComponent {
 	componentWillMount() {
 		// Adds a little delay before going to the next screen
 		setUserInfo();
-		insertFixedEventsToGoogle()
-			.then(() => {
-				if (this.props.NonFixedEventsReducer.length != 0) {
-					setTimeout(() =>{ 
-						this.generateScheduleService();
-					}, 3000);
-				} else  {
-					this.setState({goToNextScreen: true});
-					this.navigateToSelection();
-				}
-			})
-			.catch(err => {
-				if (err) {
-					Alert.alert(
-						this.strings.error,
-						err,
-						[
-							{text: this.strings.ok, onPress: () => this.props.navigation.pop()},
-						],
-						{cancelable: false}
-					);
-				}
-			});
+		setTimeout(() =>{ 
+			this.generateScheduleService();
+		}, 3000);
+
 		BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
 		this.props.navigation.setParams({onBackPress:  this.handleBackButton});
 	}
@@ -154,4 +137,8 @@ let mapStateToProps = (state) => {
 	};
 };
 
-export default connect(mapStateToProps, null)(ScheduleCreation);
+let mapDispatchToProps = (dispatch) => {
+	return bindActionCreators({ addEvents }, dispatch);
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(ScheduleCreation);

src/components/screens/ScheduleSelection.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Platform, StatusBar, View, BackHandler, Alert, Text, ScrollView, Dimensions, TouchableOpacity, FlatList } from 'react-native';
 import { connect } from 'react-redux';
 import { HeaderBackButton } from 'react-navigation';
-import { setSelectedSchedule, deleteGeneratedCalendar, clearGeneratedCalendars, clearGeneratedNonFixedEvents } from '../../actions';
+import { setSelectedSchedule, deleteGeneratedCalendar, clearGeneratedCalendars, clearGeneratedNonFixedEvents} from '../../actions';
 import { calendarColors, calendarInsideColors } from '../../../config/config';
 import { DashboardNavigator, ScheduleSelectionDetailsRoute, ReviewEventRoute } from '../../constants/screenNames';
 import updateNavigation from '../NavigationHelper';