Merge branch 'v3' into v3-student-timeline

uzh-bf · Feb 19, 2025 · de312e2 · de312e2
2 parents febe5ad + f8bdff4
commit de312e2
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.3.0-alpha.27](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.26...v3.3.0-alpha.27) (2025-02-19)
+
+
+### Bug Fixes
+
+* **apps/frontend-manage:** disable animation on case study evaluation scatter plots ([dc37349](https://github.com/uzh-bf/klicker-uzh/commit/dc373494f5f6d24d383b31903ed8b780284dd693))
+* **apps/frontend-manage:** ensure that chart on evaluation view is initialized correctly ([791c347](https://github.com/uzh-bf/klicker-uzh/commit/791c347cb20d4b3c1786e99794f2df9de3158f30))
+* **apps/frontend-manage:** fix number of bins and corresponding labels on case study histogram evaluation plot ([6581f9c](https://github.com/uzh-bf/klicker-uzh/commit/6581f9c20108a147aca760fecee17aa88bb9451f))
+* **apps/frontend-manage:** remove white text style from choices sidebar answer options ([78718f4](https://github.com/uzh-bf/klicker-uzh/commit/78718f461fd490b39a63ba2219bedea0618f1edb))
+* **packages/shared-components:** ensure that selection answer options are cleared after submission ([8612fa3](https://github.com/uzh-bf/klicker-uzh/commit/8612fa31b66dad5f690880dd78f733691074c97d))
+* **packages/shared-components:** resolve issue with table resorting on live quiz evaluation re-fetch ([#4516](https://github.com/uzh-bf/klicker-uzh/issues/4516)) ([5c477fa](https://github.com/uzh-bf/klicker-uzh/commit/5c477fab3beede466f28a0ed3d49b8272c00038a))
+
 ## [3.3.0-alpha.26](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.25...v3.3.0-alpha.26) (2025-02-13)
 
 

diff --git a/apps/auth/package.json b/apps/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/auth",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "dependencies": {
     "@klicker-uzh/i18n": "workspace:*",

diff --git a/apps/backend-docker/package.json b/apps/backend-docker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/backend-docker",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/docs",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "devDependencies": {
     "@docusaurus/core": "~3.6.3",

diff --git a/apps/frontend-control/package.json b/apps/frontend-control/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/frontend-control",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/client": "3.11.8",

diff --git a/apps/frontend-manage/package.json b/apps/frontend-manage/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/frontend-manage",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/client": "3.11.8",

diff --git a/apps/frontend-manage/src/components/evaluation/elements/CSOneDimScatterPlot.tsx b/apps/frontend-manage/src/components/evaluation/elements/CSOneDimScatterPlot.tsx
@@ -96,6 +96,7 @@ function CSOneDimScatterPlot({
               shape={(props: any) => (
                 <circle cx={props.cx} cy={props.cy} r={6} fill={props.fill} />
               )}
+              isAnimationActive={false}
             >
               <LabelList
                 dataKey="itemLabel"

diff --git a/apps/frontend-manage/src/components/evaluation/elements/CSTwoDimScatterPlot.tsx b/apps/frontend-manage/src/components/evaluation/elements/CSTwoDimScatterPlot.tsx
@@ -103,6 +103,7 @@ function CSTwoDimScatterPlot({
               shape={(props: any) => (
                 <circle cx={props.cx} cy={props.cy} r={6} fill={props.fill} />
               )}
+              isAnimationActive={false}
             >
               <LabelList
                 dataKey="itemLabel"

diff --git a/apps/frontend-manage/src/components/evaluation/elements/ChoicesSidebar.tsx b/apps/frontend-manage/src/components/evaluation/elements/ChoicesSidebar.tsx
@@ -75,7 +75,7 @@ function ChoicesSidebar({
                     maxLines={3}
                     // maxLength={60}
                     className={{
-                      tooltip: 'z-20 float-right min-w-[25rem] !text-white',
+                      tooltip: 'z-20 float-right min-w-[25rem]',
                       markdown: textSize.text,
                     }}
                   >

diff --git a/apps/frontend-manage/src/components/evaluation/hooks/useCaseStudyHistogramData.ts b/apps/frontend-manage/src/components/evaluation/hooks/useCaseStudyHistogramData.ts
@@ -180,11 +180,11 @@ function useCaseStudyHistogramData({
         return missingData
       }
 
-      const criterionMin = resultObject.min
-      const criterionMax = resultObject.max
+      const criterionMin = resultObject.min - resultObject.step / 2
+      const criterionMax = resultObject.max + resultObject.step / 2
       const binCount = Math.min(
         30,
-        (criterionMax - criterionMin) / resultObject.step
+        (resultObject.max - resultObject.min) / resultObject.step + 1
       )
 
       // sort responses into bins and count number of responses in each bin
@@ -200,6 +200,15 @@ function useCaseStudyHistogramData({
         const binWidth =
           dataArray.length > 1 ? dataArray[1]!.value - dataArray[0]!.value : 1
 
+        const labelLower = Math.max(
+          round(bin.value - binWidth / 2, 1),
+          resultObject.min
+        )
+        const labelUpper = Math.min(
+          round(bin.value + binWidth / 2, 1),
+          resultObject.max
+        )
+
         return {
           value: round(bin.value, 2),
           count: countResponsesInBin({
@@ -208,10 +217,7 @@ function useCaseStudyHistogramData({
             binValue: bin.value,
             criterionMax,
           }),
-          label: `${round(bin.value - binWidth / 2, 1)} - ${round(
-            bin.value + binWidth / 2,
-            1
-          )}`,
+          label: `${labelLower} - ${labelUpper}`,
         }
       })
 

diff --git a/apps/frontend-manage/src/components/evaluation/hooks/useChartTypeUpdate.tsx b/apps/frontend-manage/src/components/evaluation/hooks/useChartTypeUpdate.tsx
@@ -32,7 +32,7 @@ function useChartTypeUpdate({
         setChartType(ACTIVE_CHART_TYPES[activeElementType][0].value)
       }
     }
-  }, [activeInstance])
+  }, [activeInstance, activeElementType])
 }
 
 export default useChartTypeUpdate
diff --git a/apps/frontend-manage/src/pages/quizzes/[id]/evaluation.tsx b/apps/frontend-manage/src/pages/quizzes/[id]/evaluation.tsx
@@ -2,13 +2,11 @@ import { useQuery } from '@apollo/client'
 import ActivityEvaluation from '@components/evaluation/ActivityEvaluation'
 import { GetLiveQuizEvaluationDocument } from '@klicker-uzh/graphql/dist/ops'
 import Loader from '@klicker-uzh/shared-components/src/Loader'
-import { useTranslations } from 'next-intl'
 import { useRouter } from 'next/router'
 import EvaluationUnavailableNotification from '~/components/evaluation/EvaluationUnavailableNotification'
 
 function Evaluation() {
   const router = useRouter()
-  const t = useTranslations()
 
   // fetch evaluation data
   const { data, loading } = useQuery(GetLiveQuizEvaluationDocument, {

diff --git a/apps/frontend-pwa/package.json b/apps/frontend-pwa/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/frontend-pwa",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/client": "3.11.8",

diff --git a/apps/func-incoming-responses/package.json b/apps/func-incoming-responses/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/func-incoming-responses",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "files": [

diff --git a/apps/func-response-processor/package.json b/apps/func-response-processor/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/func-response-processor",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "files": [

diff --git a/apps/office-addin/package.json b/apps/office-addin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/office-addin",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "dependencies": {
     "@uzh-bf/design-system": "3.0.0-alpha.57",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "@klicker-uzh/monorepo",
   "description": "KlickerUZH instant-class-response system.",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "repository": "uzh-bf/klicker-uzh.git",
   "homepage": "https://www.klicker.uzh.ch/",
   "bugs": "https://github.com/uzh-bf/klicker-uzh/issues",

diff --git a/packages/grading/package.json b/packages/grading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/grading",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/graphql",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/markdown",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/markdown/src/Ellipsis.tsx b/packages/markdown/src/Ellipsis.tsx
@@ -44,7 +44,7 @@ function Ellipsis({
           withMarkdown ? (
             <Prose
               className={{
-                root: 'prose-p:m-0 prose-img:m-0 max-w-full flex-initial leading-6 hover:text-white',
+                root: 'prose-p:m-0 prose-img:m-0 max-w-full flex-initial leading-6',
               }}
             >
               <Markdown

diff --git a/packages/markdown/src/public/utilities.css b/packages/markdown/src/public/utilities.css
@@ -175,11 +175,6 @@
     --tw-text-opacity: 1;
     color: rgb(0 0 0 / var(--tw-text-opacity, 1))
   }
-
-  .hover\:text-white:hover {
-    --tw-text-opacity: 1;
-    color: rgb(255 255 255 / var(--tw-text-opacity, 1))
-  }
 }
 
 @media (min-width: 768px) {

diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/prisma",
-  "version": "3.3.0-alpha.26",
+  "version": "3.3.0-alpha.27",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/shared-components/src/charts/ElementTableChart.tsx b/packages/shared-components/src/charts/ElementTableChart.tsx
@@ -63,7 +63,11 @@ function ElementTableChart({
         <DataTable
           isPaginated
           isResetSortingEnabled
-          initialSorting={[{ id: 'count', desc: true }]}
+          initialSorting={[
+            { id: 'count', desc: true },
+            // default ordering by value after count to fix order for elements with identical counts
+            { id: 'value', desc: false },
+          ]}
           columns={columns}
           data={tableData}
           csvFilename={`${instance.name}_results`}

diff --git a/packages/shared-components/src/questions/SELECTIONAnswerOptions.tsx b/packages/shared-components/src/questions/SELECTIONAnswerOptions.tsx
@@ -70,7 +70,10 @@ function SELECTIONAnswerOptions({
           )?.value
 
           return (
-            <div key={inputIndex} className="flex flex-col">
+            <div
+              key={`selection-element-${elementIx}-${inputIndex}-${selectedValue}`}
+              className="flex flex-col"
+            >
               <FormLabel
                 required
                 label={t('shared.questions.seCorrectAnswerN', {