From 59642fc66e5f2a7ca7d3e9e9771b90a6d7334455 Mon Sep 17 00:00:00 2001
From: Gail Terman <gterman@gmail.com>
Date: Tue, 16 Aug 2022 08:53:00 -0400
Subject: [PATCH 1/5] fix hash links

---
 app/javascript/app.vue                    |  4 ++-
 app/javascript/components/hash_link.vue   | 21 +++++++++++++++
 app/javascript/reports/reports_screen.vue | 32 +++++++++++++----------
 app/javascript/shared/hash-links.mixin.js |  9 +++++++
 4 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 app/javascript/components/hash_link.vue
 create mode 100644 app/javascript/shared/hash-links.mixin.js

diff --git a/app/javascript/app.vue b/app/javascript/app.vue
index ceb044aaa..668afc55c 100644
--- a/app/javascript/app.vue
+++ b/app/javascript/app.vue
@@ -32,6 +32,7 @@ import VueCal from 'vue-cal'
 import 'vue-cal/dist/vuecal.css'
 import { mapState, mapActions } from 'vuex';
 import { FETCH_WORKFLOWS } from '@/store/schedule_workflow';
+import { hashLinksMixin } from './shared/hash-links.mixin';
 
 extend('email', email);
 extend('numeric', numeric);
@@ -54,7 +55,7 @@ export default  {
     BottomNavbar,
     SignAgreements
   },
-  mixins: [personSessionMixin, settingsMixin],
+  mixins: [personSessionMixin, settingsMixin, hashLinksMixin],
   data() {
     return {
       showOverlay: false
@@ -83,6 +84,7 @@ export default  {
     this.fetchSettings();
     // fetch the schedule state too
     this.fetchScheduleWorkflows();
+    setTimeout(() => this.scrollFix(this.$route.hash), 1)
   }
 }
 </script>
diff --git a/app/javascript/components/hash_link.vue b/app/javascript/components/hash_link.vue
new file mode 100644
index 000000000..53a606806
--- /dev/null
+++ b/app/javascript/components/hash_link.vue
@@ -0,0 +1,21 @@
+<template>
+  <router-link :to="to" @click.native="scrollFix(to)"><slot></slot></router-link>
+</template>
+
+<script>
+import hashLinksMixin from '@/shared/hash-links.mixin';
+
+export default {
+  name: "HashLink",
+  props: {
+    to: {
+      required: true
+    }
+  },
+  mixins: [hashLinksMixin]
+}
+</script>
+
+<style>
+
+</style>
diff --git a/app/javascript/reports/reports_screen.vue b/app/javascript/reports/reports_screen.vue
index 669d09a9d..10f348b80 100644
--- a/app/javascript/reports/reports_screen.vue
+++ b/app/javascript/reports/reports_screen.vue
@@ -2,11 +2,11 @@
   <div class="mb-3 scrollable">
     <p class="mt-2">These are interim reports.</p>
     <ul>
-      <li><a href="#participants">Participants</a></li>
-      <li><a href="#sessions">Sessions</a></li>
-      <li><a href="#conflicts">Conflicts</a></li>
-      <li><a href="#schedule">Schedule</a></li>
-      <li><a href="#prog-ops">Program Ops</a></li>
+      <li><hash-link to="#participants">Participants</hash-link></li>
+      <li><hash-link to="#sessions">Sessions</hash-link></li>
+      <li><hash-link to="#conflicts">Conflicts</hash-link></li>
+      <li><hash-link to="#schedule">Schedule</hash-link></li>
+      <li><hash-link to="#prog-ops">Program Ops</hash-link></li>
     </ul>
     <h5><a id="participants"></a>Participants</h5>
     <ul>
@@ -182,14 +182,6 @@
           <strong><em>Session data included</em></strong>: all sessions
         </p>
       </li>
-      <li>
-        <a href="/report/session_reports/daily_grid" target="_blank">Daily Grid</a>
-        <p class="ml-2">
-          <strong><em>Description</em></strong>: Session information for daily grid, one line per session<br />
-          <strong><em>Fields</em></strong>: Session title, area(s) of session, session format, session start time, session duration, session room<br />
-          <strong><em>Session data included</em></strong>: all scheduled sessions that are visible and published
-        </p>
-      </li>
       <li>
         <a href="/report/session_reports/streamed_and_recorded" target="_blank">Scheduled Sessions Streamed and/or Recorded</a>
         <p class="ml-2">
@@ -289,7 +281,7 @@
         <a href="/report/schedule_by_person" target="_blank">Schedule by Participant</a>
         <p class="ml-2">
           <strong><em>Description</em></strong>: Schedule for each participant, one line per person and session<br />
-          <strong><em>Fields</em></strong>: Person name, publishes name, participant status, session title, area(s) of session, session start time, room, moderator (y/n), invisible participant (y/n)<br />
+          <strong><em>Fields</em></strong>: Person name, published name, participant status, session title, area(s) of session, session start time, room, moderator (y/n), invisible participant (y/n)<br />
           <strong><em>Person data included</em></strong>: moderators, participants, invisible participants
         </p>
       </li>
@@ -314,6 +306,14 @@
           <strong><em>Person data included</em></strong>: moderators, participants, invisible participants
         </p>
       </li>
+      <li>
+        <a href="/report/session_reports/daily_grid" target="_blank">Daily Grid</a>
+        <p class="ml-2">
+          <strong><em>Description</em></strong>: Session information for daily grid, one line per session<br />
+          <strong><em>Fields</em></strong>: Session title, area(s) of session, session format, session start time, session duration, session room<br />
+          <strong><em>Session data included</em></strong>: all scheduled sessions that are visible and published
+        </p>
+      </li>
     </ul>
 
   </div>
@@ -321,9 +321,13 @@
 
 <script>
 import personSessionMixin from '@/auth/person_session.mixin'
+import HashLink from '@/components/hash_link.vue'
 
 export default {
   name: "ReportsScreen",
+  components: {
+    HashLink
+  },
   mixins: [
     personSessionMixin
   ]
diff --git a/app/javascript/shared/hash-links.mixin.js b/app/javascript/shared/hash-links.mixin.js
new file mode 100644
index 000000000..f82610d4b
--- /dev/null
+++ b/app/javascript/shared/hash-links.mixin.js
@@ -0,0 +1,9 @@
+export const hashLinksMixin = {
+  methods: {
+    scrollFix: function(hashbang) {
+      location.hash = hashbang;
+    }
+  }
+}
+
+export default hashLinksMixin;

From 671b43c1eb2b90d4f63a6299868ec74646b6cc36 Mon Sep 17 00:00:00 2001
From: Gail Terman <gterman@gmail.com>
Date: Tue, 16 Aug 2022 09:23:39 -0400
Subject: [PATCH 2/5] attempt 2 to fix scrolling

---
 app/javascript/app.router.js              |  9 +++++++++
 app/javascript/components/hash_link.vue   |  5 ++++-
 app/javascript/reports/reports_screen.vue | 14 +++++---------
 db/structure.sql                          |  6 +++++-
 jsconfig.json                             |  1 +
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/javascript/app.router.js b/app/javascript/app.router.js
index 6fa75824b..3b5f91dae 100644
--- a/app/javascript/app.router.js
+++ b/app/javascript/app.router.js
@@ -98,6 +98,15 @@ Vue.use(VueRouter);
 var con_roles=[], isAdmin=false, hasPowers=false;
 
 export const router = new VueRouter({
+  scrollBehavior(to) {
+    console.log(to)
+    if (to.hash) {
+      console.log("there's a hash", to.hash)
+      return {
+        selector: to.hash,
+      }
+    }
+  },
   routes: [
     {
       path: '/login',
diff --git a/app/javascript/components/hash_link.vue b/app/javascript/components/hash_link.vue
index 53a606806..bfb016ba2 100644
--- a/app/javascript/components/hash_link.vue
+++ b/app/javascript/components/hash_link.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link :to="to" @click.native="scrollFix(to)"><slot></slot></router-link>
+  <router-link :to="base" @click.native="scrollFix(to)"><slot></slot></router-link>
 </template>
 
 <script>
@@ -10,6 +10,9 @@ export default {
   props: {
     to: {
       required: true
+    },
+    base: {
+      default: "/"
     }
   },
   mixins: [hashLinksMixin]
diff --git a/app/javascript/reports/reports_screen.vue b/app/javascript/reports/reports_screen.vue
index 10f348b80..3a2242688 100644
--- a/app/javascript/reports/reports_screen.vue
+++ b/app/javascript/reports/reports_screen.vue
@@ -2,11 +2,11 @@
   <div class="mb-3 scrollable">
     <p class="mt-2">These are interim reports.</p>
     <ul>
-      <li><hash-link to="#participants">Participants</hash-link></li>
-      <li><hash-link to="#sessions">Sessions</hash-link></li>
-      <li><hash-link to="#conflicts">Conflicts</hash-link></li>
-      <li><hash-link to="#schedule">Schedule</hash-link></li>
-      <li><hash-link to="#prog-ops">Program Ops</hash-link></li>
+      <li><router-link to="#participants">Participants</router-link></li>
+      <li><router-link to="#sessions">Sessions</router-link></li>
+      <li><router-link to="#conflicts">Conflicts</router-link></li>
+      <li><router-link to="#schedule">Schedule</router-link></li>
+      <li><router-link to="#prog-ops">Program Ops</router-link></li>
     </ul>
     <h5><a id="participants"></a>Participants</h5>
     <ul>
@@ -321,13 +321,9 @@
 
 <script>
 import personSessionMixin from '@/auth/person_session.mixin'
-import HashLink from '@/components/hash_link.vue'
 
 export default {
   name: "ReportsScreen",
-  components: {
-    HashLink
-  },
   mixins: [
     personSessionMixin
   ]
diff --git a/db/structure.sql b/db/structure.sql
index c6ec3094f..34656c4e2 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1123,7 +1123,11 @@ CREATE VIEW public.person_schedules AS
     sessions.format_id,
     sessions.participant_notes,
     sessions.description,
-    sessions.environment
+    sessions.environment,
+        CASE
+            WHEN (sa.updated_at > sessions.updated_at) THEN sa.updated_at
+            ELSE sessions.updated_at
+        END AS updated_at
    FROM (((public.session_assignments sa
      JOIN public.session_assignment_role_type sart ON (((sart.id = sa.session_assignment_role_type_id) AND (sart.role_type = 'participant'::public.assignment_role_enum) AND ((sart.name)::text <> 'Reserve'::text))))
      JOIN public.people p ON ((p.id = sa.person_id)))
diff --git a/jsconfig.json b/jsconfig.json
index a6c92856e..79666df62 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es6",
     "allowSyntheticDefaultImports": false,
+    "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
       "@/*": ["app/javascript/*"],

From 0c43bcafd414360933f6ec29050a8d8f4a4908cd Mon Sep 17 00:00:00 2001
From: Gail Terman <gterman@gmail.com>
Date: Wed, 17 Aug 2022 08:50:37 -0400
Subject: [PATCH 3/5] scroll is working now

---
 app/javascript/app.router.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/app.router.js b/app/javascript/app.router.js
index 3b5f91dae..51c44b9e9 100644
--- a/app/javascript/app.router.js
+++ b/app/javascript/app.router.js
@@ -101,10 +101,12 @@ export const router = new VueRouter({
   scrollBehavior(to) {
     console.log(to)
     if (to.hash) {
-      console.log("there's a hash", to.hash)
-      return {
-        selector: to.hash,
-      }
+      setTimeout(() => {
+        const element = document.getElementById(to.hash.replace(/#/, ''))
+        if (element && element.scrollIntoView) {
+          element.scrollIntoView({block: 'start'})
+        }
+      }, 10)
     }
   },
   routes: [

From 646e3676c2ce7a2cc46a0ed165e896aed26bdf6e Mon Sep 17 00:00:00 2001
From: Gail Terman <gterman@gmail.com>
Date: Wed, 17 Aug 2022 08:57:09 -0400
Subject: [PATCH 4/5] clean up failed attempt at hash links

---
 app/javascript/app.vue                    |  3 +--
 app/javascript/components/hash_link.vue   | 24 -----------------------
 app/javascript/shared/hash-links.mixin.js |  9 ---------
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 app/javascript/components/hash_link.vue
 delete mode 100644 app/javascript/shared/hash-links.mixin.js

diff --git a/app/javascript/app.vue b/app/javascript/app.vue
index 668afc55c..e12c2e877 100644
--- a/app/javascript/app.vue
+++ b/app/javascript/app.vue
@@ -32,7 +32,6 @@ import VueCal from 'vue-cal'
 import 'vue-cal/dist/vuecal.css'
 import { mapState, mapActions } from 'vuex';
 import { FETCH_WORKFLOWS } from '@/store/schedule_workflow';
-import { hashLinksMixin } from './shared/hash-links.mixin';
 
 extend('email', email);
 extend('numeric', numeric);
@@ -55,7 +54,7 @@ export default  {
     BottomNavbar,
     SignAgreements
   },
-  mixins: [personSessionMixin, settingsMixin, hashLinksMixin],
+  mixins: [personSessionMixin, settingsMixin],
   data() {
     return {
       showOverlay: false
diff --git a/app/javascript/components/hash_link.vue b/app/javascript/components/hash_link.vue
deleted file mode 100644
index bfb016ba2..000000000
--- a/app/javascript/components/hash_link.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <router-link :to="base" @click.native="scrollFix(to)"><slot></slot></router-link>
-</template>
-
-<script>
-import hashLinksMixin from '@/shared/hash-links.mixin';
-
-export default {
-  name: "HashLink",
-  props: {
-    to: {
-      required: true
-    },
-    base: {
-      default: "/"
-    }
-  },
-  mixins: [hashLinksMixin]
-}
-</script>
-
-<style>
-
-</style>
diff --git a/app/javascript/shared/hash-links.mixin.js b/app/javascript/shared/hash-links.mixin.js
deleted file mode 100644
index f82610d4b..000000000
--- a/app/javascript/shared/hash-links.mixin.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const hashLinksMixin = {
-  methods: {
-    scrollFix: function(hashbang) {
-      location.hash = hashbang;
-    }
-  }
-}
-
-export default hashLinksMixin;

From ba4973ae2cef0911a5a08272f142bcdc19d4b808 Mon Sep 17 00:00:00 2001
From: Gail Terman <Gailbear@users.noreply.github.com>
Date: Wed, 17 Aug 2022 08:57:53 -0400
Subject: [PATCH 5/5] remove extra line

---
 app/javascript/app.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/app.vue b/app/javascript/app.vue
index e12c2e877..ceb044aaa 100644
--- a/app/javascript/app.vue
+++ b/app/javascript/app.vue
@@ -83,7 +83,6 @@ export default  {
     this.fetchSettings();
     // fetch the schedule state too
     this.fetchScheduleWorkflows();
-    setTimeout(() => this.scrollFix(this.$route.hash), 1)
   }
 }
 </script>