[Excel exports] Update filenames

UniversityOfHelsinkiCS · Jan 11, 2024 · aa7204f · aa7204f
1 parent 2224474
commit aa7204f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 4 deletions.
diff --git a/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx b/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx
@@ -171,6 +171,7 @@ export const CompletedCoursesSearchResults = ({ searchValues }) => {
       >
         <SortableTable
           title="Completed courses search"
+          featureName="completed_courses"
           columns={getColumns(data.courses, showStudentNames.visible, getTextIn)}
           onlyExportColumns={hiddenNameAndEmailForExcel}
           data={data.students}

diff --git a/services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/attempts.jsx b/services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/attempts.jsx
@@ -181,6 +181,7 @@ export const AttemptsTable = ({
       )}
       <SortableTable
         title={`Yearly attempt statistics for group ${name}`}
+        featureName="yearly_attempts"
         defaultSort={['TIME', 'desc']}
         columns={columns}
         data={data}

diff --git a/services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/student.jsx b/services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/student.jsx
@@ -219,6 +219,7 @@ export const StudentTable = ({
       )}
       <SortableTable
         title={`Student statistics for group ${name}`}
+        featureName="group_statistics"
         defaultSort={['TIME', 'desc']}
         columns={columns}
         data={data}

diff --git a/services/frontend/src/components/CustomOpenUniPopulation/OpenUniPopulationResults/index.jsx b/services/frontend/src/components/CustomOpenUniPopulation/OpenUniPopulationResults/index.jsx
@@ -230,6 +230,7 @@ export const OpenUniPopulationResults = ({ fieldValues }) => {
         {courseList.length > 0 && (
           <SortableTable
             title={`Open Uni Student Population (${Object.keys(openUniStudentStats?.data.students).length} students)`}
+            featureName="open_uni"
             columns={tableData.columns}
             data={tableData.data}
           />

diff --git a/services/frontend/src/components/PopulationCourseStats/GradeDistribution/index.jsx b/services/frontend/src/components/PopulationCourseStats/GradeDistribution/index.jsx
@@ -150,6 +150,7 @@ export const GradeDistribution = ({ flat, onlyIamRights }) => {
   return (
     <SortableTable
       title="Grade distribution of courses"
+      featureName="grade_distribution"
       data={data}
       columns={columns}
       toggleGroupExpansion={toggleGroupExpansion}

diff --git a/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx b/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx
@@ -235,6 +235,7 @@ export const PassFailEnrollments = ({ flat, onlyIamRights }) => {
     <SortableTable
       tableId="pass-and-fail-statistics-of-courses"
       title="Pass and fail statistics of courses with course enrollment details"
+      featureName="pass_and_fail"
       data={data}
       columns={columns}
       toggleGroupExpansion={toggleGroupExpansion}

diff --git a/services/frontend/src/components/PopulationCourseStats/PassingSemesters/index.jsx b/services/frontend/src/components/PopulationCourseStats/PassingSemesters/index.jsx
@@ -149,6 +149,7 @@ export const PassingSemesters = ({ onlyIamRights }) => {
     <div>
       <SortableTable
         title="Students Passing a Course per Semester"
+        featureName="passing_semester"
         actions={
           <Button size="mini" style={{ padding: '.75em .75em' }} onClick={() => setCumulativeStats(!cumulativeStats)}>
             {cumulativeStats ? 'Show yearly stats' : 'Show cumulative stats'}

diff --git a/services/frontend/src/components/PopulationCourseStats/Students/index.jsx b/services/frontend/src/components/PopulationCourseStats/Students/index.jsx
@@ -177,6 +177,7 @@ export const Students = ({ filteredStudents }) => {
             />
           </>
         }
+        featureName="courses_passed"
         actions={
           <Button size="tiny" onClick={() => toggleStudentNames()}>
             {namesVisible ? 'Hide student names' : 'Show student names'}

diff --git a/services/frontend/src/components/PopulationStudents/StudentTable/CourseTab.jsx b/services/frontend/src/components/PopulationStudents/StudentTable/CourseTab.jsx
@@ -296,6 +296,7 @@ const CoursesTable = ({ students, studyGuidanceCourses, curriculum }) => {
             <SortableTable
               tableId="course-of-population-students"
               title="Courses of population's students"
+              featureName="courses"
               columns={columns}
               onlyExportColumns={hiddenNameAndEmailForExcel}
               data={data}

diff --git a/services/frontend/src/components/PopulationStudents/StudentTable/GeneralTab/GeneralTab.jsx b/services/frontend/src/components/PopulationStudents/StudentTable/GeneralTab/GeneralTab.jsx
@@ -570,6 +570,7 @@ export const GeneralTab = ({
     <SortableTable
       style={{ height: '80vh' }}
       title="General student information"
+      featureName="students"
       columns={columns}
       onlyExportColumns={hiddenNameAndEmailForExcel}
       data={selectedStudents.map(sn => students[sn])}

diff --git a/services/frontend/src/components/PopulationStudents/StudentTable/ProgressTab/index.jsx b/services/frontend/src/components/PopulationStudents/StudentTable/ProgressTab/index.jsx
@@ -521,6 +521,7 @@ export const ProgressTable = ({ curriculum, criteria, students, months, programm
                 style={{ height: '80vh' }}
                 tableId="progress-of-population-students"
                 title="Progress of population's students after predefined criteria"
+                featureName="progress"
                 columns={columns}
                 data={data}
               />

diff --git a/services/frontend/src/components/SortableTable/ExportModal.jsx b/services/frontend/src/components/SortableTable/ExportModal.jsx
@@ -52,7 +52,7 @@ const flattenData = data => {
   return flat
 }
 
-export const ExportModal = ({ open, onOpen, onClose, data, columns }) => {
+export const ExportModal = ({ open, onOpen, onClose, data, columns, featureName }) => {
   const exportColumns = useMemo(() => getExportColumns(columns), [columns])
   const flatData = useMemo(() => flattenData(data), [data])
   const [selected, setSelected] = useState(_.uniq(_.map(exportColumns, 'key')))
@@ -72,7 +72,7 @@ export const ExportModal = ({ open, onOpen, onClose, data, columns }) => {
     const sheet = xlsx.utils.json_to_sheet(rows)
     const book = xlsx.utils.book_new()
     xlsx.utils.book_append_sheet(book, sheet)
-    xlsx.writeFile(book, `oodikone_${getTimestamp()}.xlsx`)
+    xlsx.writeFile(book, `oodikone_${featureName}_${getTimestamp()}.xlsx`)
   }
 
   const toggleSelection = key => {

diff --git a/services/frontend/src/components/SortableTable/index.jsx b/services/frontend/src/components/SortableTable/index.jsx
@@ -32,6 +32,7 @@ Future uusihenkilö's will thank you.
 
 tableId: id-property of the <table> tag
 title: Table title
+featureName: Describes the feature in the Excel filename: "oodikone_{featureName}_{timeStamp}.xlsx". Defaults to "export"
 *data: Array of data items
 *columns: Array of columns, see fields of columns below
 onlyExportColumns: Array of columns, never shown but always added to export as the first columns
@@ -93,6 +94,7 @@ export const SortableTable = ({
   tableId,
   columns: pColumns,
   title,
+  featureName = 'export',
   data,
   defaultSort,
   style,
@@ -219,6 +221,7 @@ export const SortableTable = ({
         onClose={() => setExportModalOpen(false)}
         data={data}
         columns={[...onlyExportColumns, ...columns]}
+        featureName={featureName}
       />
       <SortableTableContext.Provider value={context}>
         <FigureContainer style={figureStyles}>

diff --git a/...ces/frontend/src/components/StudyProgramme/programmeCoursesOverview/OverallStatsTable.jsx b/...ces/frontend/src/components/StudyProgramme/programmeCoursesOverview/OverallStatsTable.jsx
@@ -248,7 +248,8 @@ export const OverallStatsTable = ({ data, showStudents }) => {
       />
       <div data-cy="CoursesSortableTable">
         <SortableTable
-          title="Student statistics for study programme courses "
+          title="Student statistics for study programme courses"
+          featureName="programme_courses"
           defaultSort={['name', 'asc']}
           columns={getColumns(getTextIn, showStudents)}
           data={data}

diff --git a/services/frontend/src/components/Teachers/TeacherStatisticsTable/index.jsx b/services/frontend/src/components/Teachers/TeacherStatisticsTable/index.jsx
@@ -103,6 +103,6 @@ export const TeacherStatisticsTable = ({ statistics, variant }) => {
   return statistics.length === 0 ? (
     <Segment basic content="No statistics found for the given query." />
   ) : (
-    <SortableTable title="Teacher statistics" columns={columns} data={data} />
+    <SortableTable title="Teacher statistics" featureName="teacher_statistics" columns={columns} data={data} />
   )
 }