Commit Graph

2118 Commits

Author SHA1 Message Date
Roland Geider
1735dbcbf4 Create configuration table for gym members
This model works like GymAdminConfig, except that only regular members have
an entry.
2014-10-22 22:06:16 +02:00
Roland Geider
1e39163d6a Check trainer preferences for member activity 2014-10-20 16:51:54 +02:00
Roland Geider
15ca047e83 Set owner information for GymAdminConfig 2014-10-20 16:50:55 +02:00
Roland Geider
4065d4c224 Add gymconfig edit permission to admin group 2014-10-20 16:49:28 +02:00
Roland Geider
9b581b502b Check for correct permissions on template 2014-10-20 16:47:53 +02:00
Roland Geider
9e5e4ef177 Add edit views for gym admin configurations 2014-10-20 00:37:09 +02:00
Roland Geider
f8a786c0f5 Add new role for regular gym members
This role is emtpy at the moment, but is set when adding users to gyms
in case a need arises in the future.
2014-10-19 22:42:21 +02:00
Roland Geider
17b8488780 Create gym admin configuration
This commit also renames the table from GymUserConfig since there will
be one table for member config and one for trainers/administrators
2014-10-19 21:56:51 +02:00
Roland Geider
89f0447620 Small fixes to default permission groups 2014-10-19 11:21:25 +02:00
Roland Geider
263d1631dc Fix some tests broken with last commit 2014-10-17 23:44:36 +02:00
Roland Geider
caff2d1da6 Add tests for inactive gym members
This simple test just makes sure that the correct number of emails are send
and does not check for further details. Additionally some member users were
added to the test user fixture.
2014-10-16 23:54:14 +02:00
Roland Geider
a0113f79f6 Add email reminders about inactive members 2014-10-11 19:24:26 +02:00
Roland Geider
12c6eab1ea Yet another fix of default group permissions 2014-10-09 16:41:15 +02:00
Roland Geider
4643e01b38 Add configuration table for individual gyms
This allows to set different configuration options on a per-gym basis.
Additionally there are per-user configuration options. At the moment only
the inactivity of members can be set.
2014-10-08 22:19:07 +02:00
Roland Geider
9df3a89f07 Move gym views and models to own app
While this is not really necessary right now, this makes the app a bit more
future proof, if later on more models and views are added
2014-10-07 21:49:08 +02:00
Roland Geider
4291f74852 Small fix to dataTable CSS to not break consistency 2014-10-05 23:46:02 +02:00
Roland Geider
a897e4443f Show last activity on gym member list
The last activity is the most recent of either workout log or workout sessions.
Additionally, the table is made sortable using the jQuery plugin dataTables.
2014-10-05 18:52:10 +02:00
Roland Geider
dc2fe20f77 Use permission groups for gym administrators
Using permission groups 'gym_trainer', 'gym_manager' and 'general_gym_manager'
instead of assigning permissions directly to gym administrators
2014-10-03 21:25:49 +02:00
Roland Geider
591bf7acd5 Allow general manager to access the gym member list
This is restricted to admin users
2014-10-03 21:24:42 +02:00
Roland Geider
7ad796adc4 Fix group permission fixture 2014-10-03 21:19:20 +02:00
Roland Geider
342bbfc9ae Show additional user data on overview page 2014-10-03 12:58:03 +02:00
Roland Geider
e4789e815f Set width of columns in gym member overview 2014-10-03 11:34:36 +02:00
Roland Geider
64da90a15c Fix user email in overview template 2014-10-03 11:31:58 +02:00
Roland Geider
96086de8bb Allow gym administrators to delete users 2014-10-03 09:53:42 +02:00
Roland Geider
b7a9fca79b Export data of newly created gym users to CSV file 2014-09-28 10:08:31 +02:00
Roland Geider
fa465e2f3b Translate the custom persmissions for gym objects 2014-09-27 11:58:37 +02:00
Roland Geider
fd15086f8f Sort gyms by name by default 2014-09-27 11:57:49 +02:00
Roland Geider
f0e0cbe041 Fix URL for new user data 2014-09-27 11:50:40 +02:00
Roland Geider
86682de09b Update gitignore file 2014-09-27 11:23:36 +02:00
Roland Geider
50ea958dda Fix mailto link for gym email 2014-09-27 11:21:06 +02:00
Roland Geider
ffa9a6f015 Load default permission groups during installation 2014-09-27 10:43:35 +02:00
Roland Geider
986374fb62 Move groups fixture to core app, where it belongs 2014-09-27 10:43:11 +02:00
Roland Geider
7360a43fe4 Update default 'admin' permission group 2014-09-27 10:40:19 +02:00
Roland Geider
f67eec60c0 Check for specific permissions in language views 2014-09-27 10:37:56 +02:00
Roland Geider
bf3aceab85 Filter out admin links by checking individual rights 2014-09-27 10:37:40 +02:00
Roland Geider
c375518df1 Commit missing fixture for global gym configuration 2014-09-27 10:20:03 +02:00
Roland Geider
fdc35001e7 Use nested namespaces for gym URLs
See #92
2014-09-27 10:00:50 +02:00
Roland Geider
7bb213be2b Only logged in users can acces the user detail page
While it was already not possible before to access the page, an exception was
raises as unauthenticated users don't have a userprofile
2014-09-27 09:42:17 +02:00
Roland Geider
0664aa0f14 Show number of members in current gym 2014-09-26 22:10:23 +02:00
Roland Geider
ef857a624f Split gym member list into admins and regular users 2014-09-26 22:09:52 +02:00
Roland Geider
d0c6a7a328 Use the models' get_abolsute_url to specify the success URL 2014-09-26 21:25:53 +02:00
Roland Geider
17fca8e0a5 Add system wide gym configuration options
At the moment this only allows the administrator to set a default
gym for the installation.
2014-08-11 20:24:34 +02:00
Roland Geider
24c67d0aa9 Show the gym's data on its detail page 2014-07-17 22:59:35 +02:00
Roland Geider
4f7a71ee95 Add missing migration files 2014-07-17 22:59:18 +02:00
Roland Geider
a971913153 Add tests for the trainer user switching 2014-07-16 23:31:10 +02:00
Roland Geider
35e8869fd8 Remove unused CSS classes for the mobile version 2014-07-16 22:32:09 +02:00
Roland Geider
444277424d Move site administration options to user dropdown 2014-07-16 22:24:49 +02:00
Roland Geider
5f1117f0af Add links to the user's gym 2014-07-16 22:14:43 +02:00
Roland Geider
a15a254117 Save only the user pk to the session
For security reasons, Django 1.6 defaults to using a JSON serializer so
saving user objects to the session is not possible.
2014-07-14 20:39:41 +02:00
Roland Geider
aebdc26417 Fix regular expression used to create new users 2014-07-14 20:36:43 +02:00