Self hosted FLOSS fitness/workout, nutrition and weight tracker
Move DaysOfWeek model to core app
Roland Geider3d801fd7f684
diff --git a/wger/core/api/resources.py b/wger/core/api/resources.pyindex 6c66845d6..371530513 100644--- a/wger/core/api/resources.py+++ b/wger/core/api/resources.py@@ -18,7 +18,9 @@ from tastypie.authentication import ApiKeyAuthenticationfrom tastypie.constants import ALLfrom tastypie.resources import ModelResource-from wger.core.models import UserProfile, Language+from wger.core.models import UserProfile+from wger.core.models import Language+from wger.core.models import DaysOfWeekfrom wger.utils.resources import UserObjectsOnlyAuthorization@@ -49,3 +51,14 @@ class LanguageResource(ModelResource):filtering = {'id': ALL,"full_name": ALL,"short_name": ALL}+++class DaysOfWeekResource(ModelResource):+ '''+ Resource for days of the week+ '''++ class Meta:+ queryset = DaysOfWeek.objects.all()+ filtering = {'id': ALL,+ 'day_of_week': ALL}diff --git a/wger/core/demo.py b/wger/core/demo.pyindex f8a644aa5..e4ccf6961 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _from wger.weight.models import WeightEntryfrom wger.exercises.models import Exercise-from wger.manager.models import DaysOfWeek+from wger.core.models import DaysOfWeekfrom wger.manager.models import Workoutfrom wger.manager.models import Dayfrom wger.manager.models import Setdiff --git a/wger/manager/fixtures/days_of_week.json b/wger/core/fixtures/days_of_week.jsonsimilarity index 71%rename from wger/manager/fixtures/days_of_week.jsonrename to wger/core/fixtures/days_of_week.jsonindex 8fec9ef90..2b48aadcf 100644--- a/wger/manager/fixtures/days_of_week.json+++ b/wger/core/fixtures/days_of_week.json@@ -1,49 +1,49 @@[{"pk": 1,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Monday"}},{"pk": 2,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Tuesday"}},{"pk": 3,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Wednesday"}},{"pk": 4,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Thursday"}},{"pk": 5,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Friday"}},{"pk": 6,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Saturday"}},{"pk": 7,- "model": "manager.daysofweek",+ "model": "core.daysofweek","fields": {"day_of_week": "Sunday"}diff --git a/wger/core/migrations/0004_auto__add_daysofweek.py b/wger/core/migrations/0004_auto__add_daysofweek.pynew file mode 100644index 000000000..aeff89bd9--- /dev/null+++ b/wger/core/migrations/0004_auto__add_daysofweek.py@@ -0,0 +1,103 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import SchemaMigration+from django.db import models+++class Migration(SchemaMigration):++ def forwards(self, orm):+ # Renaming table 'DaysOfWeek'+ db.rename_table('manager_daysofweek', 'core_daysofweek')++ if not db.dry_run:+ # For permissions to work properly after migrating+ orm['contenttypes.contenttype'].objects.filter(app_label='manager', model='daysofweek').update(app_label='core')++ def backwards(self, orm):+ # Renaming table 'DaysOfWeek'+ db.rename_table('core_daysofweek', 'manager_daysofweek')++ if not db.dry_run:+ # For permissions to work properly after migrating+ orm['contenttypes.contenttype'].objects.filter(app_label='core', model='daysofweek').update(app_label='manager')+++ models = {+ u'auth.group': {+ 'Meta': {'object_name': 'Group'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})+ },+ u'auth.permission': {+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'auth.user': {+ 'Meta': {'object_name': 'User'},+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})+ },+ u'contenttypes.contenttype': {+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'core.daysofweek': {+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'core.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'core.userprofile': {+ 'Meta': {'object_name': 'UserProfile'},+ 'age': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ 'calories': ('wger.utils.fields.Html5IntegerField', [], {'default': '2500', 'null': 'True'}),+ 'freetime_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'height': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_workout_notification': ('django.db.models.fields.DateField', [], {'null': 'True'}),+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['core.Language']"}),+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'sleep_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '7', 'null': 'True'}),+ 'sport_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '3', 'null': 'True'}),+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),+ 'timer_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'timer_pause': ('wger.utils.fields.Html5IntegerField', [], {'default': '90'}),+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),+ 'work_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'workout_duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '12'}),+ 'workout_reminder': ('wger.utils.fields.Html5IntegerField', [], {'default': '14'}),+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})+ }+ }++ complete_apps = ['core']\ No newline at end of filediff --git a/wger/core/models.py b/wger/core/models.pyindex d028c7903..4f8df774a 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -395,3 +395,26 @@ def create_user_profile(sender, instance, created, **kwargs):post_save.connect(create_user_profile, sender=User)+++class DaysOfWeek(models.Model):+ '''+ Model for the days of the week++ This model is needed so that 'Day' can have multiple days of the week selected+ '''++ day_of_week = models.CharField(max_length=9,+ verbose_name=_('Day of the week'))++ class Meta:+ '''+ Order by day-ID, this is needed for some DBs+ '''+ ordering = ["pk", ]++ def __unicode__(self):+ '''+ Return a more human-readable representation+ '''+ return self.day_of_weekdiff --git a/wger/core/views/misc.py b/wger/core/views/misc.pyindex c177155ea..e5d6d34ce 100644--- a/wger/core/views/misc.py+++ b/wger/core/views/misc.py@@ -33,7 +33,7 @@ from wger.core.forms import FeedbackRegisteredFormfrom wger.core.forms import FeedbackAnonymousFormfrom wger.core.demo import create_demo_entriesfrom wger.core.demo import create_temporary_user-from wger.manager.models import DaysOfWeek+from wger.core.models import DaysOfWeekfrom wger.manager.models import Schedulefrom wger.nutrition.models import NutritionPlanfrom wger.weight.models import WeightEntrydiff --git a/wger/main.py b/wger/main.pyindex 2ddc19a43..944be21ed 100755--- a/wger/main.py+++ b/wger/main.py@@ -361,8 +361,8 @@ def run_south():'''# Manually set the order, otherwise postgreSQL rightfully complains- execute_from_command_line(["", "migrate", "wger.manager"])execute_from_command_line(["", "migrate", "wger.config"])+ execute_from_command_line(["", "migrate", "wger.manager"])execute_from_command_line(["", "migrate", "wger.exercises"])execute_from_command_line(["", "migrate", "wger.core"])execute_from_command_line(["", "migrate", "wger.nutrition"])@@ -377,7 +377,6 @@ def load_fixtures():'''Loads all fixtures'''-os.chdir('wger')current_dir = os.getcwd()@@ -385,14 +384,14 @@ def load_fixtures():path = os.path.join(current_dir, 'core', 'fixtures/')call_command("loaddata", path + "users")call_command("loaddata", path + "languages")+ call_command("loaddata", path + "days_of_week")# Configpath = os.path.join(current_dir, 'config', 'fixtures/')call_command("loaddata", path + "language_config.json")# Manager- path = os.path.join(current_dir, 'manager', 'fixtures/')- call_command("loaddata", path + "days_of_week")+ #path = os.path.join(current_dir, 'manager', 'fixtures/')# Exercisespath = os.path.join(current_dir, 'exercises', 'fixtures/')diff --git a/wger/manager/api/resources.py b/wger/manager/api/resources.pyindex faf52983d..94ea5263a 100644--- a/wger/manager/api/resources.py+++ b/wger/manager/api/resources.py@@ -21,13 +21,13 @@ from tastypie.authentication import SessionAuthenticationfrom tastypie.resources import ModelResourcefrom tastypie.constants import ALL, ALL_WITH_RELATIONS+from wger.core.api.resources import DaysOfWeekResourcefrom wger.exercises.api.resources import ExerciseResourcefrom wger.utils.resources import UserObjectsOnlyAuthorizationfrom wger.manager.models import WorkoutSessionfrom wger.manager.models import Workoutfrom wger.manager.models import Schedulefrom wger.manager.models import ScheduleStep-from wger.manager.models import DaysOfWeekfrom wger.manager.models import Dayfrom wger.manager.models import Setfrom wger.manager.models import Setting@@ -125,17 +125,6 @@ class ScheduleResource(ModelResource):'name': ALL}-class DaysOfWeekResource(ModelResource):- '''- Resource for days of the week- '''-- class Meta:- queryset = DaysOfWeek.objects.all()- filtering = {'id': ALL,- 'day_of_week': ALL}--class DayResource(ModelResource):'''Resource for training daysdiff --git a/wger/manager/fixtures/groups.json b/wger/manager/fixtures/groups.jsonindex be871c5e4..c7a49bec8 100644--- a/wger/manager/fixtures/groups.json+++ b/wger/manager/fixtures/groups.json@@ -127,17 +127,17 @@],["add_daysofweek",- "manager",+ "core","daysofweek"],["change_daysofweek",- "manager",+ "core","daysofweek"],["delete_daysofweek",- "manager",+ "core","daysofweek"],[diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.jsonindex ef93db2e7..da3d195ba 100644--- a/wger/manager/fixtures/test-user-data.json+++ b/wger/manager/fixtures/test-user-data.json@@ -128,17 +128,17 @@],["add_daysofweek",- "manager",+ "core","daysofweek"],["change_daysofweek",- "manager",+ "core","daysofweek"],["delete_daysofweek",- "manager",+ "core","daysofweek"],[diff --git a/wger/manager/migrations/0016_auto__del_daysofweek.py b/wger/manager/migrations/0016_auto__del_daysofweek.pynew file mode 100644index 000000000..e42e28da8--- /dev/null+++ b/wger/manager/migrations/0016_auto__del_daysofweek.py@@ -0,0 +1,178 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import SchemaMigration+from django.db import models+++class Migration(SchemaMigration):++ depends_on = (+ ('core', '0004_auto__add_daysofweek'),+ )++ def forwards(self, orm):+ '''+ Don't do anything here, everything happens in 0004_auto__add_daysofweek+ '''+ #pass+ db.alter_column('manager_day', 'day_id', self.gf('django.db.models.fields.related.ManyToManyField')(to=orm['core.DaysOfWeek']))+ #db.alter_column('manager_day', 'day_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.DaysOfWeek']))++ def backwards(self, orm):+ '''+ Don't do anything here, everything happens in 0004_auto__add_daysofweek+ '''+ # Foreign keys+ db.alter_column('manager_day', 'day_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['manager.DaysOfWeek']))++ models = {+ u'auth.group': {+ 'Meta': {'object_name': 'Group'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})+ },+ u'auth.permission': {+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'auth.user': {+ 'Meta': {'object_name': 'User'},+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})+ },+ u'contenttypes.contenttype': {+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'core.daysofweek': {+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'core.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'manager.day': {+ 'Meta': {'object_name': 'Day'},+ 'day': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['core.DaysOfWeek']", 'symmetrical': 'False'}),+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'training': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.schedule': {+ 'Meta': {'object_name': 'Schedule'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_loop': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'start_date': ('wger.utils.fields.Html5DateField', [], {'default': 'datetime.date.today'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.schedulestep': {+ 'Meta': {'ordering': "['order']", 'object_name': 'ScheduleStep'},+ 'duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '4', 'max_length': '1'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '1'}),+ 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Schedule']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.set': {+ 'Meta': {'ordering': "['order']", 'object_name': 'Set'},+ 'exerciseday': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Day']"}),+ 'exercises': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Exercise']", 'symmetrical': 'False'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),+ 'sets': ('wger.utils.fields.Html5IntegerField', [], {'default': '4'})+ },+ u'manager.setting': {+ 'Meta': {'ordering': "['order', 'id']", 'object_name': 'Setting'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'blank': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'set': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Set']"})+ },+ u'manager.workout': {+ 'Meta': {'ordering': "['-creation_date']", 'object_name': 'Workout'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.workoutlog': {+ 'Meta': {'ordering': "['date', 'reps']", 'object_name': 'WorkoutLog'},+ 'date': ('wger.utils.fields.Html5DateField', [], {}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'weight': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.workoutsession': {+ 'Meta': {'ordering': "['date']", 'unique_together': "(('date', 'user'),)", 'object_name': 'WorkoutSession'},+ 'date': ('wger.utils.fields.Html5DateField', [], {}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'impression': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '2'}),+ 'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),+ 'time_end': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),+ 'time_start': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ }+ }++ complete_apps = ['manager']\ No newline at end of filediff --git a/wger/manager/models.py b/wger/manager/models.pyindex 1a66d0b1b..9a78e0ed3 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -28,6 +28,7 @@ from django.core.exceptions import ValidationErrorfrom django.core.cache import cachefrom django.core.validators import MinValueValidator+from wger.core.models import DaysOfWeekfrom wger.exercises.models import Exercisefrom wger.utils.cache import cache_mapper, reset_workout_canonical_formfrom wger.utils.fields import Html5DateField@@ -329,29 +330,6 @@ class ScheduleStep(models.Model):return u"ID: {0}".format(self.id)-class DaysOfWeek(models.Model):- '''- Model for the days of the week-- This model is needed so that 'Day' can have multiple days of the week selected- '''-- day_of_week = models.CharField(max_length=9,- verbose_name=_('Day of the week'))-- class Meta:- '''- Order by day-ID, this is needed for some DBs- '''- ordering = ["pk", ]-- def __unicode__(self):- '''- Return a more human-readable representation- '''- return self.day_of_week--class Day(models.Model):'''Model for a training daydiff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 430ad5917..eff140c41 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -14,9 +14,9 @@from django.core.cache import cache+from wger.core.models import DaysOfWeekfrom wger.exercises.models import Exercisefrom wger.manager.models import Workout-from wger.manager.models import DaysOfWeekfrom wger.manager.models import Dayfrom wger.manager.models import Setfrom wger.manager.models import Settingdiff --git a/wger/manager/views/day.py b/wger/manager/views/day.pyindex 3a6813523..4e372f855 100644--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@ -26,7 +26,7 @@ from django.contrib.auth.decorators import login_requiredfrom django.views.generic import CreateViewfrom django.views.generic import UpdateView-from wger.manager.models import DaysOfWeek+from wger.core.models import DaysOfWeekfrom wger.manager.models import Workoutfrom wger.manager.models import Dayfrom wger.manager.forms import DayFormdiff --git a/wger/urls.py b/wger/urls.pyindex 035f1eebc..4d60cd4b8 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -28,7 +28,7 @@ from wger.nutrition.api import resources as nutrition_apifrom wger.utils.generic_views import TextTemplateViewfrom wger.utils.generic_views import WebappManifestViewfrom wger.manager.api import resources as manager_api-from wger.core.api.resources import UserProfileResource, LanguageResource+from wger.core.api.resources import UserProfileResource, LanguageResource, DaysOfWeekResourcefrom wger.weight.api import resources as weight_api#@@ -58,7 +58,7 @@ v1_api.register(UserProfileResource())v1_api.register(manager_api.WorkoutResource())v1_api.register(manager_api.ScheduleResource())v1_api.register(manager_api.ScheduleStepResource())-v1_api.register(manager_api.DaysOfWeekResource())+v1_api.register(DaysOfWeekResource())v1_api.register(manager_api.DayResource())v1_api.register(manager_api.SetResource())v1_api.register(manager_api.SettingResource())