@plusscommunities/pluss-maintenance-app 6.0.13 → 6.0.14-beta.1

package/src/screens/RequestDetail.js

@@ -37,6 +37,7 @@ class RequestDetail extends Component {
       galleryImages: [],
       showMessages: false,
       assignees: [],
+      selectedPDF: null,
     };
 
     this.scrollView = React.createRef();
@@ -333,7 +334,7 @@ class RequestDetail extends Component {
     const statusOption = getJobStatus(status, this.props);
     const priority = getJobPriority(job.priority);
     const canEdit = this.hasPermission();
-    const isStaff = this.props.user.category === 'staff'
+    const isStaff = this.props.user.category === 'staff';
     const showSeen = !status || status === getJobStatus(null, this.props).text;
 
     return (
@@ -464,6 +465,24 @@ class RequestDetail extends Component {
     return null;
   }
 
+  renderDocument(documents) {
+    const { colourBrandingMain } = this.props;
+
+    if (!_.isNil(documents) && !_.isEmpty(documents)) {
+      return documents.map((document, index) => {
+        return (
+          <TouchableOpacity key={index} style={styles.documentContainer} onPress={() => this.setState({ selectedPDF: document })}>
+            <View style={{ ...styles.documentTypeContainer, backgroundColor: colourBrandingMain }}>
+              <Text style={styles.documentTypeText}>{document.ext}</Text>
+            </View>
+            <Text style={styles.documentText}>{`${document.name}${document.uploading ? ` - ${document.uploadProgress}` : ''}`}</Text>
+          </TouchableOpacity>
+        );
+      });
+    }
+    return null;
+  }
+
   renderImagePopup() {
     return (
       <Components.ImagePopup
@@ -475,6 +494,18 @@ class RequestDetail extends Component {
     );
   }
 
+  renderDocumentPopup() {
+    if (_.isEmpty(this.state.selectedPDF)) return null;
+    return (
+      <Components.PDFPopup
+        source={this.state.selectedPDF.url}
+        onClose={() => this.setState({ selectedPDF: null })}
+        title={this.state.selectedPDF.name}
+        pdfCount={1}
+      />
+    );
+  }
+
   renderAssignee() {
     const { job } = this.state;
     if (!this.hasPermission() && !job.Assignee) return null;
@@ -526,7 +557,9 @@ class RequestDetail extends Component {
         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>;
+          return <View style={styles.customImage}>{this.renderImage(field.answer)}</View>;
+        case 'document':
+          return <View style={styles.customDocument}>{this.renderDocument(field.answer)}</View>;
         default:
           return <Text style={styles.customText}>{field.answer}</Text>;
       }
@@ -642,8 +675,8 @@ class RequestDetail extends Component {
         entityId={this.props.job.id}
         entityName={this.props.job.title}
         site={this.state.job.site || this.state.job.location}
-      // noScroll={true}
-      // style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
+        // noScroll={true}
+        // style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
       />
     );
   }
@@ -678,6 +711,7 @@ class RequestDetail extends Component {
         {this.renderStatusPopup()}
         {this.renderPriorityPopup()}
         {this.renderImagePopup()}
+        {this.renderDocumentPopup()}
         <DateTimePicker
           isVisible={this.state.isDateTimePickerVisible}
           onConfirm={this.onDateSelected}
@@ -949,6 +983,13 @@ const styles = StyleSheet.create({
     color: Colours.TEXT_DARKEST,
     paddingVertical: 8,
   },
+  customImage: {
+    marginTop: 8,
+  },
+  customDocument: {
+    marginTop: 8,
+    marginBottom: 16,
+  },
   customStaticTitle: {
     fontSize: 20,
     fontFamily: 'sf-semibold',
@@ -962,6 +1003,31 @@ const styles = StyleSheet.create({
     lineHeight: 24,
     marginBottom: 10,
   },
+  documentContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    paddingVertical: 4,
+  },
+  documentTypeContainer: {
+    width: 50,
+    height: 60,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    marginRight: 8,
+  },
+  documentTypeText: {
+    color: '#fff',
+    fontFamily: 'sf-semibold',
+    textAlign: 'center',
+  },
+  documentText: {
+    flex: 1,
+    fontFamily: 'sf-semibold',
+    fontSize: 16,
+    color: '#65686D',
+  },
 });
 
 const mapStateToProps = state => {

package/src/screens/ServiceRequest.js

@@ -62,6 +62,7 @@ class MaintenanceRequest extends Component {
 
       customFields: [],
       customFieldImages: {},
+      customFieldDocuments: {},
       isDateTimePickerVisible: false,
       popUpType: 'date',
       dateFieldId: null,
@@ -150,7 +151,7 @@ class MaintenanceRequest extends Component {
     this.setState(update);
   };
 
-  onUploadStarted = (uploadUri, imageUri) => {
+  onUploadStartedImage = (uploadUri, imageUri) => {
     const { imageFieldId } = this.state;
     const imagesUpdate = this.getImages(imageFieldId);
     imagesUpdate.splice(imagesUpdate.length - 1, 0, {
@@ -164,7 +165,7 @@ class MaintenanceRequest extends Component {
     this.setImages(imagesUpdate, imageFieldId);
   };
 
-  onUploadProgress = progress => {
+  onUploadProgressImage = progress => {
     const { imageFieldId } = this.state;
     const imagesUpdate = this.getImages(imageFieldId);
     imagesUpdate.map(img => {
@@ -178,7 +179,7 @@ class MaintenanceRequest extends Component {
     this.setImages(imagesUpdate, imageFieldId);
   };
 
-  onUploadSuccess = async (uri, uploadUri) => {
+  onUploadSuccessImage = async (uri, uploadUri) => {
     const { imageFieldId } = this.state;
     const imagesUpdate = this.getImages(imageFieldId);
     imagesUpdate.map(img => {
@@ -193,7 +194,7 @@ class MaintenanceRequest extends Component {
     this.setImages(imagesUpdate, imageFieldId, () => this.waitForThumbnails());
   };
 
-  onUploadFailed = uploadUri => {
+  onUploadFailedImage = uploadUri => {
     const { imageFieldId } = this.state;
     const imagesUpdate = this.getImages(imageFieldId);
     imagesUpdate.map(img => {
@@ -221,6 +222,61 @@ class MaintenanceRequest extends Component {
     this.setImages(imagesUpdate, imageFieldId);
   };
 
+  onUploadStartedDocument = (uploadUri, documentUri, documentName, documentExt, documentFieldId) => {
+    const documentsUpdate = this.getDocuments(documentFieldId);
+    documentsUpdate.splice(documentsUpdate.length - 1, 0, {
+      uploading: true,
+      uploadProgress: '0%',
+      uploadUri,
+      documentUri,
+      documentName,
+      documentExt,
+      allowRetry: true,
+    });
+
+    this.setDocuments(documentsUpdate, documentFieldId);
+  };
+
+  onUploadProgressDocument = (progress, documentFieldId) => {
+    const documentsUpdate = this.getDocuments(documentFieldId);
+    documentsUpdate.map(doc => {
+      if (doc.uploadUri === progress.uri) {
+        doc.uploadProgress = progress.percentage;
+        doc.uploading = true;
+        doc.allowRetry = true;
+      }
+    });
+
+    this.setDocuments(documentsUpdate, documentFieldId);
+  };
+
+  onUploadSuccessDocument = async (uri, uploadUri, documentFieldId) => {
+    const documentsUpdate = this.getDocuments(documentFieldId);
+    documentsUpdate.map(doc => {
+      if (doc.uploadUri === uploadUri && doc.uploading) {
+        doc.uploading = false;
+        doc.uploadProgress = '100%';
+        doc.url = uri;
+        doc.allowRetry = true;
+      }
+    });
+
+    this.setDocuments(documentsUpdate, documentFieldId);
+  };
+
+  onUploadFailedDocument = (uploadUri, documentFieldId) => {
+    const documentsUpdate = this.getDocuments(documentFieldId);
+    documentsUpdate.map(doc => {
+      if (doc.uploadUri === uploadUri) {
+        doc.uploading = true; // Requried for retry
+        doc.uploadProgress = '';
+        doc.allowRetry = true;
+      }
+    });
+
+    this.setDocuments(documentsUpdate, documentFieldId);
+  };
+
   onPressBack() {
     Services.navigation.goBack();
   }
@@ -260,6 +316,7 @@ class MaintenanceRequest extends Component {
         fail: false,
         customFields: [],
         customFieldImages: {},
+        customFieldDocuments: {},
         isDateTimePickerVisible: false,
         popUpType: 'date',
         dateFieldId: null,
@@ -273,14 +330,17 @@ class MaintenanceRequest extends Component {
     const { mandatory, type, answer } = field;
     if (['staticTitle', 'staticText'].includes(type)) return true;
 
-    const imagesList = type === 'image' ? this.getImageUrls(fieldId) : [];
     const checkMandatory = () => {
       if (!mandatory) return true;
       switch (type) {
         case 'yn':
           return _.isBoolean(answer);
         case 'image':
+          const imagesList = this.getImageUrls(fieldId);
           return imagesList.length > 0;
+        case 'document':
+          const documentsList = this.getDocumentAnswers(fieldId);
+          return documentsList.length > 0;
         case 'checkbox':
           return _.isArray(answer) && answer.length > 0;
         default:
@@ -312,7 +372,6 @@ class MaintenanceRequest extends Component {
         this.setState({
           types: res.data,
         });
-        console.log(res.data);
         this.getDefaultJob();
       })
       .catch(() => {});
@@ -322,7 +381,6 @@ class MaintenanceRequest extends Component {
     const { types } = this.state;
     const selected = types.find(t => t.typeName === type) || {};
     if (values.forceCustomFields && !selected.hasCustomFields) {
-      console.log(selected);
       this.setState({
         type,
         customFields: [],
@@ -379,6 +437,7 @@ class MaintenanceRequest extends Component {
     const customFields = _.cloneDeep(this.state.customFields);
     const updatedCustomFields = customFields.map((field, fieldId) => {
       if (field.type === 'image') field.answer = this.getImageUrls(fieldId);
+      if (field.type === 'document') field.answer = this.getDocumentAnswers(fieldId);
       return field;
     });
 
@@ -543,20 +602,54 @@ class MaintenanceRequest extends Component {
     this.setImages(imagesUpdate, fieldId);
   };
 
+  getDocuments = (fieldId = null) => {
+    const { customFieldDocuments } = this.state;
+    const documentsList = _.cloneDeep(customFieldDocuments[fieldId]) || [];
+    return documentsList;
+  };
+
+  setDocuments = (documentsList, fieldId) => {
+    let update = {};
+    const customFieldDocuments = _.cloneDeep(this.state.customFieldDocuments);
+    customFieldDocuments[fieldId] = documentsList;
+    update = { customFieldDocuments };
+    this.setState(update);
+  };
+
+  getDocumentAnswers = fieldId => {
+    const documentsList = this.getDocuments(fieldId);
+    return _.filter(documentsList, doc => {
+      return !doc.uploading && doc.url;
+    }).map(doc => {
+      return {
+        name: doc.documentName,
+        ext: doc.documentExt,
+        url: doc.url,
+      };
+    });
+  };
+
+  removeDocument = (index, fieldId) => {
+    const documentsUpdate = this.getDocuments(fieldId);
+    documentsUpdate.splice(index, 1);
+
+    this.setDocuments(documentsUpdate, fieldId);
+  };
+
   toggleFullscreenVideo = url => {
     if (typeof url !== 'string') url = '';
     this.setState({ showFullscreenVideo: url.length > 0, currentVideoUrl: url });
   };
 
-  renderUploadMenu() {
+  renderImageUploader() {
     return (
       <Components.ImageUploader
         ref={ref => (this.imageUploader = ref)}
-        onUploadStarted={this.onUploadStarted}
-        onUploadSuccess={this.onUploadSuccess}
-        onUploadFailed={this.onUploadFailed}
-        onUploadProgress={this.onUploadProgress}
-        onLibrarySelected={this.onLibrarySelected}
+        onUploadStarted={this.onUploadStartedImage}
+        onUploadSuccess={this.onUploadSuccessImage}
+        onUploadFailed={this.onUploadFailedImage}
+        onUploadProgress={this.onUploadProgressImage}
+        onLibrarySelected={this.onLibrarySelectedImage}
         size={{ width: 1400 }}
         quality={0.8}
         fileName={'serviceImage'}
@@ -623,6 +716,23 @@ class MaintenanceRequest extends Component {
     );
   }
 
+  renderDocument(item, index, fieldId = null) {
+    const { colourBrandingMain } = this.props;
+    return (
+      <View key={index} style={styles.documentContainer}>
+        <View style={{ ...styles.documentTypeContainer, backgroundColor: colourBrandingMain }}>
+          <Text style={styles.documentTypeText}>{item.documentExt}</Text>
+        </View>
+        <Text style={styles.documentText}>{`${item.documentName}${item.uploading ? ` - ${item.uploadProgress}` : ''}`}</Text>
+        {!item.uploading && (
+          <TouchableOpacity style={styles.removeDocumentButton} onPress={() => this.removeDocument(index, fieldId)}>
+            <Icon name="remove" type="font-awesome" iconStyle={{ ...styles.removeDocumentIcon, color: colourBrandingMain }} />
+          </TouchableOpacity>
+        )}
+      </View>
+    );
+  }
+
   renderSuccess() {
     return (
       <View style={{ padding: 16, flex: 1, backgroundColor: '#fff' }}>
@@ -634,17 +744,36 @@ class MaintenanceRequest extends Component {
   renderImageList(fieldId = null) {
     const imagesList = this.getImages(fieldId);
     return (
-      <View style={styles.imageSection}>
-        <View style={[styles.imageListContainer, imagesList.length < 2 && styles.imageListContainerEmpty]}>
-          <FlatList
-            keyboardShouldPersistTaps="always"
-            enableEmptySections
-            data={imagesList}
-            renderItem={({ item, index }) => this.renderImage(item, index, fieldId)}
-            keyExtractor={(item, index) => index}
-            numColumns={3}
-          />
-        </View>
+      <View style={[styles.imageListContainer, imagesList.length < 2 && styles.imageListContainerEmpty]}>
+        <FlatList
+          keyboardShouldPersistTaps="always"
+          enableEmptySections
+          data={imagesList}
+          renderItem={({ item, index }) => this.renderImage(item, index, fieldId)}
+          keyExtractor={(item, index) => index}
+          numColumns={3}
+        />
+      </View>
+    );
+  }
+
+  renderDocumentList(fieldId = null) {
+    const documentsList = this.getDocuments(fieldId);
+    return (
+      <View style={styles.documentListContainer}>
+        {documentsList.length > 0 ? documentsList.map((document, index) => this.renderDocument(document, index, fieldId)) : null}
+        <Components.DocumentUploader
+          buttonTitle="Add Files"
+          allowedTypes={['application/pdf']}
+          onUploadStarted={(uploadUri, documentUri, name, ext) => this.onUploadStartedDocument(uploadUri, documentUri, name, ext, fieldId)}
+          onUploadProgress={progress => this.onUploadProgressDocument(progress, fieldId)}
+          onUploadSuccess={(uri, uploadUri) => this.onUploadSuccessDocument(uri, uploadUri, fieldId)}
+          onUploadFailed={uploadUri => this.onUploadFailedDocument(uploadUri, fieldId)}
+          fileName="serviceDocument"
+          userId={this.props.uid}
+          disabled={false}
+          multiple
+        />
       </View>
     );
   }
@@ -806,6 +935,19 @@ class MaintenanceRequest extends Component {
             {this.renderImageList(fieldId)}
           </Components.GenericInputSection>
         );
+      case 'document':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            sectionStyle={sectionStyle}
+            isValid={() => this.isFieldValid(field, fieldId)}
+            required={field.mandatory}
+            showError={this.state.showError}
+          >
+            {this.renderDocumentList(fieldId)}
+          </Components.GenericInputSection>
+        );
       default:
         return null;
     }
@@ -1021,7 +1163,7 @@ class MaintenanceRequest extends Component {
 
     return (
       <KeyboardAvoidingView behavior={Platform.OS === 'ios' && 'padding'} style={styles.viewContainer}>
-        {this.renderUploadMenu()}
+        {this.renderImageUploader()}
         <View style={styles.container}>
           <Components.Header
             leftIcon="angle-left"
@@ -1086,6 +1228,11 @@ const styles = {
     alignItems: 'center',
     flexDirection: 'column',
   },
+  documentListContainer: {
+    marginTop: 8,
+    flexDirection: 'column',
+    alignItems: 'flex-start',
+  },
   imageContainer: {
     width: PHOTO_SIZE,
     height: PHOTO_SIZE,
@@ -1211,6 +1358,42 @@ const styles = {
     fontSize: 26,
     color: Colours.TEXT_BLUEGREY,
   },
+  documentContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    paddingVertical: 4,
+  },
+  documentTypeContainer: {
+    width: 50,
+    height: 60,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    marginRight: 8,
+  },
+  documentTypeText: {
+    color: '#fff',
+    fontFamily: 'sf-semibold',
+    textAlign: 'center',
+  },
+  documentText: {
+    flex: 1,
+    fontFamily: 'sf-semibold',
+    fontSize: 16,
+    color: '#65686D',
+  },
+  removeDocumentButton: {
+    padding: 4,
+    width: 40,
+    height: 40,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginLeft: 8,
+  },
+  removeDocumentIcon: {
+    fontSize: 24,
+  },
 };
 
 const mapStateToProps = state => {

package/src/values.config.enquiry.js

@@ -0,0 +1,42 @@
+const values = {
+  featureKey: 'maintenanceEnquiry',
+  aliases: ['maintenanceRequest'],
+  reducerKey: 'jobsEnquiry',
+  serviceKey: 'maintenanceEnquiry',
+  updateKey: 'jobsEnquiry',
+  commentKey: 'maintenancerequestEnquiry',
+  actionJobsLoaded: 'JOBS_LOADEDEnquiry',
+  actionJobAdded: 'JOB_ADDEDEnquiry',
+  actionJobsAdded: 'JOBS_ADDEDEnquiry',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDEnquiry',
+  actionJobsHideSeen: 'JOBS_HIDE_SEENEnquiry',
+  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDEnquiry',
+  screenMaintenance: 'maintenanceEnquiry',
+  screenRequestDetail: 'requestDetailEnquiry',
+  screenServiceRequest: 'serviceRequestEnquiry',
+  screenJobTypePicker: 'jobTypePickerEnquiry',
+  screenRequestNotes: 'requestNotesEnquiry',
+  permissionMaintenanceTracking: 'maintenanceTrackingEnquiry',
+  permissionMaintenanceAssignment: 'maintenanceAssignmentEnquiry',
+  iconGridMenu: 'form',
+  gridViewBox: '0 0 256 256',
+  iconAddMenu: 'form',
+  iconKioskAction: 'form',
+  hasMoreOption: false,
+  orderAddMenu: 5,
+  orderMoreMenu: 4,
+  orderKioskAction: 1,
+  textFeatureTitle: 'Enquiry',
+  textAddMenuTitle: 'Enquiry Submission',
+  textMoreMenuTitle: 'Enquiry',
+  textKioskActionTitle: 'Enquiry',
+  textEntityName: 'Enquiry',
+  textJobType: 'Enquiry Type',
+  emptyRequestsStaff: 'No active Enquiry',
+  emptyRequestsUser: 'Your Enquiry will show here',
+  forceCustomFields: false,
+  stringConfigJobStatus: 'maintenanceJobStatusEnquiry',
+  stringConfigHideSeen: 'maintenanceDisableSeenEnquiry',
+};
+
+export { values };

package/src/values.config.feedback.js

@@ -0,0 +1,42 @@
+const values = {
+  featureKey: 'maintenanceFeedback',
+  aliases: ['maintenanceRequest'],
+  reducerKey: 'jobsFeedback',
+  serviceKey: 'maintenanceFeedback',
+  updateKey: 'jobsFeedback',
+  commentKey: 'maintenancerequestFeedback',
+  actionJobsLoaded: 'JOBS_LOADEDFeedback',
+  actionJobAdded: 'JOB_ADDEDFeedback',
+  actionJobsAdded: 'JOBS_ADDEDFeedback',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDFeedback',
+  actionJobsHideSeen: 'JOBS_HIDE_SEENFeedback',
+  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDFeedback',
+  screenMaintenance: 'maintenanceFeedback',
+  screenRequestDetail: 'requestDetailFeedback',
+  screenServiceRequest: 'serviceRequestFeedback',
+  screenJobTypePicker: 'jobTypePickerFeedback',
+  screenRequestNotes: 'requestNotesFeedback',
+  permissionMaintenanceTracking: 'maintenanceTrackingFeedback',
+  permissionMaintenanceAssignment: 'maintenanceAssignmentFeedback',
+  iconGridMenu: 'form',
+  gridViewBox: '0 0 256 256',
+  iconAddMenu: 'form',
+  iconKioskAction: 'form',
+  hasMoreOption: false,
+  orderAddMenu: 5,
+  orderMoreMenu: 4,
+  orderKioskAction: 1,
+  textFeatureTitle: 'Feedback',
+  textAddMenuTitle: 'Feedback Submission',
+  textMoreMenuTitle: 'Feedback',
+  textKioskActionTitle: 'Feedback',
+  textEntityName: 'Feedback',
+  textJobType: 'Feedback Type',
+  emptyRequestsStaff: 'No active Feedback',
+  emptyRequestsUser: 'Your Feedback will show here',
+  forceCustomFields: false,
+  stringConfigJobStatus: 'maintenanceJobStatusFeedback',
+  stringConfigHideSeen: 'maintenanceDisableSeenFeedback',
+};
+
+export { values };