error fixes plus new coachoffer attribute

rowers/models.py

@@ -706,6 +706,7 @@ class Rower(models.Model):
     clubsize = models.IntegerField(default=0)
     protrialexpires = models.DateField(default=datetime.date(1970,1,1))
     plantrialexpires = models.DateField(default=datetime.date(1970,1,1))
+    offercoaching = models.BooleanField(default=False, verbose_name='Offer Remote Coaching')
     
 
     # Privacy Data
@@ -3186,7 +3187,8 @@ class AccountRowerForm(ModelForm):
                   'getemailnotifications',
                   'getimportantemails',
                   'defaulttimezone','showfavoritechartnotes',
-                  'defaultlandingpage']
+                  'defaultlandingpage',
+                  'offercoaching']
 
 	widgets = {
 	    'birthdate': SelectDateWidget(
@@ -3194,6 +3196,10 @@ class AccountRowerForm(ModelForm):
                     timezone.now().year-100,timezone.now().year-10)),
             }
 
+    def __init__(self, *args, **kwargs):
+        super(AccountRowerForm, self).__init__(*args, **kwargs)
+        if self.instance.rowerplan != 'coach':
+            self.fields.pop('offercoaching')
 
     def clean_email(self):
         email = self.cleaned_data.get('email')

rowers/teams.py

@@ -1,3 +1,4 @@
+
 # All the Team related methods
 
 # Python
@@ -28,6 +29,10 @@ from rowers.tasks import (
     handle_sendemail_request_reject,handle_sendemail_invite_reject,
     handle_sendemail_invite_accept,handle_sendemail_team_removed,
     handle_sendemail_coachrequest,handle_sendemail_coacheerequest,
+    handle_sendemail_coachoffer_rejected,
+    handle_sendemail_coachoffer_accepted,
+    handle_sendemail_coachrequest_rejected,
+    handle_sendemail_coachrequest_accepted,
     )
 
 from rowers.models import ValidationError
@@ -657,7 +662,7 @@ def send_coachoffer_rejected_email(rekwest):
     coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
     coachemail = rekwest.coach.user.email
 
-    name = rekwest.user.first_name + " " + rekwst.user.last_name
+    name = rekwest.user.first_name + " " + rekwest.user.last_name
 
     res = myqueue(queuehigh,
                   handle_sendemail_coachoffer_rejected,
@@ -667,7 +672,7 @@ def send_coachrequest_rejected_email(rekwest):
     coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
     email = rekwest.user.email
 
-    name = rekwest.user.first_name + " " + rekwst.user.last_name
+    name = rekwest.user.first_name + " " + rekwest.user.last_name
 
     res = myqueue(queuehigh,
                   handle_sendemail_coachrequest_rejected,
@@ -677,7 +682,7 @@ def send_coachrequest_accepted_email(rekwest):
     coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
     email = rekwest.user.email
 
-    name = rekwest.user.first_name + " " + rekwst.user.last_name
+    name = rekwest.user.first_name + " " + rekwest.user.last_name
 
     res = myqueue(queuehigh,
                   handle_sendemail_coachrequest_accepted,
@@ -688,7 +693,7 @@ def send_coachoffer_accepted_email(rekwest):
     coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
     coachemail = rekwest.coach.user.email
 
-    name = rekwest.user.first_name + " " + rekwst.user.last_name
+    name = rekwest.user.first_name + " " + rekwest.user.last_name
 
     res = myqueue(queuehigh,
                   handle_sendemail_coachoffer_accepted,

rowers/templates/coachofferacceptedemail.html

@@ -1,7 +1,7 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
-<p>Dear <strong>{{ coachname }}</strong>,</p>
+<p>Dear <strong>{{ coach }}</strong>,</p>
 
 <p>
   {{ name }} has accepted your coaching offer on

rowers/templates/coachofferrejectedemail.html

@@ -1,7 +1,7 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
-<p>Dear <strong>{{ coachname }}</strong>,</p>
+<p>Dear <strong>{{ coach }}</strong>,</p>
 
 <p>
   {{ name }} has rejected your offer to become his coach on

rowers/templates/coachrequestacceptedemail.html

@@ -4,7 +4,7 @@
 <p>Dear <strong>{{ name }}</strong>,</p>
 
 <p>
-  {{ coachname }} has accepted your coaching request on
+  {{ coach }} has accepted your coaching request on
   rowsandall.com
 </p>
 

rowers/templates/coachrequestrejectedemail.html

@@ -4,7 +4,7 @@
 <p>Dear <strong>{{ name }}</strong>,</p>
 
 <p>
-  {{ coachname }} has rejected your coaching request on
+  {{ coach }} has rejected your coaching request on
   rowsandall.com
 </p>
 

rowers/views/userviews.py

@@ -190,6 +190,10 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
             last_name = ucd['last_name']
             email = ucd['email']
             sex = cd['sex']
+            try:
+                offercoaching = cd['offercoaching']
+            except KeyError:
+                offercoaching = False
             adaptiveclass = cd['adaptiveclass']
             defaultlandingpage = cd['defaultlandingpage']
             weightcategory = cd['weightcategory']
@@ -217,6 +221,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
             r.adaptiveclass = adaptiveclass
             r.getemailnotifications = getemailnotifications
             r.getimportantemails = getimportantemails
+            r.offercoaching = offercoaching
             r.defaultlandingpage = defaultlandingpage
             r.showfavoritechartnotes = showfavoritechartnotes
             r.sex = sex