@plusscommunities/pluss-maintenance-app 6.1.2-beta.0 → 7.0.0-beta.1

package/src/screens/ServiceRequest.js

@@ -12,11 +12,13 @@ import {
   ImageBackground,
   Keyboard,
 } from 'react-native';
+import DateTimePicker from 'react-native-modal-datetime-picker';
+import { Icon } from '@rneui/themed';
 import _ from 'lodash';
-import { Icon } from 'react-native-elements';
+import moment from 'moment';
 import { connect } from 'react-redux';
 import { jobAdded } from '../actions';
-import { generalActions } from '../apis';
+import { maintenanceActions } from '../apis';
 import { Services } from '../feature.config';
 import { Components, Colours, Helper, Config } from '../core.config';
 import { values } from '../values.config';
@@ -32,6 +34,7 @@ class MaintenanceRequest extends Component {
       fail: false,
       error: null,
       showError: false,
+      loadingTypes: values.forceCustomFields,
 
       userName: '',
       roomNumber: '',
@@ -56,8 +59,20 @@ class MaintenanceRequest extends Component {
       types: [],
 
       confirmationToShow: false,
+
+      customFields: [],
+      customFieldImages: {},
+      isDateTimePickerVisible: false,
+      popUpType: 'date',
+      dateFieldId: null,
+      imageFieldId: null,
     };
     this.checkThumb = null;
+    this.keyboardTypes = {
+      phone: 'phone-pad',
+      email: 'email-address',
+      text: 'default',
+    };
   }
 
   componentDidMount() {
@@ -75,9 +90,70 @@ class MaintenanceRequest extends Component {
     clearInterval(this.checkThumb);
   }
 
+  onChangeName = userName => {
+    const update = { userName };
+    if (!this.state.customFields || !_.some(this.state.customFields, 'isTitle')) {
+      update.title = userName;
+    }
+    this.setState(update);
+  };
+
+  onChangeAnswer = (fieldId, answer) => {
+    const update = { customFields: _.cloneDeep(this.state.customFields) };
+    const field = update.customFields[fieldId];
+    field.answer = answer;
+    if (field.isTitle) update.title = field.answer;
+    this.setState(update);
+  };
+
+  onChangeToggleAnswer = (fieldId, answer) => {
+    const update = { customFields: _.cloneDeep(this.state.customFields) };
+    const field = update.customFields[fieldId];
+    field.answer = field.answer === answer ? undefined : answer;
+    if (field.isTitle) update.title = field.answer;
+    this.setState(update);
+  };
+
+  onChangeCheckboxAnswer = (fieldId, answer) => {
+    const update = { customFields: _.cloneDeep(this.state.customFields) };
+    const field = update.customFields[fieldId];
+    field.answer = _.xor(field.answer || [], [answer]);
+    if (field.isTitle) update.title = field.answer.join(', ');
+    this.setState(update);
+  };
+
+  onOpenDatePicker = (field, fieldId) => {
+    Keyboard.dismiss();
+    this.setState({ dateFieldId: fieldId, popUpType: field.type, isDateTimePickerVisible: true });
+  };
+
+  onClearDate = fieldId => {
+    const update = { customFields: _.cloneDeep(this.state.customFields) };
+    const field = update.customFields[fieldId];
+    field.answer = undefined;
+    if (field.isTitle) update.title = field.answer;
+    this.setState(update);
+  };
+
+  onDateSelected = date => {
+    const { customFields, dateFieldId, popUpType } = this.state;
+    const update = { customFields: _.cloneDeep(customFields), isDateTimePickerVisible: false, fieldId: null };
+    const field = update.customFields[dateFieldId];
+    const dateObj = moment(date);
+    if (popUpType === 'date') {
+      field.answer = dateObj.format('YYYY-MM-DD');
+      if (field.isTitle) update.title = dateObj.format('DD MMM YYYY');
+    } else {
+      field.answer = dateObj.format('HH:mm');
+      if (field.isTitle) update.title = dateObj.format('h:mm a');
+    }
+    this.setState(update);
+  };
+
   onUploadStarted = (uploadUri, imageUri) => {
-    const images = [...this.state.images];
-    images.splice(images.length - 1, 0, {
+    const { imageFieldId } = this.state;
+    const imagesUpdate = this.getImages(imageFieldId);
+    imagesUpdate.splice(imagesUpdate.length - 1, 0, {
       uploading: true,
       uploadProgress: '0%',
       uploadUri,
@@ -85,24 +161,27 @@ class MaintenanceRequest extends Component {
       allowRetry: true,
     });
 
-    this.setState({ images });
+    this.setImages(imagesUpdate, imageFieldId);
   };
 
   onUploadProgress = progress => {
-    const images = [...this.state.images];
-    images.map(img => {
+    const { imageFieldId } = this.state;
+    const imagesUpdate = this.getImages(imageFieldId);
+    imagesUpdate.map(img => {
       if (img.uploadUri === progress.uri) {
         img.uploadProgress = progress.percentage;
         img.uploading = true;
         img.allowRetry = true;
       }
     });
-    this.setState({ images });
+
+    this.setImages(imagesUpdate, imageFieldId);
   };
 
   onUploadSuccess = async (uri, uploadUri) => {
-    const images = [...this.state.images];
-    images.map(img => {
+    const { imageFieldId } = this.state;
+    const imagesUpdate = this.getImages(imageFieldId);
+    imagesUpdate.map(img => {
       if (img.uploadUri === uploadUri && img.uploading) {
         img.url = uri.replace('/general/', '/general1400/');
         img.thumbNailExists = false;
@@ -110,12 +189,14 @@ class MaintenanceRequest extends Component {
         img.allowRetry = true;
       }
     });
-    this.setState({ images }, () => this.waitForThumbnails());
+
+    this.setImages(imagesUpdate, imageFieldId, () => this.waitForThumbnails());
   };
 
   onUploadFailed = uploadUri => {
-    const images = [...this.state.images];
-    images.map(img => {
+    const { imageFieldId } = this.state;
+    const imagesUpdate = this.getImages(imageFieldId);
+    imagesUpdate.map(img => {
       if (img.uploadUri === uploadUri) {
         img.uploading = true; // Requried for retry
         img.uploadProgress = '';
@@ -123,12 +204,13 @@ class MaintenanceRequest extends Component {
       }
     });
 
-    this.setState({ images });
+    this.setImages(imagesUpdate, imageFieldId);
   };
 
   onLibrarySelected = uri => {
-    const images = [...this.state.images];
-    images.splice(images.length - 1, 0, {
+    const { imageFieldId } = this.state;
+    const imagesUpdate = this.getImages(imageFieldId);
+    imagesUpdate.splice(imagesUpdate.length - 1, 0, {
       uploading: false,
       allowRetry: false,
       url: Helper.get1400(uri),
@@ -136,7 +218,7 @@ class MaintenanceRequest extends Component {
       thumbNailUrl: Helper.getThumb300(uri),
     });
 
-    this.setState({ images });
+    this.setImages(imagesUpdate, imageFieldId);
   };
 
   onPressBack() {
@@ -160,52 +242,121 @@ class MaintenanceRequest extends Component {
   }
 
   onConfirmationReset() {
-    this.setState({
-      confirmationToShow: false,
-      title: '',
-      description: '',
-      times: '',
-      isHome: false,
-      uploadingImage: false,
-      images: [
-        {
-          add: true,
-        },
-      ],
-      submitting: false,
-      success: false,
-      fail: false,
-    });
+    this.setState(
+      {
+        confirmationToShow: false,
+        title: '',
+        description: '',
+        times: '',
+        isHome: false,
+        uploadingImage: false,
+        images: [
+          {
+            add: true,
+          },
+        ],
+        submitting: false,
+        success: false,
+        fail: false,
+        customFields: [],
+        customFieldImages: {},
+        isDateTimePickerVisible: false,
+        popUpType: 'date',
+        dateFieldId: null,
+        imageFieldId: null,
+      },
+      () => this.pickType(this.state.type),
+    );
   }
 
+  isFieldValid = (field, fieldId) => {
+    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':
+          return imagesList.length > 0;
+        case 'checkbox':
+          return _.isArray(answer) && answer.length > 0;
+        default:
+          return !_.isNil(answer) && !_.isEmpty(answer);
+      }
+    };
+    const checkFormat = () => {
+      if (_.isNil(answer) || _.isEmpty(answer)) return true;
+      switch (type) {
+        case 'email':
+          return Helper.isEmail(answer);
+        case 'date':
+          return moment(answer, 'YYYY-MM-DD', true).isValid();
+        case 'time':
+          return moment(answer, 'HH:mm', true).isValid();
+        default:
+          return true;
+      }
+    };
+
+    const valid = checkMandatory() && checkFormat();
+    return valid;
+  };
+
   getJobTypes() {
-    const self = this;
-    generalActions
+    maintenanceActions
       .getJobTypes(Helper.getSite(this.props.site))
       .then(res => {
-        self.setState({
+        this.setState({
           types: res.data,
         });
-        self.getDefaultJob();
+        console.log(res.data);
+        this.getDefaultJob();
       })
-      .catch(() => {});
+      .catch(() => { });
   }
 
-  getDefaultJob() {
-    if (this.state.types.length !== 0 && this.state.jobId == null) {
-      this.setState({ type: this.state.types[0].typeName });
+  pickType(type) {
+    const { types } = this.state;
+    const selected = types.find(t => t.typeName === type) || {};
+    if (values.forceCustomFields && !selected.hasCustomFields) {
+      console.log(selected);
+      this.setState({
+        type,
+        customFields: [],
+        noType: true,
+      });
+      return;
+    }
+    const update = {
+      type,
+      customFields: selected.hasCustomFields && selected.customFields.length > 0 ? _.cloneDeep(selected.customFields) : [],
+      loadingTypes: false,
+    };
+
+    if (!_.isEmpty(update.customFields) && !_.some(update.customFields, 'isTitle')) {
+      update.title = this.state.userName;
     }
+
+    this.setState(update);
   }
 
-  pickType(type) {
-    this.setState({ type });
+  getDefaultJob() {
+    const { types, jobId } = this.state;
+    if (types.length !== 0 && jobId == null) {
+      const defaultType = types[0];
+      this.pickType(defaultType.typeName);
+    }
   }
 
-  showUploadMenu = () => {
+  showUploadMenu = fieldId => {
     Keyboard.dismiss();
     if (this.state.uploadingImage || this.state.submitting) {
       return;
     }
+    if (fieldId) this.setState({ imageFieldId: fieldId });
     this.imageUploader.showUploadMenu();
   };
 
@@ -222,13 +373,16 @@ class MaintenanceRequest extends Component {
       this.scrollContainer.scrollTo({ y: 0 });
     }, 100);
 
-    const images = _.filter(this.state.images, img => {
-      return !img.uploading && !img.add;
-    }).map(img => {
-      return img.url;
+    const images = this.getImageUrls();
+
+    // Fix custom images field answers
+    const customFields = _.cloneDeep(this.state.customFields);
+    const updatedCustomFields = customFields.map((field, fieldId) => {
+      if (field.type === 'image') field.answer = this.getImageUrls(fieldId);
+      return field;
     });
 
-    generalActions
+    maintenanceActions
       .sendMaintenanceRequest(
         this.props.uid,
         this.state.userName,
@@ -242,6 +396,7 @@ class MaintenanceRequest extends Component {
         Helper.getSite(this.props.site),
         this.state.isHome,
         this.state.times,
+        updatedCustomFields,
       )
       .then(res => {
         if (res.data.success) {
@@ -269,46 +424,99 @@ class MaintenanceRequest extends Component {
 
   refreshRequest = async id => {
     try {
-      const job = await generalActions.getJob(Helper.getSite(this.props.site), id);
-      // console.log('refreshRequest', job?.data);
+      const job = await maintenanceActions.getJob(Helper.getSite(this.props.site), id);
       this.props.jobAdded(job.data);
     } catch (error) {
       console.log('refreshRequest error', error);
     }
   };
 
+  validateCustomFields = () => {
+    const { customFields } = this.state;
+    if (!customFields || customFields.length === 0) return true;
+
+    return customFields.every((field, index) => {
+      const isValid = this.isFieldValid(field, index);
+      return isValid;
+    });
+  };
+
   submitRequest() {
-    if (this.state.submitting || !this.props.connected) {
+    const { customFields, submitting, uploadingImage, title, roomNumber, isHome, times } = this.state;
+    const hasCustomFields = customFields && customFields.length > 0;
+
+    if (submitting || !this.props.connected) {
       if (!this.props.connected) {
         this.setState({ error: { message: 'No internet connection detected' } });
       }
       return;
     }
-    if (this.state.uploadingImage) {
-      return;
-    }
+    if (uploadingImage) return;
+
     this.setState({ error: null, showError: false });
-    if (this.state.title.length === 0 || !this.state.roomNumber || this.state.roomNumber.length === 0) {
+    if (title.length === 0 || !roomNumber || roomNumber.length === 0) {
+      console.log('submitRequest - error', { title, roomNumber });
       this.setState({ showError: true });
       return;
     }
-    if (this.state.isHome && this.state.times.length < 2) {
-      this.setState({ showError: true });
-      return;
+    if (hasCustomFields) {
+      if (!this.validateCustomFields()) {
+        console.log('submitRequest - custom fields error');
+        this.setState({ showError: true });
+        return;
+      }
+    } else {
+      if (isHome && times.length < 2) {
+        console.log('submitRequest - error', { isHome, times });
+        this.setState({ showError: true });
+        return;
+      }
     }
     this.submit();
   }
 
+  getImages = (fieldId = null) => {
+    const { images, customFieldImages } = this.state;
+    const imagesList = _.cloneDeep(fieldId ? customFieldImages[fieldId] : images);
+    if (!imagesList || !Array.isArray(imagesList) || imagesList.length === 0) {
+      return [{ add: true }];
+    }
+    return imagesList;
+  };
+
+  setImages = (imagesList, fieldId = null, callback = null) => {
+    let update = {};
+    if (fieldId) {
+      const customFieldImages = _.cloneDeep(this.state.customFieldImages);
+      customFieldImages[fieldId] = imagesList;
+      update = { customFieldImages };
+    } else {
+      update = { images: imagesList };
+    }
+    this.setState(update, callback);
+  };
+
+  getImageUrls = (fieldId = null) => {
+    const imagesList = this.getImages(fieldId);
+    return _.filter(imagesList, img => {
+      return !img.uploading && !img.add;
+    }).map(img => {
+      return img.url;
+    });
+  };
+
   waitForThumbnails = () => {
     if (this.checkThumb) return;
 
     this.checkThumb = setInterval(async () => {
-      const images = [];
+      const { imageFieldId } = this.state;
+      const imagesList = this.getImages(imageFieldId);
+      const imagesUpdate = [];
       await Promise.all(
-        this.state.images.map(image => {
+        imagesList.map(image => {
           return new Promise(async resolve => {
             const newImage = { ...image };
-            images.push(newImage);
+            imagesUpdate.push(newImage);
             if (newImage.url && !newImage.thumbNailExists) {
               newImage.uploading = false;
               newImage.allowRetry = false;
@@ -319,20 +527,20 @@ class MaintenanceRequest extends Component {
           });
         }),
       );
-      const thumbnailsExist = images.every(image => !image.url || image.thumbNailExists);
+      const thumbnailsExist = imagesUpdate.every(image => !image.url || image.thumbNailExists);
       if (thumbnailsExist) {
         clearInterval(this.checkThumb);
         this.checkThumb = null;
-        this.setState({ images });
+        this.setImages(imagesUpdate, imageFieldId);
       }
     }, 2000);
   };
 
-  removeImage = index => {
-    const images = [...this.state.images];
-    images.splice(index, 1);
+  removeImage = (index, fieldId) => {
+    const imagesUpdate = this.getImages(fieldId);
+    imagesUpdate.splice(index, 1);
 
-    this.setState({ images });
+    this.setImages(imagesUpdate, fieldId);
   };
 
   toggleFullscreenVideo = url => {
@@ -361,16 +569,17 @@ class MaintenanceRequest extends Component {
     );
   }
 
-  renderImage(item, index) {
+  renderImage(item, index, fieldId = null) {
     const isVideoUrl = Helper.isVideo(item.url);
+    const imagesList = this.getImages(fieldId);
 
     if (item.add) {
       return (
-        <TouchableOpacity activeOpacity={0.8} onPress={this.showUploadMenu}>
+        <TouchableOpacity activeOpacity={0.8} onPress={() => this.showUploadMenu(fieldId)}>
           <View
             style={[
               styles.imageContainer,
-              this.state.images.length > 1 && styles.imageContainerNotEmpty,
+              imagesList.length > 1 && styles.imageContainerNotEmpty,
               index % 3 === 0 && { marginLeft: 0 },
               index > 2 && { marginTop: 8 },
             ]}
@@ -386,7 +595,7 @@ class MaintenanceRequest extends Component {
       <View
         style={[
           styles.imageContainer,
-          this.state.images.length > 1 && styles.imageContainerNotEmpty,
+          imagesList.length > 1 && styles.imageContainerNotEmpty,
           index % 3 === 0 && { marginLeft: 0 },
           index > 2 && { marginTop: 8 },
         ]}
@@ -405,7 +614,7 @@ class MaintenanceRequest extends Component {
                 </TouchableOpacity>
               </View>
             )}
-            <TouchableOpacity style={styles.removeImage} onPress={this.removeImage.bind(this, index)}>
+            <TouchableOpacity style={styles.removeImage} onPress={() => this.removeImage(index, fieldId)}>
               <Icon name="remove" type="font-awesome" iconStyle={styles.imageControlIcon} style={styles.removeImage} />
             </TouchableOpacity>
           </ImageBackground>
@@ -422,15 +631,16 @@ class MaintenanceRequest extends Component {
     );
   }
 
-  renderImageList() {
+  renderImageList(fieldId = null) {
+    const imagesList = this.getImages(fieldId);
     return (
       <View style={styles.imageSection}>
-        <View style={[styles.imageListContainer, this.state.images.length < 2 && styles.imageListContainerEmpty]}>
+        <View style={[styles.imageListContainer, imagesList.length < 2 && styles.imageListContainerEmpty]}>
           <FlatList
             keyboardShouldPersistTaps="always"
             enableEmptySections
-            data={this.state.images}
-            renderItem={({ item, index }) => this.renderImage(item, index)}
+            data={imagesList}
+            renderItem={({ item, index }) => this.renderImage(item, index, fieldId)}
             keyExtractor={(item, index) => index}
             numColumns={3}
           />
@@ -439,7 +649,185 @@ class MaintenanceRequest extends Component {
     );
   }
 
+  renderDateField(field, fieldId, sectionStyle) {
+    let displayText, placeHolder, icon, errorText;
+    if (field.type === 'date') {
+      displayText = field.answer ? moment(field.answer, 'YYYY-MM-DD').format('DD MMM YYYY') : '';
+      placeHolder = 'dd mmm yyyy';
+      icon = 'calendar';
+      errorText = 'Not a valid date';
+    } else {
+      displayText = field.answer ? moment(field.answer, 'HH:mm').format('h:mm a') : '';
+      placeHolder = '--:-- --';
+      icon = 'clock-o';
+      errorText = 'Not a valid time';
+    }
+
+    return (
+      <Components.GenericInputSection
+        key={fieldId}
+        label={field.label}
+        sectionStyle={sectionStyle}
+        isValid={() => this.isFieldValid(field, fieldId)}
+        required={field.mandatory}
+        showError={this.state.showError}
+        errorText={errorText}
+      >
+        <View style={styles.dateContainer}>
+          <TouchableOpacity style={styles.dateFieldButton} onPress={() => this.onOpenDatePicker(field, fieldId)}>
+            <View style={styles.dateFieldContainer}>
+              <Text style={styles.dateText}>{displayText || placeHolder}</Text>
+              <Icon type="font-awesome" name={icon} iconStyle={styles.dateIcon} />
+            </View>
+          </TouchableOpacity>
+          {displayText ? (
+            <TouchableOpacity style={styles.dateClearButton} onPress={() => this.onClearDate(fieldId)}>
+              <Icon type="font-awesome" name="times" iconStyle={styles.removeIcon} />
+            </TouchableOpacity>
+          ) : null}
+        </View>
+      </Components.GenericInputSection>
+    );
+  }
+
+  renderField(field, fieldId) {
+    const sectionStyle = { marginTop: fieldId === 0 ? 24 : 0, marginBottom: 24 };
+    switch (field.type) {
+      case 'yn':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            sectionStyle={sectionStyle}
+            inputType="toggle"
+            value={field.answer}
+            onChange={answer => this.onChangeToggleAnswer(fieldId, answer)}
+            isValid={() => this.isFieldValid(field, fieldId)}
+            showError={this.state.showError}
+            required={field.mandatory}
+          />
+        );
+      case 'multichoice':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            sectionStyle={sectionStyle}
+            inputType="radio"
+            value={field.answer}
+            onChange={answer => this.onChangeToggleAnswer(fieldId, answer)}
+            options={field.values.map(o => {
+              return {
+                Label: o,
+                Value: o,
+              };
+            })}
+            isValid={() => this.isFieldValid(field, fieldId)}
+            showError={this.state.showError}
+            required={field.mandatory}
+          />
+        );
+      case 'checkbox':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            sectionStyle={sectionStyle}
+            isValid={() => this.isFieldValid(field, fieldId)}
+            showError={this.state.showError}
+            required={field.mandatory}
+          >
+            {field.values.map((o, i) => {
+              const isActive = field.answer && _.includes(field.answer, o);
+              return (
+                <TouchableOpacity
+                  onPress={() => this.onChangeCheckboxAnswer(fieldId, o)}
+                  key={i}
+                  style={styles.multiChoiceOption}
+                  hitSlop={{ top: 8, left: 8, bottom: 8, right: 8 }}
+                >
+                  {isActive ? (
+                    <Components.TickIcon style={styles.tick} size={20} color={this.props.colourBrandingMain} />
+                  ) : (
+                    <View style={styles.unticked} />
+                  )}
+                  <Text style={styles.multiChoiceText}>{o}</Text>
+                </TouchableOpacity>
+              );
+            })}
+          </Components.GenericInputSection>
+        );
+      case 'text':
+      case 'email':
+      case 'phone':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            placeholder={field.placeHolder}
+            value={field.answer}
+            onChangeText={val => this.onChangeAnswer(fieldId, val)}
+            editable
+            squaredCorners
+            isValid={() => this.isFieldValid(field, fieldId)}
+            showError={this.state.showError}
+            errorText={field.type === 'email' ? 'Not a valid email' : undefined}
+            required={field.mandatory}
+            sectionStyle={sectionStyle}
+            autoCapitalize="sentences"
+            keyboardType={this.keyboardTypes[field.type]}
+          />
+        );
+      case 'staticTitle':
+        return (
+          <Text key={fieldId} style={[styles.staticTitle, { color: this.props.colourBrandingMain }, sectionStyle]}>
+            {field.label}
+          </Text>
+        );
+      case 'staticText':
+        return (
+          <View key={fieldId} style={[styles.staticText, sectionStyle]}>
+            {Helper.toParagraphed(field.label, styles.staticText)}
+          </View>
+        );
+      case 'date':
+      case 'time':
+        return this.renderDateField(field, fieldId, sectionStyle);
+      case 'image':
+        return (
+          <Components.GenericInputSection
+            key={fieldId}
+            label={field.label}
+            sectionStyle={sectionStyle}
+            isValid={() => this.isFieldValid(field, fieldId)}
+            required={field.mandatory}
+            showError={this.state.showError}
+          >
+            {this.renderImageList(fieldId)}
+          </Components.GenericInputSection>
+        );
+      default:
+        return null;
+    }
+  }
+
+  renderCustomFields() {
+    const { customFields } = this.state;
+    if (!customFields || customFields.length === 0) return null;
+
+    return (
+      <Components.FormCard style={{ marginTop: 16 }}>{customFields.map((field, i) => this.renderField(field, i))}</Components.FormCard>
+    );
+  }
+
   renderForm() {
+    const { customFields, loadingTypes } = this.state;
+    const hasCustomFields = customFields && customFields.length > 0;
+
+    if (loadingTypes) {
+      return <Components.Spinner />;
+    }
+
     return (
       <View style={{ flex: 1 }}>
         <ScrollView keyboardShouldPersistTaps="always" style={{ flex: 1 }} ref={ref => (this.scrollContainer = ref)}>
@@ -451,7 +839,7 @@ class MaintenanceRequest extends Component {
                 label={'Name'}
                 placeholder={'Enter your name'}
                 textValue={this.state.userName}
-                onChangeText={userName => this.setState({ userName })}
+                onChangeText={userName => this.onChangeName(userName)}
                 editable={this.props.userType === 'KIOSK' && this.state.submitting === false}
                 isValid={() => {
                   return this.state.userName.length > 1;
@@ -482,13 +870,13 @@ class MaintenanceRequest extends Component {
                 }}
                 required
                 errorText="Please provide your address."
-                showError={this.state.showError && this.state.roomNumber && this.state.roomNumber.length < 2}
+                showError={this.state.showError && (!this.state.roomNumber || this.state.roomNumber.length < 2)}
               />
             </Components.FormCard>
             <Components.FormCard
               style={{ marginTop: 16, paddingHorizontal: 24, paddingVertical: 16, flexDirection: 'row', justifyContent: 'space-between' }}
             >
-              <Text style={styles.sectionTitle}>{Config.env.strings.JOB_TYPE}</Text>
+              <Text style={styles.sectionTitle}>{values.textJobType}</Text>
               <TouchableOpacity onPress={this.onPressType.bind(this)}>
                 <View style={{ flexDirection: 'row' }}>
                   <Text style={[styles.sectionTitle, { color: this.props.colourBrandingMain, marginRight: 16 }]}>{this.state.type}</Text>
@@ -500,81 +888,87 @@ class MaintenanceRequest extends Component {
                 </View>
               </TouchableOpacity>
             </Components.FormCard>
-            <Components.FormCard style={{ marginTop: 16 }}>
-              <Components.FormCardSection
-                label={'Title'}
-                placeholder={'Enter a title for your request'}
-                textValue={this.state.title}
-                onChangeText={title => this.setState({ title })}
-                editable={this.state.submitting === false}
-                hasUnderline
-                isValid={() => {
-                  return this.state.title.length > 1;
-                }}
-                required
-                errorText="Please provide a title."
-                showError={this.state.showError && this.state.title.length < 2}
-                autoCorrect
-                multiline
-                autoGrow
-              />
-              <Components.FormCardSection
-                label={'Description'}
-                placeholder={'Describe your request here in detail'}
-                textValue={this.state.description}
-                onChangeText={description => this.setState({ description })}
-                editable={this.state.submitting === false}
-                hasUnderline
-                autoCorrect
-                multiline
-                autoGrow
-              />
-            </Components.FormCard>
-            <Components.FormCard style={{ marginTop: 16, paddingHorizontal: 24 }}>
-              <View
-                style={[
-                  {
-                    width: '100%',
-                    paddingVertical: 16,
-                    flexDirection: 'row',
-                    justifyContent: 'space-between',
-                    alignItems: 'center',
-                    position: 'relative',
-                  },
-                  this.state.isHome && { borderBottomWidth: 1, borderBottomColor: Colours.LINEGREY },
-                ]}
-              >
-                <Text style={styles.sectionTitle}>{Config.env.strings.MAINTENANCE_HOME}</Text>
-                <Switch
-                  value={this.state.isHome}
-                  disabled={this.state.submitting}
-                  onValueChange={value => this.setState({ isHome: value })}
-                  trackColor={{ false: '#ddd', true: this.props.colourBrandingMain }}
-                  thumbColor={Platform.OS === 'android' ? '#fff' : null}
-                />
-              </View>
-              {this.state.isHome && (
-                <Components.FormCardSection
-                  label={'Available times'}
-                  placeholder={'Describe your available times here in detail.'}
-                  textValue={this.state.times}
-                  onChangeText={times => this.setState({ times })}
-                  editable={this.state.submitting === false}
-                  hasUnderline
-                  isValid={() => {
-                    return this.state.times.length > 1;
-                  }}
-                  required
-                  errorText="Please provide available times."
-                  showError={this.state.showError && this.state.isHome && this.state.times.length < 2}
-                  minHeight={40}
-                  autoCorrect
-                  multiline
-                  autoGrow
-                />
-              )}
-            </Components.FormCard>
-            {this.renderImageList()}
+            {hasCustomFields ? (
+              this.renderCustomFields()
+            ) : (
+              <>
+                <Components.FormCard style={{ marginTop: 16 }}>
+                  <Components.FormCardSection
+                    label={'Title'}
+                    placeholder={'Enter a title for your request'}
+                    textValue={this.state.title}
+                    onChangeText={title => this.setState({ title })}
+                    editable={this.state.submitting === false}
+                    hasUnderline
+                    isValid={() => {
+                      return this.state.title.length > 1;
+                    }}
+                    required
+                    errorText="Please provide a title."
+                    showError={this.state.showError && this.state.title.length < 2}
+                    autoCorrect
+                    multiline
+                    autoGrow
+                  />
+                  <Components.FormCardSection
+                    label={'Description'}
+                    placeholder={'Describe your request here in detail'}
+                    textValue={this.state.description}
+                    onChangeText={description => this.setState({ description })}
+                    editable={this.state.submitting === false}
+                    hasUnderline
+                    autoCorrect
+                    multiline
+                    autoGrow
+                  />
+                </Components.FormCard>
+                <Components.FormCard style={{ marginTop: 16, paddingHorizontal: 24 }}>
+                  <View
+                    style={[
+                      {
+                        width: '100%',
+                        paddingVertical: 16,
+                        flexDirection: 'row',
+                        justifyContent: 'space-between',
+                        alignItems: 'center',
+                        position: 'relative',
+                      },
+                      this.state.isHome && { borderBottomWidth: 1, borderBottomColor: Colours.LINEGREY },
+                    ]}
+                  >
+                    <Text style={styles.sectionTitle}>{Config.env.strings.MAINTENANCE_HOME}</Text>
+                    <Switch
+                      value={this.state.isHome}
+                      disabled={this.state.submitting}
+                      onValueChange={value => this.setState({ isHome: value })}
+                      trackColor={{ false: '#ddd', true: this.props.colourBrandingMain }}
+                      thumbColor={Platform.OS === 'android' ? '#fff' : null}
+                    />
+                  </View>
+                  {this.state.isHome && (
+                    <Components.FormCardSection
+                      label={'Available times'}
+                      placeholder={'Describe your available times here in detail.'}
+                      textValue={this.state.times}
+                      onChangeText={times => this.setState({ times })}
+                      editable={this.state.submitting === false}
+                      hasUnderline
+                      isValid={() => {
+                        return this.state.times.length > 1;
+                      }}
+                      required
+                      errorText="Please provide available times."
+                      showError={this.state.showError && this.state.isHome && this.state.times.length < 2}
+                      minHeight={40}
+                      autoCorrect
+                      multiline
+                      autoGrow
+                    />
+                  )}
+                </Components.FormCard>
+                {this.renderImageList()}
+              </>
+            )}
           </View>
         </ScrollView>
       </View>
@@ -584,7 +978,7 @@ class MaintenanceRequest extends Component {
   renderRegisterConfirmation() {
     return (
       <Components.ConfirmationPopup
-        confirmText={'Request submitted'}
+        confirmText={`${values.textEntityName} submitted`}
         repeatText={'Submit another'}
         visible={this.state.confirmationToShow}
         onClose={this.onCloseConfirmationPopup.bind(this)}
@@ -607,7 +1001,24 @@ class MaintenanceRequest extends Component {
     );
   }
 
+  renderNoType() {
+    if (!this.state.noType) {
+      return null;
+    }
+    return (
+      <Components.WarningPopup
+        confirmText={'No forms are available'}
+        infoText={'Check back later for forms.'}
+        visible={this.state.noType}
+        onClose={this.onPressBack.bind(this)}
+        padHorizontal
+      />
+    );
+  }
+
   render() {
+    const { submitting, success, isDateTimePickerVisible, popUpType } = this.state;
+
     return (
       <KeyboardAvoidingView behavior={Platform.OS === 'ios' && 'padding'} style={styles.viewContainer}>
         {this.renderUploadMenu()}
@@ -616,7 +1027,7 @@ class MaintenanceRequest extends Component {
             leftIcon="angle-left"
             onPressLeft={this.onPressBack.bind(this)}
             text={this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle}
-            rightText={this.state.submitting || this.state.success ? null : 'Done'}
+            rightText={submitting || success ? null : 'Done'}
             onPressRight={this.submitRequest.bind(this)}
             absoluteRight
           />
@@ -624,6 +1035,14 @@ class MaintenanceRequest extends Component {
         </View>
         {this.renderRegisterConfirmation()}
         {this.renderVideoPlayerPopup()}
+        {this.renderNoType()}
+        <DateTimePicker
+          isVisible={isDateTimePickerVisible}
+          onConfirm={this.onDateSelected}
+          onCancel={() => this.setState({ isDateTimePickerVisible: false })}
+          mode={popUpType}
+          headerTextIOS={`Pick a ${popUpType}`}
+        />
       </KeyboardAvoidingView>
     );
   }
@@ -726,6 +1145,72 @@ const styles = {
     alignItems: 'center',
     justifyContent: 'center',
   },
+  staticTitle: {
+    fontSize: 20,
+    fontFamily: 'sf-semibold',
+    color: Colours.TEXT_DARKEST,
+  },
+  staticText: {
+    fontSize: 17,
+    fontFamily: 'sf-regular',
+    color: Colours.TEXT_DARKEST,
+    lineHeight: 24,
+  },
+  multiChoiceOption: {
+    marginTop: 16,
+    flexDirection: 'row',
+    alignItems: 'center',
+    minHeight: 20,
+  },
+  multiChoiceText: {
+    flex: 1,
+    fontFamily: 'sf-medium',
+    fontSize: 14,
+    color: Colours.TEXT_DARK,
+  },
+  tick: {
+    marginRight: 10,
+    borderRadius: 4,
+  },
+  unticked: {
+    marginRight: 10,
+    width: 20,
+    height: 20,
+    borderColor: Colours.LINEGREY,
+    borderWidth: 1,
+    borderRadius: 4,
+  },
+  dateContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  dateFieldButton: {
+    flex: 1,
+  },
+  dateFieldContainer: {
+    flexDirection: 'row',
+    borderRadius: 2,
+    backgroundColor: '#ebeff2',
+    padding: 8,
+    marginTop: 8,
+  },
+  dateText: {
+    flex: 1,
+    fontFamily: 'sf-regular',
+    fontSize: 16,
+    color: '#65686D',
+  },
+  dateIcon: {
+    fontSize: 18,
+    color: Colours.TEXT_BLUEGREY,
+  },
+  dateClearButton: {
+    paddingLeft: 12,
+  },
+  removeIcon: {
+    fontSize: 26,
+    color: Colours.TEXT_BLUEGREY,
+  },
 };
 
 const mapStateToProps = state => {