show responsibles of all courses for faculties

Author: mluukkai

public/locales/en/translation.json

@@ -551,6 +551,8 @@
     "feedbackCorrespondents": "Feedback liaisons",
     "surveyTab": "Programme questions",
     "organisationSurveysTab": "Programme surveys",
+    "surveyFacultyTab": "Faculty questions",
+    "organisationFacultySurveysTab": "Faculty surveys",
     "summaryTab": "Summary",
     "courseRealisationsTab": "Courses",
     "responsiblesTab": "Responsibles",

public/locales/fi/translation.json

@@ -551,6 +551,8 @@
     "feedbackCorrespondents": "Palautevastaavat",
     "surveyTab": "Koulutusohjelman kysymykset",
     "organisationSurveysTab": "Koulutusohjelman kyselyt",
+    "surveyFacultyTab": "Tiedekunnan kysymykset",
+    "organisationFacultySurveysTab": "Tiedekunnan kyselyt",
     "summaryTab": "Yhteenveto",
     "courseRealisationsTab": "Kurssit",
     "responsiblesTab": "Vastuuopettajat",

public/locales/sv/translation.json

@@ -528,6 +528,8 @@
     "feedbackCorrespondents": "Korrespondenter för responsen",
     "surveyTab": "Utbildningsprogrammets frågor",
     "organisationSurveysTab": "Utbildningsprogrammets enkäter",
+    "surveyFacultyTab": "Fakultetsfrågor",
+    "organisationFacultySurveysTab": "Fakultetsenkäter",
     "summaryTab": "Sammandrag",
     "courseRealisationsTab": "Kurser",
     "openQuestionsTab": "Öppna frågor",

src/client/pages/Organisation/Organisation.jsx

@@ -56,6 +56,8 @@ const Organisation = () => {
   const hasWriteAccess = Boolean(organisation?.access?.write)
   const hasAdminAccess = Boolean(organisation?.access?.admin)
 
+  const isFaculty = Boolean(organisation?.isFaculty)
+
   if (!hasReadAccess) {
     return <Navigate to="/" />
   }
@@ -108,14 +110,18 @@ const Organisation = () => {
           )}
           {hasWriteAccess && (
             <RouterTab
-              label={t('organisationSettings:surveyTab')}
+              label={t(isFaculty ? 'organisationSettings:surveyFacultyTab' : 'organisationSettings:surveyTab')}
               icon={<LiveHelpOutlined />}
               to={`${pathnameBase}/survey`}
             />
           )}
           {ORGANISATION_SURVEYS_ENABLED && hasWriteAccess && (
             <RouterTab
-              label={t('organisationSettings:organisationSurveysTab')}
+              label={t(
+                isFaculty
+                  ? 'organisationSettings:organisationFacultySurveysTab'
+                  : 'organisationSettings:organisationSurveysTab'
+              )}
               icon={<DynamicFormOutlined />}
               to={`${pathnameBase}/organisation-surveys`}
             />
@@ -173,7 +179,7 @@ const Organisation = () => {
           />
         )}
 
-        <Route path="/responsibles" element={<Responsibles />} />
+        <Route path="/responsibles" element={<Responsibles organisation={organisation} />} />
         <Route path="/responsibles/xlsx" element={<ResponsiblesXlsx />} />
 
         <Route

src/client/pages/Organisation/Responsibles.jsx

@@ -29,7 +29,12 @@ import { YearSemesterPeriodSelector } from '../../components/common/YearSemester
 import useHistoryState from '../../hooks/useHistoryState'
 import { getYearRange } from '../../util/yearUtils'
 import { NorButton } from '../../components/common/NorButton'
-import { useOrganisationFeedbackTargets, getCourseRealisationName, generateTeacherStats } from './responsiblesUtils'
+import {
+  useOrganisationFeedbackTargets,
+  getCourseRealisationName,
+  generateTeacherStats,
+  useFacultyFeedbackTargets,
+} from './responsiblesUtils'
 
 const styles = {
   filtersHead: {
@@ -72,7 +77,7 @@ const Filters = React.memo(({ startDate, endDate, onChange, timeOption, setTimeO
   )
 })
 
-const Responsibles = () => {
+const Responsibles = ({ organisation }) => {
   const { t, i18n } = useTranslation()
   const { code } = useParams()
   const [searchParams, setSearchParams] = useSearchParams()
@@ -126,7 +131,8 @@ const Responsibles = () => {
     setExportMenuAnchor(null)
   }
 
-  const { data: feedbackTargets, isLoading } = useOrganisationFeedbackTargets({
+  const hookToUse = organisation.isFaculty ? useFacultyFeedbackTargets : useOrganisationFeedbackTargets
+  const { data: feedbackTargets, isLoading } = hookToUse({
     code,
     startDate,
     endDate,

src/client/pages/Organisation/responsiblesUtils.js

@@ -22,6 +22,26 @@ export const useOrganisationFeedbackTargets = ({ code, startDate, endDate, enabl
   })
 }
 
+export const useFacultyFeedbackTargets = ({ code, startDate, endDate, enabled }) => {
+  const queryKey = ['facultyFeedbackTargets', code, startDate, endDate]
+
+  const queryFn = async () => {
+    const { data: feedbackTargets } = await apiClient.get(`/feedback-targets/for-faculty/${code}`, {
+      params: { startDate, endDate },
+    })
+
+    return feedbackTargets
+  }
+
+  return useQuery({
+    queryKey,
+    queryFn,
+    enabled,
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+  })
+}
+
 export const getCourseRealisationName = (fbt, i18n) => {
   const name =
     fbt.courseRealisation.name[i18n.language] ||

src/server/models/organisation.ts

@@ -38,6 +38,7 @@ class Organisation extends Model<InferAttributes<Organisation>, InferCreationAtt
   // --- Virtual fields. ---------
   // --- ideally refactor away ---
   // -----------------------------
+  declare isFaculty?: boolean
   declare summary?: Summary
   declare courseUnits?: CourseUnit[]
   declare summaries?: Summary[]
@@ -120,6 +121,12 @@ Organisation.init(
       allowNull: false,
       defaultValue: [],
     },
+    isFaculty: {
+      type: VIRTUAL,
+      get() {
+        return /^H\d{2}$/.test(this.code || '')
+      },
+    },
     summary: {
       type: VIRTUAL,
     },

src/server/routes/feedbackTargets/feedbackTargetController.ts

@@ -1,6 +1,7 @@
 import { Response, Router } from 'express'
 import { AuthenticatedRequest } from 'types'
 import { ApplicationError } from '../../util/ApplicationError'
+import { Organisation } from '../../models'
 
 import { createFeedbackTargetLog } from '../../services/auditLog'
 import { mailer } from '../../mailer'
@@ -32,6 +33,52 @@ import { PUBLIC_COURSE_BROWSER_ENABLED } from '../../util/config'
 const adRouter = Router()
 const noadRouter = Router()
 
+// TODO figure out if the two bellow functions could be united
+adRouter.get('/for-faculty/:code', async (req: AuthenticatedRequest, res: Response) => {
+  const { user } = req
+  const { code } = req.params
+  const { startDate, endDate } = req.query
+  if (!code) throw ApplicationError.BadRequest('Missing code')
+
+  const organisationAccess = await user.organisationAccess
+  if (!organisationAccess[code]?.read) throw ApplicationError.Forbidden()
+
+  const facultyOrganisation = await Organisation.findOne({
+    where: { code },
+    include: [
+      {
+        model: Organisation,
+        as: 'childOrganisations',
+        attributes: ['id', 'code'],
+      },
+    ],
+  })
+
+  if (!facultyOrganisation) throw ApplicationError.NotFound('Organisation not found')
+
+  const childOrgCodes =
+    facultyOrganisation.childOrganisations
+      ?.filter(child => organisationAccess[child.code]?.read)
+      .map(child => child.code) || []
+
+  const allOrganisationCodes = [code, ...childOrgCodes]
+
+  const feedbackTargetsPromises = allOrganisationCodes.map(orgCode =>
+    getFeedbackTargetsForOrganisation({
+      organisationCode: orgCode,
+      startDate: startDate as string,
+      endDate: endDate as string,
+      user,
+    })
+  )
+
+  const feedbackTargetsArrays = await Promise.all(feedbackTargetsPromises)
+
+  const feedbackTargets = feedbackTargetsArrays.flat()
+
+  res.send(feedbackTargets)
+})
+
 adRouter.get('/for-organisation/:code', async (req: AuthenticatedRequest, res: Response) => {
   const { user } = req
   const { code } = req.params