Merge pull request #639 from ChicagoWorldcon/plan-716-plan-717

PLAN-716 PLAN-717 fix report page headings
PlanoramaEvents · Aug 17, 2022 · a5b41f7 · a5b41f7
2 parents 402b18f + ba4973a
commit a5b41f7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/app/javascript/app.router.js b/app/javascript/app.router.js
@@ -98,6 +98,17 @@ Vue.use(VueRouter);
 var con_roles=[], isAdmin=false, hasPowers=false;
 
 export const router = new VueRouter({
+  scrollBehavior(to) {
+    console.log(to)
+    if (to.hash) {
+      setTimeout(() => {
+        const element = document.getElementById(to.hash.replace(/#/, ''))
+        if (element && element.scrollIntoView) {
+          element.scrollIntoView({block: 'start'})
+        }
+      }, 10)
+    }
+  },
   routes: [
     {
       path: '/login',

diff --git 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><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>
@@ -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>

diff --git 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
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es6",
     "allowSyntheticDefaultImports": false,
+    "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
       "@/*": ["app/javascript/*"],