Skip to content

Commit

Permalink
change to textfield + add publish date
Browse files Browse the repository at this point in the history
  • Loading branch information
erfanmotnt committed Jun 12, 2020
1 parent 9c820bb commit 5dfd270
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 7 deletions.
18 changes: 18 additions & 0 deletions mhbank/migrations/0031_auto_20200612_1841.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.0.4 on 2020-06-12 14:11

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('mhbank', '0030_auto_20200526_2341'),
]

operations = [
migrations.AlterField(
model_name='question',
name='text',
field=models.TextField(),
),
]
43 changes: 43 additions & 0 deletions mhbank/migrations/0032_auto_20200612_1843.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Generated by Django 3.0.4 on 2020-06-12 14:13

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('mhbank', '0031_auto_20200612_1841'),
]

operations = [
migrations.AlterField(
model_name='answer',
name='text',
field=models.TextField(),
),
migrations.AlterField(
model_name='guidance',
name='text',
field=models.TextField(),
),
migrations.AlterField(
model_name='teach_box',
name='expectations',
field=models.TextField(blank=True, null=True),
),
migrations.AlterField(
model_name='teach_box',
name='generalـprocess',
field=models.TextField(),
),
migrations.AlterField(
model_name='teach_box',
name='goal',
field=models.TextField(blank=True, null=True),
),
migrations.AlterField(
model_name='themed_q',
name='text',
field=models.TextField(),
),
]
28 changes: 28 additions & 0 deletions mhbank/migrations/0033_auto_20200612_1845.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 3.0.4 on 2020-06-12 14:15

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('mhbank', '0032_auto_20200612_1843'),
]

operations = [
migrations.AddField(
model_name='answer',
name='publish_date',
field=models.DateTimeField(null=True, verbose_name='date published'),
),
migrations.AddField(
model_name='guidance',
name='publish_date',
field=models.DateTimeField(null=True, verbose_name='date published'),
),
migrations.AddField(
model_name='teach_box',
name='publish_date',
field=models.DateTimeField(null=True, verbose_name='date published'),
),
]
17 changes: 10 additions & 7 deletions mhbank/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Question(models.Model):
events = models.ManyToManyField(Event, blank=True)
source = models.ForeignKey(Source, blank=True, null=True, on_delete=models.CASCADE)
question_maker = models.ForeignKey(Account, on_delete=models.CASCADE)
text = models.CharField(max_length=3000)
text = models.TextField()
#answer = models.CharField(max_length=3000, null=True, blank=True)
#guidance = models.CharField(max_length=1000)
publish_date = models.DateTimeField('date published')
Expand Down Expand Up @@ -100,15 +100,16 @@ class Attempt(models.Model):

class Themed_q(models.Model):
theme = models.CharField(max_length=200)
text = models.CharField(max_length=3000)
text = models.TextField()
question = models.ForeignKey(Question, on_delete=models.CASCADE)


class Answer(models.Model):
question = models.ForeignKey(Question, on_delete=models.CASCADE)
text = models.CharField(max_length=3000)
text = models.TextField()
account = models.ForeignKey(Account, on_delete=models.CASCADE)
change_date = models.DateTimeField('date changed')
publish_date = models.DateTimeField('date published', null=True)
#guidances
#comments
#is it original?(not student writen)
Expand All @@ -117,18 +118,20 @@ class Answer(models.Model):

class Guidance(models.Model):
answer = models.ForeignKey(Answer, on_delete=models.CASCADE)
text = models.CharField(max_length=1000)
text = models.TextField()
change_date = models.DateTimeField('date changed')
publish_date = models.DateTimeField('date published', null=True)


class Teach_box(models.Model):
answer = models.ForeignKey(Answer, on_delete=models.CASCADE)
goal = models.CharField(max_length=1000, null=True, blank=True)
expectations = models.CharField(max_length=1000, null=True, blank=True)
goal = models.TextField(null=True, blank=True)
expectations = models.TextField(null=True, blank=True)
#notes
time = models.TimeField(null=True)
generalـprocess = models.CharField(max_length=3000)
generalـprocess = models.TextField()
change_date = models.DateTimeField('date changed')
publish_date = models.DateTimeField('date published', null=True)

'''
class Note(models.Model):
Expand Down

0 comments on commit 5dfd270

Please sign in to comment.