Merge branch 'master' into Issue-181

Author: medy-io

README.md

@@ -8,6 +8,11 @@ Currently, they are storing data from their programs in separate Excel spreadshe
 
 This project would work to migrate all of the disparate data sources into one system, make a UI that allows Prevention Point to access all participant data in one system, and increase the ease with which program coordinators can evaluate and monitor activities.
 
+## Before Contributing: 
+
+* Read through the [Wiki](https://github.com/CodeForPhilly/prevention-point/wiki). 
+* Familiarize yourself with the agreed upon project [change management practices](https://github.com/CodeForPhilly/prevention-point/wiki/Change-Management-Practices).
+
 ## [Code of Conduct](https://codeforphilly.org/pages/code_of_conduct/)
 
 This is a Code for Philly project operating under their code of conduct.

firstPR.md

@@ -11,8 +11,8 @@ export const caseManagementQueueData = {
   waitTime: "10 minutes",
   length: 2,
   rows: [
-    createData(1, "FL159", "Last", "1:23 PM", "checkedIn", true),
-    createData(1, "FL237", "Last", "1:23 PM", "checkedIn", false),
+    createData(1, "FL159", "Last", "1:23 PM", "Waiting", true),
+    createData(1, "FL237", "Last", "1:23 PM", "Waiting", false),
   ],
 }
 export const legalServicesQueueData = {
@@ -21,9 +21,9 @@ export const legalServicesQueueData = {
   waitTime: "5 minutes",
   length: 3,
   rows: [
-    createData(1, "FL262", "Last", "1:23 PM", "checkedIn", false),
-    createData(1, "FL305", "Last", "1:23 PM", "checkedIn", false),
-    createData(3, "FL356", "Last", "1:23 PM", "checkedIn", false),
+    createData(1, "FL262", "Last", "1:23 PM", "Waiting", false),
+    createData(1, "FL305", "Last", "1:23 PM", "Waiting", false),
+    createData(3, "FL356", "Last", "1:23 PM", "Waiting", false),
   ],
 }
 export const stepQueueData = {
@@ -32,10 +32,10 @@ export const stepQueueData = {
   waitTime: "7 minutes",
   length: 5,
   rows: [
-    createData(1, "FL159", "Last", "1:23 PM", "checkedIn", false),
-    createData(1, "FL237", "Last", "1:23 PM", "checkedIn", false),
-    createData(3, "FL262", "Last", "1:23 PM", "checkedIn", true),
-    createData(1, "FL305", "Last", "1:23 PM", "checkedIn", false),
-    createData(5, "FL356", "Last", "1:23 PM", "checkedIn", true),
+    createData(1, "FL159", "Last", "1:23 PM", "Waiting", false),
+    createData(1, "FL237", "Last", "1:23 PM", "Waiting", false),
+    createData(3, "FL262", "Last", "1:23 PM", "Waiting", true),
+    createData(1, "FL305", "Last", "1:23 PM", "Waiting", false),
+    createData(5, "FL356", "Last", "1:23 PM", "Waiting", true),
   ],
 }

frontend/fixtures/MockQueueData.js

@@ -61,6 +61,7 @@
     "moment": "^2.24.0",
     "node-sass": "^4.11.0",
     "prop-types": "^15.7.2",
+    "query-string": "^6.9.0",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-router-dom": "^5.1.2",

frontend/package.json

@@ -1,7 +1,11 @@
 import apisauce from "apisauce"
 import createAuthRefreshInterceptor from "axios-auth-refresh"
 import refreshAuthLogic from "./refreshAuthLogic"
-import { getParticipants } from "./participantEndpoints"
+import {
+  getParticipants,
+  createParticipant,
+  updateParticipant,
+} from "./participantEndpoints"
 import { createToken, verifyToken } from "./authEndpoints"
 import { getQueue } from "./queueEndpoints"
 import { postFrontDeskEvent } from "./frontDeskEventEndpoints"
@@ -11,6 +15,8 @@ import {
   createVisits,
   patchVisit,
 } from "./visitEndpoints"
+import { getInsurers } from "./insurersEndpoints"
+import { getPrograms } from "./programEndpoints"
 
 const create = () => {
   const api = apisauce.create({
@@ -34,10 +40,14 @@ const create = () => {
     getQueue: getQueue(api),
     postFrontDeskEvent: postFrontDeskEvent(api),
     getParticipants: getParticipants(api),
+    createParticipant: createParticipant(api),
+    updateParticipant: updateParticipant(api),
     getVisits: getVisits(api),
     updateVisits: updateVisits(api),
     createVisits: createVisits(api),
     patchVisit: patchVisit(api),
+    getInsurers: getInsurers(api),
+    getPrograms: getPrograms(api),
   }
 }
 

frontend/src/api/index.js

@@ -0,0 +1 @@
+export const getInsurers = api => async () => await api.get("insurers/")

frontend/src/api/insurersEndpoints.js

@@ -1,2 +1,35 @@
-export const getParticipants = api => async params =>
-  await api.get("participants/", params)
+import queryString from "query-string"
+
+const removeEmptyParams = params => {
+  let filteredParams = {}
+  for (const key in params) {
+    if (["", null, undefined].includes(params[key])) continue
+    filteredParams[key] = params[key]
+  }
+  return filteredParams
+}
+
+export const getParticipants = api => async params => {
+  const queryParams = queryString.stringify(removeEmptyParams(params))
+  return await api.get(
+    queryParams ? `participants?${queryParams}` : "participants"
+  )
+}
+
+export const getParticipantById = api => async id =>
+  await api.get(`participants/${id}/`)
+
+export const getParticipantByName = api => async (firstname, lastname) =>
+  await api.get(`participants/?first_name=${firstname}&last_name=${lastname}`)
+
+export const getParticipant = api => async id =>
+  await api.get(`/participants/${id}`)
+
+export const updateParticipant = api => async (id, body) =>
+  await api.put(`/participants/${id}/`, body)
+
+export const createParticipant = api => async body =>
+  await api.post("/participants/", body)
+
+// export const postParticipant = api => async (id, body) =>
+// await api.post(`/participant/${id}`, body)

frontend/src/api/participantEndpoints.js

@@ -0,0 +1 @@
+export const getPrograms = api => async () => await api.get("programs/")

frontend/src/api/programEndpoints.js

@@ -96,12 +96,14 @@ const AllQueues = observer(() => {
   //Update all queues on first rendering
   useEffect(() => {
     for (let i = 1; i <= queueSize; i++) queueStore.getQueue(i)
-  }, [queueSize, queueStore])
+    //eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 
   //Update queue of selected tab
   useEffect(() => {
     queueStore.getQueue(tabValue + 1)
-  }, [queueStore, tabValue])
+    //eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tabValue])
 
   const tabArray = []
   for (let i = 1; i <= queueSize; i++) {