From f7868789e25276aa5d11a5dfe571ddc375e16f76 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 10:14:53 +0100
Subject: [PATCH 1/6] removing older compare functions

---
 rowers/forms.py                    |   9 ++
 rowers/templates/menu_workout.html |   2 +-
 rowers/tests/statements.py         |   2 +-
 rowers/urls.py                     |  15 ---
 rowers/views/workoutviews.py       | 149 -----------------------------
 5 files changed, 11 insertions(+), 166 deletions(-)

diff --git a/rowers/forms.py b/rowers/forms.py
index deee532d..81dcf643 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -1291,6 +1291,15 @@ class AnalysisChoiceForm(forms.Form):
                                             label='Include Rest Strokes')
 
 
+    def __init__(self, *args, **kwargs):
+        super(AnalysisChoiceForm, self).__init__(*args, **kwargs)
+
+        if 'initial' in kwargs and kwargs['initial']['function'] == 'compare':
+            self.fields['xaxis'].initial = 'time'
+            self.fields['yaxis1'].initial = 'hr'
+            self.fields['plottype'].initial = 'line'
+
+
 
 class BoxPlotChoiceForm(forms.Form):
     yparam = forms.ChoiceField(choices=parchoices,initial='spm',
diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index e161ca7a..16b38908 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -48,7 +48,7 @@
         </a>
       </li>
       <li id="compare">
-        <a href="/rowers/team-compare-select/workout/{{ workout.id|encode }}/">
+        <a href="/rowers/user-analysis-select/compare/workout/{{ workout.id|encode }}/">
           <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
         </a>
       </li>
diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py
index 7d4f8187..74f2a1b8 100644
--- a/rowers/tests/statements.py
+++ b/rowers/tests/statements.py
@@ -36,7 +36,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from io import StringIO
 
 from django.test.client import RequestFactory
-from rowers.views import c2_open, multi_compare_view
+from rowers.views import c2_open
 
 
 from rowers.forms import (
diff --git a/rowers/urls.py b/rowers/urls.py
index 25bbf732..6f55af06 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -312,17 +312,6 @@ urlpatterns = [
     re_path(r'^standards/upload/(?P<id>\d+)/$',views.standards_upload_view,name='standards_upload_view'),
     re_path(r'^workout/addmanual/(?P<raceid>\d+)/$',views.addmanual_view,name='addmanual_view'),
     re_path(r'^workout/addmanual/$',views.addmanual_view,name='addmanual_view'),
-    re_path(r'^team-compare-select/workout/(?P<id>\d+)/team/(?P<teamid>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/workout/(?P<id>\b[0-9A-Fa-f]+\b)/team/(?P<teamid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/workout/(?P<id>\b[0-9A-Fa-f]+\b)/team/(?P<teamid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/workout/(?P<id>\b[0-9A-Fa-f]+\b)/team/(?P<teamid>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/workout/(?P<id>\b[0-9A-Fa-f]+\b)/user/(?P<userid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/team/(?P<teamid>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/team/(?P<teamid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/user/(?P<userid>\d+)/$',views.team_comparison_select,name='team_comparison_select'),
-    re_path(r'^team-compare-select/$',views.team_comparison_select,name='team_comparison_select'),
     re_path(r'^workouts-join/$',views.workouts_join_view,name='workouts_join_view'),
     re_path(r'^workouts-join/user/(?P<userid>\d+)$',views.workouts_join_view,name='workouts_join_view'),
     re_path(r'^workouts-join-select/$',views.workouts_join_select,name='workouts_join_select'),
@@ -522,10 +511,6 @@ urlpatterns = [
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/recalcsummary/$',views.workout_recalcsummary_view,name='workout_recalcsummary_view'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/sporttracksuploadw/$',views.workout_sporttracks_upload_view,name='workout_sporttracks_upload_view'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/tpuploadw/$',views.workout_tp_upload_view,name='workout_tp_upload_view'),
-    re_path(r'^multi-compare/workout/(?P<id>\b[0-9A-Fa-f]+\b)/user/(?P<userid>\d+)/$',views.multi_compare_view,
-        name='multi_compare_view'),
-    re_path(r'^multi-compare/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.multi_compare_view,name='multi_compare_view'),
-    re_path(r'^multi-compare/$',views.multi_compare_view,name='multi_compare_view'),
     re_path(r'^alerts/user/(?P<userid>\d+)/$',views.alerts_view,name='alerts_view'),
     re_path(r'^alerts/$',views.alerts_view,name='alerts_view'),
     re_path(r'^alerts/(?P<pk>\d+)/delete/$',views.AlertDelete.as_view(),name='alert_delete_view'),
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 00b1e4a5..2a8b783d 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2055,155 +2055,6 @@ def plannedsession_compare_view(request,id=0,userid=0):
 
     return HttpResponseRedirect(url)
 
-# Team comparison
-@login_required()
-def multi_compare_view(request,id=0,userid=0):
-    promember=0
-    if not request.user.is_anonymous:
-        r = getrower(request.user)
-        result = request.user.is_authenticated and ispromember(request.user)
-        if result:
-            promember=1
-
-    if request.method == 'POST' and 'workouts' in request.POST:
-        form = WorkoutMultipleCompareForm(request.POST)
-        chartform = ChartParamChoiceForm(request.POST)
-        if form.is_valid() and chartform.is_valid():
-            cd = form.cleaned_data
-            workouts = cd['workouts']
-            xparam = chartform.cleaned_data['xparam']
-            yparam = chartform.cleaned_data['yparam']
-            plottype = chartform.cleaned_data['plottype']
-            teamid = chartform.cleaned_data['teamid']
-            ids = [int(w.id) for w in workouts]
-            request.session['ids'] = ids
-
-            labeldict = {
-                int(w.id): w.__str__() for w in workouts
-                }
-
-        else: # pragma: no cover
-            return HttpResponse("Form is not valid")
-    elif request.method == 'POST' and 'ids' in request.session:
-        chartform = ChartParamChoiceForm(request.POST)
-        if chartform.is_valid():
-            xparam = chartform.cleaned_data['xparam']
-            yparam = chartform.cleaned_data['yparam']
-            plottype = chartform.cleaned_data['plottype']
-            teamid = chartform.cleaned_data['teamid']
-            ids = request.session['ids']
-            request.session['ids'] = ids
-            workouts = []
-            for id in ids:
-                try:
-                    workouts.append(Workout.objects.get(id=id))
-                except Workout.DoesNotExist: # pragma: no cover
-                    pass
-
-            labeldict = {
-                int(w.id): w.__str__() for w in workouts
-                }
-    elif 'ids' in request.session and 'plottype' in request.session:
-        xparam = request.session['xparam']
-        yparam = request.session['yparam']
-        plottype = request.session['plottype']
-        teamid = 0
-        ids = request.session['ids']
-        workouts = []
-        for id in ids:
-            try:
-                workouts.append(Workout.objects.get(id=id))
-            except Workout.DoesNotExist: # pragma: no cover
-                pass
-
-        labeldict = {
-            int(w.id): w.__str__() for w in workouts
-            }
-        chartform = ChartParamChoiceForm(
-            initial = {
-                'xparam':xparam,
-                'yparam':yparam,
-                'plottype':plottype,
-                'teamid':teamid
-                }
-            )
-
-    else:
-        url = reverse('team_comparison_select',
-                      kwargs={
-                          'id':id,
-                          'teamid':0})
-        return HttpResponseRedirect(url)
-
-
-    res = interactive_multiple_compare_chart(ids,xparam,yparam,
-                                             promember=promember,
-                                             plottype=plottype,
-                                             labeldict=labeldict)
-    script = res[0]
-    div = res[1]
-    errormessage = res[3]
-    if errormessage != '': # pragma: no cover
-        messages.error(request,errormessage)
-
-    r = getrower(request.user)
-
-    breadcrumbs = [
-        {
-            'url':'/rowers/list-workouts/',
-            'name':'Workouts'
-        },
-        {
-            'url':reverse('team_comparison_select',kwargs={'teamid':teamid}),
-            'name': 'Compare Select'
-        },
-        {
-            'url':reverse('multi_compare_view'),
-            'name': 'Comparison Chart'
-        }
-    ]
-
-    if 'ps' in request.session: # pragma: no cover
-        ps = PlannedSession.objects.get(id=int(request.session['ps']))
-        breadcrumbs = [
-            {
-                'url': reverse('plannedsessions_view',
-                               kwargs={'userid':userid}),
-                'name': 'Sessions'
-            },
-            {
-            'url':reverse('plannedsession_view',
-                          kwargs={
-                              'userid':userid,
-                              'id':ps.id,
-                          }
-            ),
-            'name': ps.id
-            },
-            {
-            'url':reverse('plannedsession_compare_view',
-                          kwargs={
-                              'userid':userid,
-                              'id':ps.id,
-                          }
-            ),
-            'name': 'Compare'
-            }
-        ]
-
-
-    return render(request,'multicompare.html',
-                  {'interactiveplot':script,
-                   'the_div':div,
-                   'breadcrumbs':breadcrumbs,
-                   'rower':r,
-                   'active':'nav-workouts',
-                   'promember':promember,
-                   'teamid':teamid,
-                   'chartform':chartform,
-                   'teams':get_my_teams(request.user),
-                  })
-
 
 # List Workouts
 @login_required()

From a5c33a8fac9ecf0848c7e418c9b4a8fd7de12806 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 10:21:24 +0100
Subject: [PATCH 2/6] removing obsolete tests

---
 rowers/tests/test_aworkouts.py | 64 ----------------------------------
 rowers/tests/test_team.py      | 64 ----------------------------------
 rowers/tests/test_urls.py      |  2 --
 rowers/tests/viewnames.csv     |  2 --
 4 files changed, 132 deletions(-)

diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py
index 5754eaaa..b9f6f85f 100644
--- a/rowers/tests/test_aworkouts.py
+++ b/rowers/tests/test_aworkouts.py
@@ -214,70 +214,6 @@ class WorkoutViewTest(TestCase):
                              expected_url=expected_url,
                              status_code=302,target_status_code=200)
 
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db')
-    @patch('rowers.middleware.myqueue')
-    def test_compares(self, mocked_sqlalchemy, mocked_getsmallrowdata_db,
-                      mocked_myqueue):
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
-
-
-        session = self.c.session
-        session['ids'] = [self.werg1.id,self.werg2.id]
-        session.save()
-
-        response = self.c.get('/')
-
-        url = reverse('team_comparison_select')
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-        d1 = self.werg1.date-datetime.timedelta(days=2)
-        d2 = self.werg2.date+datetime.timedelta(days=2)
-
-        form_data = {
-            'startdate': d1.strftime('%Y-%m-%d'),
-            'enddate': d2.strftime('%Y-%m-%d'),
-            'modality':'water',
-            'waterboattype':['1x'],
-            }
-
-        form = DateRangeForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        form = TrendFlexModalForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        response = self.c.post(url,form_data)
-        self.assertEqual(response.status_code,200)
-
-        url = reverse('multi_compare_view',kwargs={
-            'userid':self.u.id,
-            'id':encoder.encode_hex(self.werg1.id),
-        })
-
-        form_data = {
-            'xparam':'time',
-            'yparam':'power',
-            'plottype':'line',
-            'teamid': '',
-            }
-
-
-        response = self.c.post(url,form_data,follow=True)
-        self.assertEqual(response.status_code,200)
-
-        session['plottype'] = 'scatter'
-        session['xparam'] = 'time'
-        session['yparam'] = 'hr'
-
-        session.save()
-
-        response = self.c.get('/')
-
-        response = self.c.get(url,follow=True)
-        self.assertEqual(response.status_code,200)
 
     @patch('rowers.dataprep.create_engine')
     @patch('rowers.dataprep.getsmallrowdata_db')
diff --git a/rowers/tests/test_team.py b/rowers/tests/test_team.py
index ae4a0687..10c43b91 100644
--- a/rowers/tests/test_team.py
+++ b/rowers/tests/test_team.py
@@ -169,70 +169,6 @@ class TeamTest(TestCase):
         response = self.c.get(url)
         self.assertEqual(response.status_code, 200)
 
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db')
-    @patch('rowers.middleware.myqueue')
-    def test_compares(self, mocked_sqlalchemy, mocked_getsmallrowdata_db,
-                      mocked_myqueue):
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
-
-
-        session = self.c.session
-        session['ids'] = [self.werg1.id,self.werg2.id]
-        session.save()
-
-        response = self.c.get('/')
-
-        url = reverse('team_comparison_select',kwargs={'teamid':self.t.id})
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-        d1 = self.werg1.date-timedelta(days=2)
-        d2 = self.werg2.date+timedelta(days=2)
-
-        form_data = {
-            'startdate': d1.strftime('%Y-%m-%d'),
-            'enddate': d2.strftime('%Y-%m-%d'),
-            'modality':'water',
-            'waterboattype':['1x'],
-            }
-
-        form = DateRangeForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        form = TrendFlexModalForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        response = self.c.post(url,form_data)
-        self.assertEqual(response.status_code,200)
-
-        url = reverse('multi_compare_view',kwargs={
-            'userid':self.u.id,
-            'id':encoder.encode_hex(self.werg1.id),
-        })
-
-        form_data = {
-            'xparam':'time',
-            'yparam':'power',
-            'plottype':'line',
-            'teamid': '',
-            }
-
-
-        response = self.c.post(url,form_data,follow=True)
-        self.assertEqual(response.status_code,200)
-
-        session['plottype'] = 'scatter'
-        session['xparam'] = 'time'
-        session['yparam'] = 'hr'
-
-        session.save()
-
-        response = self.c.get('/')
-
-        response = self.c.get(url,follow=True)
-        self.assertEqual(response.status_code,200)
 
     def test_teamsview(self):
 
diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py
index c34057d8..1baeb62d 100644
--- a/rowers/tests/test_urls.py
+++ b/rowers/tests/test_urls.py
@@ -125,8 +125,6 @@ class URLTests(TestCase):
         '/rowers/sessions/multicreate/',
         '/rowers/sessions/print/',
         '/rowers/sessions/teamcreate/',
-        '/rowers/team-compare-select/',
-        '/rowers/team-compare-select/workout/'+encoded1+'/',
         '/rowers/workout/'+encoded1+'/',
         '/rowers/workout/'+encoded1+'/adddistanceplot/',
         '/rowers/workout/'+encoded1+'/adddistanceplot2/',
diff --git a/rowers/tests/viewnames.csv b/rowers/tests/viewnames.csv
index a9b88233..34c2b7cd 100644
--- a/rowers/tests/viewnames.csv
+++ b/rowers/tests/viewnames.csv
@@ -23,7 +23,6 @@
 22,24,courses_view,see race courses,TRUE,200,FALSE,200,302,FALSE,200,302,FALSE,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
 23,25,course_upload_view,upload a new course,TRUE,302,basic,200,302,FALSE,200,302,FALSE,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
 24,26,addmanual_view,upload a manual workout,TRUE,302,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
-25,27,team_comparison_select,compare with a team member workout,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,TRUE,TRUE,TRUE,TRUE,
 26,28,workouts_join_view,join workouts,TRUE,302,pro,302,302,pro,403,403,coach,302,403,FALSE,TRUE,FALSE,TRUE,TRUE,
 27,29,workouts_join_select,select workouts to join,TRUE,404,pro,200,302,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE,
 29,31,analysis_new,analysis front page,TRUE,302,pro,200,302,FALSE,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
@@ -97,7 +96,6 @@
 111,137,workout_recalcsummary_view,recalculates workout summary,TRUE,403,basic,302,403,basic,403,403,coach,302,403,FALSE,FALSE,TRUE,TRUE,TRUE,
 112,138,workout_sporttracks_upload_view,uploads workout to C2,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,TRUE,FALSE,FALSE,
 115,141,workout_tp_upload_view,uploads workout to C2,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,TRUE,FALSE,FALSE,
-116,142,multi_compare_view,compare workouts  ,TRUE,302,basic,302,403,basic,302,403,coach,302,302,FALSE,FALSE,TRUE,TRUE,TRUE,
 117,145,alerts_view,view alerts,TRUE,302,basic,200,403,basic,403,403,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
 118,147,AlertDelete,delete alert,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
 119,148,alert_edit_view,edit alert,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,

From f90ab8ea3a1e00dbe4eb9a6f6a73e996c72dd725 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 10:33:12 +0100
Subject: [PATCH 3/6] removing more obsolete tests

---
 rowers/tests/test_analysis.py | 64 -----------------------------------
 1 file changed, 64 deletions(-)

diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py
index 819ab6a8..bca8a55a 100644
--- a/rowers/tests/test_analysis.py
+++ b/rowers/tests/test_analysis.py
@@ -11,70 +11,6 @@ nu = datetime.datetime.now()
 from rowers.views import *
 from rowers.views.analysisviews import histodata
 
-class WorkoutCompareTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError, OSError):
-                pass
-
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db')
-    def test_workouts_compare(self, mocked_sqlalchemy,
-                              mocked_getsmallrowdata_db):
-
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
-
-        url = '/rowers/team-compare-select/workout/'+encoded1+'/team/0/user/1/'
-
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getsmallrowdata_db)
-    def test_workouts_compare_submit(self, mocked_sqlalchemy,
-                                     mocked_getsmallrowdata_db):
-
-        login = self.c.login(username=self.u.username,password=self.password)
-        self.assertTrue(login)
-
-        form_data = {
-            'chartform':'Compare',
-            'plottype':'scatter',
-            'teamid':0,
-            'workouts':['1','2','3'],
-            'xparam':'distance',
-            'yparam':'hr',
-            }
-
-        form = WorkoutMultipleCompareForm(form_data)
-        chartform = ChartParamChoiceForm(form_data)
-        self.assertTrue(form.is_valid())
-        self.assertTrue(chartform.is_valid())
-
-        response = self.c.post('/rowers/multi-compare/',form_data)
-
-        self.assertEqual(response.status_code,200)
-
-
 
 
 class ListWorkoutTest(TestCase):

From 222c9afa50a9f0d8e2bafcff73f23d6ea4239482 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 10:43:30 +0100
Subject: [PATCH 4/6] fixed menu

---
 rowers/templates/menu_workouts.html   |   4 ++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 0 -> 4001 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 rowers/tests/testdata/testdata.tcx.gz

diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index 4d0e2d02..93b4d31a 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -10,10 +10,10 @@
   </li>
   <li id="compare">
     {% if team %}
-    <a href="/rowers/team-compare-select/team/{{ team.id }}/">
+    <a href="/rowers/user-analysis-select/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/team/0/">
       <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
     {% endif %}
   </li>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
new file mode 100644
index 0000000000000000000000000000000000000000..168c1261e098b1ce5496a56c4a9dbd82b815bdde
GIT binary patch
literal 4001
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
H#DD<+Fv>s-

literal 0
HcmV?d00001


From 045e04e0c09ff7c203fc1895cc20d4db272d51b5 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 12:55:01 +0100
Subject: [PATCH 5/6] more refs to old page removed

---
 rowers/templates/menu_other.html          |   6 +-
 rowers/templates/menu_workouts.html       |   4 +-
 rowers/templates/team_compare_select.html | 144 ----------------------
 rowers/templates/teambuttons.html         |   2 +-
 rowers/tests/test_plans.py                |  11 +-
 rowers/tests/testdata/testdata.tcx.gz     | Bin 4001 -> 4000 bytes
 rowers/urls.py                            |   3 +
 rowers/views/analysisviews.py             |  12 +-
 rowers/views/workoutviews.py              |   9 +-
 9 files changed, 36 insertions(+), 155 deletions(-)
 delete mode 100644 rowers/templates/team_compare_select.html

diff --git a/rowers/templates/menu_other.html b/rowers/templates/menu_other.html
index 71789d84..f56facfa 100644
--- a/rowers/templates/menu_other.html
+++ b/rowers/templates/menu_other.html
@@ -10,9 +10,11 @@
   </li>
   <li id="compare">
     {% if team %}
-    <a href="/rowers/team-compare-select/team/{{ team.id }}/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    <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/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    <a href="/rowers/user-analysis-select/compare/team/0/">
+      <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
     {% endif %}
   </li>
   <li>
diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index 93b4d31a..24c0bc8f 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -10,10 +10,10 @@
   </li>
   <li id="compare">
     {% if team %}
-    <a href="/rowers/user-analysis-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/user-analysis-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 %}
   </li>
diff --git a/rowers/templates/team_compare_select.html b/rowers/templates/team_compare_select.html
deleted file mode 100644
index 19140d18..00000000
--- a/rowers/templates/team_compare_select.html
+++ /dev/null
@@ -1,144 +0,0 @@
-{% extends "newbase.html" %}
-{% load static %}
-{% load rowerfilters %}
-
-{% block title %}Workouts{% endblock %}
-
-{% block main %}
-
-<script>
-  function toggle(source) {
-  checkboxes = document.querySelectorAll("input[name='workouts']");
-  for(var i=0, n=checkboxes.length;i<n;i++) {
-       checkboxes[i].checked = source.checked;
-  }
- }
-</script>
-<script src="https://code.jquery.com/jquery-1.9.1.min.js"></script>
-<script>
-  $(function() {
-  
-  // Get the form fields and hidden div
-  var modality = $("#id_modality");
-  var hidden = $("#id_waterboattype");
-
-  
-  // Hide the fields.
-  // Use JS to do this in case the user doesn't have JS 
-  // enabled.
-
-  hidden.hide();
-
-  if (modality.val() == 'water') {
-  hidden.show();
-  }
-  
-  // Setup an event listener for when the state of the 
-  // checkbox changes.
-  modality.change(function() {
-    // Check to see if the checkbox is checked.
-    // If it is, show the fields and populate the input.
-  // If not, hide the fields.
-    var Value = modality.val();
-    if (Value=='water') {
-  // Show the hidden fields.
-  hidden.show();
-  } else {
-  // Make sure that the hidden fields are indeed
-  // hidden.
-  hidden.hide();
-      
-      // You may also want to clear the value of the 
-      // hidden fields here. Just in case somebody 
-      // shows the fields, enters data to them and then 
-      // unticks the checkbox.
-      //
-      // This would do the job:
-      //
-      // $("#hidden_field").val("");
-    }
-  });
-
-
-  });
-
-
-
-</script>
-
-<h1>{{ team.name }} Compare Workouts</h1>
-
-
-<ul class="main-content">
-  <li class="grid_4">
-    <p>Select two or more workouts on the left, set your plot settings,
-        and press submit</p>
-    <p>
-      You can use the date and search forms to search through all
-      workouts from this team.
-    </p>
-    <p>
-      TIP: Agree with your team members to put tags (e.g. '8x500m')
-      in the notes section of
-      your workouts. That makes it easy to search.
-      </p>
-  </li>
-  <li class="grid_2">
-    <form enctype="multipart/form-data"
-          action=""
-          method="post">
-      <table>
-        {{ dateform.as_table }}
-      </table>
-      <table>
-        {{ modalityform.as_table }}
-      </table>
-      {% csrf_token %}
-      <p>
-        <input name='modalityform' class="button green" type="submit" value="Filter">
-      </p>
-    </form>
-  </li>
-  <li class="grid_2">
-    <form id="searchform"
-          action=""
-          method="get" accept-charset="utf-8">
-      {{ searchform }}
-      <input type="submit" value="GO"></input>
-    </form>
-  </li>
-  <li class="grid_2 maxheight">
-    {% if workouts %}
-    <form enctype="multipart/form-data"
-          action="/rowers/multi-compare/"
-          method="post">
-      
-      <input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
-      
-      <table width="100%" class="listtable">
-        {{ form.as_table }}
-      </table>
-      
-      {% else %}
-      <p> No workouts found </p>
-      {% endif %}
-  </li>
-  <li class="grid_2">
-    <p>
-      {% csrf_token %}
-      <table>
-        {{ chartform.as_table }}
-      </table>
-    </p>
-    <p>
-      <input name="chartform" type="submit" value="Compare">
-    </p>
-  </form>
-  </li>
-</ul>
-
-{% endblock %}
-
-{% block sidebar %}
-{% include 'menu_workouts.html' %}
-{% endblock %}
diff --git a/rowers/templates/teambuttons.html b/rowers/templates/teambuttons.html
index e45b807e..828d1769 100644
--- a/rowers/templates/teambuttons.html
+++ b/rowers/templates/teambuttons.html
@@ -6,7 +6,7 @@
 </div>
 <div class="grid_2">
   <p>
-    <a class="button gray small" href="/rowers/team-compare-select/team/{{ teamid }}/">Multi Compare</a>
+    <a class="button gray small" href="/rowers/user-analysis-select/compare/{{ teamid }}/">Multi Compare</a>
   </p>
 </div>
 <div class="grid_2">
diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py
index f6f5b73f..cc5de299 100644
--- a/rowers/tests/test_plans.py
+++ b/rowers/tests/test_plans.py
@@ -16,6 +16,7 @@ from django.db import transaction
 import json
 
 from rowers.views.workoutviews import plannedsession_compare_view
+from rowers.views.analysisviews import analysis_new
 from rowers.views.otherviews import download_fit
 from rowers.opaque import encoder
 from django.utils.crypto import get_random_string
@@ -443,7 +444,11 @@ class SessionLinkTest(TestCase):
 
             url = reverse(plannedsession_compare_view,kwargs={'id':ps.id,'userid':self.u.id})
             response = self.c.get(url,follow=True)
-            expected_url = reverse('multi_compare_view',kwargs={'userid':self.u.id,'id':encoder.encode_hex(w.id)})
+            expected_url = reverse('analysis_new',
+                                   kwargs={'function':'compare',
+                                           'id':encoder.encode_hex(w.id),
+                                           'session':ps.id,
+                                           })
             self.assertRedirects(response,expected_url=expected_url,
                                  status_code=302,target_status_code=200)
 
@@ -473,7 +478,7 @@ class SessionLinkTest(TestCase):
             session.save()
 
             request.user = self.u
-            response = multi_compare_view(request,id=str(w.id))
+            response = analysis_new(request,id=encoder.encode_hex(w.id))
             self.assertEqual(response.status_code,200)
 
             # and adding a get
@@ -491,7 +496,7 @@ class SessionLinkTest(TestCase):
             session.save()
 
             request.user = self.u
-            response = multi_compare_view(request,id=str(w.id))
+            response = analysis_new(request,id=encoder.encode_hex(w.id))
             self.assertEqual(response.status_code,200)
 
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 168c1261e098b1ce5496a56c4a9dbd82b815bdde..d0b9235f8e8ec37e6ad81ee04f4a3522d3e02985 100644
GIT binary patch
literal 4000
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
GfB^t`&_9;|

literal 4001
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
H#DD<+Fv>s-

diff --git a/rowers/urls.py b/rowers/urls.py
index 6f55af06..cffc7775 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -316,9 +316,12 @@ urlpatterns = [
     re_path(r'^workouts-join/user/(?P<userid>\d+)$',views.workouts_join_view,name='workouts_join_view'),
     re_path(r'^workouts-join-select/$',views.workouts_join_select,name='workouts_join_select'),
     re_path(r'^workouts-join-select/user/(?P<userid>\d+)/$',views.workouts_join_select,name='workouts_join_select'),
+    re_path(r'^user-analysis-select/(?P<function>\w.*)/team/(?P<teamid>\d+)/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.analysis_new,name='analysis_new'),
+    re_path(r'^user-analysis-select/(?P<function>\w.*)/session/(?P<session>\d+)/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/user/(?P<userid>\d+)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/team/(?P<teamid>\d+)/$',views.analysis_new,name='analysis_new'),
+    re_path(r'^user-analysis-select/team/(?P<teamid>\d+)/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/user/(?P<userid>\d+)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/team/(?P<teamid>\d+)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/$',views.analysis_new,name='analysis_new'),
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 9f62d9bf..03af6174 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -8,6 +8,7 @@ from rowers.views.statements import *
 import collections
 import simplejson
 from jinja2 import Template,Environment,FileSystemLoader
+from rowers.rower_rules import can_view_session
 
 def floatformat(x,prec=2): # pragma: no cover
     return '{x}'.format(x=round(x,prec))
@@ -35,7 +36,7 @@ defaultoptions = {
                   message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
                   redirect_field_name=None)
 @permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
-def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
+def analysis_new(request,userid=0,function='boxplot',teamid=0,id='',session=0):
     r = getrequestrower(request, userid=userid)
     user = r.user
     userid = user.id
@@ -53,6 +54,13 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
     except Team.DoesNotExist:
         theteam = None
 
+    try:
+        thesession = PlannedSession.objects.get(id=session)
+        if not can_view_session(user,thesession):
+            raise PermissionDenied("you cannot view this session")
+    except PlannedSession.DoesNotExist:
+        thesession = None
+
 
     if 'options' in request.session:
         options = request.session['options']
@@ -211,6 +219,8 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
                                           startdatetime__lte=enddate,
                                           workouttype__in=modalities,
         )
+    elif thesession is not None:
+        workouts = get_workouts_session(r,thesession)
     else:
         workouts = Workout.objects.filter(user=r,
                                           startdatetime__gte=startdate,
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 2a8b783d..5bdc17ef 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2047,9 +2047,14 @@ def plannedsession_compare_view(request,id=0,userid=0):
     request.session['plottype'] = plottype
     request.session['ps'] = ps.id
 
+    teams = ps.team.all()
+
     if ids:
-        url = reverse('multi_compare_view',
-                      kwargs={'userid':userid,'id':encoder.encode_hex(ids[0])})
+        url = reverse('analysis_new',
+                      kwargs={
+                          'session':ps.id,
+                          'id':encoder.encode_hex(ids[0]),
+                          'function':'compare'})
     else:
         url = reverse('plannedsession_view',kwargs={'id':ps.id})
 

From 47a56b0cc4e426bc53d0573f4dd56d661c7d5aed Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 28 Dec 2021 13:06:37 +0100
Subject: [PATCH 6/6] solves #465

---
 rowers/templates/coachrequestemail.html |   5 ++-
 rowers/templates/teams.html             |  50 ++++++++++++------------
 rowers/tests/testdata/testdata.tcx.gz   | Bin 4000 -> 0 bytes
 3 files changed, 29 insertions(+), 26 deletions(-)
 delete mode 100644 rowers/tests/testdata/testdata.tcx.gz

diff --git a/rowers/templates/coachrequestemail.html b/rowers/templates/coachrequestemail.html
index 19965e7a..58e641b6 100644
--- a/rowers/templates/coachrequestemail.html
+++ b/rowers/templates/coachrequestemail.html
@@ -13,13 +13,14 @@
   on behalf of {{ name }}.
 </p>
 <p>
-  By accepting the invite, you are agreeing with the sharing 
+  By accepting the invite, you are agreeing with the sharing
   of personal data according to our privacy policy.
 </p>
 <p>
   To accept the login to the
   site and you will find the invitation here on the Teams page:
-  <a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>
+  <a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>,
+  including the email address of {{ name }}, if you need a contact.
 </p>
 <p>
   You can also click the direct link:
diff --git a/rowers/templates/teams.html b/rowers/templates/teams.html
index 22e6ef47..be96301f 100644
--- a/rowers/templates/teams.html
+++ b/rowers/templates/teams.html
@@ -21,7 +21,7 @@
           <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
         </td>
         <td>
-          <a class="button small red" href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
+          <a  href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
         </td>
       </tr>
       {% endfor %}
@@ -29,7 +29,7 @@
     </table>
   </li>
   {% endif %}
-    
+
   {% if otherteams %}
   <li  class="grid_2">
     <h2>Open Groups</h2>
@@ -73,7 +73,7 @@
             <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
           </td>
           <td>
-            <a class="button small red" href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
+            <a  href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
           </td>
         </tr>
         {% endfor %}
@@ -98,7 +98,7 @@
 	    {{ coach.user.first_name }} {{ coach.user.last_name }}
 	  </td>
 	  <td>
-	    <a class="button small red"
+	    <a
 	       href="/rowers/coaches/{{ coach.id }}/dropcoachconfirm/">Remove
 	    </a>
 	  </td>
@@ -124,7 +124,7 @@
 	    {{ coachee.user.first_name }} {{ coachee.user.last_name }}
 	  </td>
 	  <td>
-	    <a class="button small red"
+	    <a
 	       href="/rowers/coaches/{{ coachee.id }}/dropconfirm/">Remove
 	    </a>
 	  </td>
@@ -138,11 +138,11 @@
   <li class="grid_2">
     <h2>Group Invitations and Requests</h2>
     <p>This section lists open invites to join a group. By accepting
-      a group invite, you are agreeing with the sharing 
+      a group invite, you are agreeing with the sharing
       of personal data between group members and coaches according to
       our <a href="/rowers/legal/">privacy policy</a>.
     </p>
-    
+
     <p>As a group manager, by accepting a group invite, you are agreeing
       with our <a href="/rowers/legal/">privacy policy</a> regarding groups and
       personal data owned by group members.</p>
@@ -163,10 +163,10 @@
             <td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
             <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
             <td>{{ user.first_name }} {{ user.last_name }}</td>
-            <td><a class="button small green" href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
+            <td><a  href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -184,9 +184,9 @@
             <td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
             <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
-            <td><a class="button small green" href="/rowers/me/request/{{ i.code }}/">Accept</a>
+            <td><a  href="/rowers/me/request/{{ i.code }}/">Accept</a>
             <td>
-              <a class="button small red" href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -201,7 +201,7 @@
             {% endif %}
             <td>&nbsp;
             <td>
-              <a class="button small red" href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
+              <a  href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
           {% endfor %}
@@ -218,7 +218,7 @@
         <table>
           {{ form.as_table }}
         </table>
-        <input class="button green" type="submit" value="Submit">
+        <input class="button" type="submit" value="Submit">
       </form>
     {% endif %}
   {% if mycoachrequests or mycoachoffers or coachoffers or coachrequests %}
@@ -226,16 +226,17 @@
     <h2>Coaching Offers and Requests</h2>
     <p>This section lists open offers and requests related to coaching.
       By accepting a coaching offer, the coach can run
-      analysis, add workouts and edit settings on behalf of the athlete. 
+      analysis, add workouts and edit settings on behalf of the athlete.
       You agree to the sharing
       of personal data between athletes and coaches according to
       our <a href="/rowers/legal/">privacy policy</a>.
-    </p>    
+    </p>
       <table width="90%" class="listtable">
         <thead>
           <tr>
             <th>Coach</th>
             <th>User</th>
+						<th>E-mail</th>
             <th>Action</th>
             <th>&nbsp;</th>
           </tr>
@@ -245,12 +246,13 @@
           <tr>
             <td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
+						<td>{{ i.user.email }}</td>
             <td><a
-		  class="button small green"
+
 		  href="/rowers/me/coachrequest/{{ i.code }}/accept">Accept</a>
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -261,7 +263,7 @@
             <td>&nbsp;
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
+              <a  href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
           {% endfor %}
@@ -272,7 +274,7 @@
 	    <td>&nbsp;</td>
             <td>
               <a
-		class="button small red"
+
 		href="/rowers/me/coachrequest/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
@@ -282,12 +284,12 @@
             <td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
 	    <td><a
-		  class="button small green"
+
 		  href="/rowers/me/coachoffer/{{ i.code }}/accept/">Accept</a>
 	    </td>
             <td>
               <a
-		class="button small red"
+
 		href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Reject</a>
             </td>
           </tr>
@@ -312,14 +314,14 @@
             <td>{{ a.user.first_name }} {{ a.user.last_name }}</td>
             <td>
 	      <a
-		class="button small green"
+
 		href="/rowers/me/coachoffer/{{ a.user.id }}/">Offer Coaching</a>
             </td>
           </tr>
           {% endfor %}
         </tbody>
       </table>
-  </li>  
+  </li>
   {% endif %}
   {% if potentialcoaches %}
   <li class="grid_2">
@@ -337,7 +339,7 @@
             <td>{{ c.first_name }} {{ c.last_name }}</td>
             <td>
 	      <a
-		class="button small green"
+
 		href="/rowers/me/coachrequest/{{ c.id }}/">Request Coaching</a>
             </td>
           </tr>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index d0b9235f8e8ec37e6ad81ee04f4a3522d3e02985..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4000
zcmV;R4`1*fiwFqD_sU@c|8!+@bYx+4VJ>uIcmVC4TW=Ic7J%RR6&4T4!-|@7sZ$rn
zI3keMA^{r(l+D|!V<u*H?Xl%)ZvTF(X22M5D;#^fRNX2bkf*0_(_f#ebFYIR-<_W9
zy;)vtR%h$`chSJzy&n(n9K5*bR_oRJ_~CNhFE1W-efLMVS?;Bs*PHuyU-kX@{$la=
z?OSu)U7W7g=IHEnk-pp<y;`1jo5l5qFW%7I-6{6Fci(W92S@$t&8mO@^Sgez&Nq1F
z1n)Mh&(83c&Dq8Af&g&w`_m`Sx2L$bT5tMpeY8wRZC3lc^FBE{>iX@kz0nQq>5qCt
z=H2GyUmy7Qu7B8_oL#Jzo5dUa>;3=i`lH?c%gamQw_R!w&`l5B{l>e8clP!UK0JW*
zGxEnz8{Y3dKR>(Z@8A7r|7v-0clTxb`ti#{0(AF4?h(8|-nY0<&O}EX;co!@00)b-
z)5ravbmx1|`|hHDu{vGezx!9mUS232`r@qbPV!;Tmq%yomzzUjf3Wy!>!$-At#)tF
z(`EXxn{=P~UcT7)Y44Bt4iUq_;_}m{9Udf6>yDTISf;!Gwd<EZou6)B&Hnv)`X!f}
zAFqE}cKzm;<;Bz0`gOnjcYozaq|^M?oxENiqD>ds{rTw%i)$`%<?E;2yVdFI)Bn>A
zh`Z(nuDQgOuOF|suWJAPaQjv)6WPlxS0CidWqQDeg!wV<{=P!-Vs(6+Zf)7WI(vEe
zv|GRKP7=k>wqD)4JNoZucfZ|oezscoS2yP`(mU`C@8Wj1&yW1#l@McxUz6<tw<K_t
z0{O2f>_}XX;Ijt|*F4|t4ws|X=BvxT_~rL+o(ZlU!@oRZI_JN-zE5Hk4;H(>zP#ol
zUG&SJcl|Bq7vVa*TIviYNxN7Db!3Cnz@8s;Mcm0%#63Yoa6!SHlHOF1d$>7ws!QIj
zRK(pGVpNUtX^7y0+~aJxJ6jR=nB?7x*Km&|<(*+R+<isdEp5knr{Hdbp@Q7;7TmEa
z?g1*|E{S^*DvdVpjhhJfy5v1@Mclm!9-Ky>cdn!v$21@Az8>xZ#s{<-dG}&uBHSw*
z=PR<~giQn+HQa-gwBP3>@1Y{@&Nv{@=yg$w>htrFcZ7-*JBfx_=cYv{OP+5*p6Vh`
z)lBiU56P4hohgSXC4Dz+=Ognh6_K|lCZ%2_^CTt|Brh`}A1flC%sD|0s_={}YR9|z
zkhiWL@(9LRB$do3<G-Zm&d+C_7pRCl8_OuHAz#>c7iUDCDkAR;I-L^-oi91hTWF*G
zDCC2QBvuoiLmx`|?`}oDjrN1&35_H0s?k1_B|o1C9ZE%39a$rQsM7FaENRcriM$OJ
zkxzO$6RMK0AeM~MS(?#kj}?)RCLnmLO1o?1XF#6GxQJ0jJ}2iEBtIj+eNCf1i(v;|
zGtZMPOWw|id_@r(4h8_cXvhncjLzHJ`0cq_bwlKn{91>qG%S)>(uX%I@)h~;EE`6&
znkX&#q8av${7B@T0jne*U@|ga+dN-Ul-360)2pbm=OY;3G`y+L^MWRcyvm+ufT9tb
z8IATe$-G#To-L4uJmO?@`xd1gChv?F44Nn{6Bf1S=S03Ddp=ueY*q6-GnzON^4RA2
z>&bJ@y=6escyiK<QZnn>y5_eZg}fMG2r8KuDjKnA<i{cJO-K@t8uE^t%-@ha*Fzq`
zNPwVflHs|i%=@O>k3yaeTNKqiAGoN7=bOxrLf#pSC@Ptcwy5{E$^1Cvx4E~f7HGC?
zMdhu?WAot+k<YoeVpY1mEn87(LzDSY$Xk<!`l!+EExDpHADUG+3VClRqSJV9ExV%m
z_MwgTV~}Uqw#3rt_SU+hx_xNz`BBJ|aSTz_1W(G6pHoGptBAZ9E6l2S-W9E-ofUbh
zh<q@KyD9_ImaV81Xfi(rd5b1#oQ_m2PmA`tl^Io0i>-(}8}D>cS{q}@oSZq4ucyX_
zbMCG4h?>z}5GEt@&7L179}NYFK}9|`-G2HJ8=>4SMHQtLhNjz3U*^S{kaT;M%-gbA
z*Rj>ojzZoWVO_*Vq%8U7!yAFTO|T7mtIE0-*T~<Lysd~lnc#KRRpN0n@%bk6!{o(S
zLREE@gtB#Ytq0~f<bxqZRp$hWWovAF)9uF~k6<DaYrMA(u;t!PU*?gG1R_n8*5P!>
zbMxd3l6N`lTGa{B5f;_$=S04y(LNeL44U}7V=7uj?OS|)4DvbmHek^7y>*s~=HAYU
zd`0#=Swjw4HO~u8Cij+G{rn(#Z_pyCMtes^?fDszcT^Gi+&O_*)8F2CE;`T8iF`%6
zebUxAqH5JL7q~@fXFy&IfT+5hyT~m{JN?m~y%EuMLiEtc-;{hsy1fO%UR0hOkG7<S
zcdI<Srr`~f=iL2N<-PUE5{xYabMoZHc<WFTtMf@WC>W~~oRK|WQGDJ8W06slljGCd
zVkbhrHXmN7hrD2}rB$tI;iYK({G4RICJj&6cp=pI@Vs*+{r0n(=PR=3ll*cdRgI1J
zu2odtkbFf^T8RdjKsDM2HyPc&d2a{E%RZp-N*|t&MOPu8mCQ>;<gKwFDwz*ZbS>&x
z$-JwGyf+908mlf~n2gLf^26k#acQvEjP`*-QG0$)qkX7{Jd&{%qbBP*aBMPvL-MgA
z@?sz;M|)dzrNUWxaw;0_(Hk$K>Xs5*(bY-k<h}J&4|#&z8;doboKSX+N})!66!L74
zbUiRbD7tFdoXFQS&y$!S7&RG~A!5<Y44TnA?<*o7j3k-YR9Zx!Ci7E|)yY1iu}rGW
zjELOGPd#Fj$Xi3{pNc#cUB@QZpSH}55y<<Tho|a?7rE#<HezSg{j?_X(FBK4CG&-|
zv25#mI|g}6#)+=FDi+Shn$x<p6-8;2{0b{|d*_N;b#o$LktfFnLy<s}Zy&ucI@-Io
z7WEk9ce%H^c|L@qR^6P)SLDf&WT7#EihK-3b8=jp=SLy$Ot8e7C@lh%4b#pEeMPPu
zi8<jOf(kuBLx02mr`3%2E_c3lQ8(TrFcwX@zYTh*482r@UUI_}&<*&OCW9VZzw1Ht
z!3YwP3Vl)yc_K!AllnpQxt%E?>(Dz})V7m0*N=kU8Y`&s;UaixQh!7AR1tcgTV#1u
zp$~2{QePQ*cJ-i7cA5<YR)s$LqH5lp27IgtJ*T;zKsDDRgvp?<ZNRTd>YZUgQqA><
zWy@{mgq|xxAG3xZby8n;)xw5;9Q3&ps$*4V7N!}iY4|fhFL}UMg=`Upibm__q~=v*
z+;K4EF{m_rbj_Q0Q{yhwgFcPj;BtRF4SHX+5ALlpGNBoFgXpaRAl6BJu#-WL&A1yx
z?-P1m6OEkBRTMop^rN7UCR(LShrksz?x=b5#z3Ex^@zH%8>H;`Z&E*b^kSUXqNlR0
z(&i-fP!alIL`c;D8!1_YzM-GCOULKVnAVA?j5|sSf=r}+4z^|K2hm%@Ue`V+FN`sn
z&PmO#A4cyD1qr$V-$T*DdTeUm80awxu(IF|Dd1!};$ln797N9sovv#ZQY^Y~>8u8P
zstCO^U`dye%fORa<EG8^!{~#FqO87Qv_)MyZLS{$J)wz2pi0nUn$DVL&4)jX-kQM5
z>KkS^nWkwiOJ^9pH{J@XG<>#Y*SVoqb2kS1oM9=btFLD%+fId=nl}o1HUb!RQt!fK
z27GJ@T7&4Fv8Y?i5ZT9~jnk;v^`oGVh9X*>h9Am?Z@78$#z1c=_s`OK^Ek$)=1qUV
zw_-q)g;y3~GV%J_lCdia+S;VCA;qXdPt@l6>7y4gQMqt2TBf3ryXM0m2R)nUkaXxR
zPiA?u=ExmJzipZ5Rcf9U+gv)+cjRtcCZgBP^-d;}pw-ec2hfLY%S6yEd4twVGw!Bt
z*N5CP(TbqTk!wS%zPTy-P!al&J80>;YS>sde8X+P9|Jw2VHT&7dV#Xb)$@$hJg5l0
z-L_Uxsd-YkjnbUz>up8oy&<a%+6qHaZ=P)f{ut;93=$)&&|8?y+J?=WH;jH;WKF7g
zeX<Bzk@XCu-sP?uQHS19QRA+4)ffkT$Wrfh1HR|UNPQdd2hlT{AgqhmORz;X{1&tw
z2fZ~85mj9^B--Z9o4zBLz41&|6|{BWCX=es)Vx9T$xgElby+$NT^sPHo|~7@vk}Tp
z8V!1yP6<Y9qcn`(84EelQiGmD8}O&^$h9${CsGw&IU6TaY1^`N2GI){*81?BgErUC
z0KFI@t(xbdW#mr1@G9h%iI}$O&<C7MLzSlH4WN&?Wg;L(on0TPrDe_lJ(~bZZ=Q#;
z%NaxKr85e8m(fR+UGI^L*4#le?nXf$jYnl3zNfM!7|?>YW1vUM4ONs<&t*$6papG5
zK`*(X3hAWYO3}z2G&OG&^ue%T&`G_xqNy59%^L+hCF72itrfg;&5=8Gmrl$r6G6MC
zt@nO1b3L`7?I8MGWX+%o-}vC0T|Wc#(MYoHbW$JvWbArsYTgifCL`AB!Z!gzv+HMo
zUUK0T=+I+P^m(bEHsFtdJ{Vxs^}`Q2d4D44sd@8;(C3w`0fP=b$H|~?>(>vXXA^{U
zk-PMwl+^HZCyIuC1oX~$wo&EM2@XrTbY_KKDncLgnzo>mdXGg1eBVki#y~G*oW-EZ
z(g~qxrR}ZIx0<_Q^pdM@f+{07#G;k9w;J$UFP&lZA+Kqxi`+#hy4cyQH2hk!bOg35
zSp#~NBR8T<#-#(TZ{8sK?Ml|Vb?zdS4cbDR>qkNFbM=i9J^RV5ZrSGgLG*bgYerIe
z^P=@dt8b|F%^L+hZx=CF8Fx`)TitTv-n@+7<-#i^dKZgIeQT6D4*Hl2uXJ{O4A7dV
zP28K8&~I0=Rz~h(#MT*m2I#FxGrej76ar{Ha&L;>kA?oj){h$w7EikK%MZ`a`sL>E
zyOaKhpHG&j%XPo^{dUv$dtJW=@BE*3dGsfDWIOooxc}i`u{+?-?o1zlWBz>kX|?<Q
z;NeB$cy{q&-)CKVdoIr2Zo2i$?&M_qw9?1b`uJtncj>&{?(IrcJ{@=P;C27%?BdF6
z^5FdZWOdZ_>8D@57?<b%>SXD=pI)y{US9s(-_rY-4!!blK5Ti~{U=>AI}5IU{(867
zI&JpyX}|4;%SZdg`43*Cn?C$?d9v&_%fumn`tazk+}FXAZhidt(c#a}GMnw6yY0WE
zxA@uX(?6E!&H(NK?EXJkT=`=6<hPIM@Xi+XYMq|L!-R5q@hClwKhmWS@B9zhfrK8!
GfB^t`&_9;|