@plusscommunities/pluss-maintenance-app 6.0.6-auth.0 → 6.1.2-beta.0

package/src/components/MaintenanceListItem.js

@@ -19,10 +19,11 @@ import moment from 'moment';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
 import { Services } from '../feature.config';
 import { Helper, Colours } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenanceListItem extends Component {
   onPressJob = () => {
-    Services.navigation.navigate('requestDetail', { job: this.props.job });
+    Services.navigation.navigate(values.screenRequestDetail, { job: this.props.job });
   };
 
   renderCommentCount() {
@@ -63,7 +64,7 @@ class MaintenanceListItem extends Component {
     const { job } = this.props;
     const createdTime = moment(job.createdUnix);
     const createdTimeText = `${createdTime.format('ddd, D MMMM')} • ${createdTime.format('h:mma')}`;
-    const assigneeText = job.Assignee ? `Assigned to\n${job.Assignee.displayName}` : '';
+    const activityTimeText = job.expectedDate ? moment(job.expectedDate).format('D MMMM') : '--';
     const { statusText, statusColor } = getJobStatusProps(job.status);
 
     return (
@@ -77,9 +78,7 @@ class MaintenanceListItem extends Component {
                 {job.room ? <Text style={styles.jobLocationText}>{job.room}</Text> : null}
                 <View style={styles.jobTypeSeenContainer}>
                   <View style={[styles.jobTypeContainer, { backgroundColor: Colours.hexToRGBAstring(this.props.colourBrandingMain, 0.2) }]}>
-                    <Text style={[styles.jobTypeText, { color: this.props.colourBrandingMain }]} numberOfLines={2}>
-                      {job.type}
-                    </Text>
+                    <Text style={[styles.jobTypeText, { color: this.props.colourBrandingMain }]}>{job.type}</Text>
                   </View>
                   {this.renderSeen()}
                 </View>
@@ -94,14 +93,14 @@ class MaintenanceListItem extends Component {
               <Text style={styles.jobCreatedText}>{createdTimeText}</Text>
               <View style={styles.jobActivityContainer}>
                 <View style={[styles.jobStatusContainer, { backgroundColor: statusColor }]}>
-                  {/* <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} /> */}
+                  <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} />
                   <Text style={styles.jobStatusText}>{statusText}</Text>
                 </View>
                 <View style={[styles.jobStatusLine, { borderColor: statusColor }]}>
                   <View style={styles.jobStatusLineMask} />
                 </View>
                 <View style={[styles.jobStatusCircle, { backgroundColor: statusColor }]} />
-                <Text style={styles.jobStatusDateText}>{assigneeText}</Text>
+                <Text style={styles.jobStatusDateText}>{activityTimeText}</Text>
               </View>
             </View>
           </View>
@@ -153,9 +152,8 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   jobTypeContainer: {
-    padding: 4,
-    minWidth: 80,
-    maxWidth: 140,
+    height: 20,
+    width: 80,
     borderRadius: 4,
     justifyContent: 'center',
   },
@@ -163,7 +161,6 @@ const styles = StyleSheet.create({
     fontFamily: 'sf-semibold',
     fontSize: 12,
     textAlign: 'center',
-    maxWidth: '100%',
   },
   jobSeenContainer: {
     flexDirection: 'row',
@@ -231,7 +228,7 @@ const styles = StyleSheet.create({
   jobStatusContainer: {
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'center',
+    justifyContent: 'space-between',
     width: 105,
     height: 30,
     paddingHorizontal: 8,
@@ -269,7 +266,7 @@ const styles = StyleSheet.create({
   jobStatusDateText: {
     flex: 1,
     textAlign: 'right',
-    fontFamily: 'sf-medium',
+    fontFamily: 'sf-bold',
     fontSize: 14,
     color: Colours.TEXT_DARK,
   },

package/src/components/MaintenanceWidgetItem.js

@@ -7,10 +7,11 @@ import _ from 'lodash';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
 import { Services } from '../feature.config';
 import { Colours, Helper } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenanceWidgetItem extends Component {
   onPressJob = () => {
-    Services.navigation.navigate('requestDetail', { job: this.props.job });
+    Services.navigation.navigate(values.screenRequestDetail, { job: this.props.job });
   };
 
   render() {
@@ -43,7 +44,7 @@ class MaintenanceWidgetItem extends Component {
             </View>
             <View style={styles.jobBottomSection}>
               <View style={[styles.jobStatusContainer, { backgroundColor: statusColor }]}>
-                {/* <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} /> */}
+                <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} />
                 <Text style={styles.jobStatusText}>{statusText}</Text>
               </View>
             </View>

package/src/components/StatusSelectorPopup.js

@@ -11,7 +11,6 @@ class StatusSelectorPopup extends PureComponent {
       ? filter.map(status => {
           return {
             name: status,
-            label: getJobStatusLabel(status),
             color: getJobStatusColour(status),
           };
         })
@@ -33,7 +32,7 @@ class StatusSelectorPopup extends PureComponent {
             return (
               <TouchableOpacity key={status.name} onPress={() => onSelect(status.name)}>
                 <View style={[styles.jobStatusContainer, { backgroundColor: status.color }]}>
-                  <Text style={styles.jobStatusText}>{status.label}</Text>
+                  <Text style={styles.jobStatusText}>{status.name}</Text>
                 </View>
               </TouchableOpacity>
             );

package/src/components/WidgetSmall.js

@@ -2,11 +2,12 @@ import React, { Component } from 'react';
 import { Text, View, ScrollView, StyleSheet } from 'react-native';
 import { connect } from 'react-redux';
 import _ from 'lodash';
-import { maintenanceActions } from '../apis';
+import { generalActions } from '../apis';
 import { jobsLoaded } from '../actions';
 import MaintenanceWidgetItem from './MaintenanceWidgetItem';
 import { Services } from '../feature.config';
 import { Colours, Components, Config } from '../core.config';
+import { values } from '../values.config';
 
 const MAX_ITEMS = 10;
 
@@ -27,7 +28,7 @@ class WidgetSmall extends Component {
   getTitle = () => {
     const { options } = this.props;
     if (options && !_.isEmpty(options.Title)) return options.Title;
-    return Config.env.strings.MAINTENANCE;
+    return this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
   };
 
   getEmptyStateText = () => {
@@ -39,7 +40,7 @@ class WidgetSmall extends Component {
   refresh = () => {
     this.onLoadingChanged(true, async () => {
       try {
-        const res = await maintenanceActions.getJobsRecursive(this.props.site);
+        const res = await generalActions.getJobsRecursive(this.props.site);
         // console.log('WidgetSmall - refresh', res.data);
         this.props.jobsLoaded(res);
       } catch (error) {
@@ -136,13 +137,15 @@ const styles = StyleSheet.create({
 });
 
 const mapStateToProps = state => {
-  const { user, jobs, notifications } = state;
+  const { user, notifications } = state;
+  const jobs = state[values.reducerKey];
   return {
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     jobs: _.orderBy(jobs.jobs, ['createdUnix'], ['desc']),
     site: user.site,
     userCategory: user.category,
-    dataUpdated: notifications.dataUpdated.jobs,
+    dataUpdated: notifications.dataUpdated[values.updateKey],
+    strings: state.strings?.config || {},
   };
 };
 

package/src/feature.config.js

@@ -1,5 +1,6 @@
 // import * as PlussCore from '../../pluss-core/src';
 import * as PlussCore from '@plusscommunities/pluss-core-app';
+import { values } from './values.config';
 
 export const Services = {
   navigation: null,
@@ -10,25 +11,25 @@ export const BaseComponents = {
 };
 
 const FeatureConfig = {
-  key: 'maintenance',
-  aliases: ['maintenanceRequest'],
-  title: 'Request',
+  key: values.featureKey,
+  aliases: values.aliases,
+  title: values.textFeatureTitle,
   gridMenu: {
-    icon: 'maintenance',
+    icon: values.iconGridMenu,
     viewBox: '0 0 30 30',
-    navigate: 'maintenance',
+    navigate: values.screenMaintenance,
   },
   addMenu: {
-    order: 5,
-    icon: 'request',
-    title: 'Request',
-    navigate: 'serviceRequest',
-    visibleExps: { type: 'feature', value: 'maintenance' },
+    order: values.orderAddMenu,
+    icon: values.iconAddMenu,
+    title: values.textAddMenuTitle,
+    navigate: values.screenServiceRequest,
+    visibleExps: { type: 'feature', value: values.featureKey },
   },
   moreMenu: {
-    order: 4,
-    title: 'Request',
-    navigate: 'maintenance',
+    order: values.orderMoreMenu,
+    title: values.textMoreMenuTitle,
+    navigate: values.screenMaintenance,
     visibleExps: {
       type: 'and',
       exps: [
@@ -38,10 +39,10 @@ const FeatureConfig = {
     },
   },
   kioskAction: {
-    order: 1,
-    icon: 'wrench',
-    title: 'Request',
-    navigate: 'serviceRequest',
+    order: values.orderKioskAction,
+    icon: values.iconKioskAction,
+    title: values.textKioskActionTitle,
+    navigate: values.screenServiceRequest,
   },
   hideTabBar: [],
   env: {
@@ -65,19 +66,6 @@ const FeatureConfig = {
     Services.navigation = navigation;
     BaseComponents.NotificationBell = notificationBell;
     PlussCore.Config.init(environment, navigation);
-
-    // Override strings
-    if (environment && environment.strings) {
-      const { MAINTENANCE, MAINTENANCE_REQUEST } = environment.strings;
-      if (MAINTENANCE) {
-        FeatureConfig.addMenu.title = MAINTENANCE;
-      }
-      if (MAINTENANCE_REQUEST) {
-        FeatureConfig.title = MAINTENANCE_REQUEST;
-        FeatureConfig.moreMenu.title = MAINTENANCE_REQUEST;
-        FeatureConfig.kioskAction.title = MAINTENANCE_REQUEST;
-      }
-    }
   },
 };
 export default FeatureConfig;

package/src/helper.js

@@ -1,20 +1,16 @@
-import { label } from 'aws-amplify';
 import { Colours } from './core.config';
 
 const jobStatusOptions = [
   {
     name: 'Unassigned',
-    label: 'Open',
     color: Colours.LINEGREY,
   },
   {
     name: 'In Progress',
-    label: 'In Progress',
     color: Colours.COLOUR_TEAL,
   },
   {
     name: 'Completed',
-    label: 'Completed',
     color: Colours.COLOUR_GREEN_LIGHT,
   },
 ];
@@ -24,16 +20,11 @@ const getJobStatusColour = status => {
   return option ? option.color : jobStatusOptions[0].color;
 };
 
-const getJobStatusLabel = status => {
-  const option = jobStatusOptions.find(item => item.name === status);
-  return option ? option.label : jobStatusOptions[0].label;
-};
-
 const getJobStatusProps = status => {
-  const statusText = getJobStatusLabel(status) || jobStatusOptions[0].label;
+  const statusText = status || jobStatusOptions[0].name;
   const statusColor = getJobStatusColour(statusText);
 
   return { statusText, statusColor };
 };
 
-export { jobStatusOptions, getJobStatusColour, getJobStatusProps, getJobStatusLabel };
+export { jobStatusOptions, getJobStatusColour, getJobStatusProps };

package/src/index.js

@@ -4,15 +4,22 @@ import ServiceRequest from './screens/ServiceRequest';
 import JobTypePicker from './screens/JobTypePicker';
 import RequestNotes from './screens/RequestNotes';
 import JobsReducer from './reducers/JobsReducer';
+import { values } from './values.config';
 
-export const Reducers = { jobs: JobsReducer };
-export const Screens = {
-  maintenance: MaintenancePage,
-  requestDetail: RequestDetail,
-  serviceRequest: ServiceRequest,
-  jobTypePicker: JobTypePicker,
-  requestNotes: RequestNotes,
-};
+export const Reducers = (() => {
+  const reducers = {};
+  reducers[values.reducerKey] = JobsReducer;
+  return reducers;
+})();
+export const Screens = (() => {
+  const screens = {};
+  screens[values.screenMaintenance] = MaintenancePage;
+  screens[values.screenRequestDetail] = RequestDetail;
+  screens[values.screenServiceRequest] = ServiceRequest;
+  screens[values.screenJobTypePicker] = JobTypePicker;
+  screens[values.screenRequestNotes] = RequestNotes;
+  return screens;
+})();
 export { default as Config } from './feature.config';
 export { default as WidgetSmall } from './components/WidgetSmall';
 export { default as WidgetLarge } from './components/WidgetLarge';

package/src/screens/MaintenancePage.js

@@ -5,6 +5,7 @@ import _ from 'lodash';
 import MaintenanceList from '../components/MaintenanceList';
 import { Services, BaseComponents } from '../feature.config';
 import { Components, Helper, Styles, Config } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenancePage extends Component {
   constructor(props) {
@@ -29,10 +30,11 @@ class MaintenancePage extends Component {
   };
 
   renderHeader() {
+    const title = this.props.title || this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
     if (this.state.isHomeTab) {
       return (
         <Components.Header
-          text={this.props.title || Config.env.strings.MAINTENANCE}
+          text={title}
           rightContent={
             _.includes(this.props.user.hidden, 'notifications') ? null : (
               <View style={styles.notificationContainer}>
@@ -46,9 +48,7 @@ class MaintenancePage extends Component {
         />
       );
     }
-    return (
-      <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack} text={this.props.title || Config.env.strings.MAINTENANCE} />
-    );
+    return <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack} text={values.textFeatureTitle} />;
   }
 
   render() {
@@ -89,6 +89,7 @@ const styles = StyleSheet.create({
 const mapStateToProps = state => {
   return {
     user: state.user,
+    strings: state.strings?.config || {},
   };
 };