Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Merge requests
!247
Resolve "Update Vuetify"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Update Vuetify"
250-update-vuetify
into
master
Overview
2
Commits
60
Pipelines
32
Changes
91
Merged
Jakob Dieterle
requested to merge
250-update-vuetify
into
master
4 years ago
Overview
2
Commits
60
Pipelines
32
Changes
91
Expand
Closes
#250 (closed)
Edited
4 years ago
by
Thilo Wischmeyer
0
0
Merge request reports
Compare
master
version 30
c7263f41
4 years ago
version 29
14fd464f
4 years ago
version 28
67d0dc83
4 years ago
version 27
2b51b823
4 years ago
version 26
e667d050
4 years ago
version 25
406f01a2
4 years ago
version 24
849a583d
4 years ago
version 23
a973adbd
4 years ago
version 22
58308f53
4 years ago
version 21
fe661f21
4 years ago
version 20
b643fb89
4 years ago
version 19
63648144
4 years ago
version 18
da5f5d46
4 years ago
version 17
3eb9a44c
4 years ago
version 16
9fb220c3
4 years ago
version 15
8bab1c75
4 years ago
version 14
a8414800
4 years ago
version 13
9de2c8cf
4 years ago
version 12
70f91a57
4 years ago
version 11
2fd31125
4 years ago
version 10
4e5255cd
4 years ago
version 9
d36890a4
4 years ago
version 8
e4858231
4 years ago
version 7
976a794f
4 years ago
version 6
f755bda4
4 years ago
version 5
6c3b133d
4 years ago
version 4
52c8fb8c
4 years ago
version 3
92b5e676
4 years ago
version 2
27df6d7c
4 years ago
version 1
c393daa8
4 years ago
master (base)
and
latest version
latest version
6af43d11
60 commits,
4 years ago
version 30
c7263f41
59 commits,
4 years ago
version 29
14fd464f
59 commits,
4 years ago
version 28
67d0dc83
58 commits,
4 years ago
version 27
2b51b823
57 commits,
4 years ago
version 26
e667d050
56 commits,
4 years ago
version 25
406f01a2
55 commits,
4 years ago
version 24
849a583d
54 commits,
4 years ago
version 23
a973adbd
51 commits,
4 years ago
version 22
58308f53
50 commits,
4 years ago
version 21
fe661f21
49 commits,
4 years ago
version 20
b643fb89
49 commits,
4 years ago
version 19
63648144
48 commits,
4 years ago
version 18
da5f5d46
47 commits,
4 years ago
version 17
3eb9a44c
44 commits,
4 years ago
version 16
9fb220c3
41 commits,
4 years ago
version 15
8bab1c75
40 commits,
4 years ago
version 14
a8414800
35 commits,
4 years ago
version 13
9de2c8cf
34 commits,
4 years ago
version 12
70f91a57
33 commits,
4 years ago
version 11
2fd31125
32 commits,
4 years ago
version 10
4e5255cd
31 commits,
4 years ago
version 9
d36890a4
29 commits,
4 years ago
version 8
e4858231
26 commits,
4 years ago
version 7
976a794f
25 commits,
4 years ago
version 6
f755bda4
23 commits,
4 years ago
version 5
6c3b133d
22 commits,
4 years ago
version 4
52c8fb8c
19 commits,
4 years ago
version 3
92b5e676
19 commits,
4 years ago
version 2
27df6d7c
17 commits,
4 years ago
version 1
c393daa8
16 commits,
4 years ago
91 files
+
2407
−
3255
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
91
Search (e.g. *.vue) (Ctrl+P)
frontend/src/components/export/DataExport.vue
+
28
−
28
Options
@@ -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:return
V
alue=
"hide"
@
update:return
-v
alue=
"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-
selec
t
<
v-
file-
inpu
t
v-model=
"mapFile"
v-model=
"mapFile"
display-text=
"Select m
ap file"
label=
"M
ap 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
fla
t
tex
t
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"
fla
t
tex
t
outline
outline
d
@
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