Merge branch 'master' into Issue-181

Author: TriStarGod

.dockerignore

@@ -0,0 +1,2 @@
+env/
+frontend/

.gitignore

@@ -31,6 +31,7 @@ Temporary Items
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+.mypy_cache/
 
 # C extensions
 *.so
@@ -95,8 +96,9 @@ db.sqlite3
 /.cache
 /dist
 
-# dependencies
+# Javascript
 frontend/node_modules/
+node_modules
 frontend/.pnp
 .pnp.js
 
@@ -116,4 +118,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-/notes.txt
+/notes.txt

Dockerfile

@@ -1,7 +1,32 @@
-FROM python:3.7
+FROM python:3.7-slim
 
-RUN pip install pipenv
-COPY . /app
+ARG APP_USER=appuser
 
+COPY . /app
 WORKDIR /app
-RUN pipenv install --system
+
+RUN set -ex \
+    && groupadd -r ${APP_USER} && useradd --no-log-init -r -g ${APP_USER} ${APP_USER} \
+    && buildDeps=' \
+        gcc \
+        libbz2-dev \
+        libc6-dev \
+        libgdbm-dev \
+        liblzma-dev \
+        libncurses-dev \
+        libreadline-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        libpcre3-dev \
+        make \
+        tcl-dev \
+        tk-dev \
+        wget \
+        xz-utils \
+        zlib1g-dev \
+    ' \
+    && apt-get update && apt-get install -y $buildDeps --no-install-recommends \
+    && pip install pipenv && pip install uwsgi && pipenv install --system \
+    && apt-get purge -y --auto-remove $buildDeps 
+
+CMD ["uwsgi", "uwsgi.ini"]

Pipfile.lock

@@ -8,9 +8,9 @@ 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: 
+## Before Contributing:
 
-* Read through the [Wiki](https://github.com/CodeForPhilly/prevention-point/wiki). 
+* 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/)
@@ -78,6 +78,16 @@ $ docker volume prune
  - Run `yarn dev` and navigate to `localhost:1234`
  - Default username / password: admin / password123
 
+ For more information on the front-end please see the [front-end README](./frontend/readme)
+
+## Scripts
+
+This project implements the [Scripts To Rule Them All](https://github.com/github/scripts-to-rule-them-all) interface for developers:
+
+* `script/server` — Brings a fully working environment up at [localhost:8080](http://localhost:8080)
+* `script/setup` — Run after `script/server` to initialize local database with seed data
+* `script/update` — Run after changing code or switching branches to refresh server
+
 Other tools
 ## Links
 [Wiki](https://github.com/CodeForPhilly/prevention-point/wiki)

README.md

@@ -1,4 +1,4 @@
-import random, pytz
+import random, pytz, datetime
 
 
 from django.utils import timezone
@@ -20,6 +20,7 @@
     Visit,
     ProgramServiceMap,
     UrgencyLevel,
+    ProgramAvailability
 )
 from core.permissions import CASE_MANAGER, FRONT_DESK, ADMIN
 from core.models.front_desk_event import FrontDeskEventType, FrontDeskEvent
@@ -90,17 +91,44 @@ def frequency(self):
 fake.add_provider(FrequencyProvider)
 
 
+class MonFriProvider(BaseProvider):
+    __provider__ = "day of week"
+    __lang__ = "en_US"
+
+    def mon_fri(self):
+        days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']
+        return random.choices(days)
+
+
+fake.add_provider(MonFriProvider)
+
+
+class AvailabilityWindowProvider(BaseProvider):
+    """For HRSC sign in. HRSC appointments are available Mon-Fri, 10a-4p"""
+    __provider__ = "availability window"
+    __lang__ = "en_US"
+
+    def availability_window(self, start_hour = 10, end_hour = 17):
+        """Returns a tuple (start_time, end_time)"""
+        window_begin = random.randint(start_hour, end_hour - 2)
+        end_hour = random.randint(window_begin + 1, end_hour)
+        return datetime.time(hour=window_begin), datetime.time(hour=end_hour)
+       
+
+fake.add_provider(AvailabilityWindowProvider)
+
+
 def run_seed(self):
-    call_command("migrate")
-    call_command("flush")
+    call_command("migrate", interactive=False)
+    call_command("flush", interactive=False)
     create_groups(output=False)
     create_users(output=False)
     add_users_to_groups(output=False)
     create_insurers(output=False)
     create_participants()
     create_programs(output=False)
     create_visits(output=False)
-
+    create_program_availability(output=False)
 
 def create_users(output=True):
     for group in DEFAULT_GROUPS:
@@ -298,6 +326,36 @@ def create_event(visit, type):
     f.full_clean()
     f.save()
 
+
+def create_program_availability(output=True):
+    """create program availability"""
+    programs = Program.objects.all()
+    days_of_week = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+    for program in programs:
+        for day in days_of_week:
+            if random.randint(0, 10) < 8:
+                availability = ProgramAvailability()
+                availability.program = program
+                availability.day_of_week = day
+                availability.start_time, availability.end_time = fake.availability_window(
+                    start_hour=8, end_hour=18)
+                window_one_end = availability.end_time.hour
+                availability.full_clean()
+                availability.save()
+                if window_one_end < 15:
+                    availability_two = ProgramAvailability()
+                    availability_two.program = program
+                    availability_two.day_of_week = day
+                    availability_two.start_time, availability_two.end_time = fake.availability_window(
+                        start_hour=window_one_end+1, end_hour=23)
+                    availability_two.full_clean()
+                    availability_two.save()
+
+    if output:
+        for availability in ProgramAvailability.objects.all().order_by('program'): 
+            print(f"Created program availability: {availability.program.name} {availability.day_of_week} {availability.start_time} {availability.end_time}")
+
+
 def arrived(visit):
     """After ARRIVED, can be either LEFT, SEEN, STEPPED_OUT or pending (still in ARRIVED status)"""
     create_event(visit, "ARRIVED")

core/management/commands/seed.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.9 on 2020-02-16 19:13
+
+import core.models.visit
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_auto_20191026_1355'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='program',
+            name='is_frozen',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='visit',
+            name='urgency',
+            field=models.CharField(choices=[('_1', 1), ('_2', 2), ('_3', 3), ('_4', 4), ('_5', 5)], default=core.models.visit.UrgencyLevel(1), max_length=20),
+        ),
+    ]

core/migrations/0003_auto_20200216_1413.py

@@ -4,3 +4,4 @@
 class Program(models.Model):
     name = models.CharField(max_length=100)
     is_closed = models.BooleanField(default=False)
+    is_frozen = models.BooleanField(default=False)

core/models/program.py

@@ -1,7 +1,7 @@
 from core.models import Participant
 from rest_framework import serializers
 
-class ParticipantSerializer(serializers.HyperlinkedModelSerializer):
+class ParticipantSerializer(serializers.ModelSerializer):
     class Meta:
         model = Participant
 

core/participants/serializers.py

@@ -9,4 +9,5 @@ class Meta:
             "id",
             "name",
             "is_closed",
+            "is_frozen",
         )  # backwards nested relationship uses '_set'