diff --git a/rowers/forms.py b/rowers/forms.py index 27deb56f..bf7f79cd 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -125,9 +125,9 @@ class EmailForm(forms.Form): message = forms.CharField() disqualificationreasons = ( - ('noimage','You did not attach a monitor screenshot or other photographic evidence as required'), - ('suspicious','We doubt that you rowed this in the right boat class or type'), - ('duplicate','This result looks like a duplicate entry'), + ('noimage','No monitor screenshot or data evidence was included'), + ('suspicious','The result is not plausible for the boat class or athlete gorup'), + ('duplicate','Appears to be a duplicate entry'), ('other','Other Reason'), ) diff --git a/rowers/models.py b/rowers/models.py index 3d62dc69..c69a1c34 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2759,7 +2759,7 @@ class Workout(models.Model): def save(self, *args, **kwargs): user = self.user if self.notes is not None and len(self.notes)>1000: - self.notes = notes[0:950] + self.notes = self.notes[0:950] if not can_add_workout(user.user): raise forms.ValidationError("Free Coach User cannot have any workouts") diff --git a/rowers/templates/withdraw_view.html b/rowers/templates/withdraw_view.html index 9bd3ba04..810826e3 100644 --- a/rowers/templates/withdraw_view.html +++ b/rowers/templates/withdraw_view.html @@ -40,9 +40,9 @@
  • - Before you reject this challenge result, please carefully review it - using the information below. If you still want to reject the entry, - scroll down to the rejection form. + Before you remove this challenge result, please carefully review it + using the information below. If you still want to remove the entry, + scroll down to the form.

  • @@ -110,11 +110,11 @@
  • - Yes, I want to reject this entry + Yes, I want to remove this entry

    Please select a reason and add a comment (mandatory). - Pressing 'Reject' removes the submitted result. + Pressing 'Remove' removes the submitted result. An email will be sent to the rower. There is no "undo".

    @@ -125,7 +125,7 @@

    {% csrf_token %} - +

  • diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index 4b4e50a4..31df3ae7 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -28,6 +28,7 @@ from django.utils.six import StringIO from django.test.client import RequestFactory from rowers.views import c2_open, multi_compare_view + from rowers.forms import ( DocumentsForm,CNsummaryForm,RegistrationFormUniqueEmail, ChartParamChoiceForm,WorkoutMultipleCompareForm, diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index ee812a89..a4d172a8 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -4,7 +4,7 @@ from __future__ import print_function from __future__ import unicode_literals from rowers.views.statements import * - +from rowsandall_app.settings import SITE_URL # List Courses def courses_view(request): @@ -1833,10 +1833,22 @@ def indoorvirtualevent_create_view(request): dotweet = False else: dotweet = True + + announcementshort = "New Virtual Indoor Challenge on rowsandall.com: {name}".format( + name = name, + ) + + announcement = announcementshort + " {siteurl}/rowers/virtualevent/{raceid}/".format( + siteurl = SITE_URL, + raceid = vs.id + ) + + + if len(announcement)>250: + announcement = announcementshort + sa = SiteAnnouncement( - announcement = "New Virtual Indoor Challenge on rowsandall.com: {name}".format( - name = name, - ), + announcement = announcement, dotweet = dotweet ) @@ -1955,13 +1967,25 @@ def virtualevent_create_view(request): dotweet = False else: dotweet = True + + announcementshort = "New Virtual Challenge on rowsandall.com: {name} on course {course}".format( + name = name, + course = course.name, + ) + + announcement = announcementshort + " {siteurl}/rowers/virtualevent/{raceid}/".format( + siteurl = SITE_URL, + raceid = vs.id + ) + + + if len(announcement)>250: + announcement = announcementshort + sa = SiteAnnouncement( - announcement = "New Virtual Challenge on rowsandall.com: {name} on course {course}".format( - name = name, - course = course.name, - ), + announcement = announcement, dotweet = dotweet - ) + ) sa.save() url = reverse('virtualevents_view')