Capacities and occupancies for service and program occurrences

backend/config/index.js

@@ -6,7 +6,7 @@ if (isProduction)
 
 const config = {
   graphdb: {
-    addr: isProduction ? 'http://localhost:7200' : `http://${isDocker ? 'host.docker.internal' : 'localhost'}:7200`,
+    addr: isProduction ? 'http://127.0.0.1:7200' : `http://${isDocker ? 'host.docker.internal' : '127.0.0.1'}:7200`,
   },
   mongodb: {
     addr: isProduction ? 'mongodb://localhost:27017/snmi' : `mongodb://localhost:27017/${process.env.test ? "snmiTest" : "snmi"}`

backend/models/service/serviceWaitlist.js

@@ -0,0 +1,26 @@
+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 {GDBClientModel} = require("../ClientFunctionalities/client");
+const { GDBCOModel } = require("../ClientFunctionalities/characteristicOccurrence");
+
+
+const GDBServiceWaitlistModel = createGraphDBModel({
+
+    clients: {type: [GDBClientModel], internalKey: ':hasClient'},
+    service: {type: GDBServiceModel, internalKey: ':hasService'},
+    characteristicOccurences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurence'}
+
+},
+{  
+    rdfTypes: [':ServiceWaitlist'], name: 'serviceWaitlist'
+}
+
+);
+module.exports = {
+    GDBServiceWaitlistModel
+  }

backend/services/characteristics/predefined/internalTypes.js

@@ -207,6 +207,35 @@ module.exports = [
     }
   },
 
+
+
+  // below are for servic waitlist
+  {
+    name: 'clientForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasClient',
+    formType: 'serviceWaitlist',
+    implementation: {
+      label: 'Client',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.MultiSelectField,
+      optionsFromClass: 'http://snmi#Client'
+    }
+  },
+  {
+    name: 'serviceForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasService',
+    formType: 'serviceWaitlist',
+    implementation: {
+      label: 'Service',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.SingleSelectField,
+      optionsFromClass: 'http://snmi#Service'
+    }
+  },
+
+
+
+
   // below are for program Provision
   {
     name: 'needOccurrenceForProgramProvision',

backend/services/genericData/index.js

@@ -21,6 +21,9 @@ const {GDBAppointmentModel} = require("../../models/appointment");
 const {GDBPersonModel} = require("../../models/person");
 const {GDBServiceOccurrenceModel} = require("../../models/service/serviceOccurrence");
 const {GDBProgramOccurrenceModel} = require("../../models/program/programOccurrence");
+
+const {GDBServiceWaitlistModel} = require("../../models/service/serviceWaitlist");
+
 const {GDBInternalTypeModel} = require("../../models/internalType");
 const {noQuestion} = require('./checkers')
 const {
@@ -123,6 +126,7 @@ const {
   afterDeleteVolunteer
 } = require("./volunteerInternalTypeTreater");
 const {GDBEligibilityModel} = require("../../models/eligibility");
+const { serviceWaitlistInternalTypeCreateTreater, serviceWaitlistInternalTypeFetchTreater, serviceWaitlistInternalTypeUpdateTreater } = require("./serviceWaitlist");
 const genericType2Model = {
   'client': GDBClientModel,
   'organization': GDBOrganizationModel,
@@ -131,6 +135,7 @@ const genericType2Model = {
   'program': GDBProgramModel,
   'appointment': GDBAppointmentModel,
   'serviceOccurrence': GDBServiceOccurrenceModel,
+  'serviceWaitlist': GDBServiceWaitlistModel,
   'programOccurrence': GDBProgramOccurrenceModel,
   'referral': GDBReferralModel,
   'serviceRegistration': GDBServiceRegistrationModel,
@@ -157,6 +162,7 @@ const genericType2Populates = {
   'service': ['serviceProvider.organization.address', 'serviceProvider.volunteer.address'],
   'program': ['serviceProvider.organization.address', 'serviceProvider.volunteer.address', 'serviceProvider.organization', 'serviceProvider.volunteer', 'manager'],
   'serviceOccurrence': ['address', 'occurrenceOf'],
+  'serviceWaitlist': ['service', 'clients'],
   'programOccurrence': ['address', 'occurrenceOf'],
   'client': ['address', 'needs'],
   'appointment': ['address', 'referral'],
@@ -165,10 +171,11 @@ const genericType2Populates = {
 };
 
 const genericType2Checker = {
-    'service': noQuestion,
-    'serviceOccurrence': noQuestion,
-    'programOccurrence': noQuestion,
-    'program': noQuestion
+  'service': noQuestion,
+  'serviceOccurrence': noQuestion,
+  'programOccurrence': noQuestion,
+  'program' : noQuestion,
+  'serviceWaitlist': noQuestion
 };
 
 
@@ -203,7 +210,8 @@ const genericType2InternalTypeCreateTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeCreateTreater,
   'clientAssessment': clientAssessmentInternalTypeCreateTreater,
   'person': personInternalTypeCreateTreater,
-  'volunteer': volunteerInternalTypeCreateTreater
+  'volunteer': volunteerInternalTypeCreateTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeCreateTreater
 };
 
 const genericType2InternalTypeFetchTreater = {
@@ -222,7 +230,9 @@ const genericType2InternalTypeFetchTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeFetchTreater,
   'clientAssessment': clientAssessmentInternalTypeFetchTreater,
   'person': personInternalTypeFetchTreater,
-  'volunteer': volunteerInternalTypeFetchTreater
+  'volunteer': volunteerInternalTypeFetchTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeFetchTreater
+
 };
 
 const genericType2InternalTypeUpdateTreater = {
@@ -241,7 +251,8 @@ const genericType2InternalTypeUpdateTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeUpdateTreater,
   'clientAssessment': clientAssessmentInternalTypeUpdateTreater,
   'person': personInternalTypeUpdateTreater,
-  'volunteer': volunteerInternalTypeUpdateTreater
+  'volunteer': volunteerInternalTypeUpdateTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeUpdateTreater
 };
 
 const genericType2AfterCreateTreater = {

backend/services/genericData/serviceWaitlist.js

@@ -0,0 +1,34 @@
+const {getPredefinedProperty} = require("./helperFunctions");
+const {GDBInternalTypeModel} = require("../../models/internalType");
+const {SPARQL} = require("graphdb-utils");
+const FORMTYPE = 'serviceWaitlist'
+
+const serviceWaitlistInternalTypeCreateTreater = async (internalType, instanceData, value) => { 
+  //get the property name from the internalType
+  const property = getPredefinedProperty(FORMTYPE, internalType);
+  //if the property is client, person or user, then set the value to the instanceData
+  if (property === 'clients' || property === 'service'){
+    instanceData[property] = value;
+  }
+};
+
+const serviceWaitlistInternalTypeFetchTreater = async (data) => {
+  const result = {};
+  const schema =  data.schema; 
+  // for each property in data, if the property is client, person or user, then set the value to the result
+  for (const property in data) {
+    if (property === 'clients' || property === 'service') {
+      const internalType = await GDBInternalTypeModel.findOne({predefinedProperty: schema[property].internalKey, formType: FORMTYPE});
+      result[ 'internalType_'+ internalType._id] = SPARQL.ensureFullURI(data[property]);
+    }
+  }
+  return result;
+};
+
+
+const serviceWaitlistInternalTypeUpdateTreater = async (internalType, value, result) => {
+  await serviceWaitlistInternalTypeCreateTreater(internalType, result, value);
+}
+
+
+module.exports = {serviceWaitlistInternalTypeCreateTreater, serviceWaitlistInternalTypeFetchTreater, serviceWaitlistInternalTypeUpdateTreater}

frontend/src/components/ServiceWaitlists.js

@@ -0,0 +1,69 @@
+import React from 'react';
+import { Link } from './shared';
+import { GenericPage } from "./shared";
+import { deleteSingleGeneric, fetchMultipleGeneric, fetchSingleGeneric } from "../api/genericDataApi";
+import {getAddressCharacteristicId} from "./shared/CharacteristicIds";
+
+const TYPE = 'serviceWaitlist';
+
+const columnsWithoutOptions = [
+  {
+    label: 'Service Name',
+    body: ({service}) => <Link color to={`/${TYPE}/${service?._id}/edit`}>{service?.name}</Link>
+
+  },
+  {
+    label: 'Clients Waitlisted',
+    body: ({clients}) => clients ? clients.length : 0
+  },
+  // {
+  //   label: 'Category',
+  //   body: ({category}) => category
+  // }
+];
+
+export default function ServiceWaitlists() {
+
+  const nameFormatter = serviceWaitlist => {
+    if (serviceWaitlist.description) {
+      return serviceWaitlist.description;
+    } else {
+      return 'Service Waitlist ' + serviceWaitlist._id;
+    }
+  }
+
+  const linkFormatter = serviceWaitlist => `/${TYPE}/${serviceWaitlist._id}`;
+
+  const fetchData = async () => {
+    const addressCharacteristicId = await getAddressCharacteristicId();
+    const serviceWaitlists = (await fetchMultipleGeneric(TYPE)).data;
+    console.log(serviceWaitlists)
+    const data = [];
+    for (const serviceWaitlist of serviceWaitlists) {
+      const serviceWaitlistData = {_id: serviceWaitlist._id};
+      if (serviceWaitlist.clients)
+        serviceWaitlistData.clients = serviceWaitlist.clients;
+      if (serviceWaitlist.service)
+        serviceWaitlistData.service = serviceWaitlist.service;
+      data.push(serviceWaitlistData);
+    }
+    return data;
+  };
+
+  const deleteService = (id) => deleteSingleGeneric('serviceWaitlist', id);
+
+  return (
+    <GenericPage
+      type={TYPE}
+      title={"Service Waitlists"}
+      columnsWithoutOptions={columnsWithoutOptions}
+      fetchData={fetchData}
+      deleteItem={deleteService}
+      nameFormatter={nameFormatter}
+      linkFormatter={linkFormatter}
+      tableOptions={{
+        idField: '_id'
+      }}
+    />
+  );
+}

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

@@ -0,0 +1,24 @@
+import React, {useEffect, useState} from 'react';
+import GenericForm from "../shared/GenericForm";
+import {fetchInternalTypeByFormType} from "../../api/internalTypeApi";
+import {ServiceAndNeedSatisfierField} from "../serviceOccurrence/ServiceAndNeedSatisfierField";
+
+export default function ServiceWaitlistForm() {
+  const formType = 'serviceWaitlist';
+
+  const [internalTypes, setInternalTypes] = useState({});
+  useEffect(() => {
+    fetchInternalTypeByFormType(formType).then(({internalTypes}) => {
+      const data = {}
+      for (const {implementation, name, _id} of internalTypes) {
+        data[name] = {implementation, _id}
+      }
+      setInternalTypes(data);
+      console.log('serviceWaitlist internalTypes', data);
+    });
+  }, []);
+
+  return (
+    <GenericForm name={formType} mainPage={'/serviceWaitlists'}/>
+  );
+};

frontend/src/components/serviceWaitlist/serviceWaitlistForm.js

@@ -0,0 +1,24 @@
+import React, {useEffect, useState} from 'react';
+import GenericForm from "../shared/GenericForm";
+import {fetchInternalTypeByFormType} from "../../api/internalTypeApi";
+import {ServiceAndNeedSatisfierField} from "./ServiceAndNeedSatisfierField";
+
+export default function ServiceWaitlistForm() {
+  const formType = 'serviceWaitlist';
+
+  const [internalTypes, setInternalTypes] = useState({});
+  useEffect(() => {
+    fetchInternalTypeByFormType(formType).then(({internalTypes}) => {
+      const data = {}
+      for (const {implementation, name, _id} of internalTypes) {
+        data[name] = {implementation, _id}
+      }
+      setInternalTypes(data);
+      console.log('serviceWaitlist internalTypes', data);
+    });
+  }, []);
+
+  return (
+    <GenericForm name={formType} mainPage={'/serviceWaitlists'}/>
+  );
+};