breaking: Added value type override for export

michaelkoelle · May 22, 2021 · ebf7367 · ebf7367
1 parent f4e556a
commit ebf7367
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 9 deletions.
diff --git a/app/exporter.ts b/app/exporter.ts
@@ -35,6 +35,7 @@ export default class Exporter {
         arg.parser,
         arg.corrections,
         arg.conditionalComments,
+        arg.valueTypeOverwrite,
         sender
       )
         .then((v) => {
@@ -53,6 +54,7 @@ export default class Exporter {
     parserType: ParserType,
     corrections: Correction[],
     conditionalComments: ConditionalComment[] = [],
+    valueTypeOverwrite: string | undefined,
     webContents: WebContents
   ) {
     return new Promise((resolve, reject) => {
@@ -104,7 +106,7 @@ export default class Exporter {
 
         const content = parser.serialize(
           c,
-          serializeCorrection(c, conditionalComments)
+          serializeCorrection(c, valueTypeOverwrite, conditionalComments)
         );
 
         // Add submission files folder
@@ -132,14 +134,15 @@ export default class Exporter {
     workspace: string,
     parser: Parser,
     corrections: Correction[],
+    valueTypeOverwrite: string | undefined,
     conditionalComments: ConditionalComment[] = []
   ) {
     const zip = new AdmZip();
 
     corrections.forEach((c) => {
       const content = parser.serialize(
         c,
-        serializeCorrection(c, conditionalComments)
+        serializeCorrection(c, valueTypeOverwrite, conditionalComments)
       );
 
       // Add rating file

diff --git a/app/modals/ExportModal.tsx b/app/modals/ExportModal.tsx
@@ -118,6 +118,9 @@ const ExportModal: FC<ExportModalProps> = ({ ...props }) => {
           conditionalComments: settings.conditionalCommentEnabled
             ? settings.conditionalComments
             : [],
+          valueTypeOverwrite: settings.valueTypeOverrideEnabled
+            ? settings.valueTypeOverride
+            : undefined,
         });
       }
     }

diff --git a/app/modals/SettingsModal.tsx b/app/modals/SettingsModal.tsx
@@ -7,10 +7,10 @@ import DialogContent from '@material-ui/core/DialogContent';
 import { Divider } from '@material-ui/core';
 import { ModalProps } from './ModalProvider';
 import DialogTitleWithCloseIcon from './DialogTitleWithCloseIcon';
-import GeneralSettingsList from '../features/settings/GeneralSettingsList';
-import BackupSettingsList from '../features/settings/BackupSettingsList';
-import MediaViewerSettingsList from '../features/settings/MediaViewerSettingsList';
-import ExportSettingsList from '../features/settings/ExportSettingsList';
+import GeneralSettingsList from './settings/GeneralSettingsList';
+import BackupSettingsList from './settings/BackupSettingsList';
+import MediaViewerSettingsList from './settings/MediaViewerSettingsList';
+import ExportSettingsList from './settings/ExportSettingsList';
 
 type SettingsModalProps = ModalProps;
 

diff --git a/app/features/settings/BackupSettingsList.tsx → app/modals/settings/BackupSettingsList.tsx b/app/features/settings/BackupSettingsList.tsx → app/modals/settings/BackupSettingsList.tsx
diff --git a/app/features/settings/ExportSettingsList.tsx → app/modals/settings/ExportSettingsList.tsx b/app/features/settings/ExportSettingsList.tsx → app/modals/settings/ExportSettingsList.tsx
@@ -6,6 +6,8 @@ import {
   List,
   ListItem,
   ListSubheader,
+  TextField,
+  Collapse,
 } from '@material-ui/core';
 
 import React from 'react';
@@ -33,6 +35,47 @@ const ExportSettingsList = () => {
           <OutputFormatSelect />
         </ListItemSecondaryAction>
       </ListItem>
+      <ListItem>
+        <ListItemText
+          primary="Value Type Overwrite"
+          secondary="Enable overwrite for the value type e.g. points"
+        />
+        <ListItemSecondaryAction>
+          <Switch
+            edge="end"
+            onChange={() =>
+              dispatch(
+                settingsSetExport({
+                  ...settings,
+                  valueTypeOverrideEnabled: !settings.valueTypeOverrideEnabled,
+                })
+              )
+            }
+            checked={settings.valueTypeOverrideEnabled}
+          />
+        </ListItemSecondaryAction>
+      </ListItem>
+      <Collapse in={settings.valueTypeOverrideEnabled}>
+        <ListItem>
+          <ListItemText primary="" secondary="" />
+          <ListItemSecondaryAction>
+            <TextField
+              label="Value Type"
+              variant="outlined"
+              size="small"
+              value={settings.valueTypeOverride}
+              onChange={(event) =>
+                dispatch(
+                  settingsSetExport({
+                    ...settings,
+                    valueTypeOverride: event.target.value,
+                  })
+                )
+              }
+            />
+          </ListItemSecondaryAction>
+        </ListItem>
+      </Collapse>
       <ListItem>
         <ListItemText
           primary="Conditional Comment"
@@ -53,13 +96,13 @@ const ExportSettingsList = () => {
           />
         </ListItemSecondaryAction>
       </ListItem>
-      {settings.conditionalCommentEnabled && (
+      <Collapse in={settings.conditionalCommentEnabled}>
         <ListItem>
           <ConditionalCommentSettings
             showLabel={settings.conditionalCommentEnabled}
           />
         </ListItem>
-      )}
+      </Collapse>
     </List>
   );
 };

diff --git a/...features/settings/GeneralSettingsList.tsx → app/modals/settings/GeneralSettingsList.tsx b/...features/settings/GeneralSettingsList.tsx → app/modals/settings/GeneralSettingsList.tsx
diff --git a/...ures/settings/MediaViewerSettingsList.tsx → ...dals/settings/MediaViewerSettingsList.tsx b/...ures/settings/MediaViewerSettingsList.tsx → ...dals/settings/MediaViewerSettingsList.tsx
diff --git a/app/model/SettingsSlice.ts b/app/model/SettingsSlice.ts
@@ -19,6 +19,8 @@ export interface MediaViewerSettings {
 
 export interface ExportSettings {
   outputFormat: ParserType;
+  valueTypeOverrideEnabled: boolean;
+  valueTypeOverride: string;
   conditionalCommentEnabled: boolean;
   conditionalComments: ConditionalComment[];
 }
@@ -46,6 +48,8 @@ const settingsSlice = createSlice({
     },
     export: {
       outputFormat: ParserType.Uni2Work,
+      valueTypeOverrideEnabled: true,
+      valueTypeOverride: 'Punkte',
       conditionalCommentEnabled: true,
       conditionalComments: [
         { text: 'Gut!', minPercentage: 0.5 },

diff --git a/app/utils/Formatter.ts b/app/utils/Formatter.ts
@@ -143,6 +143,7 @@ export function getConditionalCommentForValue(
 
 export function serializeCorrection(
   correction: Correction,
+  valueTypeOverwrite: string | undefined,
   conditionalComments: ConditionalComment[] = []
 ): string {
   const ratings: Rating[] = correction.ratings ? correction.ratings : [];
@@ -151,7 +152,13 @@ export function serializeCorrection(
     : [];
   const serializedTasks =
     tasks && ratings
-      ? serializeTasks(tasks, ratings, correction.submission.sheet.valueType)
+      ? serializeTasks(
+          tasks,
+          ratings,
+          valueTypeOverwrite !== undefined
+            ? valueTypeOverwrite
+            : correction.submission.sheet.valueType
+        )
       : '';
   const serializedAnnotation =
     correction.annotation && correction.annotation.text.trim().length > 0