diff options
| -rw-r--r-- | app/projects/admin.py | 19 | ||||
| -rw-r--r-- | app/projects/models/__init__.py | 2 | ||||
| -rw-r--r-- | app/projects/models/self_experiments.py | 56 |
3 files changed, 76 insertions, 1 deletions
diff --git a/app/projects/admin.py b/app/projects/admin.py index 15c822a..040b867 100644 --- a/app/projects/admin.py +++ b/app/projects/admin.py @@ -5,6 +5,7 @@ from projects.models.base import Project from projects.models.fiveby import FiveBy from projects.models.natparks import NationalParks from projects.models.gifs import AnimatedGif +from projects.models.self_experiments import Experiment class ProjectAdmin(OSMGeoAdmin): @@ -110,6 +111,24 @@ class AnimatedGifAdmin(admin.ModelAdmin): ) +class ExperimentAdmin(admin.ModelAdmin): + list_display = ('title', 'date_start', 'date_end_projected', 'days_remaining') + search_fields = ['title'] + fieldsets = ( + (None, { + 'fields': ( + 'title', + 'slug', + 'body_markdown', + ('date_start', 'duration', 'date_end_projected'), + 'date_end_actual', + 'status' + ) + }), + ) + + +admin.site.register(Experiment, ExperimentAdmin) admin.site.register(AnimatedGif, AnimatedGifAdmin) admin.site.register(Project, ProjectAdmin) admin.site.register(FiveBy, FiveByAdmin) diff --git a/app/projects/models/__init__.py b/app/projects/models/__init__.py index ca95ec7..3230ff4 100644 --- a/app/projects/models/__init__.py +++ b/app/projects/models/__init__.py @@ -1,5 +1,5 @@ from .base import Project from .fiveby import FiveBy from .natparks import NationalParks -from .code import Code, CodeBlogDemo, CodeBlogEntry from .gifs import AnimatedGif +from .self_experiments import Experiment diff --git a/app/projects/models/self_experiments.py b/app/projects/models/self_experiments.py new file mode 100644 index 0000000..be9d0b7 --- /dev/null +++ b/app/projects/models/self_experiments.py @@ -0,0 +1,56 @@ +import datetime +from django.db import models + +import markdown + +PUB_STATUS = ( + (0, 'Draft'), + (1, 'Published'), +) + + +def markdown_processor(md): + return markdown.markdown(md, ['footnotes'], safe_mode=False) + + +class Experiment(models.Model): + title = models.CharField(max_length=254) + slug = models.SlugField() + date_created = models.DateField(auto_now_add=True) + date_start = models.DateField() + date_end_actual = models.DateField(blank=True, null=True) + date_end_projected = models.DateField(blank=True) + duration = models.PositiveSmallIntegerField(default=30) + status = models.IntegerField(choices=PUB_STATUS, default=0) + body_html = models.TextField(blank=True) + body_markdown = models.TextField() + + class Meta: + app_label = 'projects' + ordering = ('-date_start',) + + # Returns the string representation of the model. + def __str__(self): + return self.title + + def get_absolute_url(self): + return "/projects/experiments/%s/%s/" % (self.pub_date.strftime("%Y").lower(), self.slug) + + def days_remaining(self): + return self.date_end_projected - datetime.date.today() + + @property + def get_previous_published(self): + return self.get_previous_by_pub_date(status__exact=1) + + @property + def get_next_published(self): + return self.get_next_by_pub_date(status__exact=1) + + def comment_period_open(self): + return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date + + def save(self): + self.body_html = markdown_processor(self.body_markdown) + self.date_end_projected = self.date_start + datetime.timedelta(self.duration) + super(Experiment, self).save() |