Skip to content

Commit 3faa4ab

Browse files
committed
Merge branch 'FoPro_WS_UML-Assessment' of origin
2 parents ea168cb + 8b4968a commit 3faa4ab

2 files changed

Lines changed: 26 additions & 7 deletions

File tree

components/hylimo/api/UmlApi.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,21 @@ export const umlApiGetLecturerExerciseOverviewQuery = graphql`
197197
diagramCode
198198
semanticModel
199199
}
200+
studentSubmissions {
201+
studentId
202+
solutions {
203+
id
204+
submittedAt
205+
diagram {
206+
diagramCode
207+
semanticModel
208+
}
209+
feedback {
210+
points
211+
comment
212+
}
213+
}
214+
}
200215
}
201216
202217
findContentsByIds(ids: [$assessmentId]) {

package.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@
2020
},
2121
"dependencies": {
2222
"@codingame/monaco-vscode-api": "^25.0.0",
23+
"@codingame/monaco-vscode-editor-api": "^23.2.2",
2324
"@emotion/css": "^11.11.2",
2425
"@emotion/react": "^11.11.4",
2526
"@emotion/styled": "^11.11.5",
2627
"@fontsource/roboto": "^4.5.8",
28+
"@hylimo/diagram-common": "^2.2.1",
29+
"@hylimo/diagram-protocol": "^2.2.1",
30+
"@hylimo/diagram-render-pdf": "^2.2.2",
31+
"@hylimo/diagram-render-svg": "^2.2.2",
32+
"@hylimo/diagram-ui": "^2.2.1",
2733
"@hylimo/language-server": "^2.2.1",
2834
"@hylimo/monaco-editor-support": "^2.2.1",
2935
"@mui/icons-material": "^5.15.15",
@@ -50,21 +56,15 @@
5056
"dompurify": "^3.2.6",
5157
"eslint": "8.38.0",
5258
"eslint-config-next": "13.3.0",
59+
"file-saver": "^2.0.5",
5360
"formik": "^2.4.5",
5461
"framer-motion": "^10.18.0",
5562
"graphql-ws": "^6.0.6",
5663
"immutable": "^5.1.1",
5764
"is-hotkey": "^0.2.0",
5865
"lodash": "^4.17.21",
5966
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^25.0.0",
60-
"@codingame/monaco-vscode-editor-api": "^23.2.2",
6167
"monaco-languageclient": "^10.4.0",
62-
"@hylimo/diagram-ui": "^2.2.1",
63-
"sprotty": "^1.4.0",
64-
"sprotty-protocol": "^1.4.0",
65-
"@hylimo/diagram-common": "^2.2.1",
66-
"vscode-languageclient": "^9.0.1",
67-
"@hylimo/diagram-protocol": "^2.2.1",
6868
"next": "13.4.7",
6969
"oidc-client-ts": "^2.4.0",
7070
"pdfobject": "^2.3.0",
@@ -88,6 +88,8 @@
8888
"slate": "^0.94.1",
8989
"slate-history": "^0.93.0",
9090
"slate-react": "^0.98.4",
91+
"sprotty": "^1.4.0",
92+
"sprotty-protocol": "^1.4.0",
9193
"swiper": "^11.2.10",
9294
"tailwindcss": "3.3.1",
9395
"tippy.js": "^6.3.7",
@@ -96,12 +98,14 @@
9698
"usehooks-ts": "^3.1.0",
9799
"uuid": "^13.0.0",
98100
"victory": "^36.9.2",
101+
"vscode-languageclient": "^9.0.1",
99102
"vscode-languageserver": "^9.0.1",
100103
"vscode-languageserver-protocol": "^3.17.5",
101104
"yup": "^1.4.0",
102105
"zustand": "^5.0.7"
103106
},
104107
"devDependencies": {
108+
"@types/file-saver": "^2.0.7",
105109
"@types/react-relay": "14.1.3",
106110
"@types/relay-runtime": "14.1.10",
107111
"concurrently": "^8.2.2",

0 commit comments

Comments
 (0)