From 50aa4cb6480c4339ec8c358e7a0788d2aa96de6d Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:32:08 -0700
Subject: [PATCH 1/8] add event

---
 .../templates/lims/event_confirm_delete.html  | 16 +++++
 .../lims/templates/lims/event_detail.html     | 22 +++++++
 .../lims/templates/lims/event_list.html       | 60 +++++++++++++++++++
 .../lims/templates/lims/event_new.html        | 18 ++++++
 .../lims/templates/lims/event_update.html     | 12 ++++
 5 files changed, 128 insertions(+)
 create mode 100644 out_on_a_LIMS/lims/templates/lims/event_confirm_delete.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/event_detail.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/event_list.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/event_new.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/event_update.html

diff --git a/out_on_a_LIMS/lims/templates/lims/event_confirm_delete.html b/out_on_a_LIMS/lims/templates/lims/event_confirm_delete.html
new file mode 100644
index 0000000..b76a012
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/event_confirm_delete.html
@@ -0,0 +1,16 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<div class="card border-danger">
+    <h1 class="card-header border-danger text-danger">Delete Event: {{ event.name }}</h1>
+        <div class="card-body">
+            <form method="post">{% csrf_token %}
+                <h3>Are you sure you want to delete event?</h3>
+                <p class="text-danger">This will permenently delete all data associated with this event.</p>
+                <button class="btn btn-outline-danger" type="submit">Delete <span data-feather="x-octagon"></span></button>
+                <a class="btn btn-success btn" href="{% url 'lims:event_list' %}" role="button">Cancel <span data-feather="corner-up-left"></span></a>
+            </form>
+        </div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/templates/lims/event_detail.html b/out_on_a_LIMS/lims/templates/lims/event_detail.html
new file mode 100644
index 0000000..21e6d0c
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/event_detail.html
@@ -0,0 +1,22 @@
+{% extends "lims/base.html" %}
+{% block content %}
+<div class="card"">
+    <h1 class="card-header">Event: {{ event.name }}</h1>
+    <div class="card-body">
+      <p class="card-text"><strong>Description:</strong> {{ event.description }}</p>
+    </div>
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item"><strong>Location: </strong><a href="{% url 'lims:location_detail' event.location.id %}">{{ event.location.name }}</a></li>
+      <li class="list-group-item"><strong>Collected By: </strong><a href="{% url 'lims:researcher_detail' event.researcher.id %}" >{{ event.researcher.name }}</a></li>
+      <li class="list-group-item"><Strong>Collection Date: </Strong>{{ event.date }}</li>
+      <li class="list-group-item"><strong>Notes: </strong>{{ event.notes }}</li>
+    </ul>
+    <div class="card-body">
+        <a class="btn btn-primary btn" href="{% url 'lims:edit_event' event.id %}" role="button">Edit <span data-feather="edit"></span></a>
+        <a class="btn btn-outline-danger btn" href="{% url 'lims:delete_event' event.id %}" role="button">Delete <span data-feather="trash"></span></a>
+        <a class="btn btn-outline-primary btn" href="{% url 'lims:event_list' %}" role="button">Events <span data-feather="corner-up-left"></span></a>
+        <a class="btn btn-outline-primary btn" href="{% url 'lims:index' %}" role="button">Home <span data-feather="corner-up-left"></span></a>
+    </div>
+  </div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/templates/lims/event_list.html b/out_on_a_LIMS/lims/templates/lims/event_list.html
new file mode 100644
index 0000000..6a26a52
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/event_list.html
@@ -0,0 +1,60 @@
+{% extends "lims/base.html" %}
+{% block head %}
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rr-1.2.8/sb-1.2.2/sl-1.3.3/datatables.min.css"/>
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/rowreorder/1.2.8/css/rowReorder.dataTables.min.css"/>
+{% endblock head %}
+
+{% block content %}
+    <div class="mt-3 mb-3">
+        <a class="btn btn-primary btn" href="{% url 'lims:new_event' %}" role="button">New Event <span data-feather="plus"></span></a>
+    </div>
+    
+
+    <table id="event_table" class="display table table-hover"  align="center"  style="width:100%"> 
+        <thead>
+            
+            <tr>
+                <th>Event Name</th>
+                <th>Location</th>
+                <th>Collection Date</th>
+                <th>Collected By</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for event in event_list %}
+                <tr>
+                    <td><a class="table-link" href="{% url 'lims:event_detail' event.id %}">
+                        {{ event.name }}
+                    </a></td>
+                    <td>{{ event.location.name }}</td>
+                    <td>{{ event.date }}</td>
+                    <td>{{ event.researcher.name }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+{% endblock content %}
+
+{% block js %}
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rr-1.2.8/sb-1.2.2/sl-1.3.3/datatables.min.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js"></script>
+<script>
+    $(document).ready( function () {
+    $('#event_table').DataTable({
+    rowReorder: true,
+    fixedHeader: true,
+    dom: 'B<"clear">lfrtip',
+    buttons: {
+        name: 'primary',
+        buttons: [ 'copy', 'csv', 'excel', 'pdf' ]
+
+        }}
+    );
+} );
+</script>
+{% endblock js %}
diff --git a/out_on_a_LIMS/lims/templates/lims/event_new.html b/out_on_a_LIMS/lims/templates/lims/event_new.html
new file mode 100644
index 0000000..4d788cd
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/event_new.html
@@ -0,0 +1,18 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<div class='content-section'>
+    <form method="POST">
+        {% csrf_token %}
+        <fieldset class="form-group">
+            <legend class="border-bottom mb-6">Create New Event</legend>
+            {{ form|crispy }}
+        </fieldset>
+       <div class="form-group pt-3">
+           <a class="btn btn-outline-danger mr-5" href="{% url 'lims:event_list' %}" role="button">Cancel</a>
+           <button class="btn btn-success" type="submit">Add</button>
+       </div>
+    </form>
+</div>
+{% endblock content %}
+
diff --git a/out_on_a_LIMS/lims/templates/lims/event_update.html b/out_on_a_LIMS/lims/templates/lims/event_update.html
new file mode 100644
index 0000000..4c3a17a
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/event_update.html
@@ -0,0 +1,12 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<legend class="border-bottom mb-6">Update Event</legend>
+<form method="post">{% csrf_token %}
+    {{ form | crispy }}
+    <div class="form-group pt-3">
+        <a class="btn btn-outline-danger mr-5" href="{% url 'lims:event_detail' event.id %}" role="button">Cancel</a>
+        <button class="btn btn-success" type="submit">Update</button>
+    </div>
+</form>
+{% endblock content %}
\ No newline at end of file

From 6f2251f1b93a1d2338c79392b6503fe61580d707 Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:33:10 -0700
Subject: [PATCH 2/8] update researcher

---
 .../lims/templates/lims/researcher_confirm_delete.html    | 8 ++++----
 out_on_a_LIMS/lims/templates/lims/researcher_detail.html  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/out_on_a_LIMS/lims/templates/lims/researcher_confirm_delete.html b/out_on_a_LIMS/lims/templates/lims/researcher_confirm_delete.html
index 560dc85..4d8e050 100644
--- a/out_on_a_LIMS/lims/templates/lims/researcher_confirm_delete.html
+++ b/out_on_a_LIMS/lims/templates/lims/researcher_confirm_delete.html
@@ -1,12 +1,12 @@
 {% extends "lims/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-<div class="card">
-    <h1 class="card-header">Delete Researcher: {{ researcher.name }}</h1>
+<div class="card border-danger">
+    <h1 class="card-header border-danger text-danger">Delete Researcher: {{ researcher.name }}</h1>
         <div class="card-body">
             <form method="post">{% csrf_token %}
-                <h3>Are you sure you want to delete researcher: {{ object }}?</h3>
-                <p class="text-danger">This will permenently delete all data associated with this researcher!!!</p>
+                <h3>Are you sure you want to delete researcher?</h3>
+                <p class="text-danger">This will permenently delete all data associated with this researcher.</p>
                 <button class="btn btn-outline-danger" type="submit">Delete <span data-feather="x-octagon"></span></button>
                 <a class="btn btn-success btn" href="{% url 'lims:researcher_list' %}" role="button">Cancel <span data-feather="corner-up-left"></span></a>
             </form>
diff --git a/out_on_a_LIMS/lims/templates/lims/researcher_detail.html b/out_on_a_LIMS/lims/templates/lims/researcher_detail.html
index 803c5a9..2f08cf5 100644
--- a/out_on_a_LIMS/lims/templates/lims/researcher_detail.html
+++ b/out_on_a_LIMS/lims/templates/lims/researcher_detail.html
@@ -1,7 +1,7 @@
 {% extends "lims/base.html" %}
 {% block content %}
 <div class="card"">
-    <h1 class="card-header">{{ researcher.name }}</h1>
+    <h1 class="card-header">Researcher: {{ researcher.name }}</h1>
     <ul class="list-group list-group-flush">
       <li class="list-group-item"><strong>Email:</strong> {{ researcher.email }}</li>
       <li class="list-group-item"><Strong>Phone:</Strong> {{ researcher.phone }}</li>

From 0c1b3469851ab5277113790d411873589a1ab9f2 Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:33:48 -0700
Subject: [PATCH 3/8] add subjects

---
 .../lims/subject_confirm_delete.html          | 16 +++++
 .../lims/templates/lims/subject_detail.html   | 23 +++++++
 .../lims/templates/lims/subject_list.html     | 62 +++++++++++++++++++
 .../lims/templates/lims/subject_new.html      | 18 ++++++
 .../lims/templates/lims/subject_update.html   | 12 ++++
 5 files changed, 131 insertions(+)
 create mode 100644 out_on_a_LIMS/lims/templates/lims/subject_confirm_delete.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/subject_detail.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/subject_list.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/subject_new.html
 create mode 100644 out_on_a_LIMS/lims/templates/lims/subject_update.html

diff --git a/out_on_a_LIMS/lims/templates/lims/subject_confirm_delete.html b/out_on_a_LIMS/lims/templates/lims/subject_confirm_delete.html
new file mode 100644
index 0000000..b11ea45
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/subject_confirm_delete.html
@@ -0,0 +1,16 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<div class="card border-danger">
+    <h1 class="card-header border-danger text-danger">Delete Subject: {{ subject.subject_ui }}</h1>
+        <div class="card-body">
+            <form method="post">{% csrf_token %}
+                <h3>Are you sure you want to delete subject?</h3>
+                <p class="text-danger">This will permenently delete all data associated with this project.</p>
+                <button class="btn btn-outline-danger" type="submit">Delete <span data-feather="x-octagon"></span></button>
+                <a class="btn btn-success btn" href="{% url 'lims:subject_list' %}" role="button">Cancel <span data-feather="corner-up-left"></span></a>
+            </form>
+        </div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/templates/lims/subject_detail.html b/out_on_a_LIMS/lims/templates/lims/subject_detail.html
new file mode 100644
index 0000000..8b93191
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/subject_detail.html
@@ -0,0 +1,23 @@
+{% extends "lims/base.html" %}
+{% block content %}
+<div class="card"">
+    <h1 class="card-header">Subject ID: {{ subject.subject_ui }}</h1>
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item"><strong>Project: </strong><a href="{% url 'lims:project_detail' subject.location.project.id %}">{{ subject.location.project.name }}</a></li>
+      <li class="list-group-item"><strong>Location: </strong><a href="{% url 'lims:location_detail' subject.location.id %}">{{ subject.location.name }}</a></li>
+      <li class="list-group-item"><strong>First Name:</strong> {{ subject.first_name }}</li>
+      <li class="list-group-item"><strong>Last Name:</strong> {{ subject.last_name }}</li>
+      <li class="list-group-item"><Strong>Date of Birth:</Strong> {{ subject.birthdate }}</li>
+      <li class="list-group-item"><Strong>Sex:</Strong> {{ subject.sex}}</li>
+      <li class="list-group-item"><Strong>Vaccine Status:</Strong> {{ subject.vaccine_status }}</li>
+      <li class="list-group-item"><Strong>Covid Status:</Strong> {{ subject.covid }}</li>
+    </ul>
+    <div class="card-body">
+        <a class="btn btn-primary btn" href="{% url 'lims:edit_subject' subject.id %}" role="button">Edit <span data-feather="edit"></span></a>
+        <a class="btn btn-outline-danger btn" href="{% url 'lims:delete_subject' subject.id %}" role="button">Delete <span data-feather="trash"></span></a>
+        <a class="btn btn-outline-primary btn" href="{% url 'lims:subject_list' %}" role="button">Subjects <span data-feather="corner-up-left"></span></a>
+        <a class="btn btn-outline-primary btn" href="{% url 'lims:index' %}" role="button">Home <span data-feather="corner-up-left"></span></a>
+    </div>
+  </div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/templates/lims/subject_list.html b/out_on_a_LIMS/lims/templates/lims/subject_list.html
new file mode 100644
index 0000000..65eb2dc
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/subject_list.html
@@ -0,0 +1,62 @@
+{% extends "lims/base.html" %}
+{% block head %}
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rr-1.2.8/sb-1.2.2/sl-1.3.3/datatables.min.css"/>
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/rowreorder/1.2.8/css/rowReorder.dataTables.min.css"/>
+{% endblock head %}
+
+{% block content %}
+    <div class="mt-3 mb-3">
+        <a class="btn btn-primary btn" href="{% url 'lims:new_subject' %}" role="button">New Subject <span data-feather="plus"></span></a>
+    </div>
+    
+
+    <table id="subject_table" class="display table table-hover"  align="center"  style="width:100%"> 
+        <thead>
+            
+            <tr>
+                <th>Subject ID</th>
+                <th>Project</th>
+                <th>Location</th>
+                <th>Date of Birth</th>
+                <th>Sex</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for subject in subject_list %}
+                <tr>
+                    <td><a class="table-link" href="{% url 'lims:subject_detail' subject.id %}">
+                        {{ subject.subject_ui }}
+                    </a></td>
+                    <td>{{ subject.location.project.name }}</td>
+                    <td>{{ subject.location.name }}</td>
+                    <td>{{ subject.birthdate }}</td>
+                    <td>{{ subject.sex }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+{% endblock content %}
+
+{% block js %}
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rr-1.2.8/sb-1.2.2/sl-1.3.3/datatables.min.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js"></script>
+<script>
+    $(document).ready( function () {
+    $('#subject_table').DataTable({
+    rowReorder: true,
+    fixedHeader: true,
+    dom: 'B<"clear">lfrtip',
+    buttons: {
+        name: 'primary',
+        buttons: [ 'copy', 'csv', 'excel', 'pdf' ]
+
+        }}
+    );
+} );
+</script>
+{% endblock js %}
diff --git a/out_on_a_LIMS/lims/templates/lims/subject_new.html b/out_on_a_LIMS/lims/templates/lims/subject_new.html
new file mode 100644
index 0000000..8617881
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/subject_new.html
@@ -0,0 +1,18 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<div class='content-section'>
+    <form method="POST">
+        {% csrf_token %}
+        <fieldset class="form-group">
+            <legend class="border-bottom mb-6">Create New Subject</legend>
+            {{ form|crispy }}
+        </fieldset>
+       <div class="form-group pt-3">
+           <a class="btn btn-outline-danger mr-5" href="{% url 'lims:subject_list' %}" role="button">Cancel</a>
+           <button class="btn btn-success" type="submit">Add</button>
+       </div>
+    </form>
+</div>
+{% endblock content %}
+
diff --git a/out_on_a_LIMS/lims/templates/lims/subject_update.html b/out_on_a_LIMS/lims/templates/lims/subject_update.html
new file mode 100644
index 0000000..7896b08
--- /dev/null
+++ b/out_on_a_LIMS/lims/templates/lims/subject_update.html
@@ -0,0 +1,12 @@
+{% extends "lims/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<legend class="border-bottom mb-6">Update Subject</legend>
+<form method="post">{% csrf_token %}
+    {{ form | crispy }}
+    <div class="form-group pt-3">
+        <a class="btn btn-outline-danger mr-5" href="{% url 'lims:subject_detail' subject.id %}" role="button">Cancel</a>
+        <button class="btn btn-success" type="submit">Update</button>
+    </div>
+</form>
+{% endblock content %}
\ No newline at end of file

From c970d42942959ce2ff76248c504f5e95a7966ff4 Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:34:33 -0700
Subject: [PATCH 4/8] update location

---
 .../lims/templates/lims/location_confirm_delete.html      | 8 ++++----
 out_on_a_LIMS/lims/templates/lims/location_detail.html    | 7 ++++---
 out_on_a_LIMS/lims/templates/lims/location_list.html      | 2 --
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/out_on_a_LIMS/lims/templates/lims/location_confirm_delete.html b/out_on_a_LIMS/lims/templates/lims/location_confirm_delete.html
index b05ace3..462e9f4 100644
--- a/out_on_a_LIMS/lims/templates/lims/location_confirm_delete.html
+++ b/out_on_a_LIMS/lims/templates/lims/location_confirm_delete.html
@@ -1,12 +1,12 @@
 {% extends "lims/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-<div class="card">
-    <h1 class="card-header">Delete Location: {{ location.name }}</h1>
+<div class="card border-danger">
+    <h1 class="card-header border-danger text-danger">Delete Location: {{ location.name }}</h1>
         <div class="card-body">
             <form method="post">{% csrf_token %}
-                <h3>Are you sure you want to delete location: {{ object }}?</h3>
-                <p class="text-danger">This will permenently delete all data associated with this location!!!</p>
+                <h3>Are you sure you want to delete location?</h3>
+                <p class="text-danger">This will permenently delete all data associated with this location.</p>
                 <button class="btn btn-outline-danger" type="submit">Delete <span data-feather="x-octagon"></span></button>
                 <a class="btn btn-success btn" href="{% url 'lims:location_list' %}" role="button">Cancel <span data-feather="corner-up-left"></span></a>
             </form>
diff --git a/out_on_a_LIMS/lims/templates/lims/location_detail.html b/out_on_a_LIMS/lims/templates/lims/location_detail.html
index c5cac19..938f6cf 100644
--- a/out_on_a_LIMS/lims/templates/lims/location_detail.html
+++ b/out_on_a_LIMS/lims/templates/lims/location_detail.html
@@ -1,12 +1,13 @@
 {% extends "lims/base.html" %}
 {% block content %}
 <div class="card"">
-    <h1 class="card-header">{{ location.name }}</h1>
+    <h1 class="card-header">Location: {{ location.name }}</h1>
     <div class="card-body">
-      <p class="card-text"><strong>Address:</strong> {{ location.address }}</p>
-      <p class="card-text"><strong>Description:</strong> {{ location.description }}</p>
+      <p class="card-text"><strong>Description:</strong> {{ location.description }}</p>      
     </div>
     <ul class="list-group list-group-flush">
+      <li class="list-group-item"><strong>Project:</strong> <a href="{% url 'lims:project_detail' location.project.id %}">{{ location.project.name }}</a></li>
+      <li class="list-group-item"><strong>Address:</strong> {{ location.address }}</li>
       <li class="list-group-item"><strong>Contact Name:</strong> {{ location.contact_name }}</li>
       <li class="list-group-item"><strong>Contact Email:</strong> {{ location.contact_email }}</li>
       <li class="list-group-item"><Strong>Contact Phone:</Strong> {{ location.contact_phone }}</li>
diff --git a/out_on_a_LIMS/lims/templates/lims/location_list.html b/out_on_a_LIMS/lims/templates/lims/location_list.html
index 33e80aa..015a1e1 100644
--- a/out_on_a_LIMS/lims/templates/lims/location_list.html
+++ b/out_on_a_LIMS/lims/templates/lims/location_list.html
@@ -17,7 +17,6 @@
                 <th>Location Name</th>
                 <th>Project</th>
                 <th>Address</th>
-                <th>Description</th>
             </tr>
         </thead>
         <tbody>
@@ -28,7 +27,6 @@
                     </a></td>
                     <td>{{ location.project.name }}</td>
                     <td>{{ location.address }}</td>
-                    <td>{{ location.description }}</td>
                 </tr>
             {% endfor %}
         </tbody>

From e140eb76dd95cc3b377bd9f3ff544315ac3f8201 Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:35:14 -0700
Subject: [PATCH 5/8] update project

---
 .../lims/templates/lims/project_confirm_delete.html       | 8 ++++----
 out_on_a_LIMS/lims/templates/lims/project_detail.html     | 7 +++----
 out_on_a_LIMS/lims/templates/lims/project_list.html       | 2 --
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/out_on_a_LIMS/lims/templates/lims/project_confirm_delete.html b/out_on_a_LIMS/lims/templates/lims/project_confirm_delete.html
index d8c59c8..58c2a58 100644
--- a/out_on_a_LIMS/lims/templates/lims/project_confirm_delete.html
+++ b/out_on_a_LIMS/lims/templates/lims/project_confirm_delete.html
@@ -1,12 +1,12 @@
 {% extends "lims/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-<div class="card">
-    <h1 class="card-header">Delete Project: {{ project.name }}</h1>
+<div class="card border-danger">
+    <h1 class="card-header border-danger text-danger">Delete Project: {{ project.name }}</h1>
         <div class="card-body">
             <form method="post">{% csrf_token %}
-                <h3>Are you sure you want to delete project: {{ object }}?</h3>
-                <p class="text-danger">This will permenently delete all data associated with this project!!!</p>
+                <h3>Are you sure you want to delete project?</h3>
+                <p class="text-danger">This will permenently delete all data associated with this project.</p>
                 <button class="btn btn-outline-danger" type="submit">Delete <span data-feather="x-octagon"></span></button>
                 <a class="btn btn-success btn" href="{% url 'lims:project_list' %}" role="button">Cancel <span data-feather="corner-up-left"></span></a>
             </form>
diff --git a/out_on_a_LIMS/lims/templates/lims/project_detail.html b/out_on_a_LIMS/lims/templates/lims/project_detail.html
index 8b15b11..de92a0d 100644
--- a/out_on_a_LIMS/lims/templates/lims/project_detail.html
+++ b/out_on_a_LIMS/lims/templates/lims/project_detail.html
@@ -1,16 +1,15 @@
 {% extends "lims/base.html" %}
 {% block content %}
 <div class="card"">
-    <h1 class="card-header">{{ project.name }}</h1>
+    <h1 class="card-header">Project: {{ project.name }}</h1>
     <div class="card-body">
-      <p class="card-text">{{ project.description }}</p>
-      Notes: 
-      <p>{{ project.notes }}</p>
+      <p class="card-text"><strong>Description:</strong> {{ project.description }}</p>
     </div>
     <ul class="list-group list-group-flush">
       <li class="list-group-item"><strong>Start:</strong> {{ project.start_date }}</li>
       <li class="list-group-item"><strong>End:</strong> {{ project.end_date }}</li>
       <li class="list-group-item"><Strong>Lead Investigator:</Strong> {{ project.investigator }}</li>
+      <li class="list-group-item"><Strong>Notes:</Strong> {{ project.notes }}</li>
     </ul>
     <div class="card-body">
         <a class="btn btn-primary btn" href="{% url 'lims:edit_project' project.id %}" role="button">Edit <span data-feather="edit"></span></a>
diff --git a/out_on_a_LIMS/lims/templates/lims/project_list.html b/out_on_a_LIMS/lims/templates/lims/project_list.html
index fb6b9c5..aec5de3 100644
--- a/out_on_a_LIMS/lims/templates/lims/project_list.html
+++ b/out_on_a_LIMS/lims/templates/lims/project_list.html
@@ -18,7 +18,6 @@
                 <th>Lead Investigator</th>
                 <th>Start Date</th>
                 <th>End Date</th>
-                <th>Description</th>
             </tr>
         </thead>
         <tbody>
@@ -30,7 +29,6 @@
                     <td>{{ project.investigator }}</td>
                     <td>{{ project.start_date }}</td>
                     <td>{{ project.end_date }}</td>
-                    <td>{{ project.description }}</td>
                 </tr>
             {% endfor %}
         </tbody>

From 56cf7a20b09d8a41599937d9a6aea3a7cf4f803a Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:35:40 -0700
Subject: [PATCH 6/8] update sample

---
 out_on_a_LIMS/lims/templates/lims/sample_list.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/out_on_a_LIMS/lims/templates/lims/sample_list.html b/out_on_a_LIMS/lims/templates/lims/sample_list.html
index 22ea4be..ca3d766 100644
--- a/out_on_a_LIMS/lims/templates/lims/sample_list.html
+++ b/out_on_a_LIMS/lims/templates/lims/sample_list.html
@@ -11,7 +11,6 @@
     <table id="sample_table" class="display table table-hover"  align="center"  style="width:100%"> 
         <thead>
             <tr>
-                {{ sample_list }}
                 <th>Sample ID</th>
                 <th>Status</th>
                 <th>Box ID</th>

From 071d88b9fd184846f46f0f254c9afa07e97e3ecc Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:36:23 -0700
Subject: [PATCH 7/8] add links

---
 out_on_a_LIMS/lims/templates/lims/base.html      | 4 ++--
 out_on_a_LIMS/lims/templates/lims/dashboard.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/out_on_a_LIMS/lims/templates/lims/base.html b/out_on_a_LIMS/lims/templates/lims/base.html
index e70e342..fe43529 100644
--- a/out_on_a_LIMS/lims/templates/lims/base.html
+++ b/out_on_a_LIMS/lims/templates/lims/base.html
@@ -66,7 +66,7 @@
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#">
+            <a class="nav-link" href="{% url 'lims:subject_list' %}">
               <span data-feather="users"></span>
               Subjects
             </a>
@@ -78,7 +78,7 @@
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#">
+            <a class="nav-link" href="{% url 'lims:event_list' %}">
               <span data-feather="calendar"></span>
               Events
             </a>
diff --git a/out_on_a_LIMS/lims/templates/lims/dashboard.html b/out_on_a_LIMS/lims/templates/lims/dashboard.html
index 5624b13..ffefb13 100644
--- a/out_on_a_LIMS/lims/templates/lims/dashboard.html
+++ b/out_on_a_LIMS/lims/templates/lims/dashboard.html
@@ -14,7 +14,7 @@ <h1 class="page-header">Dashboard</h1>
         <h4 class="text-center">Samples</h4>
       </a>
     
-      <a class="circle-link" href="#">
+      <a class="circle-link" href="{% url 'lims:subject_list' %}">
         <div class="container round-icon-container-circle align-items-center">
           <svg xmlns="http://www.w3.org/2000/svg"  class="bi bi-people-fill icon-lg" viewBox="0 0 16 16">
             <path d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
@@ -43,7 +43,7 @@ <h4 class="text-center">Samples</h4>
         <div class="text-center"><h4>Locations</h4></div>
       </a>
       
-      <a class="circle-link" href="#">
+      <a class="circle-link" href="{% url 'lims:event_list' %}">
         <div class="container round-icon-container-circle align-items-center">
           <svg xmlns="http://www.w3.org/2000/svg"  class="bi bi-table icon-lg" viewBox="0 0 16 16">
             <path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"/>                

From cfeee6eff6d458fcac91ab9e50f7bb74869a3fae Mon Sep 17 00:00:00 2001
From: Tara Furstenau <tarafurstenau@Taras-MacBook-Pro.local>
Date: Sat, 9 Oct 2021 14:36:51 -0700
Subject: [PATCH 8/8] update

---
 .gitignore                                    |   3 +
 out_on_a_LIMS/lims/forms.py                   |  41 ++++++-
 out_on_a_LIMS/lims/migrations/0001_initial.py |  39 +++++--
 .../migrations/0002_auto_20211009_0147.py     |  55 ---------
 .../migrations/0002_auto_20211009_1429.py     |  28 +++++
 .../migrations/0003_auto_20211009_0323.py     |  34 ------
 out_on_a_LIMS/lims/models.py                  |  77 +++++++++----
 out_on_a_LIMS/lims/urls.py                    |  11 +-
 out_on_a_LIMS/lims/views.py                   | 105 +++++++++++++++++-
 9 files changed, 264 insertions(+), 129 deletions(-)
 delete mode 100644 out_on_a_LIMS/lims/migrations/0002_auto_20211009_0147.py
 create mode 100644 out_on_a_LIMS/lims/migrations/0002_auto_20211009_1429.py
 delete mode 100644 out_on_a_LIMS/lims/migrations/0003_auto_20211009_0323.py

diff --git a/.gitignore b/.gitignore
index 2394fbf..b389cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# vscode
+.vscode
diff --git a/out_on_a_LIMS/lims/forms.py b/out_on_a_LIMS/lims/forms.py
index 8f755f1..41366b4 100644
--- a/out_on_a_LIMS/lims/forms.py
+++ b/out_on_a_LIMS/lims/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.forms import ModelForm
-from .models import Sample, Project, Location, Researcher
+from .models import (
+    Sample, Project, Location, Researcher, Event, Subject)
 
 
 class DateInput(forms.DateInput):
@@ -36,3 +37,41 @@ class ResearcherForm(ModelForm):
     class Meta:
         model = Researcher
         fields = ['name', 'email', 'phone']
+
+
+class EventForm(ModelForm):
+    class Meta:
+        model = Event
+        fields = ['name', 'location', 'date',
+        'researcher'
+        ]
+        widgets = {
+            'date': DateInput()
+        }
+    def __init__(self, *args, **kwargs):
+        super(EventForm, self).__init__(*args, **kwargs)
+        self.fields['location'].label_from_instance = self.label_from_instance
+        self.fields['researcher'].label_from_instance = self.label_from_instance
+
+    @staticmethod
+    def label_from_instance(obj):
+        return "%s" % obj.name
+
+
+class SubjectForm(ModelForm):
+    class Meta:
+        model = Subject
+        fields = ['subject_ui', 'location', 'first_name',
+        'last_name', 'birthdate', 'sex', 'vaccine_status',
+        'covid'
+        ]
+        widgets = {
+            'birthdate': DateInput()
+        }
+    def __init__(self, *args, **kwargs):
+        super(SubjectForm, self).__init__(*args, **kwargs)
+        self.fields['location'].label_from_instance = self.label_from_instance
+
+    @staticmethod
+    def label_from_instance(obj):
+        return "%s" % obj.name
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/migrations/0001_initial.py b/out_on_a_LIMS/lims/migrations/0001_initial.py
index 99fb123..89f87ef 100644
--- a/out_on_a_LIMS/lims/migrations/0001_initial.py
+++ b/out_on_a_LIMS/lims/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.2 on 2021-10-09 00:21
+# Generated by Django 3.1.2 on 2021-10-09 21:00
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -26,12 +26,12 @@ class Migration(migrations.Migration):
             name='Location',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-                ('address', models.CharField(blank=True, max_length=100)),
-                ('room', models.CharField(blank=True, max_length=100)),
-                ('contact_name', models.CharField(blank=True, max_length=100)),
-                ('contact_email', models.EmailField(blank=True, max_length=254)),
-                ('contact_phone', phone_field.models.PhoneField(blank=True, max_length=31)),
+                ('name', models.CharField(max_length=100, unique=True)),
+                ('address', models.CharField(blank=True, max_length=100, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('contact_name', models.CharField(blank=True, max_length=100, null=True)),
+                ('contact_email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('contact_phone', phone_field.models.PhoneField(blank=True, max_length=31, null=True)),
             ],
         ),
         migrations.CreateModel(
@@ -50,16 +50,23 @@ class Migration(migrations.Migration):
             name='Researcher',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-                ('email', models.EmailField(blank=True, max_length=254)),
-                ('phone', phone_field.models.PhoneField(blank=True, max_length=31)),
+                ('name', models.CharField(max_length=100, unique=True)),
+                ('email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('phone', phone_field.models.PhoneField(blank=True, max_length=31, null=True)),
             ],
         ),
         migrations.CreateModel(
             name='Subject',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('subject_id', models.CharField(max_length=6)),
+                ('subject_ui', models.CharField(max_length=6, unique=True)),
+                ('first_name', models.CharField(blank=True, max_length=100, null=True)),
+                ('last_name', models.CharField(blank=True, max_length=100, null=True)),
+                ('birthdate', models.DateField(blank=True, null=True)),
+                ('sex', models.CharField(blank=True, choices=[('M', 'Male'), ('F', 'Female')], max_length=1, null=True)),
+                ('vaccine_status', models.CharField(blank=True, choices=[('F', 'Fully'), ('P', 'Partially'), ('N', 'No')], max_length=1, null=True)),
+                ('covid', models.BooleanField(blank=True, help_text='Has subject been infected with COVID-19 prior to study', null=True)),
+                ('location', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='lims.location')),
             ],
         ),
         migrations.CreateModel(
@@ -74,13 +81,21 @@ class Migration(migrations.Migration):
                 ('subject_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='lims.subject')),
             ],
         ),
+        migrations.AddField(
+            model_name='location',
+            name='project',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='lims.project'),
+        ),
         migrations.CreateModel(
             name='Event',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, unique=True)),
                 ('date', models.DateField()),
+                ('description', models.TextField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True, null=True)),
                 ('location', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='lims.location')),
-                ('researcher', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, to='lims.researcher')),
+                ('researcher', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='lims.researcher')),
             ],
         ),
     ]
diff --git a/out_on_a_LIMS/lims/migrations/0002_auto_20211009_0147.py b/out_on_a_LIMS/lims/migrations/0002_auto_20211009_0147.py
deleted file mode 100644
index 944886f..0000000
--- a/out_on_a_LIMS/lims/migrations/0002_auto_20211009_0147.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Generated by Django 3.1.2 on 2021-10-09 08:47
-
-from django.db import migrations, models
-import django.db.models.deletion
-import phone_field.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lims', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='location',
-            name='room',
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='description',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='project',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, to='lims.project'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='address',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='contact_email',
-            field=models.EmailField(blank=True, max_length=254, null=True),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='contact_name',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='contact_phone',
-            field=phone_field.models.PhoneField(blank=True, max_length=31, null=True),
-        ),
-        migrations.AlterField(
-            model_name='location',
-            name='name',
-            field=models.CharField(max_length=100, unique=True),
-        ),
-    ]
diff --git a/out_on_a_LIMS/lims/migrations/0002_auto_20211009_1429.py b/out_on_a_LIMS/lims/migrations/0002_auto_20211009_1429.py
new file mode 100644
index 0000000..11a602a
--- /dev/null
+++ b/out_on_a_LIMS/lims/migrations/0002_auto_20211009_1429.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.1.2 on 2021-10-09 21:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lims', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subject',
+            name='covid',
+            field=models.CharField(blank=True, choices=[('Yes', 'Yes'), ('No', 'No')], help_text='Has subject been infected with COVID-19 prior to study', max_length=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subject',
+            name='sex',
+            field=models.CharField(blank=True, choices=[('MALE', 'Male'), ('FEMALE', 'Female')], max_length=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subject',
+            name='vaccine_status',
+            field=models.CharField(blank=True, choices=[('FULL', 'Full'), ('PARTIAL', 'Partial'), ('NO', 'None')], max_length=10, null=True),
+        ),
+    ]
diff --git a/out_on_a_LIMS/lims/migrations/0003_auto_20211009_0323.py b/out_on_a_LIMS/lims/migrations/0003_auto_20211009_0323.py
deleted file mode 100644
index 45bf8f8..0000000
--- a/out_on_a_LIMS/lims/migrations/0003_auto_20211009_0323.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 3.1.2 on 2021-10-09 10:23
-
-from django.db import migrations, models
-import phone_field.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lims', '0002_auto_20211009_0147'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='location',
-            name='description',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='researcher',
-            name='email',
-            field=models.EmailField(blank=True, max_length=254, null=True),
-        ),
-        migrations.AlterField(
-            model_name='researcher',
-            name='name',
-            field=models.CharField(max_length=100, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='researcher',
-            name='phone',
-            field=phone_field.models.PhoneField(blank=True, max_length=31, null=True),
-        ),
-    ]
diff --git a/out_on_a_LIMS/lims/models.py b/out_on_a_LIMS/lims/models.py
index 49c57ef..30b00b7 100644
--- a/out_on_a_LIMS/lims/models.py
+++ b/out_on_a_LIMS/lims/models.py
@@ -5,26 +5,66 @@
 
 # Create your models here.
 
+class Project(models.Model):
+    name = models.CharField(max_length=100, unique=True)
+    investigator = models.CharField(max_length=100, blank=True, null=True)
+    start_date = models.DateField(blank=True, null=True) 
+    end_date = models.DateField(blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    notes = models.TextField(blank=True, null=True)
+    
+    def __str__(self):
+        return str(self.name)
+
+class Location(models.Model):
+    name = models.CharField(max_length=100, unique=True)
+    address = models.CharField(max_length=100, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    contact_name = models.CharField(max_length=100, blank=True, null=True)
+    contact_email = models.EmailField(blank=True, null=True)
+    contact_phone = PhoneField(blank=True, null=True)
+    project = models.ForeignKey(Project, on_delete=models.PROTECT)
+
+    def __str__(self):
+        return self.name
+
+
 class Subject(models.Model):
-    subject_id = models.CharField(max_length=6)
+
+    SEX_CHOICES = [
+    ('MALE', 'Male'),
+    ('FEMALE', 'Female'),
+    ]
+    VACCINE_CHOICES = [
+        ('FULL', 'Full'),
+        ('PARTIAL', 'Partial'),
+        ('NO', 'None')
+    ]
+    COVID_CHOICES = [
+        ('Yes', 'Yes'),
+        ('No', 'No')
+    ]
+    subject_ui = models.CharField(max_length=6, unique=True)
+    first_name = models.CharField(max_length=100, null=True, blank=True)
+    last_name = models.CharField(max_length=100, null=True, blank=True)
+    birthdate = models.DateField(null=True, blank=True)
+    sex = models.CharField(max_length=10, choices=SEX_CHOICES, blank=True, null=True)
+    vaccine_status = models.CharField(max_length=10, choices=VACCINE_CHOICES, blank=True, null=True)
+    covid = models.CharField(max_length=10, choices=COVID_CHOICES, null=True, blank=True, help_text="Has subject been infected with COVID-19 prior to study")
+    location = models.ForeignKey(Location, on_delete=models.PROTECT)
+    
     def __str__(self):
-        return self.subject_id
+        return self.subject_ui
 
 class Box(models.Model):
     box_id = models.IntegerField()
     storage_location = models.CharField(max_length=100)
     storage_shelf = models.CharField(max_length=100)
+    
     def __str__(self):
         return str(self.box_id)
 
 
-class Project(models.Model):
-    name = models.CharField(max_length=100, unique=True)
-    investigator = models.CharField(max_length=100, blank=True, null=True)
-    start_date = models.DateField(blank=True, null=True) 
-    end_date = models.DateField(blank=True, null=True)
-    description = models.TextField(blank=True, null=True)
-    notes = models.TextField(blank=True, null=True)
 
 
 
@@ -36,21 +76,12 @@ class Sample(models.Model):
     project = models.CharField(max_length=100)
     collection_event = models.CharField(max_length=100)
     collected = models.BooleanField()
+    
     def __str__(self):
         return self.sample_id
 
 
-class Location(models.Model):
-    name = models.CharField(max_length=100, unique=True)
-    address = models.CharField(max_length=100, blank=True, null=True)
-    description = models.TextField(blank=True, null=True)
-    contact_name = models.CharField(max_length=100, blank=True, null=True)
-    contact_email = models.EmailField(blank=True, null=True)
-    contact_phone = PhoneField(blank=True, null=True)
-    project = models.ForeignKey(Project, on_delete=models.PROTECT)
 
-    def __str__(self):
-        return self.name
 
 class Researcher(models.Model):
     name = models.CharField(max_length=100, unique=True)
@@ -61,14 +92,16 @@ def __str__(self):
         return self.name
 
 class Event(models.Model):
+    name = models.CharField(max_length=100, unique=True)
     location = models.ForeignKey(Location, on_delete=models.PROTECT)
-    researcher = models.ForeignKey(Researcher, on_delete=models.PROTECT, blank=True)
+    researcher = models.ForeignKey(Researcher, on_delete=models.PROTECT, blank=True, null=True)
     date = models.DateField()
+    description = models.TextField(blank=True, null=True)
+    notes = models.TextField(blank=True, null=True)
     def __str__(self):
         return self.location, self.date
 
 
 
 
-    def __str__(self):
-        return str(self.name)
+
diff --git a/out_on_a_LIMS/lims/urls.py b/out_on_a_LIMS/lims/urls.py
index 8792a74..673bbe7 100644
--- a/out_on_a_LIMS/lims/urls.py
+++ b/out_on_a_LIMS/lims/urls.py
@@ -25,5 +25,14 @@
     path('researchers/detail/<str:pk>/', views.ResearcherDetailView.as_view(), name="researcher_detail"),
     path('researchers/detail/<str:pk>/edit/', views.ResearcherUpdateView.as_view(), name="edit_researcher"),
     path('researchers/detail/<str:pk>/remove/', views.ResearcherDeleteView.as_view(), name="delete_researcher"),
-
+    path('subject/', views.SubjectListView.as_view(), name="subject_list"),
+    path('subject/new/', views.SubjectFormView.as_view(), name="new_subject"),
+    path('subject/detail/<str:pk>/', views.SubjectDetailView.as_view(), name="subject_detail"),
+    path('subject/detail/<str:pk>/edit/', views.SubjectUpdateView.as_view(), name="edit_subject"),
+    path('subject/detail/<str:pk>/remove/', views.SubjectDeleteView.as_view(), name="delete_subject"),
+    path('event/', views.EventListView.as_view(), name="event_list"),
+    path('event/new/', views.EventFormView.as_view(), name="new_event"),
+    path('event/detail/<str:pk>/', views.EventDetailView.as_view(), name="event_detail"),
+    path('event/detail/<str:pk>/edit/', views.EventUpdateView.as_view(), name="edit_event"),
+    path('event/detail/<str:pk>/remove/', views.EventDeleteView.as_view(), name="delete_event"),
 ]
\ No newline at end of file
diff --git a/out_on_a_LIMS/lims/views.py b/out_on_a_LIMS/lims/views.py
index f00b4d7..04e5bb7 100644
--- a/out_on_a_LIMS/lims/views.py
+++ b/out_on_a_LIMS/lims/views.py
@@ -6,8 +6,10 @@
 from django.views import generic
 from django.contrib import messages
 from django.db.models import ProtectedError
-from .models import Sample, Project, Location, Researcher
-from .forms import ProjectForm, LocationForm, ResearcherForm
+from .models import (
+    Sample, Project, Location, Researcher, Event, Subject)
+from .forms import (
+    ProjectForm, LocationForm, ResearcherForm, EventForm, SubjectForm)
 
 # Create your views here.
 
@@ -15,6 +17,8 @@ def index(request):
     return render(request, 'lims/dashboard.html')
 
 
+# ============== PROJECTS ================================
+
 class ProjectListView(generic.ListView):
     template_name_suffix = "_list"
     context_object_name = 'project_list'
@@ -44,6 +48,7 @@ class ProjectUpdateView(SuccessMessageMixin, generic.UpdateView):
     template_name_suffix = '_update'
     form_class = ProjectForm
     success_message = "Project was successfully updated:  %(name)s"
+    
     def get_success_url(self):
         return reverse('lims:project_detail', args=(self.object.id,))
 
@@ -58,6 +63,7 @@ def post(self, request, *args, **kwargs):
         except ProtectedError:
             return render(request, "lims/protected_error.html")
 
+# ============== LOCATIONS ================================
 
 class LocationListView(generic.ListView):
     template_name_suffix = "_list"
@@ -84,7 +90,6 @@ class LocationDetailView(generic.DetailView):
 
 class LocationUpdateView(SuccessMessageMixin, generic.UpdateView):
     model = Location
-    # fields = ['investigator', 'start_date', 'end_date', 'description', 'notes']
     template_name_suffix = '_update'
     form_class = LocationForm
     success_message = "Location was successfully updated:  %(name)s"
@@ -101,6 +106,10 @@ def post(self, request, *args, **kwargs):
         except ProtectedError:
             return render(request, "lims/protected_error.html")
 
+
+# ============== RESEARCHER ================================
+
+
 class ResearcherListView(generic.ListView):
     template_name_suffix = "_list"
     context_object_name = 'researcher_list'
@@ -126,7 +135,6 @@ class ResearcherDetailView(generic.DetailView):
 
 class ResearcherUpdateView(SuccessMessageMixin, generic.UpdateView):
     model = Researcher
-    # fields = ['investigator', 'start_date', 'end_date', 'description', 'notes']
     template_name_suffix = '_update'
     form_class = ResearcherForm
     success_message = "Researcher was successfully updated:  %(name)s"
@@ -143,6 +151,95 @@ def post(self, request, *args, **kwargs):
         except ProtectedError:
             return render(request, "lims/protected_error.html")
 
+# ============== EVENTS ================================
+class EventListView(generic.ListView):
+    template_name_suffix = "_list"
+    context_object_name = 'event_list'
+
+    def get_queryset(self):
+        """
+        Return all locations
+        """
+        return Event.objects.all()
+
+class EventFormView(SuccessMessageMixin, generic.CreateView):
+    model = Event
+    template_name_suffix = '_new'
+    form_class = EventForm
+    success_message = "Event was successfully added: %(name)s"
+
+    def get_success_url(self):
+        return reverse('lims:event_detail', args=(self.object.id,))
+
+
+class EventDetailView(generic.DetailView):
+    model = Event
+
+
+class EventUpdateView(SuccessMessageMixin, generic.UpdateView):
+    model = Event
+    template_name_suffix = '_update'
+    form_class = EventForm
+    success_message = "Collection event was successfully updated:  %(name)s"
+    def get_success_url(self):
+        return reverse('lims:event_detail', args=(self.object.id,))
+
+class EventDeleteView(generic.DeleteView):
+    model = Event
+    success_url = reverse_lazy('lims:event_list', args=())
+    def post(self, request, *args, **kwargs):
+        try:
+            return self.delete(request, *args, **kwargs)
+        except ProtectedError:
+            return render(request, "lims/protected_error.html")
+
+# ============== SUBJECTS ================================
+class SubjectListView(generic.ListView):
+    template_name_suffix = "_list"
+    context_object_name = 'subject_list'
+
+    def get_queryset(self):
+        """
+        Return all locations
+        """
+        return Subject.objects.all()
+
+class SubjectFormView(SuccessMessageMixin, generic.CreateView):
+    model = Subject
+    template_name_suffix = '_new'
+    form_class = SubjectForm
+    success_message = "Subject was successfully added: %(subject_ui)s"
+
+    def get_success_url(self):
+        return reverse('lims:subject_detail', args=(self.object.id,))
+
+
+class SubjectDetailView(generic.DetailView):
+    model = Subject
+
+
+class SubjectUpdateView(SuccessMessageMixin, generic.UpdateView):
+    model = Subject
+    template_name_suffix = '_update'
+    form_class = SubjectForm
+    success_message = "Subject was successfully updated:  %(subject_ui)s"
+    def get_success_url(self):
+        return reverse('lims:subject_detail', args=(self.object.id,))
+
+class SubjectDeleteView(generic.DeleteView):
+    model = Subject
+    success_url = reverse_lazy('lims:subject_list', args=())
+    def post(self, request, *args, **kwargs):
+        try:
+            return self.delete(request, *args, **kwargs)
+        except ProtectedError:
+            return render(request, "lims/protected_error.html")
+
+
+
+
+
+# ============== SAMPLES ================================
 
 class SampleListView(generic.ListView):
     template_name = "lims/sample_list.html"