Merge pull request #309 from qccoders/fix-daily-event

Prevent Users from creating Daily Events on the fly from the Scanner UI

Author: wburklund

web/package-lock.json

@@ -31,7 +31,7 @@ const styles = {
         marginTop: 50,
         height: 'fit-content',
     },
-    deleteButton: {
+    leftButton: {
         marginRight: 'auto',
     },
     spinner: {
@@ -117,6 +117,20 @@ class EventDialog extends Component {
         this.setState({ confirmDialog: { open: true }});
     }
 
+    handleDailyEventClick = () => {
+        let start = moment().startOf('day').add(8, 'hours');
+        let end = moment().startOf('day').add(8, 'hours').add(7, 'hours');
+
+        this.setState({ 
+            event: {
+                name: 'Daily Event for ' + start.format('M/DD/YY'),
+                startDate: start.format(),
+                endDate: end.format(),
+            },
+            validation: { ...initialState.validation },
+        });
+    }
+
     handleDeleteConfirmClick = () => {
         return this.execute(
             () => this.props.context.api.delete('/v1/events/' + this.state.event.id),
@@ -264,13 +278,23 @@ class EventDialog extends Component {
                         <Button 
                             onClick={this.handleDeleteClick} 
                             color="primary" 
-                            className={classes.deleteButton}
+                            className={classes.leftButton}
                             disabled={executing}
                         >
                             {deleting && <CircularProgress size={20} style={styles.spinner}/>}
                             Delete
                         </Button>
                     }
+                    {intent === 'add' && 
+                        <Button 
+                            onClick={this.handleDailyEventClick} 
+                            color="primary" 
+                            className={classes.leftButton}
+                            disabled={executing}
+                        >
+                            Daily Event
+                        </Button>
+                    }
                     <Button 
                         onClick={this.handleCancelClick}
                         color="primary"

web/src/events/EventDialog.js

@@ -33,7 +33,7 @@ const EventList = (props) => {
 
     return (
         <List>
-            {events.sort(sortByProp('startDate')).map((e, index) => 
+            {events.sort(sortByProp('startDate', 'desc')).map((e, index) => 
                 <ListItem 
                     key={index}
                     button={onItemClick !== undefined}
@@ -48,6 +48,7 @@ const EventList = (props) => {
                     />
                 </ListItem>
             )}
+            {events.length === 0 && <ListItem><ListItemText primary='No Events have been scheduled.'/></ListItem>}
         </List>
     );
 };

web/src/events/EventList.js

@@ -113,7 +113,7 @@ class Events extends Component {
 
     refresh = (apiType) => {
         this.setState({ [apiType]: { ...this.state[apiType], isExecuting: true }}, () => {
-            this.props.context.api.get('/v1/events?offset=0&limit=100&orderBy=ASC')
+            this.props.context.api.get('/v1/events?offset=0&limit=100&orderBy=DESC')
             .then(response => {
                 this.setState({ 
                     events: response.data,

web/src/events/Events.js

@@ -22,6 +22,7 @@ import { CHECKIN_SERVICE_ID } from '../constants';
 import { isMobileAttached, initiateMobileScan } from '../mobile';
 import { withContext } from '../shared/ContextProvider';
 import { getScanResult } from './scannerUtil';
+import { userCanView } from '../util';
 import ServiceList from '../services/ServiceList';
 import ScannerMenu from './ScannerMenu';
 import ScanDisplay from './ScanDisplay';
@@ -294,7 +295,7 @@ class Scanner extends Component {
         let dailyEvent = this.getDailyEvent();
         let dailyEventExists = events.find(e => e.name === dailyEvent.name);
 
-        if (dailyEventExists === undefined) {
+        if (dailyEventExists === undefined && userCanView()) {
             events = events.concat(dailyEvent);
         }
 

web/src/scans/Scanner.js

@@ -30,6 +30,7 @@ const ServiceList = (props) => {
                     />
                 </ListItem>
             )}
+            {services.length === 0 && <ListItem><ListItemText primary='No Services have been added.'/></ListItem>}
         </List>
     );
 };

web/src/services/ServiceList.js

@@ -105,7 +105,7 @@ class Services extends Component {
 
     refresh = (apiType) => {
         this.setState({ [apiType]: { ...this.state[apiType], isExecuting: true}}, () => {
-            this.props.context.api.get('/v1/services?offset=0&limit=5000&orderBy=ASC')
+            this.props.context.api.get('/v1/services?offset=0&limit=100&orderBy=ASC')
             .then(response => {
                 this.setState({
                     services: response.data,

web/src/services/Services.js

@@ -30,6 +30,7 @@ const VeteranList = (props) => {
                     />
                 </ListItem>
             )}
+            {veterans.length === 0 && <ListItem><ListItemText primary='No Veterans have been added.'/></ListItem>}
         </List>
     );
 };