@plusscommunities/pluss-maintenance-app 6.0.7-beta.0 → 6.0.8

package/src/feature.config.js

@@ -16,7 +16,7 @@ const FeatureConfig = {
   title: values.textFeatureTitle,
   gridMenu: {
     icon: values.iconGridMenu,
-    viewBox: '0 0 30 30',
+    viewBox: values.gridViewBox,
     navigate: values.screenMaintenance,
   },
   addMenu: {
@@ -26,18 +26,20 @@ const FeatureConfig = {
     navigate: values.screenServiceRequest,
     visibleExps: { type: 'feature', value: values.featureKey },
   },
-  moreMenu: {
-    order: values.orderMoreMenu,
-    title: values.textMoreMenuTitle,
-    navigate: values.screenMaintenance,
-    visibleExps: {
-      type: 'and',
-      exps: [
-        { type: 'notHidden', value: 'maintenanceRequest' },
-        { type: 'notUserType', value: 'KIOSK' },
-      ],
-    },
-  },
+  moreMenu: values.hasMoreOption
+    ? {
+        order: values.orderMoreMenu,
+        title: values.textMoreMenuTitle,
+        navigate: values.screenMaintenance,
+        visibleExps: {
+          type: 'and',
+          exps: [
+            { type: 'notHidden', value: 'maintenanceRequest' },
+            { type: 'notUserType', value: 'KIOSK' },
+          ],
+        },
+      }
+    : undefined,
   kioskAction: {
     order: values.orderKioskAction,
     icon: values.iconKioskAction,

package/src/reducers/JobsReducer.js

@@ -3,8 +3,9 @@ import _ from 'lodash';
 import { REHYDRATE } from 'redux-persist';
 import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED } from '../actions/types';
 import { ActionTypes } from '../core.config';
+import { values } from '../values.config';
 
-const REDUCER_KEY = 'jobs';
+const REDUCER_KEY = values.reducerKey;
 
 const INITIAL_STATE = {
   jobs: [],

package/src/screens/RequestDetail.js

@@ -530,7 +530,7 @@ class RequestDetail extends Component {
                 <Text style={styles.locationText}>{job.homeText}</Text>
               </View>
             ) : null}
-            <Text style={styles.requesterLabel}>Person Requesting</Text>
+            <Text style={styles.requesterLabel}>Submitted By</Text>
             <View style={styles.profileContainer}>
               <Components.ProfilePic ProfilePic={job.userProfilePic} Diameter={40} />
               <View style={styles.nameContainer}>

package/src/screens/ServiceRequest.js

@@ -34,6 +34,7 @@ class MaintenanceRequest extends Component {
       fail: false,
       error: null,
       showError: false,
+      loadingTypes: values.forceCustomFields,
 
       userName: '',
       roomNumber: '',
@@ -297,14 +298,14 @@ class MaintenanceRequest extends Component {
   };
 
   getJobTypes() {
-    const self = this;
     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(() => {});
   }
@@ -312,9 +313,19 @@ class MaintenanceRequest extends Component {
   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;
+    }
     this.setState({
       type,
       customFields: selected.hasCustomFields && selected.customFields.length > 0 ? _.cloneDeep(selected.customFields) : [],
+      loadingTypes: false,
     });
   }
 
@@ -796,9 +807,13 @@ class MaintenanceRequest extends Component {
   }
 
   renderForm() {
-    const { customFields } = this.state;
+    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)}>
@@ -949,7 +964,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)}
@@ -972,6 +987,21 @@ 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;
 
@@ -991,6 +1021,7 @@ class MaintenanceRequest extends Component {
         </View>
         {this.renderRegisterConfirmation()}
         {this.renderVideoPlayerPopup()}
+        {this.renderNoType()}
         <DateTimePicker
           isVisible={isDateTimePickerVisible}
           onConfirm={this.onDateSelected}

package/src/values.config.default.js

@@ -15,8 +15,10 @@ const values = {
   permissionMaintenanceTracking: 'maintenanceTracking',
   permissionMaintenanceAssignment: 'maintenanceAssignment',
   iconGridMenu: 'maintenance',
+  gridViewBox: '0 0 30 30',
   iconAddMenu: 'request',
   iconKioskAction: 'wrench',
+  hasMoreOption: true,
   orderAddMenu: 5,
   orderMoreMenu: 4,
   orderKioskAction: 1,
@@ -25,6 +27,9 @@ const values = {
   textMoreMenuTitle: 'Request',
   textKioskActionTitle: 'Request',
   textEntityName: 'Job',
+  emptyRequestsStaff: 'No active Requests',
+  emptyRequestsUser: 'Your Requests will show here',
+  forceCustomFields: false,
 };
 
 export { values };

package/src/values.config.forms.js

@@ -0,0 +1,35 @@
+const values = {
+  featureKey: 'maintenanceForms',
+  aliases: ['maintenanceRequest'],
+  reducerKey: 'maintenanceForms',
+  serviceKey: 'maintenanceForms',
+  updateKey: 'jobsForms',
+  actionJobsLoaded: 'JOBS_LOADEDForms',
+  actionJobAdded: 'JOB_ADDEDForms',
+  actionJobsAdded: 'JOBS_ADDEDForms',
+  screenMaintenance: 'maintenanceForms',
+  screenRequestDetail: 'requestDetailForms',
+  screenServiceRequest: 'serviceRequestForms',
+  screenJobTypePicker: 'jobTypePickerForms',
+  screenRequestNotes: 'requestNotesForms',
+  permissionMaintenanceTracking: 'maintenanceTrackingForms',
+  permissionMaintenanceAssignment: 'maintenanceAssignmentForms',
+  iconGridMenu: 'form',
+  gridViewBox: '0 0 256 256',
+  iconAddMenu: 'form',
+  iconKioskAction: 'form',
+  hasMoreOption: false,
+  orderAddMenu: 5,
+  orderMoreMenu: 4,
+  orderKioskAction: 1,
+  textFeatureTitle: 'Forms',
+  textAddMenuTitle: 'Form Submission',
+  textMoreMenuTitle: 'Forms',
+  textKioskActionTitle: 'Forms',
+  textEntityName: 'Form',
+  emptyRequestsStaff: 'No active Form Submissions',
+  emptyRequestsUser: 'Your Form Submissions will show here',
+  forceCustomFields: true,
+};
+
+export { values };

package/src/values.config.js

@@ -15,8 +15,10 @@ const values = {
   permissionMaintenanceTracking: 'maintenanceTracking',
   permissionMaintenanceAssignment: 'maintenanceAssignment',
   iconGridMenu: 'maintenance',
+  gridViewBox: '0 0 30 30',
   iconAddMenu: 'request',
   iconKioskAction: 'wrench',
+  hasMoreOption: true,
   orderAddMenu: 5,
   orderMoreMenu: 4,
   orderKioskAction: 1,
@@ -25,6 +27,9 @@ const values = {
   textMoreMenuTitle: 'Request',
   textKioskActionTitle: 'Request',
   textEntityName: 'Job',
+  emptyRequestsStaff: 'No active Requests',
+  emptyRequestsUser: 'Your Requests will show here',
+  forceCustomFields: false,
 };
 
 export { values };