Merge pull request #96 from BenShelton/develop

v1.1.2
BenShelton · Oct 30, 2019 · 2dd1fd4 · 2dd1fd4
2 parents fb685d2 + ec813d9
commit 2dd1fd4
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 11 deletions.
diff --git a/database/scraper.ts b/database/scraper.ts
@@ -140,7 +140,6 @@ export default function scrapeWOL (date: string, language: Languages): Promise<{
         'assignments.openingPrayer.inherit': inherit.includes('openingPrayer'),
         'assignments.gems.text': 'N/A',
         'assignments.gems.type': 'gems',
-        'assignments.gems.time': '8 min.',
         'assignments.gems.inherit': inherit.includes('gems'),
         'assignments.reader.text': 'N/A',
         'assignments.reader.type': 'reader',
@@ -161,6 +160,12 @@ export default function scrapeWOL (date: string, language: Languages): Promise<{
         [highlightsPath + 'inherit']: inherit.includes('highlights')
       })
 
+      // Gems
+      const gemsText = $(paragraphSelector, '#section2').eq(1).text().trim()
+      Object.assign(update, {
+        'assignments.gems.time': safeRegex(timeRegex, gemsText)
+      })
+
       // Bible Reading
       const bibleReadingP = $(paragraphSelector, '#section2').last()
       const bibleReadingText = bibleReadingP.text().trim()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oclm-planner",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "serve": "npm-run-all --parallel serve:**",

diff --git a/src/components/Schedule/ScheduleWeekView.vue b/src/components/Schedule/ScheduleWeekView.vue
@@ -446,7 +446,7 @@ export default class ScheduleWeekView extends Vue {
       { name: 'serviceTalk1', displayName: 'Service Talk 1' },
       { name: 'serviceTalk2', displayName: 'Service Talk 2' },
       { name: 'congregationBibleStudy', displayName: 'Congregation Bible Study' },
-      { name: 'reader', displayName: 'Reader' },
+      { name: 'reader', displayName: 'CBS Reader' },
       { name: 'closingPrayer', displayName: 'Closing Prayer' }
     ]
     return assignmentRefs.reduce((acc, { name, displayName }) => {

diff --git a/src/constants.ts b/src/constants.ts
@@ -23,21 +23,21 @@ export const ASSIGNMENT_TYPE_MAP = {
 
 export const PRIVILEGES = [
   { name: 'Chairman', key: 'chairman' },
-  { name: 'Highlights', key: 'highlights' },
-  { name: 'Gems', key: 'gems' },
-  { name: 'Service Talk', key: 'serviceTalk' },
+  { name: 'Highlights', key: 'highlights', tip: 'The first talk in the "Treasures From God\'s Word" section' },
+  { name: 'Gems', key: 'gems', tip: 'AKA "Digging for Spiritual Gems"' },
+  { name: 'Service Talk', key: 'serviceTalk', tip: 'Either of the first 2 talks in the "Living As Christians" section' },
   { name: 'Congregation Bible Study', key: 'congregationBibleStudy' },
-  { name: 'Reader', key: 'reader' },
+  { name: 'CBS Reader', key: 'reader' },
   { name: 'Prayer', key: 'prayer' },
   { name: 'Bible Reading', key: 'bibleReading' },
-  { name: 'Ministry Video', key: 'ministryVideo' },
+  { name: 'Ministry Video', key: 'ministryVideo', tip: 'Normally assigned to the chairman and the first item in "Apply Yourself To The Field Ministry"' },
   { name: 'Initial Call', key: 'initialCall' },
   { name: 'Initial Call Assistant', key: 'initialCallAssist' },
   { name: 'Return Visit', key: 'returnVisit' },
   { name: 'Return Visit Assistant', key: 'returnVisitAssist' },
   { name: 'Bible Study', key: 'bibleStudy' },
   { name: 'Bible Study Assistant', key: 'bibleStudyAssist' },
-  { name: 'Student Talk', key: 'studentTalk' }
+  { name: 'Student Talk', key: 'studentTalk', tip: 'A "Talk" student assignment, normally the last item in "Apply Yourself To The Field Ministry"' }
 ] as const
 
 export const COLORS = {

diff --git a/src/plugins/pdfMake.ts b/src/plugins/pdfMake.ts
@@ -389,7 +389,7 @@ export const generateSchedule: PDFGenerator = function (weeks, month) {
     const bibleReadingTitle = `${translation.bibleReading} (${bibleReading.time}): ${bibleReading.title}`
     stack.push(createScheduleTable(COLORS.TREASURES, [
       [timer, getAssignmentTitle(highlights), null, getScheduleAssignees(highlights, coVisit), addTime(highlights.time), highlights.inherit],
-      [timer, translation.gems + ' (10 min.)', null, getScheduleAssignees(gems, coVisit), addTime(gems.time), gems.inherit],
+      [timer, `${translation.gems} (${gems.time})`, null, getScheduleAssignees(gems, coVisit), addTime(gems.time), gems.inherit],
       [timer, bibleReadingTitle, null, getScheduleAssignees(bibleReading, coVisit), addTime(bibleReading.time), bibleReading.inherit, true]
     ]))
 

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -16,6 +16,7 @@ Vue.use(Router)
 const router = new Router({
   mode: 'history',
   base: process.env.BASE_URL,
+  scrollBehavior: () => ({ x: 0, y: 0 }),
   routes: [
     {
       path: '/',

diff --git a/src/views/Congregation.vue b/src/views/Congregation.vue
@@ -47,6 +47,14 @@
               <p class="mt-3 mb-0 subheading">
                 Privileges
               </p>
+              <v-layout align-center class="mt-1 ml-1 grey--text text--darken-1">
+                <span class="font-weight-bold mr-1">TIP:</span>
+                <span>Hover over</span>
+                <v-icon size="19" class="mx-1">
+                  help
+                </v-icon>
+                <span>to see more details of an assignment</span>
+              </v-layout>
               <v-layout wrap>
                 <v-flex
                   v-for="privilege of PRIVILEGES"
@@ -59,7 +67,23 @@
                     v-model="editMember.privileges[privilege.key]"
                     hide-details
                     :label="privilege.name"
-                  />
+                  >
+                    <div slot="label">
+                      <span v-text="privilege.name" />
+                      <v-tooltip v-if="privilege.tip" top>
+                        <template #activator="{ on }">
+                          <v-icon
+                            class="ml-1"
+                            size="19"
+                            v-on="on"
+                          >
+                            help
+                          </v-icon>
+                        </template>
+                        <span v-text="privilege.tip" />
+                      </v-tooltip>
+                    </div>
+                  </v-checkbox>
                 </v-flex>
               </v-layout>
             </v-container>

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -68,6 +68,22 @@ export default Vue.extend({
   computed: {
     changes (): IChange[] {
       return [
+        {
+          version: '1.1.2',
+          date: '30 Oct 2019',
+          summary: 'Updates for Gems & UX improvements',
+          updates: [
+            { title: 'Features', items: ['Tooltips added to some privileges to clarify which item they apply to'] },
+            {
+              title: 'Fixes',
+              items: [
+                'Gems time no longer always shows "(10 min.)" on the schedule',
+                'Gems time is downloaded properly from the site rather than always being set to "(8 min.)"',
+                'Page now scrolls to the top after changing pages'
+              ]
+            }
+          ]
+        },
         {
           version: '1.1.1',
           date: '19 Oct 2019',