From 3c5b64db0b1fb3aba50cb9be30c7d749f2995cb9 Mon Sep 17 00:00:00 2001
From: Zak Timson <zaktimson@gmail.com>
Date: Sun, 14 Jan 2018 21:10:47 -0500
Subject: [PATCH] Added order to charter members

---
 charter_members/admin.py                      |   2 +-
 .../migrations/0004_attorney_order.py         |  20 ++++++++++++++++++
 charter_members/models.py                     |   1 +
 main/views.py                                 |   2 +-
 media/portraits/download.jpg                  | Bin 0 -> 4107 bytes
 .../migrations/0004_auto_20180114_2108.py     |  20 ++++++++++++++++++
 6 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 charter_members/migrations/0004_attorney_order.py
 create mode 100644 media/portraits/download.jpg
 create mode 100644 newsletters/migrations/0004_auto_20180114_2108.py

diff --git a/charter_members/admin.py b/charter_members/admin.py
index d89f125..55300b0 100644
--- a/charter_members/admin.py
+++ b/charter_members/admin.py
@@ -12,5 +12,5 @@ class MemberAdmin(admin.ModelAdmin):
     list_display = ['name', 'position', 'chapter', 'phone_formatted', 'email', 'front_page', 'joined', 'thumbnail']
     list_filter = ['chapter', 'position', 'front_page', 'joined']
     search_fields = ['email', 'joined', 'name', 'chapter', 'position', 'website', 'phone', 'phone_formatted']
-    fields = ['image_preview', 'image', 'name', 'position', 'chapter', 'biography', 'phone', 'email', 'website', 'front_page', 'joined']
+    fields = ['image_preview', 'image', 'name', 'position', 'chapter', 'biography', 'phone', 'email', 'website', 'front_page', 'order', 'joined']
     readonly_fields = ['image_preview']
diff --git a/charter_members/migrations/0004_attorney_order.py b/charter_members/migrations/0004_attorney_order.py
new file mode 100644
index 0000000..613c78e
--- /dev/null
+++ b/charter_members/migrations/0004_attorney_order.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-01-15 02:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('charter_members', '0003_auto_20180114_1722'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='attorney',
+            name='order',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Order On Front Page'),
+        ),
+    ]
diff --git a/charter_members/models.py b/charter_members/models.py
index a599d33..b8a898b 100644
--- a/charter_members/models.py
+++ b/charter_members/models.py
@@ -26,6 +26,7 @@ class Attorney(models.Model):
     image = models.ImageField(upload_to='portraits', default='portraits/silhouette.png')
     joined = models.DateField(blank=True, null=True)
     name = models.CharField(max_length=100)
+    order = models.IntegerField(blank=True, null=True, verbose_name='Order On Front Page')
     phone = models.CharField(max_length=10, blank=True, null=True)
     position = models.ForeignKey(Position)
     website = models.CharField(max_length=255, blank=True, null=True)
diff --git a/main/views.py b/main/views.py
index 2245def..88def91 100644
--- a/main/views.py
+++ b/main/views.py
@@ -13,7 +13,7 @@ from OACPL import settings
 
 
 def index(request):
-    attorneys = Attorney.objects.filter(front_page=True)
+    attorneys = Attorney.objects.filter(front_page=True).order_by('order')
     return render(request, 'index.html', {'attorneys': attorneys, 'contact': settings.EMAIL_CONTACT})
 
 
diff --git a/media/portraits/download.jpg b/media/portraits/download.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e69358d94a9c21f19d6061d4532f96e7c79ad973
GIT binary patch
literal 4107
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

literal 0
HcmV?d00001

diff --git a/newsletters/migrations/0004_auto_20180114_2108.py b/newsletters/migrations/0004_auto_20180114_2108.py
new file mode 100644
index 0000000..cb7d632
--- /dev/null
+++ b/newsletters/migrations/0004_auto_20180114_2108.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-01-15 02:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('newsletters', '0003_subscriber_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscriber',
+            name='date',
+            field=models.DateField(auto_now_add=True),
+        ),
+    ]