Fakultas Ilmu Komputer UI

Commit d1d1d3ab authored by Ami's avatar Ami
Browse files

changing physical_activity_other and problem_and_feedback to 'not required'

parent 6a88a490
Pipeline #80616 passed with stages
in 13 minutes and 4 seconds
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.db import migrations, models
import django.db.models.deletion
......@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('auth', '0012_alter_user_first_name_max_length'),
('dietela_quiz', '0001_initial'),
('nutritionists', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
]
operations = [
......@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
('is_staff', models.BooleanField(default=False)),
('is_active', models.BooleanField(default=True)),
('date_joined', models.DateTimeField(default=django.utils.timezone.now)),
('deadline', models.DateField(default=django.utils.timezone.now)),
('deadline', models.DateField(null=True)),
('diet_profile', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user', to='dietela_quiz.dietprofile')),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
('nutritionist', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='clients', to='nutritionists.nutritionist')),
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.conf import settings
from django.db import migrations, models
......@@ -38,11 +38,11 @@ class Migration(migrations.Migration):
('vegetables_portion', models.IntegerField(choices=[(1, '0'), (2, '1'), (3, '2'), (4, '3'), (5, '4'), (6, 'Lebih dari 4')])),
('water_consumption', models.PositiveIntegerField()),
('physical_activity', multiselectfield.db.fields.MultiSelectField(choices=[(1, 'Hampir tidak pernah olahraga dan/atau duduk lebih dari 9 jam perhari'), (2, 'Jalan kaki santai'), (3, 'Jalan kaki cepat'), (4, 'Pemanasan'), (5, 'Naik turun tangga'), (6, 'Jogging'), (7, 'Treadmill'), (8, 'Senam Aerobic/cardio, Recovery/Scratching, Dance dll'), (9, 'Latihan penguatan otot (strength workout, weight workout)'), (10, 'Other')], max_length=20)),
('physical_activity_other', models.TextField()),
('physical_activity_other', models.TextField(blank=True, null=True)),
('time_for_activity', models.IntegerField(choices=[(1, '0 - 60 menit'), (2, '60 - 100 menit'), (3, '100 - 120 menit'), (4, '100 - 120 menit'), (5, '120 - 150 menit'), (6, '150 - 175 menit'), (7, '175 - 200 menit'), (8, '200 - 250 menit'), (9, 'Lebih dari 250 menit')])),
('feeling_rating', models.IntegerField(choices=[(1, 'Rasanya mau menyerah saja'), (2, 'Capek, susah, bosen, males, repot, sibuk'), (3, 'Biasa aja, meski ada kendala tapi semua bisa diatur'), (4, 'Lancar terus, semangat cukup stabil, gak ada masalah'), (5, 'Super seneng, semangat banget, worry-free lah')])),
('lesson_learned', models.TextField()),
('problem_faced_and_feedbacks', models.TextField()),
('problem_faced_and_feedbacks', models.TextField(blank=True, null=True)),
('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='weekly_report', to=settings.AUTH_USER_MODEL)),
('nutritionist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='weekly_report', to='nutritionists.nutritionist')),
],
......
......@@ -61,13 +61,13 @@ class WeeklyReport(models.Model):
water_consumption = models.PositiveIntegerField()
physical_activity = MultiSelectField(
choices = PhysicalActivity.choices)
physical_activity_other = models.TextField()
physical_activity_other = models.TextField(null=True, blank=True)
time_for_activity = models.IntegerField(
choices=TimeForActivity.choices)
feeling_rating = models.IntegerField(
choices = Rating.choices)
lesson_learned = models.TextField()
problem_faced_and_feedbacks = models.TextField()
problem_faced_and_feedbacks = models.TextField(null=True, blank=True)
def __str__(self):
return f"{self.client} - {self.nutritionist} - Week {self.week_num}"
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.conf import settings
import django.contrib.postgres.fields
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.db import migrations, models
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.db import migrations, models
import django.db.models.deletion
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.db import migrations, models
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.conf import settings
from django.db import migrations, models
......@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('nutritionists', '0001_initial'),
('dietela_program', '0001_initial'),
('nutritionists', '0001_initial'),
]
operations = [
......
# Generated by Django 3.1 on 2021-05-31 13:53
# Generated by Django 3.1 on 2021-06-01 10:40
from django.conf import settings
from django.db import migrations, models
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment