summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/fieldnotes/__init__.py0
-rw-r--r--app/fieldnotes/admin.py38
-rw-r--r--app/fieldnotes/build.py36
-rw-r--r--app/fieldnotes/migrations/0001_initial.py37
-rw-r--r--app/fieldnotes/migrations/0002_auto_20190303_1222.py25
-rw-r--r--app/fieldnotes/migrations/__init__.py0
-rw-r--r--app/fieldnotes/models.py111
-rw-r--r--app/fieldnotes/urls.py39
-rw-r--r--app/fieldnotes/views.py36
-rw-r--r--app/jrnl/migrations/0033_entry_field_notes_two.py19
-rw-r--r--app/jrnl/models.py2
-rw-r--r--app/photos/models.py3
12 files changed, 346 insertions, 0 deletions
diff --git a/app/fieldnotes/__init__.py b/app/fieldnotes/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/fieldnotes/__init__.py
diff --git a/app/fieldnotes/admin.py b/app/fieldnotes/admin.py
new file mode 100644
index 0000000..838063d
--- /dev/null
+++ b/app/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/fieldnotes/build.py b/app/fieldnotes/build.py
new file mode 100644
index 0000000..4c5c83b
--- /dev/null
+++ b/app/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/fieldnotes/migrations/0001_initial.py b/app/fieldnotes/migrations/0001_initial.py
new file mode 100644
index 0000000..cec67fb
--- /dev/null
+++ b/app/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/fieldnotes/migrations/0002_auto_20190303_1222.py b/app/fieldnotes/migrations/0002_auto_20190303_1222.py
new file mode 100644
index 0000000..c0e352e
--- /dev/null
+++ b/app/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/fieldnotes/migrations/__init__.py b/app/fieldnotes/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/fieldnotes/migrations/__init__.py
diff --git a/app/fieldnotes/models.py b/app/fieldnotes/models.py
new file mode 100644
index 0000000..e3cb527
--- /dev/null
+++ b/app/fieldnotes/models.py
@@ -0,0 +1,111 @@
+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('<img(.*)/>', 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})
+
+ @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()
+ if self.note_type == 1:
+ 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/fieldnotes/urls.py b/app/fieldnotes/urls.py
new file mode 100644
index 0000000..f3ef944
--- /dev/null
+++ b/app/fieldnotes/urls.py
@@ -0,0 +1,39 @@
+from django.urls import path, re_path
+
+from . import views
+
+app_name = "fieldnotes"
+
+urlpatterns = [
+ re_path(
+ r'(?P<year>[0-9]{4})/$',
+ views.FieldNoteYearArchiveView.as_view(),
+ name="list_year"
+ ),
+ path(
+ r'',
+ views.FieldNoteListView.as_view(),
+ {'page': 1},
+ name="list"
+ ),
+ path(
+ r'<int:page>/',
+ views.FieldNoteListView.as_view(),
+ name="list"
+ ),
+ path(
+ r'<int:year>/<int:month>/<str:slug>.txt',
+ views.FieldNoteDetailViewTXT.as_view(),
+ name="detail-txt"
+ ),
+ path(
+ r'<int:year>/<int:month>/<str:slug>',
+ views.FieldNoteDetailView.as_view(),
+ name="detail"
+ ),
+ path(
+ r'<int:year>/<int:month>/',
+ views.FieldNoteMonthArchiveView.as_view(month_format='%m'),
+ name="list_month"
+ ),
+]
diff --git a/app/fieldnotes/views.py b/app/fieldnotes/views.py
new file mode 100644
index 0000000..fefd138
--- /dev/null
+++ b/app/fieldnotes/views.py
@@ -0,0 +1,36 @@
+from django.views.generic.dates import YearArchiveView, MonthArchiveView
+from django.views.generic.detail import DetailView
+
+from utils.views import PaginatedListView
+
+from .models import FieldNote
+
+
+class FieldNoteListView(PaginatedListView):
+ """
+ Return a list of Notes in reverse chronological order
+ """
+ queryset = FieldNote.objects.filter(status=1).order_by('-pub_date')
+
+
+class FieldNoteDetailView(DetailView):
+ 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"
diff --git a/app/jrnl/migrations/0033_entry_field_notes_two.py b/app/jrnl/migrations/0033_entry_field_notes_two.py
new file mode 100644
index 0000000..b90e86b
--- /dev/null
+++ b/app/jrnl/migrations/0033_entry_field_notes_two.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1.7 on 2019-03-03 15:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('fieldnotes', '0002_auto_20190303_1222'),
+ ('jrnl', '0032_entry_subtitle'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='entry',
+ name='field_notes_two',
+ field=models.ManyToManyField(blank=True, to='fieldnotes.FieldNote'),
+ ),
+ ]
diff --git a/app/jrnl/models.py b/app/jrnl/models.py
index beb0723..dc2b3dc 100644
--- a/app/jrnl/models.py
+++ b/app/jrnl/models.py
@@ -22,6 +22,7 @@ from photos.models import PhotoGallery, LuxImage, LuxImageSize
from locations.models import Location
from sketches.models import Sketch
from books.models import Book
+from fieldnotes.models import FieldNote
from utils.util import render_images, parse_video, markdown_to_html
@@ -66,6 +67,7 @@ class Entry(models.Model):
featured_image = models.ForeignKey(LuxImage, on_delete=models.CASCADE, null=True, blank=True)
has_video = models.BooleanField(blank=True, default=False)
field_notes = models.ManyToManyField(Sketch, blank=True)
+ field_notes_two = models.ManyToManyField(FieldNote, blank=True)
books = models.ManyToManyField(Book, blank=True)
class Meta:
diff --git a/app/photos/models.py b/app/photos/models.py
index 2e022e2..df8eac4 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -159,6 +159,9 @@ class LuxImage(models.Model):
else:
return "%s/%s/%s_%s.%s" % (settings.IMAGES_ROOT, self.pub_date.strftime("%Y"), base, size, self.get_image_ext())
+ def get_thumbnail_url(self):
+ return self.get_image_by_size("tn")
+
def admin_thumbnail(self):
return format_html('<a href="%s"><img src="%s"></a>' % (self.get_image_by_size(), self.get_image_by_size("tn")))
admin_thumbnail.short_description = 'Thumbnail'
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-17 07:55:00 +0000