From 9f1e258180841dd02ef33b8b39082e716f093b99 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 13:46:03 -0500
Subject: [PATCH] Added recurrence to new request add/edit page (#16)

still need to get the actual non-immediate recurrence stuff to work correctly
---
 src/app/src/App.vue                           |  8 ++
 .../src/components/request/EditRequest.vue    | 87 +++++++++++++++----
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index 0b39c32..a034b44 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -101,6 +101,14 @@ a[role="button"]:hover {
   color: white;
   text-decoration: none;
 }
+label {
+  font-variant: small-caps;
+  font-size: 1.1rem;
+}
+label.normal {
+  font-variant: unset;
+  font-size: unset;
+}
 footer {
   border-top: solid 1px lightgray;
   margin-top: 1rem;
diff --git a/src/app/src/components/request/EditRequest.vue b/src/app/src/components/request/EditRequest.vue
index 22a35d9..6d1f876 100644
--- a/src/app/src/components/request/EditRequest.vue
+++ b/src/app/src/components/request/EditRequest.vue
@@ -12,22 +12,52 @@ article.mpj-main-content(role='main')
     template(v-if='!isNew')
       label Also Mark As
       br
-      input(type='radio'
-            id='status_updated'
-            value='Updated'
-            v-model='form.status')
-      label(for='status_updated')= ' Updated'
-      input(type='radio'
-            id='status_prayed'
-            value='Prayed'
-            v-model='form.status')
-      label(for='status_prayed')= ' Prayed'
-      input(type='radio'
-            id='status_answered'
-            value='Answered'
-            v-model='form.status')
-      label(for='status_answered')= ' Answered'
-    br(v-else)
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Updated')
+        | Updated
+      | &nbsp; &nbsp;
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Prayed')
+        | Prayed
+      | &nbsp; &nbsp;
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Answered')
+        | Answered
+      br
+    label Recurrence
+    | &nbsp; &nbsp;
+    em.mpj-muted-text After prayer, request reappears...
+    br
+    label.normal
+      input(v-model='form.recur.typ'
+            type='radio'
+            name='recur'
+            value='immediate')
+      | Immediately
+    | &nbsp; &nbsp;
+    label.normal
+      input(v-model='form.recur.typ'
+            type='radio'
+            name='recur'
+            value='other')
+      | Every...
+    input#recur_count(v-model='form.recur.count'
+                      type='number'
+                      :disabled='!showRecurrence')
+    select(v-model='form.recur.other'
+           :disabled='!showRecurrence')
+      option(value='hours') hours
+      option(value='days') days
+      option(value='weeks') weeks
     .mpj-text-right
       button(@click.stop='saveRequest()').primary
         md-icon(icon='save')
@@ -60,7 +90,12 @@ export default {
       form: {
         requestId: '',
         requestText: '',
-        status: 'Updated'
+        status: 'Updated',
+        recur: {
+          typ: 'immediate',
+          other: '',
+          count: ''
+        }
       }
     }
   },
@@ -68,6 +103,9 @@ export default {
     toast () {
       return this.$parent.$refs.toast
     },
+    showRecurrence () {
+      this.form.recur.typ !== 'immediate'
+    },
     ...mapState(['journal'])
   },
   async mounted () {
@@ -77,6 +115,9 @@ export default {
       this.form.requestId = ''
       this.form.requestText = ''
       this.form.status = 'Created'
+      this.form.recur.typ = 'immediate'
+      this.form.recur.other = ''
+      this.form.recur.count = ''
     } else {
       this.title = 'Edit Prayer Request'
       this.isNew = false
@@ -87,6 +128,15 @@ export default {
       this.form.requestId = this.id
       this.form.requestText = req.text
       this.form.status = 'Updated'
+      if (req.recurType === 'immediate') {
+        this.form.recur.typ = 'immediate'
+        this.form.recur.other = ''
+        this.form.recur.count = ''
+      } else {
+        this.form.recur.typ = 'other'
+        this.form.recur.other = req.recurType
+        this.form.recur.count = req.recurCount
+      }
     }
   },
   methods: {
@@ -126,4 +176,7 @@ export default {
 #request_text {
   width: 100%;
 }
+#recur_count {
+  width: 3rem;
+}
 </style>