small changes and test for better nav

diff --git a/core/admin.py b/core/admin.py
index 153f50268f87d3b563e9ce983d0be208094bc886..1b930ed1cc3bed8c42d4f0504d2a4291e0562d60 100644 (file)
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from core.models import StablePart, Bay, Horse, FodderPlan, Misc
+from core.models import StablePart, Bay, Horse, FodderPlan, Misc, IsInBay
 
 # Register your models here.
 admin.site.register(StablePart)
@@ -7,3 +7,4 @@ admin.site.register(Bay)
 admin.site.register(Horse)
 admin.site.register(FodderPlan)
 admin.site.register(Misc)
+admin.site.register(IsInBay)

diff --git a/core/templates/core/stablepart_list.html b/core/templates/core/stablepart_list.html
index af24e12815e829f00ba3027a4504a0a2ea1bd81a..284fa00f8f1970ecda5c4a5cccde1f141df26c30 100644 (file)
--- a/core/templates/core/stablepart_list.html
+++ b/core/templates/core/stablepart_list.html
@@ -3,12 +3,31 @@
 {% block title %}Stable Parts - {{ block.super }}{% endblock %}
 
 {% block main %}
+<ul>
+  {% for sp in object_list %}
+  <li>{{ sp }}
     <ul>
-      {% for sp in object_list %}
-        <li><a href="/stablepart/{{sp.id}}">{{ sp }}</a></li>
-      {% empty %}
-        <li>No Stable yet</li>
+      {% for bay in sp.bays.all %}
+      <li>
+        <div class="card">
+          <h3>{{ bay }}</h3>
+          {% for inbay in bay.isinbay_set.all %}
+          <div>{{ inbay.in_bay_since }} bis {{ inbay.in_bay_until }}: {{ inbay.horse }}</div>
+          {% endfor %}
+        </div>
+      </li>
       {% endfor %}
     </ul>
+  </li>
+  {% endfor %}
+</ul>
 {% endblock %}
-  
+<!-- {% block nav %}
+<ul>
+  {% for sp in object_list %}
+  <li><a href="/stablepart/{{sp.id}}">{{ sp }}</a></li>
+  {% empty %}
+  <li>No Stable yet</li>
+  {% endfor %}
+</ul>
+{% endblock %} -->
\ No newline at end of file

diff --git a/stable/settings.py b/stable/settings.py
index 5ec8e751c28ba85115c11cf9d52d3518152bd38a..51db7cd3e6be92ccb4e680f4eddff6ff1b89bd12 100644 (file)
--- a/stable/settings.py
+++ b/stable/settings.py
@@ -81,7 +81,7 @@ DATABASES = {
         'NAME': 'stable', 
         'USER': 'stable', 
         'PASSWORD': 'po1Ahf5eph7dogh1', 
-            }
+    }
 }