From c762313aa71f1008a30a9e8f8eb12c1ebfd8b65e Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 22 Sep 2015 13:08:11 +0200 Subject: [PATCH] Fixed Wishlist, DateFields and Fields --- requirements.txt | 1 - scrumtools/apps/scrumboard/forms.py | 10 ---------- scrumtools/apps/scrumboard/models.py | 8 ++++---- scrumtools/apps/scrumboard/views.py | 14 +++++++++----- scrumtools/apps/wishlist/models.py | 2 +- .../{WishList => wishlist}/confirm_delete.html | 0 .../templates/{WishList => wishlist}/form.html | 0 .../{WishList => wishlist}/wish_detail.html | 0 .../{WishList => wishlist}/wish_list.html | 0 scrumtools/apps/wishlist/views.py | 8 +++++--- 10 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 scrumtools/apps/scrumboard/forms.py rename scrumtools/apps/wishlist/templates/{WishList => wishlist}/confirm_delete.html (100%) rename scrumtools/apps/wishlist/templates/{WishList => wishlist}/form.html (100%) rename scrumtools/apps/wishlist/templates/{WishList => wishlist}/wish_detail.html (100%) rename scrumtools/apps/wishlist/templates/{WishList => wishlist}/wish_list.html (100%) diff --git a/requirements.txt b/requirements.txt index c798f25..a7e7df9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ django-sitetree==1.4.0 django-suit==0.2.12 djangorestframework==3.1.0 Markdown==2.6.1 -psycopg2==2.6 pytz==2014.10 PyYAML==3.11 requests==2.7.0 diff --git a/scrumtools/apps/scrumboard/forms.py b/scrumtools/apps/scrumboard/forms.py deleted file mode 100644 index bec5c48..0000000 --- a/scrumtools/apps/scrumboard/forms.py +++ /dev/null @@ -1,10 +0,0 @@ -from django import forms - -from scrumtools.apps.scrumboard.models import Project, Sprint - -# FORM set test stuff -class ProjectForm(forms.Form): - project_name = forms.ModelChoiceField(Project.objects.all()) - -class SprintForm(forms.Form): - sprint_name = forms.ModelChoiceField(Sprint.objects.all()) diff --git a/scrumtools/apps/scrumboard/models.py b/scrumtools/apps/scrumboard/models.py index 6b3b8d1..07957e2 100644 --- a/scrumtools/apps/scrumboard/models.py +++ b/scrumtools/apps/scrumboard/models.py @@ -56,8 +56,8 @@ class Story(models.Model): name=models.CharField(max_length=200) description=models.TextField() sprint = models.ForeignKey(Sprint, blank=True, null=True) - created_on=models.DateTimeField() - modified_on=models.DateTimeField(default=timezone.now) + created_on=models.DateTimeField(auto_now_add=True) + modified_on=models.DateTimeField(auto_now=True) class Meta: verbose_name = _('Story') @@ -86,8 +86,8 @@ class Task(models.Model): story = models.ForeignKey(Story, blank=True, null=True) story_points=models.IntegerField(default=0) estimated_days=models.IntegerField(default=0) - created_on=models.DateTimeField() - modified_on=models.DateTimeField(default=timezone.now) + created_on=models.DateTimeField(auto_now_add=True) + modified_on=models.DateTimeField(auto_now_add=True) assigned = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True) started = models.DateField(blank=True, null=True) due = models.DateField(blank=True, null=True) diff --git a/scrumtools/apps/scrumboard/views.py b/scrumtools/apps/scrumboard/views.py index 779c4a4..b565a59 100644 --- a/scrumtools/apps/scrumboard/views.py +++ b/scrumtools/apps/scrumboard/views.py @@ -8,7 +8,6 @@ from django.contrib.auth.decorators import login_required from scrumtools.apps.scrumboard.models import Project, Status, Sprint, Story, Task -from scrumtools.apps.scrumboard.forms import ProjectForm, SprintForm from django.utils import timezone import json @@ -66,16 +65,19 @@ class StatusList(ListView): class StatusCreate(CreateView): model = Status + fields = ['name','order'] success_url = reverse_lazy('scrumboard:status-list') template_name = 'scrumboard/form.html' class StatusUpdate(UpdateView): model = Status + fields = ['name','order'] success_url = reverse_lazy('scrumboard:status-list') template_name = 'scrumboard/form.html' class StatusDelete(DeleteView): model = Status + fields = ['name','order'] success_url = reverse_lazy('scrumboard:status-list') template_name = 'scrumboard/confirm_delete.html' @@ -113,23 +115,27 @@ class StoryList(ListView): class StoryCreate(CreateView): model = Story - form_class = modelform_factory(Story) + fields = ['project', 'name', 'description', 'sprint'] + #form_class = modelform_factory(Story) success_url = reverse_lazy('scrumboard:story-list') template_name = 'scrumboard/form.html' class StoryUpdate(UpdateView): model = Story - form_class = modelform_factory(Story) + fields = ['project', 'name', 'description', 'sprint'] success_url = reverse_lazy('scrumboard:story-list') template_name = 'scrumboard/form.html' class StoryDelete(DeleteView): model = Story + fields = ['project', 'name', 'description', 'sprint'] success_url = reverse_lazy('scrumboard:story-list') template_name = 'scrumboard/confirm_delete.html' class StoryDetail(DetailView): model = Story + fields = ['project', 'name', 'description', 'sprint'] + #Tasks class TaskList(ListView): @@ -138,13 +144,11 @@ class TaskList(ListView): class TaskCreate(CreateView): model = Task - form_class = modelform_factory(Task) success_url = reverse_lazy('scrumboard:task-list') template_name = 'scrumboard/form.html' class TaskUpdate(UpdateView): model = Task - form_class = modelform_factory(Task) success_url = reverse_lazy('scrumboard:task-list') template_name = 'scrumboard/form.html' diff --git a/scrumtools/apps/wishlist/models.py b/scrumtools/apps/wishlist/models.py index e373851..b8c316c 100644 --- a/scrumtools/apps/wishlist/models.py +++ b/scrumtools/apps/wishlist/models.py @@ -14,7 +14,7 @@ class Wish(models.Model): name=models.CharField(max_length=200) description=models.TextField() votes=models.IntegerField(default=0) - created_on=models.DateTimeField('Creation date') + created_on=models.DateTimeField(auto_now_add=True) class Meta: verbose_name = _('Wish') diff --git a/scrumtools/apps/wishlist/templates/WishList/confirm_delete.html b/scrumtools/apps/wishlist/templates/wishlist/confirm_delete.html similarity index 100% rename from scrumtools/apps/wishlist/templates/WishList/confirm_delete.html rename to scrumtools/apps/wishlist/templates/wishlist/confirm_delete.html diff --git a/scrumtools/apps/wishlist/templates/WishList/form.html b/scrumtools/apps/wishlist/templates/wishlist/form.html similarity index 100% rename from scrumtools/apps/wishlist/templates/WishList/form.html rename to scrumtools/apps/wishlist/templates/wishlist/form.html diff --git a/scrumtools/apps/wishlist/templates/WishList/wish_detail.html b/scrumtools/apps/wishlist/templates/wishlist/wish_detail.html similarity index 100% rename from scrumtools/apps/wishlist/templates/WishList/wish_detail.html rename to scrumtools/apps/wishlist/templates/wishlist/wish_detail.html diff --git a/scrumtools/apps/wishlist/templates/WishList/wish_list.html b/scrumtools/apps/wishlist/templates/wishlist/wish_list.html similarity index 100% rename from scrumtools/apps/wishlist/templates/WishList/wish_list.html rename to scrumtools/apps/wishlist/templates/wishlist/wish_list.html diff --git a/scrumtools/apps/wishlist/views.py b/scrumtools/apps/wishlist/views.py index c085add..3f9dad8 100644 --- a/scrumtools/apps/wishlist/views.py +++ b/scrumtools/apps/wishlist/views.py @@ -1,7 +1,6 @@ from django.views.generic import ListView from django.views.generic.detail import DetailView from django.views.generic.edit import CreateView, UpdateView, DeleteView -from django.forms.models import modelform_factory from django.core.urlresolvers import reverse_lazy @@ -9,27 +8,30 @@ class WishList(ListView): model = Wish + fields = ['name', 'description'] paginate_by = 10 class WishCreate(CreateView): model = Wish - form_class = modelform_factory(Wish) + fields = ['name', 'description'] success_url = reverse_lazy('wishlist:wish-list') template_name = 'wishlist/form.html' class WishUpdate(UpdateView): model = Wish - form_class = modelform_factory(Wish) + fields = ['name', 'description'] success_url = reverse_lazy('wishlist:wish-list') template_name = 'wishlist/form.html' class WishDelete(DeleteView): model = Wish + fields = ['name', 'description'] success_url = reverse_lazy('wishlist:wish-list') template_name = 'wishlist/confirm_delete.html' class WishDetail(DetailView): model = Wish + #fields = ['name', 'description']