From d16c597d1e4e52ab1df1c77bda54445437bac5c0 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Wed, 11 Nov 2020 22:39:19 -0500 Subject: cleaned up Posts Admin and added field_notes --- app/posts/admin.py | 42 ++++---- app/posts/migrations/0013_auto_20201111_2231.py | 23 +++++ app/posts/models.py | 8 +- app/unused_apps/fieldnotes/__init__.py | 0 app/unused_apps/fieldnotes/admin.py | 38 +++++++ app/unused_apps/fieldnotes/build.py | 36 +++++++ .../fieldnotes/migrations/0001_initial.py | 37 +++++++ .../migrations/0002_auto_20190303_1222.py | 25 +++++ app/unused_apps/fieldnotes/migrations/__init__.py | 0 app/unused_apps/fieldnotes/models.py | 113 +++++++++++++++++++++ .../fieldnotes/fieldnote_archive_list_date.html | 43 ++++++++ .../templates/fieldnotes/fieldnote_detail.html | 95 +++++++++++++++++ .../templates/fieldnotes/fieldnote_list.html | 49 +++++++++ app/unused_apps/fieldnotes/urls.py | 39 +++++++ app/unused_apps/fieldnotes/views.py | 37 +++++++ 15 files changed, 559 insertions(+), 26 deletions(-) create mode 100644 app/posts/migrations/0013_auto_20201111_2231.py create mode 100644 app/unused_apps/fieldnotes/__init__.py create mode 100644 app/unused_apps/fieldnotes/admin.py create mode 100644 app/unused_apps/fieldnotes/build.py create mode 100644 app/unused_apps/fieldnotes/migrations/0001_initial.py create mode 100644 app/unused_apps/fieldnotes/migrations/0002_auto_20190303_1222.py create mode 100644 app/unused_apps/fieldnotes/migrations/__init__.py create mode 100644 app/unused_apps/fieldnotes/models.py create mode 100644 app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_archive_list_date.html create mode 100644 app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_detail.html create mode 100644 app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_list.html create mode 100644 app/unused_apps/fieldnotes/urls.py create mode 100644 app/unused_apps/fieldnotes/views.py diff --git a/app/posts/admin.py b/app/posts/admin.py index eaf1a1c..1e2e845 100644 --- a/app/posts/admin.py +++ b/app/posts/admin.py @@ -12,18 +12,18 @@ from utils.util import get_latlon @admin.register(Post) -class EntryAdmin(OSMGeoAdmin): +class PostAdmin(OSMGeoAdmin): form = LGEntryForm def get_queryset(self, request): - test_model_qs = super(EntryAdmin, self).get_queryset(request) + test_model_qs = super(PostAdmin, self).get_queryset(request) test_model_qs = test_model_qs.prefetch_related('related').prefetch_related('books') return test_model_qs def render_change_form(self, request, context, *args, **kwargs): #context['adminform'].form.fields['featured_image'].queryset = LuxImage.objects.all()[:200] - return super(EntryAdmin, self).render_change_form(request, context, *args, **kwargs) + return super(PostAdmin, self).render_change_form(request, context, *args, **kwargs) def formfield_for_dbfield(self, db_field, **kwargs): if db_field.name == 'thumbnail' or db_field.name == 'image': @@ -32,22 +32,27 @@ class EntryAdmin(OSMGeoAdmin): field = forms.CharField(widget=forms.Textarea(attrs={'rows': 4, 'cols': 75})) field.required = False else: - field = super(EntryAdmin, self).formfield_for_dbfield(db_field, **kwargs) + field = super(PostAdmin, self).formfield_for_dbfield(db_field, **kwargs) return field list_display = ('title', 'post_type', 'pub_date', 'template_name', 'status',) search_fields = ['title', 'body_markdown'] prepopulated_fields = {"slug": ('title',)} list_filter = ('post_type', 'pub_date', 'enable_comments', 'status') - filter_horizontal = ('related',) + filter_horizontal = ('related', 'books', 'field_notes') fieldsets = ( ('Entry', { 'fields': ( ('title', 'short_title'), 'subtitle', 'body_markdown', - ('pub_date', 'status', 'post_type', 'old_id',), - 'slug', + ('pub_date', 'status', 'post_type'), + ('slug', 'enable_comments',), + 'point', + 'dek', + 'meta_description', + 'template_name', + ('featured_image','related'), ), 'classes': ( 'show', @@ -56,29 +61,22 @@ class EntryAdmin(OSMGeoAdmin): ) } ), - ('Metadata', { - 'fields': ( - 'point', - 'dek', - 'meta_description', - 'topics', - 'template_name', - 'enable_comments', - 'featured_image', - 'related', - ('has_video', 'disclaimer',), - ), - }), ('Extras', { 'fields': ( 'books', - 'field_notes', - 'jrnl', + 'field_notes', + ('has_video', 'disclaimer',), + 'topics', 'prologue_markdown', 'epilogue_markdown', 'originally_published_by', 'originally_published_by_url', ), + 'classes': ( + 'collapse', + 'extrapretty', + 'wide' + ) }), ) # options for OSM map Using custom ESRI topo map diff --git a/app/posts/migrations/0013_auto_20201111_2231.py b/app/posts/migrations/0013_auto_20201111_2231.py new file mode 100644 index 0000000..99de3fe --- /dev/null +++ b/app/posts/migrations/0013_auto_20201111_2231.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1 on 2020-11-11 22:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('posts', '0012_remove_post_field_notes'), + ] + + operations = [ + migrations.AddField( + model_name='post', + name='field_notes', + field=models.ManyToManyField(blank=True, limit_choices_to={'post_type': 5}, to='posts.Post'), + ), + migrations.AlterField( + model_name='post', + name='disclaimer', + field=models.BooleanField(blank=True, default=False), + ), + ] diff --git a/app/posts/models.py b/app/posts/models.py index 898dc49..5829fe9 100644 --- a/app/posts/models.py +++ b/app/posts/models.py @@ -27,7 +27,7 @@ from normalize.models import RelatedPost from photos.models import LuxImage, LuxImageSize from locations.models import Location from books.models import Book -from fieldnotes.models import FieldNote +#from fieldnotes.models import FieldNote from taxonomy.models import TaggedItems, Category from utils.util import render_images, render_products, parse_video, markdown_to_html, extract_main_image @@ -71,16 +71,16 @@ class Post(models.Model): template_name = models.IntegerField(choices=TEMPLATES, default=0) has_video = models.BooleanField(blank=True, default=False) has_code = models.BooleanField(blank=True, default=False) - disclaimer = models.BooleanField(blank=True, default=True) + disclaimer = models.BooleanField(blank=True, default=False) books = models.ManyToManyField(Book, blank=True) - field_notes = models.ManyToManyField(FieldNote, blank=True) + #field_notes = models.ManyToManyField(FieldNote, blank=True) related = models.ManyToManyField(RelatedPost, blank=True) point = models.PointField(null=True, blank=True) location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True, blank=True) topics = models.ManyToManyField(Category, blank=True) originally_published_by = models.CharField(max_length=400, null=True, blank=True) originally_published_by_url = models.CharField(max_length=400, null=True, blank=True) - field_notes = models.ManyToManyField(FieldNote, blank=True) + field_notes = models.ManyToManyField('self', blank=True, symmetrical=False, limit_choices_to = {'post_type': PostType.FIELD_NOTE}) books = models.ManyToManyField(Book, blank=True) class Meta: diff --git a/app/unused_apps/fieldnotes/__init__.py b/app/unused_apps/fieldnotes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/unused_apps/fieldnotes/admin.py b/app/unused_apps/fieldnotes/admin.py new file mode 100644 index 0000000..838063d --- /dev/null +++ b/app/unused_apps/fieldnotes/admin.py @@ -0,0 +1,38 @@ +from django.contrib import admin +from django.contrib.contenttypes.admin import GenericTabularInline + +from .models import FieldNote +from utils.widgets import LGEntryForm, OLAdminBase +from utils.util import get_latlon + + +@admin.register(FieldNote) +class NoteAdmin(OLAdminBase): + form = LGEntryForm + prepopulated_fields = {"slug": ('title',)} + list_display = ('title', 'slug', 'pub_date', 'location') + fieldsets = ( + ('Note', { + 'fields': ( + ('title', 'note_type'), + 'subtitle', + 'body_markdown', + 'slug', + ('pub_date', 'status'), + 'point' + ), + 'classes': ( + 'show', + 'extrapretty', + 'wide' + ) + } + ), + ) + lat, lon = get_latlon() + default_lon = lon + default_lat = lat + default_zoom = 10 + + class Media: + js = ('image-loader.js', 'next-prev-links.js') diff --git a/app/unused_apps/fieldnotes/build.py b/app/unused_apps/fieldnotes/build.py new file mode 100644 index 0000000..4c5c83b --- /dev/null +++ b/app/unused_apps/fieldnotes/build.py @@ -0,0 +1,36 @@ +import os +from django.urls import reverse +from builder.base import BuildNew + + +class BuildNotes(BuildNew): + + def build(self): + self.build_detail_view() + self.build_list_view( + base_path=reverse("fieldnotes:list"), + paginate_by=24 + ) + self.build_year_view("fieldnotes:list_year") + self.build_month_view("fieldnotes:list_month") + + def get_model_queryset(self): + return self.model.objects.all() + + def build_detail_view(self): + ''' + write out all the expenses for each trip + ''' + for obj in self.get_model_queryset(): + url = obj.get_absolute_url() + path, slug = os.path.split(url) + path = '%s/' % path + # write html + response = self.client.get(url) + print(path, slug) + self.write_file(path, response.content, filename=slug) + + +def builder(): + j = BuildNotes("fieldnotes", "fieldnote") + j.build() diff --git a/app/unused_apps/fieldnotes/migrations/0001_initial.py b/app/unused_apps/fieldnotes/migrations/0001_initial.py new file mode 100644 index 0000000..cec67fb --- /dev/null +++ b/app/unused_apps/fieldnotes/migrations/0001_initial.py @@ -0,0 +1,37 @@ +# Generated by Django 2.1.7 on 2019-03-03 12:13 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('locations', '0017_auto_20190217_1849'), + ] + + operations = [ + migrations.CreateModel( + name='FieldNote', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(blank=True, max_length=250)), + ('subtitle', models.CharField(blank=True, max_length=250)), + ('slug', models.SlugField(blank=True, unique_for_date='pub_date')), + ('pub_date', models.DateTimeField(default=django.utils.timezone.now)), + ('body_html', models.TextField(blank=True)), + ('body_markdown', models.TextField(verbose_name='Note')), + ('point', django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326)), + ('status', models.IntegerField(choices=[(0, 'Draft'), (1, 'Published')], default=1)), + ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')), + ], + options={ + 'get_latest_by': 'pub_date', + 'ordering': ('-pub_date',), + }, + ), + ] diff --git a/app/unused_apps/fieldnotes/migrations/0002_auto_20190303_1222.py b/app/unused_apps/fieldnotes/migrations/0002_auto_20190303_1222.py new file mode 100644 index 0000000..c0e352e --- /dev/null +++ b/app/unused_apps/fieldnotes/migrations/0002_auto_20190303_1222.py @@ -0,0 +1,25 @@ +# Generated by Django 2.1.7 on 2019-03-03 12:22 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('photos', '0018_auto_20161130_1218'), + ('fieldnotes', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='fieldnote', + name='featured_image', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='photos.LuxImage'), + ), + migrations.AddField( + model_name='fieldnote', + name='note_type', + field=models.IntegerField(choices=[(0, 'Note'), (1, 'Photo')], default=0), + ), + ] diff --git a/app/unused_apps/fieldnotes/migrations/__init__.py b/app/unused_apps/fieldnotes/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/unused_apps/fieldnotes/models.py b/app/unused_apps/fieldnotes/models.py new file mode 100644 index 0000000..c14ba80 --- /dev/null +++ b/app/unused_apps/fieldnotes/models.py @@ -0,0 +1,113 @@ +import re +from django import forms +from django.contrib.gis.db import models +from django.utils import timezone +from django.urls import reverse +from django.conf import settings +from django.contrib.sitemaps import Sitemap + +from locations.models import Location, CheckIn +from photos.models import LuxImage +from utils.util import render_images, parse_image, markdown_to_html, extract_main_image + + +def render_images(s): + s = re.sub('', parse_image, s) + return s + + +class FieldNote(models.Model): + title = models.CharField(max_length=250, blank=True) + subtitle = models.CharField(max_length=250, blank=True) + slug = models.SlugField(unique_for_date='pub_date', blank=True) + pub_date = models.DateTimeField(default=timezone.now) + body_html = models.TextField(blank=True) + body_markdown = models.TextField('Note') + point = models.PointField(blank=True, null=True) + location = models.ForeignKey(Location, on_delete=models.CASCADE, blank=True, null=True) + PUB_STATUS = ( + (0, 'Draft'), + (1, 'Published'), + ) + status = models.IntegerField(choices=PUB_STATUS, default=1) + NOTE_TYPE = ( + (0, 'Note'), + (1, 'Photo'), + ) + note_type = models.IntegerField(choices=NOTE_TYPE, default=0) + featured_image = models.ForeignKey(LuxImage, on_delete=models.SET_NULL, blank=True, null=True) + + class Meta: + ordering = ('-pub_date',) + get_latest_by = 'pub_date' + + def __str__(self): + return self.title + + def get_absolute_url(self): + return reverse("fieldnotes:detail", kwargs={"year": self.pub_date.year, "month": self.pub_date.strftime("%m"), "slug": self.slug}) + + def get_object_type(self): + return 'fieldnote' + + @property + def region(self): + return self.location.lux_region + + @property + def longitude(self): + '''Get the site's longitude.''' + return round(self.point.x, 2) + + @property + def latitude(self): + '''Get the site's latitude.''' + return round(self.point.y, 2) + + @property + def get_previous_published(self): + return self.get_previous_by_pub_date() + + @property + def get_next_published(self): + return self.get_next_by_pub_date() + + @property + def get_previous_admin_url(self): + n = self.get_previous_by_pub_date() + return reverse('admin:%s_%s_change' %(self._meta.app_label, self._meta.model_name), args=[n.id] ) + + @property + def get_next_admin_url(self): + model = apps.get_model(app_label=self._meta.app_label, model_name=self._meta.model_name) + try: + return reverse('admin:%s_%s_change' %(self._meta.app_label, self._meta.model_name), args=[self.get_next_by_pub_date().pk] ) + except model.DoesNotExist: + return '' + + def save(self, *args, **kwargs): + md = render_images(self.body_markdown) + self.body_html = markdown_to_html(md) + if not self.point: + self.point = CheckIn.objects.latest().point + try: + self.location = Location.objects.filter(geometry__contains=self.point).get() + except Location.DoesNotExist: + raise forms.ValidationError("There is no location associated with that point, add it: %sadmin/locations/location/add/" % (settings.BASE_URL)) + if not self.id: + self.pub_date = timezone.now() + self.date_last_updated = timezone.now() + self.featured_image = extract_main_image(self.body_markdown) + super(FieldNote, self).save() + + +class FieldNoteSitemap(Sitemap): + changefreq = "never" + priority = 0.7 + protocol = "https" + + def items(self): + return FieldNote.objects.filter(status=1) + + def lastmod(self, obj): + return obj.pub_date diff --git a/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_archive_list_date.html b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_archive_list_date.html new file mode 100644 index 0000000..5d6865f --- /dev/null +++ b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_archive_list_date.html @@ -0,0 +1,43 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% load html5_datetime %} +{% block pagetitle %} Field Notes | luxagraf {% endblock %} +{% block metadescription %} Rough notes and sketches from the field {% endblock %} +{%block bodyid%}id="field-notes"{%endblock%} + +{% block primary %} + +
+
+

Field Notes {% if month or year %}{% if month %} from {{month|date:"F"}} {{month|date:"Y"}}{%else%} from {{year|date:"Y"}}{%endif%}{%endif%}

+

Quick notes, sketches and images from the road. This is the semi-orgnized brain dump that comes before the more organized journal entries and essays. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot few people read it.

+
+ +
+ +{% endblock %} + + + diff --git a/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_detail.html b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_detail.html new file mode 100644 index 0000000..d1c648b --- /dev/null +++ b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_detail.html @@ -0,0 +1,95 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% load html5_datetime %} +{% load month_number_to_name %} +{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Field Notes{% endblock %} + +{% block metadescription %}{{object.body_html|striptags|safe|truncatewords:30}}{% endblock %} +{%block extrahead%} + + + + + +{%endblock%} +{% block bodyid %}class="notes--permalin detail" id="archive-{% if month %}{{month|month_number_to_name}}{%endif%}{{year}}"{%endblock%} +{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} +{% block primary %}
+
+
+

{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}

+ {% if object.subtitle %}

{{object.subtitle|smartypants|safe}}

{%endif%} +
+ {% if object.location %}
+

{% if object.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name|safe}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name|safe}}{%endif%}

+ – Map +
{%endif%} + + +
+
+
+ {{object.body_html|safe|smartypants}} +
+ + + + + + + + {% with object.get_next_published as next %} + {% with object.get_previous_published as prev %} + {%endwith%}{%endwith%} +
+
+{% endblock %} + +{% block js %} + +{%endblock%} diff --git a/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_list.html b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_list.html new file mode 100644 index 0000000..37cd0ca --- /dev/null +++ b/app/unused_apps/fieldnotes/templates/fieldnotes/fieldnote_list.html @@ -0,0 +1,49 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% load get_next %} +{% load html5_datetime %} +{% load pagination_tags %} +{% block pagetitle %} Field Notes | luxagraf {% endblock %} +{% block metadescription %}Rough notes and sketches from the field {% endblock %} +{%block bodyid%}id="field-notes"{%endblock%} +{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} +{% block primary %}
+
+

Field Notes

+

Quick notes, sketches, and images from the road. This is the semi-organized brain dump that comes before the more organized journal entries. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot fewer people read it.

+
+ {% autopaginate object_list 30 %} + +
+ +{% endblock %} + + + diff --git a/app/unused_apps/fieldnotes/urls.py b/app/unused_apps/fieldnotes/urls.py new file mode 100644 index 0000000..85ee710 --- /dev/null +++ b/app/unused_apps/fieldnotes/urls.py @@ -0,0 +1,39 @@ +from django.urls import path, re_path + +from . import views + +app_name = "field notes" + +urlpatterns = [ + re_path( + r'(?P[0-9]{4})/$', + views.FieldNoteYearArchiveView.as_view(), + name="list_year" + ), + path( + r'', + views.FieldNoteListView.as_view(), + {'page': 1}, + name="list" + ), + path( + r'/', + views.FieldNoteListView.as_view(), + name="list" + ), + path( + r'//.txt', + views.FieldNoteDetailViewTXT.as_view(), + name="detail-txt" + ), + path( + r'//', + views.FieldNoteDetailView.as_view(), + name="detail" + ), + path( + r'//', + views.FieldNoteMonthArchiveView.as_view(month_format='%m'), + name="list_month" + ), +] diff --git a/app/unused_apps/fieldnotes/views.py b/app/unused_apps/fieldnotes/views.py new file mode 100644 index 0000000..9b49cc0 --- /dev/null +++ b/app/unused_apps/fieldnotes/views.py @@ -0,0 +1,37 @@ +from django.views.generic.dates import YearArchiveView, MonthArchiveView +from django.views.generic.detail import DetailView + +from utils.views import PaginatedListView, LuxDetailView + +from .models import FieldNote + + +class FieldNoteListView(PaginatedListView): + model = FieldNote + """ + Return a list of Notes in reverse chronological order + """ + queryset = FieldNote.objects.filter(status=1).order_by('-pub_date') + + +class FieldNoteDetailView(LuxDetailView): + model = FieldNote + slug_field = "slug" + + +class FieldNoteDetailViewTXT(FieldNoteDetailView): + template_name = "jrnl/entry.txt" + + +class FieldNoteYearArchiveView(YearArchiveView): + queryset = FieldNote.objects.filter(status=1) + date_field = "pub_date" + template_name = "fieldnotes/fieldnote_archive_list_date.html" + make_object_list = True + + +class FieldNoteMonthArchiveView(MonthArchiveView): + queryset = FieldNote.objects.filter(status=1) + date_field = "pub_date" + make_object_list = True + template_name = "fieldnotes/fieldnote_archive_list_date.html" -- cgit v1.2.3-70-g09d2