Skip to content
Snippets Groups Projects

Resolve "Update Vuetify"

Merged Jakob Dieterle requested to merge 250-update-vuetify into master
Compare and
91 files
+ 2407
3255
Compare changes
  • Side-by-side
  • Inline
Files
91
@@ -2,7 +2,7 @@
@@ -2,7 +2,7 @@
<v-dialog
<v-dialog
v-model="exportDialog"
v-model="exportDialog"
max-width="31vw"
max-width="31vw"
@update:returnValue="hide"
@update:return-value="hide"
>
>
<v-card id="data-export-modal">
<v-card id="data-export-modal">
<v-card-title class="title">
<v-card-title class="title">
@@ -12,47 +12,50 @@
@@ -12,47 +12,50 @@
<div v-if="!mapFileLoaded">
<div v-if="!mapFileLoaded">
If you select a mapping file, the anonymized data
If you select a mapping file, the anonymized data
will be mapped back automatically and locally on your machine.
will be mapped back automatically and locally on your machine.
<v-layout
<v-row
row
align-center
align="center"
>
>
<file-select
<v-file-input
v-model="mapFile"
v-model="mapFile"
display-text="Select map file"
label="Map file"
class="ma-3"
accept="application/JSON"
/>
/>
<span>Without the mapping, the data will still be obfuscated.</span>
<span>Without the mapping, the data will still be obfuscated.</span>
</v-layout>
</v-row>
</div>
</div>
<span>
<span>
<b>NOTE:</b> Mapping / setting passwords can take some time depending on course size.
<b>NOTE:</b> Mapping / setting passwords can take some time depending on course size.
</span>
</span>
<v-layout row>
<v-row>
<v-flex xs4>
<v-col cols="4">
<v-tooltip top>
<v-tooltip top>
<v-checkbox
<template #activator="{ on }">
slot="activator"
<div v-on="on">
v-model="setPasswords"
<v-checkbox
label="Set passwords"
v-model="setPasswords"
/>
label="Set passwords"
 
/>
 
</div>
 
</template>
<span>Setting this will cause all student passwords
<span>Setting this will cause all student passwords
to be reset upon export. The new passwords will be contained in the
to be reset upon export. The new passwords will be contained in the
export file.
export file.
</span>
</span>
</v-tooltip>
</v-tooltip>
</v-flex>
</v-col>
<v-flex
<v-col
id="type-select"
id="type-select"
xs3
cols="3"
offset-xs1
offset="1"
>
>
<span>Export as <b>json</b>
<span>Export as <b>json</b>
</span>
</span>
</v-flex>
</v-col>
</v-layout>
</v-row>
<v-card-actions>
<v-card-actions>
<v-btn
<v-btn
flat
text
color="blue lighten-2"
color="blue lighten-2"
@click="exportDialog = false"
@click="exportDialog = false"
>
>
@@ -66,8 +69,8 @@
@@ -66,8 +69,8 @@
<v-btn
<v-btn
v-else
v-else
id="export-data-download-btn"
id="export-data-download-btn"
flat
text
outline
outlined
@click="getExportFile('data')"
@click="getExportFile('data')"
>
>
{{ mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping' }}
{{ mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping' }}
@@ -82,13 +85,10 @@
@@ -82,13 +85,10 @@
import Component, { mixins } from 'vue-class-component'
import Component, { mixins } from 'vue-class-component'
import { getters } from '@/store/getters'
import { getters } from '@/store/getters'
import ax, { StudentExportItem, fetchStudentExportData } from '@/api'
import ax, { StudentExportItem, fetchStudentExportData } from '@/api'
import FileSelect from '@/components/util/FileSelect.vue'
import { mutations as mut } from '@/store/mutations'
import { mutations as mut } from '@/store/mutations'
import { ExportType, exportMixin } from '@/components/mixins/exportMixin.ts'
import { ExportType, exportMixin } from '@/components/mixins/exportMixin.ts'
@Component({
@Component
components: { FileSelect }
})
export default class DataExport extends mixins(exportMixin) {
export default class DataExport extends mixins(exportMixin) {
get studentMap () { return getters.state.studentMap }
get studentMap () { return getters.state.studentMap }
Loading