Self hosted FLOSS fitness/workout, nutrition and weight tracker
Export data of newly created gym users to CSV file
Roland Geiderb7a9fca79bc7
diff --git a/wger/core/templates/gym/new_user.html b/wger/core/templates/gym/new_user.htmlindex c04cf99c8..9b7217f77 100644--- a/wger/core/templates/gym/new_user.html+++ b/wger/core/templates/gym/new_user.html@@ -18,14 +18,38 @@</tr><tr><th>{% trans "Email" %}</th>- <td>{{new_user.email}}</td>+ <td>{{new_user.email|default:'-/-'}}</td></tr><tr><th>{% trans "Gym" %}</th><td>{{new_user.userprofile.gym}}</td></tr></table>+{% endblock %}+++++{% block sidebar %}+<h4>{% trans "Info" %}</h4>+<p>+ {% blocktrans %}Please write down the user password or save the exported+file, which contains all the user data, and keep it in a safe place. The password+cannot be recovered later.{% endblocktrans %}+</p>++<h4>{% trans "Options" %}</h4>+<p>+<a href="{% url 'core:gym:new-user-data-export' %}" {% auto_link_css flavour %}>+ <img src="{% static 'images/icons/save.svg' %}"+ width="32"+ height="32"+ alt="{% trans 'Export user data' %}">+ {% trans "Export user data" %}+</a>+</p>+<p><a href="{% url 'core:gym:user-list' new_user.userprofile.gym.pk %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/list.svg' %}"width="32"@@ -33,14 +57,5 @@alt="{% trans 'Back to overview' %}">{% trans "Back to gym" %}</a>-{% endblock %}-----{% block sidebar %}-<h3>{% trans "Info" %}</h3>-<p>- {% blocktrans %}Please write down the user password, this value cannot be recovered later.{% endblocktrans %}</p>{% endblock %}diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex b783874ce..4a99fbd35 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -12,6 +12,8 @@## You should have received a copy of the GNU Affero General Public License+import datetime+from django.contrib.auth.models import Userfrom django.contrib.auth.models import Permissionfrom django.contrib.contenttypes.models import ContentType@@ -161,6 +163,38 @@ class GymAddUserTestCase(WorkoutManagerTestCase):'''self.add_user(fail=True)+ def new_user_data_export(self, fail=False):+ '''+ Helper function to test exporting the data of a newly created user+ '''+ response = self.client.get(reverse('core:gym:new-user-data-export'))+ if fail:+ self.assertIn(response.status_code, (302, 403))+ else:+ self.assertEqual(response.status_code, 200)+ self.assertEqual(response['Content-Type'], 'text/csv')+ today = datetime.date.today()+ filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-cletus.csv'.format(t=today)+ self.assertEqual(response['Content-Disposition'],+ 'attachment; filename={}'.format(filename))+ self.assertGreaterEqual(len(response.content), 90)+ self.assertLessEqual(len(response.content), 120)++ def test_new_user_data_export(self):+ '''+ Test exporting the data of a newly created user+ '''+ self.user_login('admin')+ self.add_user()+ self.new_user_data_export(fail=False)++ self.user_logout()+ self.new_user_data_export(fail=True)++ self.user_logout()+ self.user_login('test')+ self.new_user_data_export(fail=True)+class TrainerLoginTestCase(WorkoutManagerTestCase):'''diff --git a/wger/core/urls.py b/wger/core/urls.pyindex a1eaa1cf7..d36b35623 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -30,9 +30,12 @@ patterns_gym = patterns('',url(r'^list$',gym.GymListView.as_view(),name='list'),- url(r'^new-user-data$',+ url(r'^new-user-data/view$',gym.gym_new_user_info,name='new-user-data'),+ url(r'^new-user-data/export$',+ gym.gym_new_user_info_export,+ name='new-user-data-export'),url(r'^(?P<pk>\d+)/members',gym.GymUserListView.as_view(),name='user-list'),diff --git a/wger/core/views/gym.py b/wger/core/views/gym.pyindex 79ff1c4f2..13eadf664 100644--- a/wger/core/views/gym.py+++ b/wger/core/views/gym.py@@ -13,7 +13,8 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License-+import csv+import datetimeimport loggingfrom django.contrib.auth.decorators import login_required@@ -22,8 +23,8 @@ from django.contrib.auth.models import Userfrom django.contrib.contenttypes.models import ContentTypefrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazy-from django.http.response import HttpResponseForbidden-from django.shortcuts import render+from django.http.response import HttpResponseForbidden, HttpResponse, HttpResponseRedirect+from django.shortcuts import render, get_object_or_404from django.utils.translation import ugettext as _from django.utils.translation import ugettext_lazyfrom django.views.generic import ListView@@ -113,14 +114,51 @@ def gym_new_user_info(request):'''Shows info about a newly created user'''- if not (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.manage_gym')):+ if not request.user.has_perm('core.manage_gym'):return HttpResponseForbidden()- context = {'new_user': User.objects.get(pk=request.session['gym.user']['user_pk']),+ if not request.session.get('gym.user'):+ return HttpResponseRedirect(reverse('core:gym:list'))++ context = {'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),'password': request.session['gym.user']['password']}return render(request, 'gym/new_user.html', context)+@login_required+def gym_new_user_info_export(request):+ '''+ Exports the info of newly created user+ '''+ if not request.user.has_perm('core.manage_gym'):+ return HttpResponseForbidden()++ if not request.session.get('gym.user'):+ return HttpResponseRedirect(reverse('core:gym:list'))++ new_user = get_object_or_404(User, pk=request.session['gym.user']['user_pk'])+ new_username = new_user.username+ password = request.session['gym.user']['password']++ # Crease CSV 'file'+ response = HttpResponse(content_type='text/csv')+ writer = csv.writer(response)+ writer.writerow([_('User name'), _('First name'), _('Last name'), _('Gym'), _('Password')])+ writer.writerow([new_username,+ new_user.first_name,+ new_user.last_name,+ new_user.userprofile.gym.name,+ password])++ # Send the data to the browser+ today = datetime.date.today()+ filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-{user}.csv'.format(t=today,+ user=new_username)+ response['Content-Disposition'] = 'attachment; filename={0}'.format(filename)+ response['Content-Length'] = len(response.content)+ return response++class GymAddUserView(WgerFormMixin, CreateView):'''View to add a user to a new gym