Base Code for Service Waitlist Type

backend/models/service/serviceWaitlist.js

@@ -0,0 +1,19 @@
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
+
+//These might need tweaking, need to figure out what things we need for this model
+const {GDBServiceModel} = require("./service");
+const {GDBNeedModel} = require("../need/need");
+
+
+const GDBServiceWaitlistModel = createGraphDBModel({
+    occurrenceOf: {type: GDBServiceModel, internalKey: ':occurrenceOf'},
+    clients: {type: [GDBNeedModel], internalKey: ':hasNeed'},
+},
+{  
+    rdfTypes: [':ServiceWaitlist'], name: 'serviceWaitlist'
+}
+
+);
+module.exports = {
+    GDBServiceWaitlistModel
+  }

frontend/src/components/layouts/TopNavbar.js

@@ -146,6 +146,13 @@ function TopNavBar() {
                 <Typography variant="inherit">Service Occurrences</Typography>
               </MenuItem>
 
+              <MenuItem onClick={handleLink(`/serviceWaitlists`)}>
+                <ListItemIcon>
+                  <LocationCityIcon fontSize="medium" sx={{color: 'black'}}/>
+                </ListItemIcon>
+                <Typography variant="inherit">Service Waitlists</Typography>
+              </MenuItem>
+
               <MenuItem onClick={handleLink(`/appointments`)}>
                 <ListItemIcon>
                   <BusinessCenterIcon fontSize="medium" sx={{color: 'black'}}/>

frontend/src/components/serviceWaitlist/serviceWaitlists.js

@@ -0,0 +1,81 @@
+import React from 'react'
+import { Link } from '../shared';
+import { GenericPage } from "../shared";
+import { deleteSingleGeneric, fetchMultipleGeneric, fetchSingleGeneric } from "../../api/genericDataApi";
+import { getInstancesInClass } from "../../api/dynamicFormApi";
+import {getAddressCharacteristicId} from "../shared/CharacteristicIds";
+
+const TYPE = 'serviceWaitlists';
+
+const columnsWithoutOptions = [
+  {
+    label: 'ID',
+    body: ({_id}) => {
+      return <Link color to={`/${TYPE}/${_id}/edit`}>{_id}</Link>
+    }
+  },
+  {
+    label: 'Service',
+    body: ({service}) => {
+      return <Link color to={`/${TYPE}/${service}/edit`}>{service}</Link>
+    }
+  },
+  {
+    label: 'Waitlist Size',
+    body: ({clients}) => {
+      if (clients) {
+        return <Link color to={`/need/${clients}/edit`}>{clients}</Link>;
+      } else {
+        return "";
+      }
+    }
+  },
+  // {
+  //   label: 'Description',
+  //   body: ({desc}) => desc
+  // },
+  // {
+  //   label: 'Category',
+  //   body: ({category}) => category
+  // }
+];
+
+export default function ServiceWaitlists() {
+
+  const nameFormatter = serviceWaitlist => 'Service Waitlist' + serviceWaitlist._id;
+
+  const linkFormatter = needOccurrence => `/${TYPE}/${serviceWaitlist._id}`;
+
+  const fetchData = async () => {
+    const addressCharacteristicId = await getAddressCharacteristicId();
+    const serviceWaitlists = (await fetchMultipleGeneric('serviceWatilist')).data;
+    const data = [];
+    for (const serviceWaitlist of serviceWaitlists) {
+      const serviceWaitlistData = {
+              _id: serviceWaitlist._id,
+              service: serviceWaitlist.service,
+              clients: serviceWaitlist.clients
+      };
+      data.push(serviceWaitlistData);
+      console.log(data)
+    }
+    return data;
+  }
+
+  const deleteServiceWaitlist = (id) => deleteSingleGeneric('serviceWaitlist', id);
+
+  return (
+    <GenericPage
+      type={TYPE}
+      title={"Service Waitlist"}
+      columnsWithoutOptions={columnsWithoutOptions}
+      fetchData={fetchData}
+      deleteItem={deleteServiceWaitlist}
+      nameFormatter={nameFormatter}
+      linkFormatter={linkFormatter}
+      tableOptions={{
+        idField: '_id'
+      }}
+    />
+  )
+}

frontend/src/components/settings/ManageFormFields.js

@@ -154,6 +154,7 @@ export default function ManageFormFields() {
     //if this is not the case, then the error message is displayed and the form
     //is not created/updated
     form.formStructure.forEach(step => {
+      form
       if (step.fields.length <= 0){
         setErrors(errors => ({...errors, formName: 'Blank step detected.'}));
         empty_step = true;
@@ -164,6 +165,19 @@ export default function ManageFormFields() {
       return;
     }
 
+      if ((formType) === 'client'){
+        //the "48" is the internal type ID for "Needs" and is hardcoded in, there
+        //must be some sort of dynamic way to acquire this, which I will need to look into
+        const hasNeeds = usedInternalTypeIds.some(item => item = 48);
+        if (!hasNeeds){
+          setErrors(errors => ({...errors, formName: 'Client Forms must have a needs category'}));
+          return;
+        }
+      }
+
+
+
+
 
     try {
       if (method === 'new') {
@@ -176,7 +190,7 @@ export default function ManageFormFields() {
     } catch (e) {
       console.error(e)
     }
-  };
+  }; 
 
   const handleChange = useCallback(name => e => {
     const value = e.target.value;