Merge pull request #186 from CodeForPhilly/update-queues-163

Update queues 163

Author: TriStarGod

core/management/commands/seed.py

@@ -29,7 +29,7 @@
 
 DEFAULT_DEV_ENV_PASS = "password123"
 DEFAULT_GROUPS = [FRONT_DESK, CASE_MANAGER, ADMIN]
-DEFAULT_NUMBER_PARTICIPANTS = 10
+DEFAULT_NUMBER_PARTICIPANTS = 1000
 DEFAULT_NUMBER_VISITS = 100
 DEFAULT_NUMBER_INSURERS = 10
 
@@ -290,7 +290,6 @@ def create_visits(output=True, uds=True, medication=True):
                 )
             )
 
-
 def create_event(visit, type):
     """Create a FrontDeskEvent for thie visit and of this type, e.g. ARRIVED, STEPPED_OUT. Events are created now(), i.e. today"""
     f = FrontDeskEvent()
@@ -299,32 +298,21 @@ def create_event(visit, type):
     f.full_clean()
     f.save()
 
-
 def arrived(visit):
     """After ARRIVED, can be either LEFT, SEEN, STEPPED_OUT or pending (still in ARRIVED status)"""
     create_event(visit, "ARRIVED")
     random.choice([left, seen, stepped_out, pending])(visit)
 
-
 def left(visit):
     create_event(visit, "LEFT")
 
-
 def seen(visit):
     create_event(visit, "SEEN")
 
-
 def stepped_out(visit):
-    """After STEPPED_OUT can be either LEFT, CAME_BACK or pending (still in STEPPED_OUT status)"""
+    """After STEPPED_OUT can be either LEFT, ARRIVED or pending (still in STEPPED_OUT status)"""
     create_event(visit, "STEPPED_OUT")
-    random.choice([left, came_back, pending])(visit)
-
-
-def came_back(visit):
-    """After CAME_BACK, either LEFT, SEEN or pending (still in CAME_BACK status)"""
-    create_event(visit, "CAME_BACK")
-    random.choice([left, seen, pending])(visit)
-
+    random.choice([left, arrived, pending])(visit)
 
 def pending(visit):
     pass

core/models/visit.py

@@ -6,11 +6,11 @@
 
 
 class UrgencyLevel(Enum):
-    ONE = 1
-    TWO = 2
-    THREE = 3
-    FOUR = 4
-    FIVE = 5
+    _1 = 1
+    _2 = 2
+    _3 = 3
+    _4 = 4
+    _5 = 5
 
 
 class Visit(models.Model):
@@ -21,4 +21,4 @@ class Visit(models.Model):
         ProgramServiceMap, null=True, on_delete=models.CASCADE
     )
     notes = models.TextField("Visit Notes", null=True, blank=True)
-    urgency = models.CharField(choices=URGENCY_LEVEL, max_length=20, default=UrgencyLevel.ONE)
+    urgency = models.CharField(choices=URGENCY_LEVEL, max_length=20, default=UrgencyLevel._1)

core/queue/views.py

@@ -28,7 +28,7 @@ def retrieve(self, request, program_id=None):
         visits_queryset = Visit.objects.filter(
             program_service_map__program_id=program_id,
             created_at__date=datetime.date.today(),
-        )
+        ).order_by("urgency", "-created_at")
 
         todays_visit_data = VisitWithPopulationSerializer(
             visits_queryset, many=True, context={'request': request}

core/tests/visits.py

@@ -37,7 +37,7 @@ def test_create_visit(self):
             "program": 1,
             "service": 1,
             "notes": "hello prevention point",
-            "urgency": "ONE",
+            "urgency": "_1",
         }
         response = self.client.post(url, data, format="json", follow=True, **headers)
 
@@ -56,7 +56,7 @@ def test_update_visit_notes(self):
             "participant": 1,
             "program": 1,
             "service": 1,
-            "urgency": UrgencyLevel.TWO.name,
+            "urgency": "_2",
         }
         create_response = self.client.post(
             "/api/visits/", data, format="json", **headers
@@ -91,7 +91,7 @@ def test_get_visits(self):
                 "program": 1,
                 "service": 2,
                 "notes": "hello prevention point",
-                "urgency": UrgencyLevel.THREE.name,
+                "urgency": "_3",
             }
             post_response = self.client.post(url, data, format="json", **headers)
             self.assertEqual(post_response.status_code, status.HTTP_201_CREATED)
@@ -132,7 +132,7 @@ def test_create_visit_and_medical_data(self):
             "participant_id": 1,
             "program_service_map_id": 1,
             "notes": "hello prevention point",
-            "urgency": UrgencyLevel.TWO.name,
+            "urgency": "_2",
         }
 
         visit = Visit.objects.create(**new_visit)

frontend/package.json

@@ -60,7 +60,6 @@
     "mobx-react-lite": "^1.3.0",
     "moment": "^2.24.0",
     "node-sass": "^4.11.0",
-    "object-hash": "^2.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",

frontend/src/App.js

@@ -28,6 +28,8 @@ const App = observer(() => {
       }
     }
     stillAuthenticated()
+    //Suppress eslint error for []
+    //eslint-disable-next-line react-hooks/exhaustive-deps
   }, []) // Hooks equivalent to "componentDidMount"
 
   if (rootStore.authStore.isAuthenticated === null) {

frontend/src/api/frontDeskEventEndpoints.js

@@ -0,0 +1,8 @@
+export const getFrontDeskEvent = api => async id =>
+  await api.get(`front-desk-events/${id}/`)
+
+export const postFrontDeskEvent = api => async data =>
+  await api.post("front-desk-events/", data)
+
+export const patchFrontDeskEvent = api => async (id, data) =>
+  await api.patch(`front-desk-events/${id}/`, data)

frontend/src/api/index.js

@@ -4,7 +4,13 @@ import refreshAuthLogic from "./refreshAuthLogic"
 import { getParticipants } from "./participantEndpoints"
 import { createToken, verifyToken } from "./authEndpoints"
 import { getQueue } from "./queueEndpoints"
-import { getVisits, updateVisits, createVisits } from "./visitsEndpoint"
+import { postFrontDeskEvent } from "./frontDeskEventEndpoints"
+import {
+  getVisits,
+  updateVisits,
+  createVisits,
+  patchVisit,
+} from "./visitEndpoints"
 
 const create = () => {
   const api = apisauce.create({
@@ -26,10 +32,12 @@ const create = () => {
     createToken: createToken(api),
     verifyToken: verifyToken(api),
     getQueue: getQueue(api),
+    postFrontDeskEvent: postFrontDeskEvent(api),
     getParticipants: getParticipants(api),
     getVisits: getVisits(api),
     updateVisits: updateVisits(api),
     createVisits: createVisits(api),
+    patchVisit: patchVisit(api),
   }
 }
 

frontend/src/api/visitsEndpoint.js renamed to frontend/src/api/visitEndpoints.js

@@ -7,3 +7,6 @@ export const updateVisits = api => async (id, body) =>
 
 export const createVisits = api => async body =>
   await api.post("/visits/", body)
+
+export const patchVisit = api => async (visitId, data) =>
+  await api.patch(`visits/${visitId}/`, data)

frontend/src/components/AllQueues.js

@@ -87,16 +87,22 @@ function QueueTab(props) {
 const AllQueues = observer(() => {
   const queueStore = useContext(QueueStoreContext)
   const queueSize = Object.keys(queueStore.queues).length
-
-  useEffect(() => {
-    for (let i = 1; i <= queueSize; i++) queueStore.getQueue(i)
-  })
   const classes = useStyles()
   const [tabValue, setTabValue] = useState(0)
   function handleChange(event, newValue) {
     setTabValue(newValue)
   }
 
+  //Update all queues on first rendering
+  useEffect(() => {
+    for (let i = 1; i <= queueSize; i++) queueStore.getQueue(i)
+  }, [queueSize, queueStore])
+
+  //Update queue of selected tab
+  useEffect(() => {
+    queueStore.getQueue(tabValue + 1)
+  }, [queueStore, tabValue])
+
   const tabArray = []
   for (let i = 1; i <= queueSize; i++) {
     tabArray.push(