links on analysis now to new analysis function

rowers/templates/analysis.html

@@ -14,9 +14,9 @@
   <li class="rounder">
     <h2>Compare Workouts</h2>
     {% if team %}
-    <a href="/rowers/team-compare-select/team/{{ team.id }}/">
+    <a href="/rowers/user-analysis-select/compare/team/{{ team.id }}/">
       {% else %}
-      <a href="/rowers/team-compare-select/team/0/">
+      <a href="/rowers/user-analysis-select/compare/team/0/">
 	{% endif %}
 	<div class="vignet">
 	<img src="/static/img/workoutcompare.png"
@@ -29,7 +29,7 @@
   </li>
   <li class="rounder">
     <h2>Stroke Analysis</h2>
-    <a href="/rowers/flexall/">
+    <a href="/rowers/user-analysis-select/flexall/">
         <div class="vignet">
           <img src="/static/img/strokeanalysis.png"
                alt="Stroke Analysis">
@@ -41,7 +41,7 @@
  </li>
   <li class="rounder">
     <h2>Histogram</h2>
-      <a href="/rowers/histo/">
+      <a href="/rowers/user-analysis-select/histo/">
         <div class="vignet">
           <img src="/static/img/histogram.png" alt="Power Histogram">
         </div>
@@ -52,7 +52,7 @@
   </li>
   <li class="rounder">
     <h2>Statistics</h2>
-    <a href="/rowers/cumstats/">
+    <a href="/rowers/user-analysis-select/stats/">
       <div class="vignet">
         <img src="/static/img/statistics.PNG" alt="Statistics">
       </div>
@@ -63,7 +63,7 @@
   </li>
   <li class="rounder">
     <h2>Box Chart</h2>
-    <a href="/rowers/user-boxplot-select/">
+    <a href="/rowers/user-analysis-select/boxplot/">
     <div class="vignet">
       <img src="/static/img/boxplot.png" alt="Box Chart">
     </div>
@@ -75,7 +75,7 @@
   </li>
   <li class="rounder">
     <h2>Trend Flex</h2>
-      <a href="/rowers/user-multiflex-select/">
+      <a href="/rowers/user-analysis-select/trendflex/">
       <div class="vignet">
         <img src="/static/img/trendflex.png" alt="Trend Flex">
       </div>

rowers/templates/menu_analytics.html

@@ -10,11 +10,11 @@
     <ul>
       <li id="compare">
 	{% if team %}
-	<a href="/rowers/team-compare-select/team/{{ team.id }}/">
+	<a href="/rowers/user-analysis-select/compare/team/{{ team.id }}/">
           <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
         </a>
 	{% else %}
-	<a href="/rowers/team-compare-select/team/0/">
+	<a href="/rowers/user-analysis-select/compare/team/0/">
           <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
         </a>
 	{% endif %}
@@ -48,29 +48,29 @@
     </label>
     <ul>
       <li id="stats-boxchart">
-        <a href="/rowers/user-boxplot-select/">
+        <a href="/rowers/user-analysis-select/boxplot/">
           <i class="fas fa-box-open fa-fw"></i>&nbsp;Box Chart
         </a>
       </li>
       <li id="stats-trendflex">
-        <a href="/rowers/user-multiflex-select/">
+        <a href="/rowers/user-analysis-select/trendflex/">
           <i class="far fa-chart-line fa-fw"></i>&nbsp;Trend Flex
         </a>
       </li>
       <li id="stats-cumstats">
-        <a href="/rowers/cumstats/">
+        <a href="/rowers/user-analysis-select/stats/">
           <i class="fal fa-table fa-fw"></i>&nbsp;Statistics
         </a>
       </li>
       <li id="stats-histo">
-        <a href="/rowers/histo/">
+        <a href="/rowers/user-analysis-select/histo/">
           <i class="fas fa-chart-bar"></i>&nbsp;Histogram
         </a>
       </li>
     </ul>
   </li>
   <li>
-    <a href="/rowers/flexall/">
+    <a href="/rowers/user-analysis-select/flexall/">
       <i class="fas fa-chart-line fa-fw"></i>&nbsp;Cumulative Flex Chart
     </a>
   </li>
@@ -106,4 +106,29 @@
 {% endif %}
 {% endif %}
 
+{% if user|user_teams  %}
+<p>&nbsp;</p>
+<ul class="cd-accordion-menu animated">
+  <li class="has-children" id="teams">
+    <input type="checkbox" name="team-selector" id="team-selector">
+    <label for="team-selector"><i class="fas fa-bullhorn fa-fw"></i>&nbsp;Groups</label>
+    <ul>
+      {% for tteam in teams %}
+      <li>
+        <a href={{ request.path|teamurl:tteam }}>
+          <i class="fas fa-users fa-fw"></i>        
+          {% if tteam == team %}
+          &bull;
+          {% else %}
+          &nbsp;
+          {% endif %}
+          {{ tteam.name }}
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </li>
+</ul>
+{% endif %}
+
 {% include 'menuscript.html' %}