Fakultas Ilmu Komputer UI

Commit a7af13ae authored by Muzaki Azami's avatar Muzaki Azami
Browse files

Merge branch 'PBI-13-ProgressDietClient' into 'staging'

Pbi 13 progress diet client

See merge request !72
parents 0780e3fb a024531c
Pipeline #79520 passed with stages
in 13 minutes and 40 seconds
# Generated by Django 3.1 on 2021-05-30 01:18
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import multiselectfield.db.fields
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('diet_progress', '0003_auto_20210529_2308'),
]
operations = [
migrations.AlterField(
model_name='weeklyreport',
name='client',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='weekly_report', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='weeklyreport',
name='physical_activity',
field=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),
),
]
......@@ -19,7 +19,7 @@ class WeeklyReport(models.Model):
on_delete=models.CASCADE,
related_name='weekly_report'
)
client = models.OneToOneField(
client = models.ForeignKey(
CustomUser,
on_delete=models.CASCADE,
related_name='weekly_report'
......
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