testing

rowers/forms.py

@@ -236,7 +236,7 @@ class SearchForm(forms.Form):
 # simple form for Contact page. Sends email to info@rowsandall.com
 class EmailForm(forms.Form):
     firstname = forms.CharField(max_length=255)
-    lastname = forms.CharField(max_length=255)
+    lastname = forms.CharField(max_length=255, required=False)
     email = forms.EmailField()
     subject = forms.CharField(max_length=255)
     message = forms.CharField(widget=forms.Textarea())

rowers/templates/email.html

@@ -26,36 +26,36 @@
 	  <tr><td>
 	  </span>
 	  <span class="span">
-						</td><td>
+</td><td>
   <input name= "lastname" class="inputtext" maxlength="255" size="18" />
   <label>Last</label>
-						</span>
+</span>
-					</td></tr>
+</td></tr>
-					<tr><td>
+<tr><td>
     <label>Email Address  <span class="required">*</span></label>
   </td><td>
     <input name="email" class="inputtext" type="text" maxlength="255" size="35" />
-					</td></tr>
+</td></tr>
-					<tr><td>
+<tr><td>
     <label>Subject  <span class="required">*</span></label>
   </td><td>
     <input name="subject" class="inputtext" type="text" maxlength="255" size="45" />
-					</td></tr>
+</td></tr>
-				</table>
+</table>
-				<table>
+<table>
   <input type="hidden" name="g-recaptcha-response" id='recaptcha'>
-				</td></tr>
+</td></tr>
-				<tr><td>
+<tr><td>
     <label>Message  <span class="required">*</span></label>
   </td><td>
     <textarea name="message" class="inputtextarea" rows="11" cols="45"></textarea>
-				</td></tr>
+</td></tr>
-				<tr><td>
+<tr><td>
     <input type="submit" name="submitform" value="Send Message" />
-				</td></tr>
+</td></tr>
-			</table>
+</table>
-		</p>
+</p>
-	</form>
+</form>
 </li>
 
 <li class="grid_2">
@@ -77,9 +77,9 @@
   <ul>
     <li><a href="https://www.facebook.com/groups/rowsandall/">https://www.facebook.com/groups/rowsandall/</a></li>
   </ul>
-	</li>
+</li>
 
-	<li class="grid_2">
+<li class="grid_2">
   <h1>Twitter</h1>
   
   <p>You can also check me on Twitter:
@@ -88,9 +88,9 @@
     </ul>
     When the site is down, this is the appropriate channel to look for apologies, updates, and offer help.
   </p>
-		</li>
+</li>
 
-		<li class="grid_2">
+<li class="grid_2">
   <h1>Rowsandall s.r.o.</h1>
   
   <p><strong>Rowsandall s.r.o.</strong><br />
@@ -105,17 +105,17 @@
     Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)<br/>
   </p>
   
-		</li>
+</li>
-	</ul>
+</ul>
-	{% endblock %}
+{% endblock %}
 
-	{% block sidebar %}
+{% block sidebar %}
-	{% include 'menu_help.html' %}
+{% include 'menu_help.html' %}
-	{% endblock %}
+{% endblock %}
 
-	{% block scripts %}
+{% block scripts %}
-	<script src="https://www.google.com/recaptcha/api.js?render=6LdRtMwUAAAAAGcKcFc28pGvmEb1wwDY27i0AX8B"></script>
+<script src="https://www.google.com/recaptcha/api.js?render=6LdRtMwUAAAAAGcKcFc28pGvmEb1wwDY27i0AX8B"></script>
-	<script>
+<script>
   // 3
   grecaptcha.ready(function() {
       // 4
@@ -132,5 +132,5 @@
       })
       
   });
-	</script>
+</script>
-	{% endblock %}
+{% endblock %}

rowers/tests/test_aworkouts.py

@@ -42,12 +42,7 @@ class ListWorkoutTest(TestCase):
                                     rowerplan='coach')
 
       self.c = Client()
-      self.user_workouts = WorkoutFactory.create_batch(len(workouttypes), user=self.r)
+      self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-      i = 0
-      for workouttype in workouttypes:
-         self.user_workouts[i].workouttype = workouttype[0]
-         self.user_workouts[i].save()
-         i = i+1
 
       self.factory = RequestFactory()
       self.password = faker.word()