diff --git a/db.sqlite3 b/db.sqlite3 index 646aeef..71694ee 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/noticia/blog/forms.py b/noticia/blog/forms.py index a3476a4..7077df1 100644 --- a/noticia/blog/forms.py +++ b/noticia/blog/forms.py @@ -1,10 +1,21 @@ from django import forms -from .models import NewsItem +from .models import NewsItem, Event -class PostForm(forms.ModelForm): +class NewsItemForm(forms.ModelForm): + publish_date = forms.DateField(widget=forms.SelectDateWidget()) - class Meta: - model = NewsItem - fields = ('title', 'description', 'publish_date') + class Meta: + model = NewsItem + fields = ('title', 'description', 'publish_date') + + +class EventForm(forms.ModelForm): + + start_date = forms.DateField(widget=forms.SelectDateWidget()) + end_date = forms.DateField(widget=forms.SelectDateWidget()) + + class Meta: + model = Event + fields = ('title', 'description', 'start_date', 'end_date') diff --git a/noticia/blog/models.py b/noticia/blog/models.py index c716be8..b971eae 100644 --- a/noticia/blog/models.py +++ b/noticia/blog/models.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.utils import timezone from django.db import models -import datetime + # Create your models here. @@ -23,7 +23,7 @@ def __unicode__(self): class NewsItem(BaseNews): - publish_date = models.DateTimeField(blank=True, null=True) + publish_date = models.DateTimeField(blank=False, null=False) def publish(self): self.published_date = timezone.now() @@ -31,5 +31,5 @@ def publish(self): class Event(BaseNews): - start_date = models.DateTimeField(blank=True, null=True) - end_date = models.DateTimeField(blank=True, null=True) + start_date = models.DateTimeField(blank=False, null=False) + end_date = models.DateTimeField(blank=False, null=False) diff --git a/noticia/blog/serializers.py b/noticia/blog/serializers.py new file mode 100644 index 0000000..7591383 --- /dev/null +++ b/noticia/blog/serializers.py @@ -0,0 +1,16 @@ +from rest_framework import serializers +from .models import NewsItem, Event + + +class NewsItemSerializer(serializers.ModelSerializer): + + class Meta: + model = NewsItem + fields = ('id', 'title', 'description', 'publish_date') + + +class EventSerializer(serializers.ModelSerializer): + + class Meta: + model = Event + fields = ('id', 'title', 'description', 'start_date', 'end_date') diff --git a/noticia/blog/templates/blog/event_confirm_delete.html b/noticia/blog/templates/blog/event_confirm_delete.html index ff6ab61..13381b4 100644 --- a/noticia/blog/templates/blog/event_confirm_delete.html +++ b/noticia/blog/templates/blog/event_confirm_delete.html @@ -9,7 +9,7 @@