Merge pull request OpenTreeMap#135 from ahinz/bug/polygons

Bug/polygons

Author: ahinz

polygons/admin.py

@@ -0,0 +1,5 @@
+from django.contrib.gis import admin
+from polygons.models import TreeRegionPolygon, DBHClass, TreeRegionEntry
+
+admin.site.register(DBHClass)
+admin.site.register(TreeRegionEntry)

polygons/models.py

@@ -10,15 +10,26 @@ class TreeRegionPolygon(models.Model):
     photo = models.ImageField(upload_to="polygons/%Y/%m/%d",null=True,blank=True)
     objects = models.GeoManager()
 
+    def __unicode__(self):
+        return u"Polygon #%s, Region ID: %s" % (self.pk, self.region_id)
+
 class DBHClass(models.Model):
     label = models.CharField(max_length=255)
     dbh_min = models.FloatField()
     dbh_max = models.FloatField()
 
+    def __unicode__(self):
+        return u"DBH Class #%s: %s (%s - %s)" % \
+            (self.pk, self.label, self.dbh_min, self.dbh_max)
+
 class TreeRegionEntry(models.Model):
     polygon = models.ForeignKey(TreeRegionPolygon)
     species = models.ForeignKey(Species)
     dbhclass = models.ForeignKey(DBHClass)
     count = models.IntegerField(default=0)
 
     objects = models.GeoManager()
+
+    def __unicode__(self):
+        return u"%s, Species: %s, Count: %s" % \
+            (str(self.polygon), str(self.species), self.count)

static/css/polygons.css

@@ -6,8 +6,9 @@ input {
     width: 100%;
 }
 
-#polygontable {
+.table-container {
     overflow: auto;
+    width: 95%;
 }
 
 /** CSS for OTM is screwy... we're just going to give

templates/polygons/base.html

@@ -54,7 +54,7 @@
       <form method="POST" action="{{ SITE_ROOT }}polygons/{{ polygonobj.pk }}/photo" enctype="multipart/form-data">
         <input type="file" name="photo">
         <input type="hidden" name="currentpage" value="{{ request.get_full_path }}">
-        <input type="submit">
+        <input type="submit" value="Submit Photo">
       </form>
     {% endif %}
   </ul>

templates/polygons/edit.html

@@ -5,27 +5,30 @@
 <h1>Polygon #{{ polygonobj.pk }}</h1>
 
 <form method="POST" action="{{ SITE_ROOT}}polygons/{{ polygonobj.pk }}/update">
-  <table class="polygon-table table" data-id="{{ polygonobj.pk }}" width="100%">
-    <tr>
-      <th>Species</th>
-      {% for cl in classes %}
-      <th data-dbh-id={{ cl.pk }}>{{ cl.label }}</th>
+  <div class="table-container">
+    <table class="polygon-table table" data-id="{{ polygonobj.pk }}" width="100%">
+      <tr>
+        <th>Species</th>
+        {% for cl in classes %}
+        <th data-dbh-id={{ cl.pk }}>{{ cl.label }}</th>
+        {% endfor %}
+        <th></th>
+      </tr>
+      {% for row in polygon %}
+      <tr>
+        {% for item in row %}
+        {% if forloop.first %}
+        <td data-species-id="{{ item.0 }}">{{ item.1 }}</td>
+        {% else %}
+        <td><input name="pval_{{ polygonobj.pk }}_{{ row.0.0 }}_{{ item.0 }}" value="{% if item.1 %}{{ item.1 }}{% else %}0{% endif %}"></td>
+        {% endif %}
+        {% endfor %}
+        <td><a href="#" class="removespecies">Remove</a></td>
+      </tr>
       {% endfor %}
-      <th></th>
-    </tr>
-    {% for row in polygon %}
-    <tr>
-      {% for item in row %}
-      {% if forloop.first %}
-      <td data-species-id="{{ item.0 }}">{{ item.1 }}</td>
-      {% else %}
-      <td><input name="pval_{{ polygonobj.pk }}_{{ row.0.0 }}_{{ item.0 }}" value="{% if item.1 %}{{ item.1 }}{% else %}0{% endif %}"></td>
-      {% endif %}
-      {% endfor %}
-      <td><a href="#" class="removespecies">Remove</a></td>
-    </tr>
-    {% endfor %}
   </table>
+</div>
+
 <input type="submit" name="submit" value="Update" />
 <a href="{{ SITE_ROOT}}polygons/{{ polygonobj.pk }}">Cancel</a>
 </form>

templates/polygons/view.html

@@ -7,20 +7,22 @@ <h1>Polygon #{{ polygonobj.pk }}</h1>
 <a href="{{ SITE_ROOT }}polygons/{{ polygonobj.pk }}/edit"><button>Edit</button></a>
 {% endif %}
 
-<table id="polygontable" class="table" width="100%">
-  <tr>
-    <th>Species</th>
-    {% for cl in classes %}
-    <th>{{ cl.label }}</th>
+<div class="table-container">
+  <table id="polygontable" class="table" width="100%">
+    <tr>
+      <th>Species</th>
+      {% for cl in classes %}
+      <th>{{ cl.label }}</th>
+      {% endfor %}
+    </tr>
+    {% for row in polygon %}
+    <tr>
+      {% for item in row %}
+      <td>{{ item.1 }}</td>
+      {% endfor %}
+    </tr>
     {% endfor %}
-  </tr>
-  {% for row in polygon %}
-  <tr>
-    {% for item in row %}
-    <td>{{ item.1 }}</td>
-    {% endfor %}
-  </tr>
-  {% endfor %}
-</table>
+  </table>
+</div>
 
 {% endblock %}