Commit 0b08438b authored by Rajo Christian Cadorna's avatar Rajo Christian Cadorna

Resolved conflict at settings.py

parents 30596070 711158c6
from django.contrib import admin
# Register your models here.
from .models import Assignment
admin.site.register(Assignment)
# Generated by Django 4.0.3 on 2022-03-22 07:49
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Assignment',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=20)),
('description', models.CharField(max_length=300)),
('max_points', models.IntegerField()),
],
),
]
# Generated by Django 4.0.3 on 2022-03-22 08:13
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='assignment',
name='description',
field=models.CharField(max_length=500),
),
migrations.AlterField(
model_name='assignment',
name='name',
field=models.CharField(max_length=100),
),
]
from django.db import models
# Create your models here.
class Assignment(models.Model):
name = models.CharField(max_length=100)
description = models.CharField(max_length=500)
max_points = models.IntegerField()
def __str__(self):
return self.name
......@@ -36,6 +36,7 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [
'homepage.apps.HomepageConfig',
'Forum.apps.ForumConfig',
'assignments.apps.AssignmentsConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
......
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