Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix some bug in workout sets

Roland Geidera2db6031bbe9
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 44a9b7849..5204f58b7 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -70,6 +70,7 @@ class DayForm(ModelForm):
class SetForm(ModelForm):
class Meta:
model = Set
+ exclude = ('order', 'exerciseday')
widgets = {'exercises': ExerciseAjaxSelect(), }
# We need to overwrite the init method here because otherwise Django
@@ -89,6 +90,7 @@ class SetFormMobile(ModelForm):
class Meta:
model = Set
+ exclude = ('order', 'exerciseday')
# We need to overwrite the init method here because otherwise Django
# will outut a default help text, regardless of the widget used
diff --git a/wger/manager/migrations/0018_auto__chg_field_set_order.py b/wger/manager/migrations/0018_auto__chg_field_set_order.py
new file mode 100644
index 000000000..90a9f413a
--- /dev/null
+++ b/wger/manager/migrations/0018_auto__chg_field_set_order.py
@@ -0,0 +1,177 @@
+# -*- 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):
+
+ # Changing field 'Set.order'
+ db.alter_column(u'manager_set', 'order', self.gf('wger.utils.fields.Html5IntegerField')(null=True))
+
+ def backwards(self, orm):
+
+ # Changing field 'Set.order'
+ db.alter_column(u'manager_set', 'order', self.gf('wger.utils.fields.Html5IntegerField')(max_length=1, null=True))
+
+ 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.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ 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']"}),
+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ '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'})
+ },
+ 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'}),
+ 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', [], {'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 file
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 2bf5f7a30..18537d8fa 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -477,14 +477,12 @@ class Set(models.Model):
MAX_SETS = 7
exerciseday = models.ForeignKey(Day,
- verbose_name=_('Exercise day'),
- editable=False)
- exercises = models.ManyToManyField(Exercise, verbose_name=_('Exercises'))
- order = Html5IntegerField(max_length=1,
- blank=True,
+ verbose_name=_('Exercise day'))
+ exercises = models.ManyToManyField(Exercise,
+ verbose_name=_('Exercises'))
+ order = Html5IntegerField(blank=True,
null=True,
- verbose_name=_('Order'),
- editable=False)
+ verbose_name=_('Order'))
sets = Html5IntegerField(validators=[MinValueValidator(0), MaxValueValidator(MAX_SETS)],
verbose_name=_('Number of sets'),
default=DEFAULT_SETS)