From 186835ec0cfe3d4da43d783ced526b5d3b202cb9 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Mon, 30 Jan 2023 22:03:36 +0100
Subject: [PATCH] [admin] timesheets overview improvements

---
 routes/admin.vue                   |  7 -------
 routes/adminTimesheets.vue         |  6 +++++-
 routes/adminTimesheetsOverview.vue | 17 ++++++++++-------
 server/routes/admin.js             |  8 ++++++--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/routes/admin.vue b/routes/admin.vue
index ca3ba02c6..0e706e3c5 100644
--- a/routes/admin.vue
+++ b/routes/admin.vue
@@ -107,13 +107,6 @@
                 link="/admin/timesheets"
                 header="Volunteering timesheets"
             />
-            <AdminDashboardCard
-                v-if="$isGranted('org')"
-                v-show="!filterAttention"
-                icon="file-spreadsheet"
-                link="/admin/timesheets/overview"
-                header="Timesheets overview"
-            />
         </div>
 
         <template v-for="({name, config: localeConfig, url, published}, locale) in allLocales" v-if="$isGranted('panel', locale) && stats[locale]">
diff --git a/routes/adminTimesheets.vue b/routes/adminTimesheets.vue
index 8ff4cea47..0326fd9e7 100644
--- a/routes/adminTimesheets.vue
+++ b/routes/adminTimesheets.vue
@@ -2,11 +2,15 @@
     <Page wide>
     <NotFound v-if="!$isGranted('panel')"/>
     <div v-else>
-        <p>
+        <p class="d-flex justify-content-between">
             <nuxt-link to="/admin">
                 <Icon v="user-cog"/>
                 <T>admin.header</T>
             </nuxt-link>
+            <nuxt-link to="/admin/timesheets/overview">
+                <Icon v="file-spreadsheet"/>
+                Overview
+            </nuxt-link>
         </p>
         <div v-html="moderation.timesheets"/>
 
diff --git a/routes/adminTimesheetsOverview.vue b/routes/adminTimesheetsOverview.vue
index a038cf02b..a065fb266 100644
--- a/routes/adminTimesheetsOverview.vue
+++ b/routes/adminTimesheetsOverview.vue
@@ -1,14 +1,17 @@
 <template>
     <Page wide>
-    <NotFound v-if="!$isGranted('org')"/>
+    <NotFound v-if="!$isGranted('panel')"/>
     <div v-else>
-        <p>
+        <p class="d-flex justify-content-between">
             <nuxt-link to="/admin">
                 <Icon v="user-cog"/>
                 <T>admin.header</T>
             </nuxt-link>
-        </p>
-        <h2>
+            <nuxt-link to="/admin/timesheets">
+                <Icon v="file-spreadsheet"/>
+                Fill out yours
+            </nuxt-link>
+        </p>        <h2>
             <Icon v="file-spreadsheet"/>
             Timesheets overview
         </h2>
@@ -49,10 +52,10 @@
             <tr v-for="(hours, username) in hoursSummary">
                 <th><LocaleLink locale="_" :link="`/@${username}`">@{{username}}</LocaleLink></th>
                 <td>{{ hours }}</td>
-                <td>{{ hoursSum && username !== 'andrea' ? ((100 * hours / hoursSum).toFixed(1) + '%') : '—'}}</td>
+                <td>{{ hoursSum && timesheets[username].transfer !== 'skip' ? ((100 * hours / hoursSum).toFixed(1) + '%') : '—'}}</td>
                 <td>
                     <p><strong>{{timesheets[username].transfer}}</strong></p>
-                    <ul>
+                    <ul v-if="timesheets[username]">
                         <li v-for="(value, key) in timesheets[username].details" v-if="value">
                             <strong>{{ key }}:</strong> {{ value }}
                         </li>
@@ -127,7 +130,7 @@ export default {
         hoursSum() {
             let sum = 0;
             for (let username in this.hoursSummary) {
-                if (!this.hoursSummary.hasOwnProperty(username) || username === 'andrea') { continue; }
+                if (!this.hoursSummary.hasOwnProperty(username) || this.timesheets[username].transfer === 'skip') { continue; }
                 sum += this.hoursSummary[username];
             }
             return sum;
diff --git a/server/routes/admin.js b/server/routes/admin.js
index a2e98a02d..dd9e1621c 100644
--- a/server/routes/admin.js
+++ b/server/routes/admin.js
@@ -568,13 +568,17 @@ router.post('/admin/timesheet', handleErrorAsync(async (req, res) => {
 }));
 
 router.get('/admin/timesheets', handleErrorAsync(async (req, res) => {
-    if (!req.isGranted('org')) {
+    if (!req.isGranted('panel')) {
         return res.status(401).json({error: 'Unauthorised'});
     }
 
     const timesheetsByUsername = {};
     for (let {username, timesheets} of await req.db.all(SQL`SELECT username, timesheets FROM users WHERE timesheets IS NOT NULL`)) {
-        timesheetsByUsername[username] = JSON.parse(timesheets);
+        timesheets = JSON.parse(timesheets);
+        if (!req.isGranted('org')) {
+            delete timesheets['details'];
+        }
+        timesheetsByUsername[username] = timesheets;
     }
 
     return res.json(timesheetsByUsername);