fixed initials

rowers/interactiveplots.py

@@ -246,6 +246,24 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
     rowers = []
     durations = []
 
+    rowersinitials = {}
+    seen = ['seen']
+    idseen = []
+    
+    for w in workouts:
+        aantal=1
+        initials = w.user.user.first_name[0:aantal]+w.user.user.last_name[0:aantal]    
+        if w.user.id not in idseen:
+            while initials in seen:
+                aantal += 1
+                initials = w.user.user.first_name[0:aantal]+w.user.user.last_name[0:aantal]
+
+            seen.append(initials)
+            idseen.append(w.user.id)
+            rowersinitials[w.user.id] = initials
+
+            
+
     for w in workouts:
         dd = w.date.strftime('%m/%d')
         dd2 = w.date.strftime('%Y/%m/%d')
@@ -256,7 +274,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
         
         types.append(w.workouttype)
         try:
-            rowers.append(w.user.user.first_name[0]+w.user.user.last_name[0])
+            rowers.append(rowersinitials[w.user.id])
         except IndexError:
             rowers.append(str(w.user))
 

rowers/templates/teamstats.html

@@ -12,12 +12,12 @@
     {% for u in theusers %}
     <tr>
       <td>{{ u.first_name }} {{ u.last_name }}</td>
-      <td><a href="/rowers/{{ u.id }}/ote-bests">Ranking Pieces</a></td>
+      <td><a href="/rowers/ote-bests/user/{{ u.id }}">Ranking Pieces</a></td>
-      <td><a href="/rowers/flexall/u/{{ u.id }}">Stroke Analysis</a></td>
+      <td><a href="/rowers/flexall/user/{{ u.id }}">Stroke Analysis</a></td>
-      <td><a href="/rowers/histo/u/{{ u.id }}">Power Histogram</a></td>
+      <td><a href="/rowers/histo/user/{{ u.id }}">Power Histogram</a></td>
-      <td><a href="/rowers/cumstats/u/{{ u.id }}">Stats</a></td>
+      <td><a href="/rowers/cumstats/user/{{ u.id }}">Stats</a></td>
       <td><a href="/rowers/user-boxplot-select/user/{{ u.id }}/">Box Chart</a></td>
-      <td><a href="/rowers/{{ u.id }}/otw-bests">OTW Ranking Pieces</a></td>
+      <td><a href="/rowers/otw-bests/user/{{ u.id }}">OTW Ranking Pieces</a></td>
       <td><a href="/rowers/user-multiflex-select/user/{{ u.id }}/">Trend Flex</a></td>
     </tr>
     {% endfor %}

rowers/urls.py

@@ -206,6 +206,7 @@ urlpatterns = [
     url(r'^ote-bests2/$',views.rankings_view2),
     url(r'^otw-bests/user/(?P<theuser>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.otwrankings_view),
     url(r'^otw-bests/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.otwrankings_view),
+    url(r'^otw-bests/user/(?P<theuser>\d+)/$',views.otwrankings_view),
     url(r'^otw-bests/$',views.otwrankings_view),
     url(r'^ote-ranking/user/(?P<theuser>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.oterankings_view),
     url(r'^ote-ranking/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.oterankings_view),

rowers/views.py

@@ -102,8 +102,7 @@ from rowers import courses
 import rowers.uploads as uploads
 from django.forms.formsets import formset_factory
 from django.forms import modelformset_factory
-import StringIO
+
-import cStringIO
 from django.contrib.auth.decorators import login_required #,user_passes_test
 from rowers.decorators import user_passes_test
 from time import strftime,strptime,mktime,time,daylight
@@ -1459,7 +1458,7 @@ def plannedsessions_icsemail_view(request,userid=0):
         cal.add_component(event)
 
 
-    response = HttpResponse(cal.to_ical(),content_type = 'text/plain')
+    response = HttpResponse(cal.to_ical())
     response['Content-Disposition'] = 'attachment; filename="training_plan_%s.ics"' % request.user.id        
 
     return response