Merge pull request #1169 from StoDevX/split-building-hours-helpers

Split building-hours-helpers apart into individual files

Author: hawkrives

package.json

@@ -72,6 +72,7 @@
     "react-native-button": "1.8.2",
     "react-native-communications": "2.2.1",
     "react-native-custom-tabs": "0.1.4",
+    "react-native-datepicker": "1.5.1",
     "react-native-device-info": "0.10.2",
     "react-native-google-analytics-bridge": "5.0.1",
     "react-native-keychain": "1.2.0",

source/navigation.js

@@ -17,6 +17,8 @@ import JobDetailView from './views/sis/student-work/detail'
 import {
   BuildingHoursView,
   BuildingHoursDetailView,
+  BuildingHoursProblemReportView,
+  BuildingHoursScheduleEditorView,
 } from './views/building-hours'
 import TransportationView from './views/transportation'
 import SettingsView from './views/settings'
@@ -34,6 +36,8 @@ export const AppNavigator = StackNavigator(
     HomeView: {screen: HomeView},
     BuildingHoursDetailView: {screen: BuildingHoursDetailView},
     BuildingHoursView: {screen: BuildingHoursView},
+    BuildingHoursProblemReportView: {screen: BuildingHoursProblemReportView},
+    BuildingHoursScheduleEditorView: {screen: BuildingHoursScheduleEditorView},
     CalendarView: {screen: CalendarView},
     ContactsView: {screen: ContactsView},
     CreditsView: {screen: CreditsView},

source/views/building-hours/building-hours-helpers.js

@@ -11,10 +11,7 @@ import type {BuildingType} from '../types'
 import moment from 'moment-timezone'
 import ParallaxView from 'react-native-parallax-view'
 import * as c from '../../components/colors'
-import {
-  normalizeBuildingSchedule,
-  getShortBuildingStatus,
-} from '../building-hours-helpers'
+import {getShortBuildingStatus} from '../lib'
 
 import {Badge} from './badge'
 import {Header} from './header'

source/views/building-hours/detail/building.js

@@ -10,8 +10,7 @@ import type {BuildingType} from '../types'
 import type momentT from 'moment'
 import moment from 'moment-timezone'
 import {BuildingDetail} from './building'
-
-const CENTRAL_TZ = 'America/Winnipeg'
+import {CENTRAL_TZ} from '../lib'
 
 export class BuildingHoursDetailView extends React.PureComponent {
   static navigationOptions = ({navigation}) => {
@@ -42,6 +41,12 @@ export class BuildingHoursDetailView extends React.PureComponent {
     this.setState({now: moment.tz(CENTRAL_TZ)})
   }
 
+  reportProblem = () => {
+    this.props.navigation.navigate('BuildingHoursProblemReportView', {
+      initialBuilding: this.props.navigation.state.params.building,
+    })
+  }
+
   render() {
     const info = this.props.navigation.state.params.building
     const {now} = this.state

source/views/building-hours/detail/index.js

@@ -8,7 +8,7 @@ import React from 'react'
 import {View, Text, StyleSheet} from 'react-native'
 import type {SingleBuildingScheduleType} from '../types'
 
-import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
+import {formatBuildingTimes, summarizeDays} from '../lib'
 
 export class ScheduleRow extends React.PureComponent {
   props: {

source/views/building-hours/detail/schedule-row.android.js

@@ -9,7 +9,7 @@ import {StyleSheet} from 'react-native'
 import type {SingleBuildingScheduleType} from '../types'
 import moment from 'moment-timezone'
 import {Cell} from 'react-native-tableview-simple'
-import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
+import {formatBuildingTimes, summarizeDays} from '../lib'
 
 export class ScheduleRow extends React.PureComponent {
   props: {