From d31d53ca9bde858c6ba72bd0972dd0b266946bb2 Mon Sep 17 00:00:00 2001
From: Chris Giacofei <c.giacofei@gmail.com>
Date: Mon, 17 Jun 2024 10:25:53 -0400
Subject: [PATCH] Add clarifying text to pages.

Fixes #10
---
 yeast/templates/yeast/batch.html  | 2 +-
 yeast/templates/yeast/home.html   | 7 ++++---
 yeast/templates/yeast/sample.html | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/yeast/templates/yeast/batch.html b/yeast/templates/yeast/batch.html
index 36cdb2b..4fd3d82 100644
--- a/yeast/templates/yeast/batch.html
+++ b/yeast/templates/yeast/batch.html
@@ -8,7 +8,7 @@
 {% block content %}
     <div class="container">
 
-  <h1>{{ batch.strain.name }}</h1>
+  <h1>{{ batch.strain.manufacturer }}, {{ batch.strain.name }}</h1>
   <b>Source:</b> {{ batch.get_source_display }}
   {% if batch.source_batch %}
   from <a href="{{ batch.beer_url }}" target="_blank" rel="noopener noreferrer">#{{ batch.beer_num }}: {{ batch.beer_name }}</a>
diff --git a/yeast/templates/yeast/home.html b/yeast/templates/yeast/home.html
index 3eecfa3..cff75d5 100644
--- a/yeast/templates/yeast/home.html
+++ b/yeast/templates/yeast/home.html
@@ -25,7 +25,7 @@ input, label {
       <div class="container m-2">
         <label for="strain-select">Choose a strain:</label>
         <select name="strain" id="strain-select">
-          <option value="">--Please choose an option--</option>
+          <option value="{% for b in batches %}{{ b.id }},{% endfor %}">--All Available--</option>
           {% for strain in strains %}
             {% if strain.batches_available|length > 0 %}
               <option value="{{ strain.batches_available|get_value_in_qs:strain }}">{{ strain }}</option>
@@ -39,9 +39,9 @@ input, label {
         <div class="col-md-4">
           <label for="batch-select">Choose a propogation:</label>
           <select name="batch" id="batch-select" size="10" style="min-width:100%;">
-            {% for batch in batches %}
+            {% for batch in batches|dictsort:"production_date"|dictsort:"strain.name" %}
               {% if not batch.consumed %}
-                <option value="{{ batch.id }}">{{ batch.id }} {{ batch.production_date|date:"Y-m-d"  }}</option>
+                <option value="{{ batch.id }}">{{ batch.strain.name }} -- {{ batch.production_date|date:"Y-m-d"  }}</option>
               {% endif %}
             {% endfor %}
           </select>
@@ -50,6 +50,7 @@ input, label {
           {% for batch in batches %}
           {% if not batch.consumed %}
           <div id="data-{{ batch.id }}" style="display: none;" class="datatable">
+            <h3>{{ batch.strain.manufacturer }}, {{ batch.strain.name }}</h3>
             <table class="table">
               <tbody>
                 <tr>
diff --git a/yeast/templates/yeast/sample.html b/yeast/templates/yeast/sample.html
index 797319a..176f14d 100644
--- a/yeast/templates/yeast/sample.html
+++ b/yeast/templates/yeast/sample.html
@@ -14,7 +14,7 @@
 {% block jumbotronsub %}
 <table class="table table-borderless">
   <tbody>
-    <tr><th class="fit">{{ batch.strain.manufacturer.name }} {{ batch.strain.name }}</th><td><a href="{% url 'admin:yeast_yeast_change' sample.id %}">{{ sample.id }}</a></td></tr>
+    <tr><th class="fit">{{ batch.strain.manufacturer.name }}, {{ batch.strain.name }}</th><td><a href="{% url 'admin:yeast_yeast_change' sample.id %}">Admin</a></td></tr>
     <tr><th class="fit">Batch Source</th>
       <td>{{ batch.get_source_display }}
         {% if batch.source_batch %}