customize observation display

powered-by-wq · May 26, 2017 · a0cd5d2 · a0cd5d2
1 parent f3acccd
commit a0cd5d2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/app/js/insideoutside/config.js b/app/js/insideoutside/config.js
@@ -10,7 +10,20 @@ config.router = {
 config.template = {
     'templates': templates,
     'defaults': {
-        'version': version
+        'version': version,
+        'date': function() {
+            var date = new Date();
+            return (
+                date.getFullYear() + '-' +
+                (date.getMonth() < 9 ? '0' : '') +
+                (date.getMonth() + 1) + '-' +
+                (date.getDate() <= 9 ? '0' : '') +
+                date.getDate()
+	    );
+        },
+        'is_gps': function() {
+            return this.name == 'gps';
+        }
     }
 };
 

diff --git a/db/observation/models.py b/db/observation/models.py
@@ -51,6 +51,14 @@ class Observation(models.Model):
         verbose_name="Notes",
     )
 
+    wq_label_template = "{{category_id}} on {{date}}"
+
+    def __str__(self):
+        if not self.category:
+            return "New Observation"
+        return "%s on %s" % (self.category, self.date)
+
     class Meta:
         verbose_name = "observation"
         verbose_name_plural = "observations"
+        ordering = ('-pk',)
diff --git a/templates/observation_edit.html b/templates/observation_edit.html
@@ -93,7 +93,7 @@ <h1>{{^id}}Add{{/id}}{{#id}}Edit{{/id}} observation</h1>
               <fieldset data-xform-type='select one' data-role='controlgroup' data-type='horizontal'>
                 <legend>Location Mode</legend>
                 {{#toggle_choices}}
-                <input type='radio' id='observation-toggle-{{name}}' name='toggle' value='{{name}}'{{#selected}} checked{{/selected}}>
+                <input type='radio' id='observation-toggle-{{name}}' name='toggle' value='{{name}}'{{#selected}} checked{{/selected}}{{#is_gps}} checked{{/is_gps}}>
                 <label for='observation-toggle-{{name}}'>{{label}}</label>
                 {{/toggle_choices}}
               </fieldset>