finally making admin widgets work

rowers/models.py

@@ -1042,7 +1042,12 @@ def checkaccessplanuser(user,rower):
         if rower == r:
             return True
         team_managers = [t.manager for t in rower.team.all() if t.manager.rower.rowerplan in ['plan','coach']]
-        return user in team_managers        
+        if user.rower.rowerplan != 'basic':
+            return user in team_managers
+        else:
+            return False
+
+        return False
     except Rower.DoesNotExist:
         return False
     

rowers/templates/list_workouts.html

@@ -189,7 +189,7 @@
           </td>
           <td> {{ workout.date|date:"Y-m-d" }} </td>
           <td> {{ workout.starttime|date:"H:i" }} </td>
-          {% if workout.user.user == user or user == team.manager %}
+          {% if workout|may_edit:request %}
           {% if workout.name != '' %}
           <td>
             <a href={% url rower.defaultlandingpage id=workout.id|encode %}>
@@ -215,18 +215,27 @@
           <td> {{ workout.maxhr }} </td>
           {% if team %}
           <td colspan="2">
+          {% if workout|may_edit:request %}
           <a class="small" href="/rowers/{{ workout.user.id }}/list-workouts/">
             {{ workout.user.user.first_name }}
             {{ workout.user.user.last_name }}
           </a>
+	  {% else %}
+            {{ workout.user.user.first_name }}
+            {{ workout.user.user.last_name }}
+	  {% endif %}
           </td>
           {% endif %}
           <td>
+          {% if workout|may_edit:request %}
             <a class="small"
                href="/rowers/workout/{{ workout.id|encode }}/edit/"
                title="Edit">
               <i class="fas fa-pencil-alt fa-fw"></i>
             </a>
+	    {% else %}
+	    &nbsp;
+	    {% endif %}
           </td>
           <td>
             <a class="small"
@@ -236,17 +245,25 @@
             </a>
           </td>
           <td>
+          {% if workout|may_edit:request %}
             <a class="small"
                href="/rowers/workout/{{ workout.id|encode }}/stats/"
                title="Stats">
               <i class="fal fa-table fa-fw"></i>
             </a>
+	    {% else %}
+	    &nbsp;
+	    {% endif %}
           </td>
           <td>
+          {% if workout.user.user == user or user == team.manager %}
             <a class="small" href="/rowers/workout/{{ workout.id|encode }}/delete/"
                title="Delete">
               <i class="fas fa-trash-alt fa-fw"></i>
               </a>
+	    {% else %}
+	    &nbsp;
+	    {% endif %}
           </td>
         
         </tr>

rowers/views/planviews.py

@@ -548,6 +548,7 @@ def plannedsession_multicreate_view(request,
 
 # Manager creates sessions for entire team
 @user_passes_test(hasplannedsessions,login_url="/rowers/paidplans/",
+                  message="This functionality requires a Coach or Self-Coach plan",
                   redirect_field_name=None)
 def plannedsession_teamcreate_view(request,
                                    teamid=0,userid=0):
@@ -716,6 +717,7 @@ def plannedsession_teamcreate_view(request,
 
 # Manager edits sessions for entire team
 @user_passes_test(iscoachmember,login_url="/rowers/paidplans/",
+                  message="This functionality requires a Coach or Self-Coach plan",
                   redirect_field_name=None)
 def plannedsession_teamedit_view(request,
                                  sessionid=0,userid=0):

rowers/views/workoutviews.py

@@ -856,7 +856,7 @@ def virtualevent_compare_view(request,id=0):
         workouts = []
         for id in workoutids:
             try:
-                workouts.append(Workout.objects.get(id=encode.decode_hex(id)))
+                workouts.append(Workout.objects.get(id=id))
             except Workout.DoesNotExist:
                 pass
 

rowsandall_app/urls.py

@@ -75,6 +75,7 @@ urlpatterns += [
     url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
     url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^tz_detect/', include('tz_detect.urls')),
+    url(r'^jsi18n/', 'django.views.i18n.javascript_catalog',name='jsi18n'),
     ]
 
 

templates/newbase.html

@@ -12,7 +12,7 @@
     <title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
     {% block scripts %} {% endblock %}
 
-    <script type="text/javascript" src="/admin/jsi18n/"></script>
+    <script type="text/javascript" src="/jsi18n/"></script>
     <script type="text/javascript" src="/static/admin/js/core.js"></script>
     <script type="text/javascript" src="/static/admin/js/jquery.min.js"></script>
     <script type="text/javascript" src="/static/admin/js/jquery.init.js"></script>
@@ -31,7 +31,9 @@
 
     <link rel="stylesheet" href="/static/css/bokeh-0.12.3.min.css" type="text/css" />
     <link rel="stylesheet" href="/static/css/bokeh-widgets-0.12.3.min.css" type="text/css" />
-
+    <link rel="stylesheet" type="text/css" href="/static/admin/css/forms.css"/>
+    <link rel="stylesheet" type="text/css" href="/static/admin/css/widgets.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >
     <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon" />
     <link rel="icon" sizes="32x32" href="/static/img/favicon-32x32.png" type="image/png"/>
     <link rel="icon" sizes="64x64" href="/static/img/favicon-64x64.png" type="image/png"/>