Skip to content

Commit

Permalink
Merge cbd7199 into 5ef7f41
Browse files Browse the repository at this point in the history
  • Loading branch information
@wasswa-derick
wasswa-derick committed Aug 29, 2018
2 parents 5ef7f41 + cbd7199 commit ed6b608
Show file tree
Hide file tree
Showing 4 changed files with 446 additions and 2 deletions.
45 changes: 45 additions & 0 deletions wger/manager/templates/workout/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,61 @@ <h4 class="list-group-item-heading">{{ workout }}</h4>
{% endblock %}


<!--
Side bar
-->
{% block sidebar %}
<h4>{% trans "Export Workouts" %}</h4>
<div class="row">
<div class="col-sm-3">
{% if workouts|length < 1 %}
<button class="btn btn-success" disabled type="button" >
Export
</button>
{% else %}
<a href="{% url 'manager:workout:export'%}">
<button class="btn btn-success" type="button">
Export
</button>
</a>
{% endif %}
</div>
</div>

<br/>
<h4>{% trans "Import Workouts" %}</h4>
<form class="form-inline" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="row">
<div class="col-sm-3">
<input class="btn btn-success form-control" value="Import" type="submit" />
</div>

<div class="col-sm-9">
<input type="file" name="workoutfile" class="form-control" accept=".json" />
</div>
</div>
</form>

{% if messages %}
<div class="alert alert-{{ message.tags }}">{{ message }}</div>
{% endif %}

{% endblock %}

{% block options %}
<div class="dropdown">
<button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Add workout
<span class="caret"></span>
</button>

<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li><a href="{% url 'manager:workout:add' %}?cycle=micro">Microcycle: One week plan</a></li>
<li><a href="{% url 'manager:workout:add' %}?cycle=meso">Mesocycle: Two to six weeks plan</a></li>
<li><a href="{% url 'manager:workout:add' %}?cycle=macro">Macrocycle: One year plan</a></li>
</ul>


</div>
{% endblock %}
202 changes: 202 additions & 0 deletions wger/manager/tests/test_workout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
from wger.core.tests.base_testcase import WorkoutManagerEditTestCase
from wger.core.tests.base_testcase import WorkoutManagerTestCase
from wger.manager.models import Workout
from wger.manager.views.workout import export_user_workouts
import tempfile
from django.contrib.messages import get_messages


class WorkoutShareButtonTestCase(WorkoutManagerTestCase):
Expand Down Expand Up @@ -124,6 +127,205 @@ def test_create_workout_logged_in(self):
self.user_logout()


class ExportWorkoutTestCase(WorkoutManagerTestCase):
'''
Tests adding a Workout
'''

def create_workout(self):
'''
Helper function to test creating workouts
'''

# Create a workout
count_before = Workout.objects.count()
response = self.client.get(reverse('manager:workout:add'))
count_after = Workout.objects.count()

# There is always a redirect
self.assertEqual(response.status_code, 302)

# Test creating workout
self.assertGreater(count_after, count_before)

# Test accessing workout
response = self.client.get(
reverse('manager:workout:view', kwargs={'pk': 1}))

workout = Workout.objects.get(pk=1)
self.assertEqual(response.context['workout'], workout)
self.assertEqual(response.status_code, 200)

def export_workouts(self):
'''
Helper function to test exporting workouts
'''

# Export workout(s)
response = self.client.get(reverse('manager:workout:export'))
self.assertEqual(response.status_code, 200)

def test_export_workout_logged_in(self):
'''
Test creating a workout a logged in user
'''

self.user_login()
self.create_workout()
self.export_workouts()
self.user_logout()


class ImportWorkoutTestCase(WorkoutManagerTestCase):
'''
Tests Importing Workout(s)
'''

def import_workouts(self):
'''
Helper function to test importing workouts
'''
workout = [
{
"id": 1,
"cycle_kind": "microcycle",
"comment": "",
"creation_date": "2018-08-27",
"day": [
{
"id": 46,
"description": "Run through the amazon",
"daysofweek": [{"dayofweek": 1}],
"sets": [
{
"id": 20,
"sets": 4,
"order": 1,
"exercises": [
{
"id": 269,
"license_author": "foguinho.peruca",
"status": "2",
"description": "<p>Run on a treadmill</p>",
"name": "Run - treadmill",
"creation_date": "2014-09-03",
"uuid": "51d56238-31a1-4e5a-b747-da30eece4871",
"category": 9,
"muscles": [],
"muscles_secondary": [],
"equipment": [],
"settings": [
{
"reps": 5,
"order": 1,
"comment": "",
"weight": "1.00",
"repetition_unit_id": 6,
"weight_unit_id": 6
},
{
"reps": 5,
"order": 1,
"comment": "",
"weight": "1.00",
"repetition_unit_id": 6,
"weight_unit_id": 6
},
{
"reps": 5,
"order": 1,
"comment": "",
"weight": "1.00",
"repetition_unit_id": 6,
"weight_unit_id": 6
},
{
"reps": 5,
"order": 1,
"comment": "",
"weight": "1.00",
"repetition_unit_id": 6,
"weight_unit_id": 6
}
]
}
]
}
]
}
]
}
]

tmp_file = tempfile.NamedTemporaryFile(suffix='.json')
with open(tmp_file.name, 'w') as f:
f.write(str(workout))

response = self.client.post(
reverse('manager:workout:overview'),
{'workoutfile': tmp_file},
format='multipart'
)
self.assertEqual(302, response.status_code)

def test_import_workout_logged_in(self):
'''
Test importing workout(s) with a logged in user
'''

self.user_login()
self.import_workouts()
self.user_logout()

def test_import_workout_logged_in_without_json_file(self):
'''
Test importing workout(s) with a logged in user without json file
'''

self.user_login()
response = self.client.post(reverse('manager:workout:overview'))

self.assertEqual(response.status_code, 302)
self.assertRedirects(response, '/en/workout/overview')

all_messages = [msg for msg in get_messages(response.wsgi_request)]

# here's how you test the first message
self.assertEqual(all_messages[0].tags, "info")
self.assertEqual(all_messages[0].message, "No File was Chosen for Importation!")
self.user_logout()

def test_import_workout_logged_in_invalid_json(self):

self.user_login()

incorrect_json_data = [
{
"id": 1,
"cycle_kind": "microcycle",
"comment": "",
"creation_date": "2018-08-27",
"day": [
],
}
]
tmp_file = tempfile.NamedTemporaryFile(suffix='.json')
with open(tmp_file.name, 'w') as f:
f.write(str(incorrect_json_data))

response = self.client.post(
reverse('manager:workout:overview'),
{'workoutfile': tmp_file},
format='multipart'
)
all_messages = [msg for msg in get_messages(response.wsgi_request)]

# here's how you test the first message
self.assertEqual(all_messages[0].tags, "info")
self.assertEqual(all_messages[0].message, "The Workout JSON file is invalid.")
self.user_logout()


class DeleteTestWorkoutTestCase(WorkoutManagerDeleteTestCase):
'''
Tests deleting a Workout
Expand Down
3 changes: 3 additions & 0 deletions wger/manager/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
url(r'^overview$',
workout.overview,
name='overview'),
url(r'^export/$',
workout.export_user_workouts,
name='export'),
url(r'^add$',
workout.add,
name='add'),
Expand Down
Loading

0 comments on commit ed6b608

Please sign in to comment.