Merge branch 'feature/goals' into develop

rowers/interactiveplots.py

@@ -748,8 +748,9 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
             power2k = power2k,
             date = date,
             power1hr = power1hr,
-            fdate=groups['dates'].map(lambda x: x.strftime('%d-%m-%Y'))            )
+            fdate=groups['dates'].map(lambda x: x.strftime('%Y-%m-%d'))
         )
+    )
 
 
     # fit
@@ -3146,7 +3147,7 @@ def interactive_flex_chart2(id=0,promember=0,
 
 
     plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type,
-                  tools=TOOLS,
+                  tools=TOOLS,toolbar_location='above',
                   toolbar_sticky=False
                   )
                                    

rowers/templatetags/rowerfilters.py

@@ -11,7 +11,7 @@ from rowers.utils import calculate_age
 from rowers.models import (
     course_length,WorkoutComment,
     TrainingMacroCycle,TrainingMesoCycle, TrainingMicroCycle,
-    Rower,Workout
+    Rower,Workout,SiteAnnouncement
     )
 from rowers.plannedsessions import (
     race_can_register, race_can_submit,race_rower_status
@@ -33,6 +33,12 @@ import arrow
 
 from six import string_types
 
+@register.filter
+def nogoals(user):
+    targets = TrainingTarget.objects.filter(rowers=user.rower,
+                                            date__gte=datetime.date.today())
+    return len(targets)==0
+
 def strfdelta(tdelta):
     minutes,seconds = divmod(tdelta.seconds,60)
     tenths = int(tdelta.microseconds/1e5)
@@ -333,6 +339,15 @@ def user_teams(user):
 
     return teams
 
+@register.filter
+def announcements(request):
+    announcements = SiteAnnouncement.objects.filter(
+        expires__gte=datetime.date.today()).order_by(
+            "-created",
+            "-id"
+            )
+
+    return announcements[0:4]
 
 @register.filter
 def has_teams(user):

static/css/rowsandall2.css

@@ -240,6 +240,7 @@ th.rotate > div > span {
     padding: .2em .5em .2em 0em;
 }
 
+
 .site-announcement {
     font: 1.0em/1.2em sans-serif;
     text-decoration: none;
@@ -253,6 +254,19 @@ th.rotate > div > span {
     border: solid 1px #333;
 }
 
+.site-announcement-white {
+    font: 1.0em/1.2em sans-serif;
+    text-decoration: none;
+    display: block;
+    padding: .2em .5em .2em .5em; 
+    zoom: 1;
+/*    border-radius: .5em; */
+/*    -moz-border-radius: .5em; */
+/*    -webkit-border-radius: .5em; */
+    text-align: left;
+    border: solid 1px #fff;
+}
+
 
 
 .contentli {

static/css/styles2.css

@@ -80,6 +80,15 @@
         padding: 15px;
     }
 
+    ad h1 {
+        font-weight: bold;
+        text-align: left;
+        font-size: 1.4em;
+        /* color: #dddddd; */
+        color: #f8f8ff;
+        padding: 15px;
+    }
+
     aside h1 a {
         font-weight: bold;
         text-align: left;
@@ -647,8 +656,8 @@
         "side-nav nav  nav"
         "sidebar content content"
         "sidebar     content content"
-        "sidebar     content content"
+        "ad     content content"
-        "sidebar  footer footer"
+        "ad  footer footer"
         "ad  footer footer"
    }
 

templates/newbase.html

@@ -309,10 +309,27 @@
       </aside>
       
       <ad class="ad">
+        {% if request|announcements %}
+        <h1>What's New?</h1>
+        {% for a in request|announcements %}
+        <div class="site-announcement-box">
+          <div class="site-announcement-white">
+            <em>{{ a.created }}:</em>
+            {{ a.announcement|urlize }}
+          </div>
+        </div>
+
+        {% endfor %}
+        {% endif %}
+        {% if user.is_authenticated and user|nogoals %}
+        <p>
+          <a href="/rowers/createplan/">Create a Training Target!</a>
+        </p>
+        {% endif %}
         {% block ad %}
-        <a href="https://pryglrowing.com">
+          <a href="https://pryglrowing.com">
-          <img src="/static/img/prygl.jpg">
+            <img src="/static/img/prygl.jpg">
-          <p style="text-align: center">Prygl Rowing Camps</p>
+            <p style="text-align: center">Prygl Rowing Camps</p>
           </a>
         {% endblock %}
       </ad>