Skip to content

Commit

Permalink
rm level add publishdate
Browse files Browse the repository at this point in the history
  • Loading branch information
erfanmotnt committed May 20, 2020
1 parent df75a25 commit 1bb2a07
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 23 deletions.
22 changes: 22 additions & 0 deletions manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys


def main():
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'rasta_problem_bank.settings.development')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)


if __name__ == '__main__':
main()
26 changes: 13 additions & 13 deletions mhbank/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ class QuestionAdmin(admin.ModelAdmin):
fields_types = {
'a': ['name', 'verification_status', 'text',
'answer', 'source', ('tags', 'sub_tags'), 'question_maker',
'last_change_date'],
'publish_date'],
's': ['name', 'verification_status', 'text',
'answer', 'source', 'events', ('tags', 'sub_tags'), 'question_maker',
'last_change_date']
'publish_date']
}
readonly_fields_types = {
'a': ['question_maker', 'last_change_date', 'events', 'verification_status'],
's': ['question_maker', 'last_change_date']
'a': ['question_maker', 'publish_date', 'events', 'verification_status'],
's': ['question_maker', 'publish_date']
}

fields = fields_types['s']
readonly_fields = readonly_fields_types['s']

list_display = ('name', 'verification_status', 'last_change_date', 'question_maker')
list_display = ('name', 'verification_status', 'publish_date', 'question_maker')
list_filter = ['verification_status', 'question_maker']
form = QuestionForm
inlines = (HardnessInline,)
Expand All @@ -42,7 +42,7 @@ def save_model(self, request, obj, form, change):
if obj.question_maker.role == 'a':
obj.verification_status = 'w'

obj.last_change_date = timezone.localtime()
obj.publish_date = timezone.localtime()
obj.save()

def add_view(self, request, form_url='', extra_context=None):
Expand Down Expand Up @@ -78,14 +78,14 @@ def get_form(self, request, obj=None, **kwargs):
form.base_fields['answer'].initial = "please write answer"

if(obj is None and request.user.account.question_set.exists() > 0):
#form.base_fields['level'].initial = request.user.account.question_set.latest('last_change_date').level
form.base_fields['source'].initial = request.user.account.question_set.latest('last_change_date').source
#form.base_fields['level'].initial = request.user.account.question_set.latest('publish_date').level
form.base_fields['source'].initial = request.user.account.question_set.latest('publish_date').source
if request.user.account.role != 'a':
form.base_fields['events'].initial = request.user.account.question_set.latest('last_change_date').events.all()
#form.base_fields['appropriate_grades_min'].initial = request.user.account.question_set.latest('last_change_date').appropriate_grades_min
#form.base_fields['appropriate_grades_max'].initial = request.user.account.question_set.latest('last_change_date').appropriate_grades_max
form.base_fields['tags'].initial = request.user.account.question_set.latest('last_change_date').tags.all()
form.base_fields['sub_tags'].initial = request.user.account.question_set.latest('last_change_date').sub_tags.all()
form.base_fields['events'].initial = request.user.account.question_set.latest('publish_date').events.all()
#form.base_fields['appropriate_grades_min'].initial = request.user.account.question_set.latest('publish_date').appropriate_grades_min
#form.base_fields['appropriate_grades_max'].initial = request.user.account.question_set.latest('publish_date').appropriate_grades_max
form.base_fields['tags'].initial = request.user.account.question_set.latest('publish_date').tags.all()
form.base_fields['sub_tags'].initial = request.user.account.question_set.latest('publish_date').sub_tags.all()

return form

Expand Down
11 changes: 1 addition & 10 deletions mhbank/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,7 @@ def __str__(self):

class Question(models.Model):
name = models.CharField(max_length=200)
level = models.IntegerField(null=True)
verification_status = models.CharField(max_length=50)
appropriate_grades_min = models.IntegerField(
default=1,
validators=[MaxValueValidator(12), MinValueValidator(1)]
)
appropriate_grades_max = models.IntegerField(
default=12,
validators=[MaxValueValidator(12), MinValueValidator(1)]
)
tags = models.ManyToManyField(Tag, blank=True)
sub_tags = models.ManyToManyField(Sub_tag, blank=True)
events = models.ManyToManyField(Event, blank=True)
Expand All @@ -74,7 +65,7 @@ class Question(models.Model):
text = models.CharField(max_length=3000)
answer = models.CharField(max_length=3000, null=True, blank=True)
#guidance = models.CharField(max_length=1000)
last_change_date = models.DateTimeField('date published')
publish_date = models.DateTimeField('date published')
# themed_qs
# emoj

Expand Down

0 comments on commit 1bb2a07

Please sign in to comment.