Major updates to Feasts

  * Drop the old JSON-format data storage and use the new CSV instead

  * Drop the JSON ORM and use a new system of classes based on attrs

  * Show texts on the feast details view

  * Visual improvements (fonts and colors)

data/feasts.csv

@@ -0,0 +1,7 @@
+name,introit,collect,epistle_ref,epistle,gat,gradual,alleluia,tract,gospel_ref,gospel,offertory,communion
+Advent I,"Unto thee, O Lord, lift I up my soul; O my God, in thee have I trusted, let me not be confounded: neither let mine enemies triumph over me; for all they that look for thee shall not be ashamed. Shew me thy ways, O Lord: and teach me thy paths. Glory be to the Father, and to the Son, and to the Holy Ghost: As it was in the beginning, is now, and ever shall be: world without end. Amen.","ALMIGHTY God, give us grace that we may cast away the works of darkness, and put upon us the armour of light, now in the time of this mortal life, in which thy Son Jesus Christ came to visit us in great humility; that in the last day, when he shall come again in his glorious Majesty, to judge both the quick and the dead, we may rise to the life immortal; through him who liveth and reigneth with thee and the Holy Ghost, now and ever. Amen.",Romans 13:81-4,OWE no man any thing…,Gradual and Alleluia Proper,For all they that look for thee…,Alleluia. Alleluia…. Alleluia.,,St. Matthew 21:1-13,WHEN they drew nigh unto Jerusalem…,"Unto thee, O Lord, lift I up my soul …",The Lord shall …
+Christmas Day,"Unto us a Child is born; unto us a Son is given: and the government shall be upon his shoulder; and his Name shall be called, Angel of mighty Counsel. O sing unto the Lord a new song: for he hath done marvellous things. Glory be to the Father, and to the Son, and to the Holy Ghost: As it was in the beginning, is now, and ever shall be: world without end. Amen.","ALMIGHTY God, who hast given us thy only-begotten Son to take our nature upon him, and as at this time to be born of a pure Virgin: Grant that we being regenerate, and made thy children by adoption and grace, may daily be renewed by thy Holy Spirit; through the same our Lord Jesus Christ, who liveth and reigneth with thee and the same Spirit, ever one God, world without end. Amen.",Hebrews 1:1-12,"GOD, who at sundry times and in divers manners spake in time past unto the fathers by the prophets, hath in these last days spoken unto us by his Son, whom he hath appointed heir of all things, by whom also he made the worlds; who being the brightness of his glory, and the express image of his person, and upholding all things by the word of his power, when he had by himself purged our sins, sat down on the right hand of the Majesty on high; being made so much better than the angels, as he hath by inheritance obtained a more excellent name than they. For unto which of the angels said he at any time, Thou art my Son, this day have I begotten thee? And again, I will be to him a Father, and he shall be to me a Son? And again, when he bringeth in the first-begotten into the world, he saith, And let all the angels of God worship him. And of the angels he saith, Who maketh his angels spirits, and his ministers a flame of fire. But unto the Son he saith, Thy throne, O God, is for ever and ever; a sceptre of righteousness is the sceptre of thy kingdom: Thou hast loved righteousness, and hated iniquity; therefore God, even thy God, hath anointed thee with the oil of gladness above thy fellows. And, Thou, Lord, in the beginning hast laid the foundation of the earth; and the heavens are the works of thine hands: they shall perish, but thou remainest; and they all shall wax old as doth a garment; and as a vesture shalt thou fold them up, and they shall be changed; but thou art the same, and thy years shall not fail.",Gradual and Alleluia Proper,"All the ends of the earth have seen the salvation of our God: O be joyful in God, all ye lands. The Lord hath declared his salvation: in the sight of the heathen hath he openly shewed his righteousness.","Alleluia. Alleluia. A hallowed day hath dawned upon the earth; come, ye nations, and worship the Lord: for on this day a great light hath descended upon the earth. Alleluia.",,St. John 1:1-14,"IN the beginning was the Word, and the Word was with God, and the Word was God. The same was in the beginning with God. All things were made by him; and without him was not any thing made that was made. In him was life, and the life was the light of men. And the light shineth in darkness, and the darkness comprehended it not. There was a man sent from God, whose name was John. The same came for a witness, to bear witness of the light, that all men through him might believe. He was not that light, but was sent to bear witness of that light. That was the true light, which lighteth every man that cometh into the world. He was in the world, and the world was made by him, and the world knew him not. He came unto his own, and his own received him not. But as many as received him, to them gave he power to become the sons of God, even to them that believe on his Name: which were born, not of blood, nor of the will of the flesh, nor of the will of man, but of God. And the Word was made flesh, and dwelt among us (and we beheld his glory, the glory as of the only-begotten of the Father) full of grace and truth.","The heavens are thine, the earth also is thine; thou hast laid the foundations of the round world, and all that therein is: righteousness and equity are the habitation of thy seat.","Be joyful, O daughter of Sion, sing praises, O daughter of Jerusalem: behold, thy king cometh; he is righteous and having salvation."
+Septuagesima,Septuagesima Introit,Septuagesima Collect,Septuagesima Epistle-ref,Septuagesima Epistle,Gradual and Alleluia Proper,Septuagesima Gradual,,Septuagesima Tract,Septuagesima Gospel-ref,Septuagesima Gospel,Septuagesima Offertory,Septuagesima Communion
+Lent I,Lent I Introit,Lent I Collect,Lent I Epistle-ref,Lent I Epistle,Gradual and Tract,Lent I Gradual,,Lent I Tract,Lent I Gospel-ref,Lent I Gospel,Lent I Offertory,Lent I Communion
+Maundy Thursday,Maundy Thursday Introit,Maundy Thursday Collect,Maundy Thursday Epistle-ref,Maundy Thursday Epistle,Gradual,Maundy Thursday Gradual,,,Maundy Thursday Gospel-ref,Maundy Thursday Gospel,Maundy Thursday Offertory,Maundy Thursday Communion
+Easter Day,Easter Day Introit,Easter Day Collect,Easter Day Epistle-ref,Easter Day Epistle,Gradual and Alleluia Proper,Easter Day Gradual,Easter Day Alleluia,,Easter Day Gospel-ref,Easter Day Gospel,Easter Day Offertory,Easter Day Communion

forms.py

@@ -7,20 +7,23 @@
 from wtforms.validators import DataRequired, StopValidation
 from wtforms.widgets import TextArea
 
-from models import Feast
+from models import Feast, feasts_fields
 
 
 class IsCsv:
     def __init__(self):
         self.field_flags = {"required": True}
 
     def __call__(self, form, field):
-        """Checks that the submitted text is valid csv."""
+        """Checks that the submitted text is valid csv and that the
+        expected columns are present."""
         try:
-            pd.read_csv(StringIO(field.data))
+            df = pd.read_csv(StringIO(field.data))
         except pandas.errors.ParserError:
             field.errors[:] = []
             raise StopValidation("This needs to be valid CSV.")
+        if set(df.columns) != set(feasts_fields):
+            raise StopValidation(f'The CSV is expected to have the field names {feasts_fields}')
 
 
 class MyForm(FlaskForm):
@@ -32,8 +35,10 @@ class MyForm(FlaskForm):
 
 
 class PewSheetForm(FlaskForm):
+    feast_names = [feast.name for feast in Feast.all()]
     title = StringField('Title', validators=[DataRequired()])
-    feast_name = SelectField('Feast', choices=[feast.name for feast in Feast.all()])
+    primary_feast_name = SelectField('Feast', choices=feast_names)
+    secondary_feast_name = SelectField('Feast', choices=feast_names)
     date = DateField('Date', validators=[DataRequired()])
 
 

models.py

@@ -1,55 +1,75 @@
-import json
 import os
 
+import pandas as pd
+from attr import define, field
 from docx import Document
-from dotmap import DotMap
 
+feasts_fields = ['name', 'introit', 'collect', 'epistle_ref', 'epistle',
+                 'gat', 'gradual', 'alleluia', 'tract', 'gospel_ref',
+                 'gospel', 'offertory', 'communion']
 
-class Jorm(DotMap):
-    """Lightweight ORM where data is stored in a JSON file."""
-    datafile = None
 
-    class NotFoundError(Exception):
-        pass
+class NotFoundError(Exception):
+    pass
 
-    class MultipleReturnedError(Exception):
-        pass
 
-    @classmethod
-    def all(cls):
-        with open(cls.datafile) as f:
-            return [cls(x) for x in json.load(f)]
+class MultipleReturnedError(Exception):
+    pass
 
-    @classmethod
-    def filter(cls, **kwargs):
-        return [
-            x for x in cls.all()
-            if all(x[k] == kwargs[k] for k in kwargs.keys())
-        ]
 
-    @classmethod
-    def get(cls, **kwargs):
-        filtered = cls.filter(**kwargs)
-        n = len(filtered)
-        if n == 0:
-            raise cls.NotFoundError(cls, kwargs)
-        if n > 1:
-            raise cls.MultipleReturnedError(cls, kwargs, n)
-        return filtered[0]
+def get(collection, **kwargs):
+    f = lambda x: all(getattr(x, k) == v for k, v in kwargs.items())
+    filtered = list(filter(f, collection))
+
+    n = len(filtered)
+    if n == 0:
+        raise NotFoundError(kwargs)
+    if n > 1:
+        raise MultipleReturnedError(kwargs, n)
+    return filtered[0]
 
 
+@define
 class Feast:
+    name: str = field()
+    introit: str = field()
+    collect: str = field()
+    epistle_ref: str = field()
+    epistle: str = field()
+    gat: str = field()
+    gradual: str = field()
+    alleluia: str = field()
+    tract: str = field()
+    gospel_ref: str = field()
+    gospel: str = field()
+    offertory: str = field()
+    communion: str = field()
+
+    feasts_df = pd.read_csv(
+        os.path.join(os.path.dirname(__file__), 'data', 'feasts.csv')
+    )
+    assert list(feasts_df.columns) == feasts_fields
 
-    datafile = os.path.join(os.path.dirname(__file__), 'data', 'feasts.json')
+    @classmethod
+    def all(cls):
+        # attrs provides a __init__ that takes kwargs
+        # noinspection PyArgumentList
+        return [cls(**info) for _, info in cls.feasts_df.iterrows()]
+
+    @classmethod
+    def get(cls, **kwargs):
+        return get(cls.all(), **kwargs)
 
     def create_docx(self, path):
         document = Document()
         document.add_heading(self.name, 0)
         document.save(path)
 
 
-class Extract(Jorm):
-    datafile = os.path.join(os.path.dirname(__file__), 'data', 'texts.json')
+@define
+class Service:
+    primary_feast: Feast = field()
+    secondary_feast: Feast = field()
 
 
 class PewSheet:

requirements.txt

@@ -1,3 +1,4 @@
+attrs~=21.2.0
 docx2pdf~=0.1.8
 dotmap~=1.3.26
 Flask~=1.1.2

static/styles.css

@@ -2,6 +2,14 @@ body {
     --bs-body-bg: hsl(38, 23%, 5%);
 }
 
+main {
+    padding-bottom: 2in;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: "Book Antiqua", serif;
+}
+
 #navbar {
     /*background-color: black;*/
     /*noinspection CssUnresolvedCustomProperty*/

templates/feastDetails.html

@@ -3,26 +3,64 @@
 {% block content %}
     <div class="row">
         <div class="col">
-            <h1>{{ feast.name }}</h1>
+            <div class="row">
+                <div class="col">
+                    <h1>{{ feast.name }}</h1>
+                </div>
+                <div class="col">
+                    <p>
+                        <a class="btn btn-primary mx-1" href="{{ url_for('feast_docx_view', name=feast.name) }}">.docx</a>
+                        <a class="btn btn-danger mx-1" href="{{ url_for('feast_pdf_view', name=feast.name) }}">.pdf</a>
+                    </p>
+                </div>
+            </div>
+
+            <h2>Introit</h2>
+            <p>{{ feast.introit }}</p>
+
+            <h2>Collect</h2>
+            <p>{{ feast.collect }}</p>
+
+            <h2>Epistle</h2>
+            <p><i>{{ feast.epistle_ref }}</i></p>
+            <p>{{ feast.epistle }}</p>
+
+            {% if 'Gradual' in feast.gat %}
+                <h2>Gradual</h2>
+                <p>{{ feast.gradual }}</p>
+            {% endif %}
+            {% if 'Alleluia' in feast.gat %}
+                <h2>Alleluia</h2>
+                <p>{{ feast.alleluia }}</p>
+            {% endif %}
+            {% if 'Tract' in feast.gat %}
+                <h2>Tract</h2>
+                <p>{{ feast.tract }}</p>
+            {% endif %}
+
+            <h2>Gospel</h2>
+            <p><i>{{ feast.gospel_ref }}</i></p>
+            <p>{{ feast.gospel }}</p>
+
+            <h2>Offertory</h2>
+            <p>{{ feast.offertory }}</p>
+
+            <h2>Communion</h2>
+            <p>{{ feast.communion }}</p>
         </div>
-        <div class="col">
-            <p>
-                <a class="btn btn-primary mx-1" href="{{ url_for('feast_docx_view', name=feast.name) }}">.docx</a>
-                <a class="btn btn-danger mx-1" href="{{ url_for('feast_pdf_view', name=feast.name) }}">.pdf</a>
-            </p>
+
+
+        <div class="col-2">
+            <ul class="list-unstyled">
+                {% for f in feasts %}
+                    <li>
+                        <a href="{{ url_for('feast_detail_view', name=f.name) }}"
+                           class="link-info text-decoration-none">
+                            {{ f.name }}
+                        </a>
+                    </li>
+                {% endfor %}
+            </ul>
         </div>
     </div>
-
-    {% for e in feast.elements %}
-        <p>
-            {% if 'Reading' in e %}
-                {% set extract = Extract.get(title=feast.elements[e]) %}
-                <strong>{{ e }}</strong> <em>{{ extract.title }}</em><br>
-                {{ extract.text }}
-            {% else %}
-                <strong>{{ e }}</strong><br>
-                {{ feast.elements[e] }}
-            {% endif %}
-        </p>
-    {% endfor %}
 {% endblock %}

templates/pewSheet.html

@@ -38,11 +38,11 @@ <h1>{{ pew_sheet.title }}</h1>
             </div>
 
             <div class="row mb-3">
-                {{ form.feast_name.label(class='col-sm-1 col-form-label') }}
+                {{ form.primary_feast_name.label(class='col-sm-1 col-form-label') }}
                 <div class="col-sm-5">
-                    {{ form.feast_name(class='form-select') }}
-                    {% if form.feast_name.errors %}
-                        {% for error in form.feast_name.errors %}
+                    {{ form.primary_feast_name(class='form-select') }}
+                    {% if form.primary_feast_name.errors %}
+                        {% for error in form.primary_feast_name.errors %}
                             <small class="font-small text-danger">
                                 {{ error }}
                             </small>
@@ -78,10 +78,10 @@ <h1>{{ pew_sheet.title }}</h1>
     <script>
         const autogenerate = document.getElementById('autogenerate');
         const titleField = document.getElementById('title');
-        const feastNameField = document.getElementById('feast_name');
+        const primaryFeastNameField = document.getElementById('primary_feast_name');
         const dateField = document.getElementById('date');
-        autogenerate.onclick = (evt) => {
-              titleField.value = feastNameField.value + ' ' + dateField.value;
+        autogenerate.onclick = () => {
+              titleField.value = primaryFeastNameField.value + ' ' + dateField.value;
         };
 
         const todayBtn = document.getElementById('today-btn');

views.py

@@ -8,10 +8,10 @@
 )
 
 from forms import MyForm, PewSheetForm, UpdateTextsForm
-from models import Feast, Extract, PewSheet
+from models import Feast, PewSheet, NotFoundError, get
 from utils import logger
 
-TEXTS_CSV = os.path.join(os.path.dirname(__file__), 'texts.csv')
+TEXTS_CSV = os.path.join(os.path.dirname(__file__), 'data', 'feasts.csv')
 
 
 def index_view():
@@ -33,14 +33,13 @@ def feast_index_view():
 
 def feast_detail_view(name, **kwargs):
     try:
-        feast = Feast.get(name=name)
-    except Feast.NotFoundError:
+        feasts = Feast.all()
+        feast = get(feasts, name=name)
+    except NotFoundError:
         flash(f'Feast {name} not found.')
         return make_response(feast_index_view(), 404)
 
-    return render_template(
-        'feastDetails.html', feast=feast, Extract=Extract, **kwargs
-    )
+    return render_template('feastDetails.html', feast=feast, feasts=feasts, **kwargs)
 
 
 def pew_sheet_create_view():
@@ -128,7 +127,7 @@ def texts_view():
 
 def texts_download_csv_view():
     return send_file(
-        TEXTS_CSV, as_attachment=True, attachment_filename='texts.csv'
+        TEXTS_CSV, as_attachment=True, attachment_filename='feasts.csv'
     )
 
 
@@ -138,7 +137,7 @@ def texts_download_xlsx_view():
         df = pd.read_csv(TEXTS_CSV)
         df.to_excel(xlsx_path, index=False)
         return send_file(
-            xlsx_path, as_attachment=True, attachment_filename='texts.xlsx'
+            xlsx_path, as_attachment=True, attachment_filename='feasts.xlsx'
         )