Merge pull request #193 from qccoders/immutable-checkin

Implement immutable Check In Service
qccoders · Sep 23, 2018 · 75b5c7a · 75b5c7a
2 parents a5fac98 + 6370b38
commit 75b5c7a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/api/QCVOC.Api/Services/Data/Repository/ServiceRepository.cs b/api/QCVOC.Api/Services/Data/Repository/ServiceRepository.cs
@@ -88,6 +88,11 @@ INSERT INTO services (
         /// <param name="id">The id of the Service to delete.</param>
         public void Delete(Guid id)
         {
+            if (id == Guid.Empty)
+            {
+                throw new InvalidOperationException("The Check In Service may not be deleted.");
+            }
+
             var builder = new SqlBuilder();
 
             var query = builder.AddTemplate(@"
@@ -189,6 +194,11 @@ LIMIT @limit OFFSET @offset
         /// <returns>The updated Service.</returns>
         public Service Update(Service service)
         {
+            if (service.Id == Guid.Empty)
+            {
+                throw new InvalidOperationException("The Check In Service may not be modified.");
+            }
+
             var builder = new SqlBuilder();
 
             var query = builder.AddTemplate(@"

diff --git a/web/src/events/Events.js b/web/src/events/Events.js
@@ -27,7 +27,7 @@ const styles = {
         zIndex: 1000
     },
     card: {
-        minHeight: 220,
+        minHeight: 272,
         maxWidth: 800,
         margin: 'auto',
     },

diff --git a/web/src/services/ServiceDialog.js b/web/src/services/ServiceDialog.js
@@ -209,7 +209,7 @@ class ServiceDialog extends Component {
                 <DialogTitle>{(intent === 'add' ? 'Create' : 'Update')} Service</DialogTitle>
                 <DialogContent>
                     <TextField
-                        autofocus
+                        autoFocus
                         id="name"
                         label="Name"
                         value={name}

diff --git a/web/src/services/ServiceList.js b/web/src/services/ServiceList.js
@@ -5,15 +5,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { List, ListItem, ListItemIcon, ListItemText } from '@material-ui/core';
-import { Shop } from '@material-ui/icons'
+import { List, ListItem, ListItemIcon, ListItemText, ListSubheader } from '@material-ui/core';
+import { Shop, Work } from '@material-ui/icons'
 
 const ServiceList = (props) => {
     let { services, onItemClick } = props;
+    let userDefined = services.filter(s => s.id !== '00000000-0000-0000-0000-000000000000');
+    let systemDefined = services.filter(s => s.id === '00000000-0000-0000-0000-000000000000');
 
     return (
         <List>
-            {services.map(s =>
+            {userDefined && userDefined.length > 0 && <ListSubheader>User Defined</ListSubheader>}
+            {userDefined.map(s =>
                 <ListItem
                     key={s.id}
                     button
@@ -28,6 +31,18 @@ const ServiceList = (props) => {
                     />
                 </ListItem>
             )}
+            <ListSubheader>System Defined</ListSubheader>
+            {systemDefined.map(s =>
+                <ListItem key={s.id}>
+                    <ListItemIcon>
+                        <Work/>
+                    </ListItemIcon>
+                    <ListItemText
+                        primary={s.name}
+                        secondary={s.description}
+                    />
+                </ListItem>
+            )}
         </List>
     );
 }

diff --git a/web/src/services/Services.js b/web/src/services/Services.js
@@ -38,7 +38,7 @@ const styles = {
         right: 0,
         marginLeft: 'auto',
         marginRight: 'auto',
-        marginTop: 83,
+        marginTop: 72,
     },
 };