Merge branch 'bugfix/ascii' into develop

rowers/admin.py

@@ -6,7 +6,7 @@ from .models import (
     Rower, Workout,GraphImage,FavoriteChart,SiteAnnouncement,
     Team,TeamInvite,TeamRequest,
     WorkoutComment,C2WorldClassAgePerformance,PlannedSession,
-    GeoCourse,GeoPolygon,GeoPoint,VirtualRace,
+    GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult,
     )
 
 # Register your models here so you can use them in the Admin module
@@ -18,8 +18,14 @@ class RowerInline(admin.StackedInline):
     verbose_name_plural = 'rower'
     filter_horizontal = ('team','friends')
 
-class UserAdmin(UserAdmin):
+#class UserAdmin(UserAdmin):
+class UserAdmin(admin.ModelAdmin):
     inlines = (RowerInline,)
+    list_display = ('username','email','first_name','last_name','rowerplan')
+    search_fields = ["username","first_name","last_name","email"]
+
+    def rowerplan(self, obj):
+        return obj.rower.rowerplan
 
 class WorkoutAdmin(admin.ModelAdmin):
     list_display = ('date','user','name','workouttype','boattype')
@@ -58,10 +64,16 @@ class GeoPolygonInline(admin.StackedInline):
 class GeoCourseAdmin(admin.ModelAdmin):
     list_display = ('manager','name')
     inlines = (GeoPolygonInline,)
+    search_fields = ['name']
 
 
 class VirtualRaceAdmin(admin.ModelAdmin):
     list_display = ('manager','name','startdate','country')
+    search_fields = ['name','country']
+
+class VirtualRaceResultAdmin(admin.ModelAdmin):
+    list_display = ('race','userid','username','boattype','age','weightcategory')
+    search_fields = ['race__name','username']
     
 admin.site.unregister(User)
 admin.site.register(User,UserAdmin)
@@ -78,3 +90,4 @@ admin.site.register(C2WorldClassAgePerformance,
 admin.site.register(PlannedSession,PlannedSessionAdmin)
 admin.site.register(GeoCourse, GeoCourseAdmin)
 admin.site.register(VirtualRace, VirtualRaceAdmin)
+admin.site.register(VirtualRaceResult, VirtualRaceResultAdmin)

rowers/views.py

@@ -12874,9 +12874,6 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
         
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
 
-    for ps in sps:
-        print ps.name,ps.sessiontype
-
     completeness = {}
     actualvalue = {}
     completiondate = {}