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

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/helper.js

@@ -1,30 +1,68 @@
 import { Colours } from './core.config';
 
+const STATUS_NOT_ACTIONED = 'Not Actioned';
+const STATUS_IN_PROGRESS = 'In Progress';
+const STATUS_COMPLETED = 'Completed';
+
 const jobStatusOptions = [
   {
-    name: 'Unassigned',
+    text: 'Open',
+    order: 0,
     color: Colours.LINEGREY,
+    category: STATUS_NOT_ACTIONED,
   },
   {
-    name: 'In Progress',
+    text: 'In Progress',
+    order: 1,
     color: Colours.COLOUR_TEAL,
+    category: STATUS_IN_PROGRESS,
   },
   {
-    name: 'Completed',
+    text: 'Completed',
+    order: 2,
     color: Colours.COLOUR_GREEN_LIGHT,
+    category: STATUS_COMPLETED,
   },
 ];
 
-const getJobStatusColour = status => {
-  const option = jobStatusOptions.find(item => item.name === status);
-  return option ? option.color : jobStatusOptions[0].color;
-};
+const jobPriorityOptions = [
+  {
+    label: 'Low',
+    color: Colours.COLOUR_GREEN,
+    default: true,
+  },
+  {
+    label: 'Medium',
+    color: Colours.COLOUR_TANGERINE,
+  },
+  {
+    label: 'High',
+    color: Colours.COLOUR_RED,
+  },
+];
 
-const getJobStatusProps = status => {
-  const statusText = status || jobStatusOptions[0].name;
-  const statusColor = getJobStatusColour(statusText);
+const getJobStatusOptions = props => props?.statusTypes?.length ? props?.statusTypes : jobStatusOptions;
 
-  return { statusText, statusColor };
-};
+const getDefaultJobStatuses = props => getJobStatusOptions(props).filter(s => s.category === STATUS_NOT_ACTIONED);
+
+const getIncompleteJobStatuses = props => getJobStatusOptions(props).filter(s => s.category === STATUS_IN_PROGRESS);
 
-export { jobStatusOptions, getJobStatusColour, getJobStatusProps };
+const getJobStatus = (status, props) => {
+  const statusOptions = getJobStatusOptions(props);
+  // console.log('getJobStatus', JSON.stringify({ status, statusOptions }, null, 2));
+  let statusOption = null;
+  if (status) statusOption = statusOptions.find(s => s.text === status);
+  return statusOption || getDefaultJobStatuses(props)[0];
+}
+
+const getJobPriority = priority => jobPriorityOptions.find(p => p.label === priority) || jobPriorityOptions.find(p => p.default);
+
+export {
+  jobStatusOptions,
+  jobPriorityOptions,
+  getJobStatusOptions,
+  getDefaultJobStatuses,
+  getIncompleteJobStatuses,
+  getJobStatus,
+  getJobPriority,
+};

package/src/reducers/JobsReducer.js

@@ -1,18 +1,30 @@
 /* eslint-disable no-param-reassign */
 import _ from 'lodash';
 import { REHYDRATE } from 'redux-persist';
-import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED } from '../actions/types';
+import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED, JOBS_STATUSES_LOADED, JOBS_HIDE_SEEN, JOB_FILTER_LOADED } 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: [],
+  jobstatuses: [],
+  hideSeen: false,
+  jobfilters: {
+    status: '',
+    statusText: '',
+    priority: '',
+    type: '',
+    assignee: '',
+    assigneeName: '',
+  },
 };
 
 export default (state = INITIAL_STATE, action) => {
   let updateJobs = [];
   let index = 0;
+  let jobstatuses = [];
 
   switch (action.type) {
     case ActionTypes.LOGOUT:
@@ -35,6 +47,19 @@ export default (state = INITIAL_STATE, action) => {
         updateJobs.push(action.payload);
       }
       return { ...state, jobs: updateJobs };
+    case JOBS_STATUSES_LOADED:
+      jobstatuses = _.orderBy(
+        _.unionWith(action.payload, state.jobstatuses, (v1, v2) => {
+          return v1 != null && v2 != null && v1.text === v2.text;
+        }),
+        'order',
+        'asc',
+      );
+      return { ...state, jobstatuses };
+    case JOBS_HIDE_SEEN:
+      return { ...state, hideSeen: action.payload };
+    case JOB_FILTER_LOADED:
+      return { ...state, jobfilters: action.payload };
     case REHYDRATE:
       if (!action.payload) return state;
       if (action.payload[REDUCER_KEY]) {

package/src/screens/JobTypePicker.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import _ from 'lodash';
 import { TouchableOpacity, View, ScrollView, Text } from 'react-native';
 import { connect } from 'react-redux';
-import { Icon } from 'react-native-elements';
+import { Icon } from '@rneui/themed';
 import { Services } from '../feature.config';
 import { Components, Colours } from '../core.config';