Skip to content

Commit

Permalink
with some errors
Browse files Browse the repository at this point in the history
  • Loading branch information
arya-oss committed Jul 9, 2016
1 parent a2e59af commit c70a666
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 81 deletions.
Binary file modified db.sqlite3
Binary file not shown.
2 changes: 1 addition & 1 deletion mauth/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.5 on 2016-04-14 03:33
# Generated by Django 1.9.5 on 2016-04-24 08:43
from __future__ import unicode_literals

from django.conf import settings
Expand Down
32 changes: 21 additions & 11 deletions work/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.5 on 2016-04-14 07:09
# Generated by Django 1.9.5 on 2016-04-24 08:43
from __future__ import unicode_literals

import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
from django.utils.timezone import utc


class Migration(migrations.Migration):
Expand All @@ -21,25 +19,37 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='tags',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('tags_id', models.AutoField(primary_key=True, serialize=False)),
('tagname', models.CharField(max_length=20)),
('description', models.CharField(blank=True, max_length=100, null=True)),
],
),
migrations.CreateModel(
name='todo',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('todo_id', models.AutoField(primary_key=True, serialize=False)),
('title', models.CharField(max_length=50)),
('description', models.CharField(blank=True, max_length=250, null=True)),
('created_at', models.DateField(default=datetime.datetime(2016, 4, 14, 7, 9, 35, 547915, tzinfo=utc))),
('created_at', models.DateTimeField(auto_now_add=True)),
('finished_at', models.DateTimeField(blank=True, null=True)),
('is_finished', models.BooleanField(default=False)),
('priority', models.CharField(max_length=1)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.AddField(
model_name='tags',
name='todo',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='work.todo'),
migrations.CreateModel(
name='TodoTag',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='work.tags')),
('todo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='work.todo')),
],
),
migrations.CreateModel(
name='TodoUser',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('todo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='work.todo')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
20 changes: 0 additions & 20 deletions work/migrations/0002_auto_20160414_0713.py

This file was deleted.

20 changes: 0 additions & 20 deletions work/migrations/0003_auto_20160414_0722.py

This file was deleted.

25 changes: 0 additions & 25 deletions work/migrations/0004_auto_20160414_1913.py

This file was deleted.

18 changes: 14 additions & 4 deletions work/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,27 @@
from django.utils import timezone

class todo(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
todo_id = models.AutoField(primary_key=True)
title = models.CharField(max_length=50)
description = models.CharField(max_length=250, blank=True, null=True)
created_at = models.DateTimeField(auto_now_add=True)
finished_at = models.DateTimeField(blank=True, null=True)
is_finished = models.BooleanField(default=False)
priority = models.CharField(max_length=1)
def __unicode__(self):
return self.user.username+" "+self.title
return self.title

class tags(models.Model):
todo = models.ForeignKey(todo, on_delete=models.CASCADE)
tags_id = models.AutoField(primary_key=True)
tagname = models.CharField(max_length=20)
description = models.CharField(max_length=100, blank=True, null=True);
description = models.CharField(max_length=100, blank=True, null=True)
def __unicode__(self):
return self.tagname

class TodoTag(models.Model):
todo = models.ForeignKey(todo, on_delete=models.CASCADE)
tag = models.ForeignKey(tags, on_delete=models.CASCADE)

class TodoUser(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
todo = models.ForeignKey(todo, on_delete=models.CASCADE)

0 comments on commit c70a666

Please sign in to comment.