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

package/src/screens/RequestDetail.js

@@ -11,6 +11,7 @@ import StatusSelectorPopup from '../components/StatusSelectorPopup';
 import { jobStatusOptions, getJobStatusProps } from '../helper';
 import { Services } from '../feature.config';
 import { Colours, Helper, Components, Config } from '../core.config';
+import { values } from '../values.config';
 
 class RequestDetail extends Component {
   constructor(props) {
@@ -30,6 +31,7 @@ class RequestDetail extends Component {
       showFullscreenVideo: false,
       currentVideoUrl: '',
       galleryOpen: false,
+      galleryImages: [],
       showMessages: false,
       assignees: [],
     };
@@ -41,23 +43,17 @@ class RequestDetail extends Component {
 
   componentDidMount() {
     this.getJob();
-    this.updateJobState();
+    this.updateJobState(this.props.job);
     this.getAssignees();
   }
 
-  componentDidUpdate(prevProps) {
-    if (prevProps.jobs !== this.props.jobs) {
-      this.updateJobState();
-    }
-  }
-
   getJob = async () => {
     console.log('getting job');
     this.setState({ loading: true }, async () => {
       try {
         const res = await maintenanceActions.getJob(this.props.job.site, this.props.job.id);
         this.props.jobAdded(res.data);
-        console.log('got the job');
+        this.updateJobState(res.data);
       } catch (error) {
         console.log('getJob error', error.toString());
         // check for 403 or 404 error
@@ -83,8 +79,12 @@ class RequestDetail extends Component {
     }
   };
 
-  updateJobState() {
-    const job = _.find(this.props.jobs, j => j.id === this.props.job.id) || this.props.job;
+  updateJobState(defaultJob) {
+    const job = _.find(this.props.jobs, j => j.id === this.props.job.id) || defaultJob;
+    if (!job) {
+      this.getJob();
+      return;
+    }
     const newState = { job, status: job.status };
     if (job.expectedDate) {
       newState.expectedDate = moment(job.expectedDate);
@@ -111,6 +111,7 @@ class RequestDetail extends Component {
         const res = await maintenanceActions.editJob(updated, user.site);
         // console.log('markSeen updated');
         this.props.jobAdded(res.data.job);
+        this.getJob();
         this.setState({ loading: false, seen: true });
       } catch (error) {
         console.log('markSeen error', error);
@@ -132,6 +133,7 @@ class RequestDetail extends Component {
         }
         const res = await maintenanceActions.editJob(updated, user.site);
         this.props.jobAdded(res.data.job);
+        this.getJob();
       } catch (error) {
         console.log('updateJob error', error);
       } finally {
@@ -145,6 +147,7 @@ class RequestDetail extends Component {
       try {
         const res = await maintenanceActions.editJobStatus(this.props.job.id, this.state.status);
         this.props.jobAdded(res.data.job);
+        this.getJob();
       } catch (error) {
         console.log('updateJobStatus error', error);
       } finally {
@@ -172,7 +175,7 @@ class RequestDetail extends Component {
   };
 
   openStaffNotes = () => {
-    Services.navigation.navigate('requestNotes', { job: this.state.job });
+    Services.navigation.navigate(values.screenRequestNotes, { job: this.state.job, onChange: this.getJob });
   };
 
   onOpenDatePicker = () => {
@@ -219,6 +222,7 @@ class RequestDetail extends Component {
         const job = await maintenanceActions.getJob(this.props.user.site, this.props.job.id);
         // console.log('onCommentAdded', job?.data);
         this.props.jobAdded(job.data);
+        this.getJob();
       } catch (error) {
         console.log('onCommentAdded error', error);
       } finally {
@@ -230,10 +234,10 @@ class RequestDetail extends Component {
   hasPermission = () => {
     const { job } = this.state;
     const { permissions } = this.props.user;
-    if (_.includes(permissions, 'maintenanceTracking')) {
+    if (_.includes(permissions, values.permissionMaintenanceTracking)) {
       return true;
     }
-    if (_.includes(permissions, 'maintenanceAssignment')) {
+    if (_.includes(permissions, values.permissionMaintenanceAssign)) {
       return job.AssigneeId === this.props.user.Id;
     }
     return false;
@@ -244,9 +248,10 @@ class RequestDetail extends Component {
     this.setState({ showFullscreenVideo: url.length > 0, currentVideoUrl: url });
   };
 
-  openGallery(index) {
+  openGallery(galleryImages, index) {
     this.setState({
       galleryOpen: true,
+      galleryImages,
     });
     this.refs.imagePopup.scrollTo(index);
   }
@@ -275,6 +280,7 @@ class RequestDetail extends Component {
         console.log('onSelectAssignee', this.props.job.id, assignee.key);
         const res = await maintenanceActions.assignJob(this.props.job.id, assignee.key);
         this.props.jobAdded(res.data.job);
+        this.getJob();
       } catch (error) {
         console.log('onSelectAssignee error', error);
       } finally {
@@ -296,7 +302,9 @@ class RequestDetail extends Component {
     return (
       <View style={{ ...Helper.getShadowStyle() }}>
         <View style={styles.jobTitleContainer}>
-          {job.jobId ? <Text style={[styles.jobIdText, { color: this.props.colourBrandingMain }]}>{`Job #${job.jobId}`}</Text> : null}
+          {job.jobId ? (
+            <Text style={[styles.jobIdText, { color: this.props.colourBrandingMain }]}>{`${values.textEntityName} #${job.jobId}`}</Text>
+          ) : null}
           <Text style={styles.jobTitleText}>{job.title}</Text>
           <View style={styles.jobTypeSeenContainer}>
             <View style={[styles.jobTypeContainer, { backgroundColor: Colours.hexToRGBAstring(this.props.colourBrandingMain, 0.2) }]}>
@@ -359,7 +367,8 @@ class RequestDetail extends Component {
     );
   }
 
-  renderPlayableImageUrl(url, index, containerStyle, showMore) {
+  renderPlayableImageUrl(images, index, containerStyle, showMore) {
+    const url = images[index || 0];
     const thumbUrl = Helper.getThumb300(url);
 
     if (Helper.isVideo(url)) {
@@ -376,7 +385,7 @@ class RequestDetail extends Component {
 
     const imageUrl = Helper.get1400(url);
     return (
-      <TouchableOpacity style={containerStyle} onPress={this.openGallery.bind(this, index || 0)}>
+      <TouchableOpacity style={containerStyle} onPress={this.openGallery.bind(this, images, index || 0)}>
         <ImageBackground style={styles.imageContainer} source={{ uri: imageUrl }}>
           {showMore && <Text style={styles.plusImages}>+{this.state.job.images.length - 2}</Text>}
         </ImageBackground>
@@ -384,26 +393,24 @@ class RequestDetail extends Component {
     );
   }
 
-  renderPlayableImage(index, containerStyle, showMore) {
-    const url = this.state.job.images[index];
-    return this.renderPlayableImageUrl(url, index, containerStyle, showMore);
+  renderPlayableImage(images, index, containerStyle, showMore) {
+    return this.renderPlayableImageUrl(images, index, containerStyle, showMore);
   }
 
-  renderImage() {
-    const { job } = this.state;
-    if (!_.isNil(job.images) && !_.isEmpty(job.images)) {
-      if (job.images.length >= 2) {
+  renderImage(images, image = null) {
+    if (!_.isNil(images) && !_.isEmpty(images)) {
+      if (images.length >= 2) {
         return (
           <View style={styles.sideBySideImages}>
-            {this.renderPlayableImage(0, styles.sideBySideImageContainer)}
-            {this.renderPlayableImage(1, styles.sideBySideImageContainer, job.images.length > 2)}
+            {this.renderPlayableImage(images, 0, styles.sideBySideImageContainer)}
+            {this.renderPlayableImage(images, 1, styles.sideBySideImageContainer, images.length > 2)}
           </View>
         );
       } else {
-        return <View style={styles.singleImageContainer}>{this.renderPlayableImage(0)}</View>;
+        return <View style={styles.singleImageContainer}>{this.renderPlayableImage(images, 0)}</View>;
       }
-    } else if (!_.isNil(job.image)) {
-      return <View style={styles.singleImageContainer}>{this.renderPlayableImageUrl(job.image)}</View>;
+    } else if (!_.isNil(image)) {
+      return <View style={styles.singleImageContainer}>{this.renderPlayableImageUrl([image], 0)}</View>;
     }
     return null;
   }
@@ -412,7 +419,7 @@ class RequestDetail extends Component {
     return (
       <Components.ImagePopup
         visible={this.state.galleryOpen}
-        images={this.state.job.images || [this.state.job.image]}
+        images={this.state.galleryImages}
         onClose={this.closeGallery.bind(this)}
         ref="imagePopup"
       />
@@ -455,8 +462,43 @@ class RequestDetail extends Component {
     return content;
   }
 
+  renderCustomFields() {
+    const { job } = this.state;
+    const { customFields } = job;
+
+    const renderAnswer = field => {
+      switch (field.type) {
+        case 'date':
+          return <Text style={styles.customText}>{field.answer ? moment(field.answer, 'YYYY-MM-DD').format('DD MMM YYYY') : ''}</Text>;
+        case 'time':
+          return <Text style={styles.customText}>{field.answer ? moment(field.answer, 'HH:mm').format('h:mm a') : ''}</Text>;
+        case 'yn':
+          return <Text style={styles.customText}>{field.answer ? 'Yes' : 'No'}</Text>;
+        case 'checkbox':
+          return <Text style={styles.customText}>{field.answer && Array.isArray(field.answer) ? field.answer.join(', ') : ''}</Text>;
+        case 'image':
+          return <View style={{ marginTop: 8 }}>{this.renderImage(field.answer)}</View>;
+        default:
+          return <Text style={styles.customText}>{field.answer}</Text>;
+      }
+    };
+
+    return customFields.map((field, index) => {
+      if (['staticTitle', 'staticText'].includes(field.type)) return null;
+      if (_.isNil(field.answer) || field.answer === '' || (Array.isArray(field.answer) && field.answer.length === 0)) return null;
+      return (
+        <View key={index}>
+          <Text style={styles.customLabel}>{field.label}</Text>
+          {renderAnswer(field)}
+        </View>
+      );
+    });
+  }
+
   rendeDetails() {
     const { job } = this.state;
+    const { customFields } = job;
+    const hasCustomFields = customFields && customFields.length > 0;
 
     return (
       <View>
@@ -469,15 +511,20 @@ class RequestDetail extends Component {
         />
         {this.state.showMore && (
           <View>
-            {this.renderImage()}
-            {!_.isEmpty(job.description) && (
-              <Text numberOfLines={10} style={styles.jobDescriptionText}>
-                {job.description}
-              </Text>
-            )}
-            <Text style={styles.locationLabel}>Location</Text>
+            {hasCustomFields ? this.renderCustomFields() : null}
+            {!hasCustomFields ? (
+              <>
+                {this.renderImage(job.images, job.image)}
+                {!_.isEmpty(job.description) && (
+                  <Text numberOfLines={10} style={styles.jobDescriptionText}>
+                    {job.description}
+                  </Text>
+                )}
+              </>
+            ) : null}
+            <Text style={styles.locationLabel}>Address</Text>
             <Text style={styles.locationText}>{job.room}</Text>
-            {job.isHome ? (
+            {!hasCustomFields && job.isHome ? (
               <View style={styles.detailsSection}>
                 <Text style={styles.locationLabel}>Must be home</Text>
                 <Text style={styles.locationText}>{job.homeText}</Text>
@@ -504,8 +551,8 @@ class RequestDetail extends Component {
           ref={this.commentSection}
           commentReply={this.commentReply}
           scrollView={this.scrollView}
-          adminPermission="maintenanceTracking"
-          entityType="maintenancerequest"
+          adminPermission={values.permissionMaintenanceTracking}
+          entityType={values.featureKey}
           entityId={this.props.job.id}
           entityName={this.props.job.title}
           site={this.state.job.site || this.state.job.location}
@@ -542,7 +589,7 @@ class RequestDetail extends Component {
         ref={this.commentReply}
         commentSection={this.commentSection}
         scrollView={this.scrollView}
-        entityType="maintenancerequest"
+        entityType={values.featureKey}
         entityId={this.props.job.id}
         entityName={this.props.job.title}
         site={this.state.job.site || this.state.job.location}
@@ -831,13 +878,37 @@ const styles = StyleSheet.create({
     marginLeft: 10,
     lineHeight: 24,
   },
+  customLabel: {
+    fontFamily: 'sf-bold',
+    fontSize: 14,
+    color: Colours.TEXT_DARKEST,
+  },
+  customText: {
+    fontFamily: 'sf-regular',
+    fontSize: 16,
+    color: Colours.TEXT_DARKEST,
+    paddingVertical: 8,
+  },
+  customStaticTitle: {
+    fontSize: 20,
+    fontFamily: 'sf-semibold',
+    color: Colours.TEXT_DARKEST,
+    marginBottom: 10,
+  },
+  customStaticText: {
+    fontSize: 17,
+    fontFamily: 'sf-regular',
+    color: Colours.TEXT_DARKEST,
+    lineHeight: 24,
+    marginBottom: 10,
+  },
 });
 
 const mapStateToProps = state => {
   return {
     user: state.user,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
-    jobs: state.jobs.jobs,
+    jobs: state[values.reducerKey].jobs,
   };
 };
 

package/src/screens/RequestNotes.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { ScrollView, View, Text, TouchableOpacity, Modal, KeyboardAvoidingView } from 'react-native';
+import { ScrollView, View, Text, TouchableOpacity, Modal, KeyboardAvoidingView, Platform } from 'react-native';
 import { connect } from 'react-redux';
 import { Icon } from 'react-native-elements';
 import _ from 'lodash';
@@ -9,6 +9,7 @@ import { maintenanceActions } from '../apis';
 import { getBottomSpace } from 'react-native-iphone-x-helper';
 import { Services } from '../feature.config';
 import { Components, Colours, Helper } from '../core.config';
+import { values } from '../values.config';
 
 class RequestNotes extends Component {
   constructor(props) {
@@ -68,6 +69,7 @@ class RequestNotes extends Component {
     const newJob = { ...this.props.job };
     newJob.Notes = newNotes;
     this.props.jobAdded(newJob);
+    this.props.onChange && this.props.onChange();
     this.setState({
       job: newJob,
       noteToDelete: null,
@@ -158,6 +160,7 @@ class RequestNotes extends Component {
         },
         () => {
           this.props.jobAdded(res.data.job);
+          this.props.onChange && this.props.onChange();
         },
       );
     } catch (err) {
@@ -408,7 +411,7 @@ const mapStateToProps = state => {
     user: state.user,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     colourBrandingLight: Colours.getLightBrandingColourFromState(state),
-    jobs: state.jobs.jobs,
+    jobs: state[values.reducerKey].jobs,
   };
 };