From cbf502bc14f966cf594348b54c6f7c0a942795a9 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Fri, 30 Aug 2019 18:43:02 +0200
Subject: [PATCH] Format change / cosmetic changes

---
 client/src/App.js                                           | 1 +
 client/src/scenes/Home/index.js                             | 6 +++---
 .../components/MemberSelector.js                            | 4 +++-
 controllers/integration.js                                  | 2 ++
 services/integration/invoiceIntegration.js                  | 6 +++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/src/App.js b/client/src/App.js
index a773083..bdf78d1 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -8,6 +8,7 @@ import { mainMenuItems } from './constants/menuItems';
 
 class App extends Component {
     render() {
+        document.title='Sima Space CRM';
         return (
             <Router>
                 <Switch>
diff --git a/client/src/scenes/Home/index.js b/client/src/scenes/Home/index.js
index b344612..21c2698 100644
--- a/client/src/scenes/Home/index.js
+++ b/client/src/scenes/Home/index.js
@@ -15,17 +15,17 @@ class Home extends Component {
                 <hr/>
                 {
                     mainMenuItems.map((menuItem) => {
-                        const { showOnHomePage, title, description, url} = menuItem;
+                        const { id, showOnHomePage, title, description, url} = menuItem;
                         if (showOnHomePage){
-
                             return (
-                                <Message size={'large'}>
+                                <Message key={id} size={'large'}>
                                     <a href={url}><Message.Header>{title}</Message.Header></a>
                                     <br/>
                                     {description}
                                 </Message>
                             );
                         }
+                        return null;
                     })
                 }
             </Container>
diff --git a/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js b/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js
index 589e47b..1e37620 100644
--- a/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js
+++ b/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js
@@ -22,7 +22,7 @@ class MemberSelector extends Component {
     }
 
     render(){
-        const { members, defaultMemberId } = this.props;
+        const { members, defaultMemberId, loadingMembers } = this.props;
 
         const dropdownOptions = members && Array.isArray(members) ? members.map(member => ({
                 key: member.memberId,
@@ -35,6 +35,7 @@ class MemberSelector extends Component {
             <Form>
                 <label>{'Member name'}</label>
                 <Dropdown
+                    loading={loadingMembers}
                     options={dropdownOptions}
                     placeholder="Select Member"
                     selection
@@ -50,6 +51,7 @@ class MemberSelector extends Component {
 
 const mapStateToProps = (state) => ({
     members: state.membersList.result,
+    loadingMembers: state.membersList.pending,
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/controllers/integration.js b/controllers/integration.js
index 5b17d23..7cfee70 100644
--- a/controllers/integration.js
+++ b/controllers/integration.js
@@ -151,6 +151,7 @@ const addFees = (req, res) => {
                             })
                     })
                     .catch((error) => {
+                        console.log(error);
                         res.status(500).send(error);
                     });
             })
@@ -159,6 +160,7 @@ const addFees = (req, res) => {
                 res.status(500).send(error);
             })
     }else{
+        console.log('Date range is missing to send fees to ORD');
         res.status(400).send('Date range is missing');
     }
 };
diff --git a/services/integration/invoiceIntegration.js b/services/integration/invoiceIntegration.js
index 86cb5ed..077c9c2 100644
--- a/services/integration/invoiceIntegration.js
+++ b/services/integration/invoiceIntegration.js
@@ -212,10 +212,10 @@ const createFeeFromBooking = (booking, resourceMappings) => {
     const resourceName = resourcesMap[resourceId].resourceName || 'Unknown';
 
     const formattedDate = startMoment.clone().startOf('day').format('MMM DD');
-    const formattedStartTime = startMoment.format('HH:mm a');
-    const formattedEndTime = endMoment.format('HH:mm a');
+    const formattedStartTime = startMoment.format('HH:mm');
+    const formattedEndTime = endMoment.format('HH:mm');
 
-    const formattedName = `${officeName}, ${resourceName}, ${formattedDate} [${formattedStartTime} - ${formattedEndTime}]`;
+    const formattedName = `${formattedDate} [${formattedStartTime} to ${formattedEndTime}] ${resourceName}, ${officeName}`;
 
     return {
         name: formattedName,