minor improvements plannedsession views

rowers/utils.py

@@ -295,13 +295,26 @@ def calculate_age(born):
 def my_dict_from_instance(instance,model):
     thedict = {}
     thedict['id'] = instance.id
-    
-    for attr, value in instance.__dict__.iteritems():
+
+    for f in instance._meta.fields:
+        
+        fname = f.name
+
         try:
-            verbose_name = model._meta.get_field(attr).verbose_name
+            verbosename = f.verbose_name
         except:
-            verbose_name = attr
-            
-        thedict[attr] = (verbose_name,value)
+            verbosename = f.name
+
+        get_choice = 'get_'+fname+'_display'
+        if hasattr( instance, get_choice):
+            value = getattr(instance, get_choice)()
+        else:
+            try:
+                value = getattr(instance,fname)
+            except AttributeError:
+                value = None
+
+        if f.editable and value:
+            thedict[fname] = (verbosename,value)
 
     return thedict