From c41acb0f46bacedf29915beb6fcf0b92a8f61f7d Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Mon, 28 Feb 2022 17:06:30 +0000 Subject: [PATCH 001/113] #157 chore: install tensorflow dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 6c33f77..5378983 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "@nlpjs/language": "^4.21.1", "@nlpjs/nlp": "^4.22.0", "@nlpjs/sentiment": "^4.22.0", + "@tensorflow/tfjs": "^3.13.0", "chart.js": "^3.6.0", "chartjs-plugin-zoom": "^1.2.0", "core-js": "^3.6.5", From a638e15a687bdb0d897efcd905b9ec453c45195c Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Wed, 2 Mar 2022 18:26:07 +0000 Subject: [PATCH 002/113] #158 feat: ai page component --- src/pages/Settings/AI/AI.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/pages/Settings/AI/AI.vue diff --git a/src/pages/Settings/AI/AI.vue b/src/pages/Settings/AI/AI.vue new file mode 100644 index 0000000..6bf8a85 --- /dev/null +++ b/src/pages/Settings/AI/AI.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file From 407f86c81b8c28d47a22e82ed198278b677bf24e Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Wed, 2 Mar 2022 18:27:14 +0000 Subject: [PATCH 003/113] #158 feat: add AI page data to settings routes --- src/pages/Settings/Settings.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue index f0677c4..a818687 100644 --- a/src/pages/Settings/Settings.vue +++ b/src/pages/Settings/Settings.vue @@ -76,6 +76,10 @@ export default { tab_name: "General", tab_path: "/settings/general" }, + { + tab_name: "AI", + tab_path: "/settings/ai" + }, { tab_name: "Themes", tab_path: "/settings/themes" From b45cd021814171cd09b81bb0cdf85f4525034356 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Wed, 2 Mar 2022 18:27:30 +0000 Subject: [PATCH 004/113] #158 feat: add AI page to app routing --- src/router/router.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/router/router.js b/src/router/router.js index 32f5aab..0834d36 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -13,6 +13,7 @@ import Sentimental from "@/pages/Dashboard/Sentiment/Sentiment"; import General from "@/pages/Settings/General/General"; import Themes from "@/pages/Settings/Themes/Themes"; import About from "@/pages/Settings/About/About"; +import AI from "@/pages/Settings/AI/AI"; const routes = [ { @@ -96,6 +97,11 @@ const routes = [ name: "general", component: General, }, + { + path: '/settings/ai', + name: "artificial intelligence", + component: AI, + }, { path: '/settings/themes', name: "themes", From 402d9cb07d55b46554b2c4dbf8288237c06b771e Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 3 Mar 2022 14:16:22 +0000 Subject: [PATCH 005/113] #160 feat: emotion card component --- src/components/Settings/AI/EmotionCard.vue | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/components/Settings/AI/EmotionCard.vue diff --git a/src/components/Settings/AI/EmotionCard.vue b/src/components/Settings/AI/EmotionCard.vue new file mode 100644 index 0000000..fe4143b --- /dev/null +++ b/src/components/Settings/AI/EmotionCard.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file From 27c74eb68e598e08ea9f6c5e38476d329d94323e Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 3 Mar 2022 14:59:13 +0000 Subject: [PATCH 006/113] #160 feat: button component --- src/components/UI/Button.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/components/UI/Button.vue diff --git a/src/components/UI/Button.vue b/src/components/UI/Button.vue new file mode 100644 index 0000000..40ec3d1 --- /dev/null +++ b/src/components/UI/Button.vue @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file From 004f68caad610f4beb961eef0c3af84e0c276f3e Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 3 Mar 2022 15:00:19 +0000 Subject: [PATCH 007/113] #160 feat: emotions list & import emotions area --- src/pages/Settings/AI/AI.vue | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/pages/Settings/AI/AI.vue b/src/pages/Settings/AI/AI.vue index 6bf8a85..35651a1 100644 --- a/src/pages/Settings/AI/AI.vue +++ b/src/pages/Settings/AI/AI.vue @@ -1,13 +1,49 @@ From 65d8134b3f01b49be47b2ed889f9d2df8235d6ea Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 3 Mar 2022 18:38:06 +0000 Subject: [PATCH 008/113] #160 feat: btn click event --- src/components/UI/Button.vue | 13 +++++++++++-- src/pages/Settings/AI/AI.vue | 3 +-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/UI/Button.vue b/src/components/UI/Button.vue index 40ec3d1..ba886f1 100644 --- a/src/components/UI/Button.vue +++ b/src/components/UI/Button.vue @@ -1,5 +1,5 @@ @@ -8,7 +8,16 @@ export default { name: "Button", - props: ['text'] + props: ['text'], + emits: ['btnClick'], + methods: { + /** + * Emits a bntClick event to the parent component + */ + click: function () { + this.$emit('btnClick') + } + } } diff --git a/src/pages/Settings/AI/AI.vue b/src/pages/Settings/AI/AI.vue index 35651a1..90c0867 100644 --- a/src/pages/Settings/AI/AI.vue +++ b/src/pages/Settings/AI/AI.vue @@ -22,9 +22,8 @@ id="emotions-input" placeholder="Enter emotions here" > - +
@@ -23,16 +29,26 @@ From ca8dc8a46828194591b389757c565fb11438634f Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sat, 5 Mar 2022 12:40:12 +0100 Subject: [PATCH 020/113] #164 feat: show either students list or information programmatically --- src/pages/Dashboard/Students/Students.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index 4eb3594..01772d1 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -15,13 +15,17 @@
-
+
+ +

+ Total number of interactions between each student and the resources of the course (Includes course viewing). +

From c24a1e4584e3c916ac98d1c3fae50685b21b474a Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sat, 5 Mar 2022 20:01:13 +0100 Subject: [PATCH 021/113] #164 feat: add id field to participation card component --- src/components/Students/ParticipationCard.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Students/ParticipationCard.vue b/src/components/Students/ParticipationCard.vue index ddf50da..afaf522 100644 --- a/src/components/Students/ParticipationCard.vue +++ b/src/components/Students/ParticipationCard.vue @@ -1,5 +1,6 @@ @@ -43,9 +44,11 @@ import ParticipationCard from "@/components/Students/ParticipationCard"; import {mdiClose, mdiHelpCircleOutline} from "@mdi/js"; import SvgIcon from "@jamescoyle/vue-icon"; +import StudentDedication from "@/components/Students/StudentDedication"; export default { name: "Students", components: { + StudentDedication, ParticipationCard, SvgIcon }, From 1de4102a8cf00912814fc3c213e17ca5e852998d Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sun, 6 Mar 2022 19:35:44 +0100 Subject: [PATCH 028/113] #168 feat: students page tabs routes --- src/pages/Dashboard/Students/Students.vue | 18 +++++++++++++++--- src/router/router.js | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index e958239..e536b1b 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -59,9 +59,21 @@ export default { }, data() { return { - info_icon: mdiHelpCircleOutline, - close_icon: mdiClose, - sp_info: false + left_icon: mdiMenuLeft, + right_icon: mdiMenuRight, + current_page: 0, + tabs: [ + { + tab_name: "Overview", + tab_description: "Information on students interactions", + tab_path: "dashboard/students/overview" + }, + { + tab_name: "Students List", + tab_description: "Students list", + tab_path: "dashboard/students/list" + } + ] } } } diff --git a/src/router/router.js b/src/router/router.js index 0532207..093c52a 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -13,6 +13,8 @@ import Sentimental from "@/pages/Dashboard/Sentiment/Sentiment"; import General from "@/pages/Settings/General/General"; import Themes from "@/pages/Settings/Themes/Themes"; import About from "@/pages/Settings/About/About"; +import Overview from "@/pages/Dashboard/Students/Overview/Overview"; +import List from "@/pages/Dashboard/Students/List/List"; const routes = [ { @@ -52,6 +54,20 @@ const routes = [ path: '/dashboard/students', name: "students", component: Students, + redirect: "/dashboard/students/overview", + children: [ + { + name: 'overview', + component: Overview, + path: '/dashboard/students/overview', + + }, + { + name: 'students list', + component: List, + path: '/dashboard/students/list', + } + ] }, { path: '/dashboard/resources', From bd6e0a901aad116f886af5519f3116370bc6a2ec Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sun, 6 Mar 2022 19:37:53 +0100 Subject: [PATCH 029/113] #168 refactor: overview & student list layout --- src/pages/Dashboard/Students/Students.vue | 60 +++++++---------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index e536b1b..9918fb2 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -1,55 +1,31 @@ + + \ No newline at end of file From 0831b1c9e0e3659e97f9a43505635a557f2117e8 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sun, 6 Mar 2022 19:41:30 +0100 Subject: [PATCH 033/113] #168 feat: student list page component --- src/pages/Dashboard/Students/List/List.vue | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/pages/Dashboard/Students/List/List.vue diff --git a/src/pages/Dashboard/Students/List/List.vue b/src/pages/Dashboard/Students/List/List.vue new file mode 100644 index 0000000..c858fba --- /dev/null +++ b/src/pages/Dashboard/Students/List/List.vue @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file From b69048e075ff8cdc9bfe17970135abbef1f2235f Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sun, 6 Mar 2022 19:41:48 +0100 Subject: [PATCH 034/113] #168 feat: student list component --- src/components/Students/StudentList.vue | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/components/Students/StudentList.vue diff --git a/src/components/Students/StudentList.vue b/src/components/Students/StudentList.vue new file mode 100644 index 0000000..188ca34 --- /dev/null +++ b/src/components/Students/StudentList.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file From 44b8f8248369551f32162cc44e6b663d5fc8d435 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Sun, 6 Mar 2022 19:41:59 +0100 Subject: [PATCH 035/113] #168 feat: student card component for list rendering --- src/components/Students/StudentCard.vue | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/components/Students/StudentCard.vue diff --git a/src/components/Students/StudentCard.vue b/src/components/Students/StudentCard.vue new file mode 100644 index 0000000..2019cd0 --- /dev/null +++ b/src/components/Students/StudentCard.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file From a1d620e033b52277ec8cca343f2e2ff65ee7d226 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Mon, 7 Mar 2022 11:40:51 +0100 Subject: [PATCH 036/113] #168 feat: students page tabs button conditional disabling --- src/pages/Dashboard/Students/Students.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index 5f7aa3a..251e903 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -5,12 +5,14 @@ From 3b19ddd043fccfcf1ced9cd96832d732f921a3f4 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Mon, 7 Mar 2022 11:41:06 +0100 Subject: [PATCH 037/113] #168 feat: students page tabs button disabled styles --- src/pages/Dashboard/Students/Students.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index 251e903..b4dadf9 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -3,14 +3,16 @@

Students Data

@@ -26,11 +34,22 @@
-
+ +
+ +
+ +
@@ -65,6 +84,7 @@ export default { list_icon: mdiViewGrid, grid_icon: mdiViewSequential, student_search: '', + grid: false, } } } From a241c83205e3b60b05e22ae887a713d1d9db64a1 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Tue, 8 Mar 2022 11:02:59 +0100 Subject: [PATCH 043/113] #168 fix: no overflow for students tab router view --- src/pages/Dashboard/Students/Students.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Dashboard/Students/Students.vue b/src/pages/Dashboard/Students/Students.vue index b4dadf9..e8896ff 100644 --- a/src/pages/Dashboard/Students/Students.vue +++ b/src/pages/Dashboard/Students/Students.vue @@ -21,7 +21,7 @@
{{ tabs[current_page].tab_description }} - + + + \ No newline at end of file From a8464aa65b2fbd5c0054fd4ca85c8f7caba2c2de Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 10 Mar 2022 12:32:22 +0000 Subject: [PATCH 051/113] #171 feat: summary page dynamic layout --- src/pages/Dashboard/Summary/Summary.vue | 144 +++++++++--------------- 1 file changed, 56 insertions(+), 88 deletions(-) diff --git a/src/pages/Dashboard/Summary/Summary.vue b/src/pages/Dashboard/Summary/Summary.vue index d3cd97f..3e4ed5a 100644 --- a/src/pages/Dashboard/Summary/Summary.vue +++ b/src/pages/Dashboard/Summary/Summary.vue @@ -1,113 +1,81 @@ + + \ No newline at end of file From 0b45e45ddbf2ee56da26da6d82ba88bcd857d8e6 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 10 Mar 2022 12:34:21 +0000 Subject: [PATCH 053/113] #171 feat: weekly interactions heatmap config --- src/assets/weeklyInteractionsMap.js | 62 +++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 src/assets/weeklyInteractionsMap.js diff --git a/src/assets/weeklyInteractionsMap.js b/src/assets/weeklyInteractionsMap.js new file mode 100644 index 0000000..c752b1a --- /dev/null +++ b/src/assets/weeklyInteractionsMap.js @@ -0,0 +1,62 @@ +const hours = [ + '00', '01', '02', '03', '04', '05', '06', + '07', '08', '09', '10', '11', + '12', '13', '14', '15', '16', '17', + '18', '19', '20', '21', '22', '23' +]; + +const days = [ + 'Sunday','Saturday', 'Friday', 'Thursday', + 'Wednesday', 'Tuesday', 'Monday' +]; + +const weeklyInteractionConfig = { + tooltip: { + position: 'top' + }, + grid: { + height: '60%', + top: 'center', + }, + xAxis: { + type: 'category', + data: hours, + splitArea: { + show: true + } + }, + yAxis: { + type: 'category', + data: days, + splitArea: { + show: true + } + }, + visualMap: { + min: 0, + max: 500, + calculable: true, + orient: 'vertical', + top: 'center', + right: '3%', + }, + series: [ + { + name: 'Weekly Interactions', + type: 'heatmap', + coordinateSystem: 'cartesian2d', + data: null, + label: { + show: true + }, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] +}; + +export default weeklyInteractionConfig; \ No newline at end of file From 6629a9e8cea4c82670ec7e8ce6cead8273918dbd Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Thu, 10 Mar 2022 13:44:02 +0000 Subject: [PATCH 054/113] #171 fix: heatmap variable is not reactive & mapped to vue component instance --- src/pages/Dashboard/Summary/Weekly/Weekly.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Dashboard/Summary/Weekly/Weekly.vue b/src/pages/Dashboard/Summary/Weekly/Weekly.vue index 329e257..57225c9 100644 --- a/src/pages/Dashboard/Summary/Weekly/Weekly.vue +++ b/src/pages/Dashboard/Summary/Weekly/Weekly.vue @@ -18,12 +18,11 @@ export default { this.heatmap.setOption(this.week_data); }, beforeUnmount() { - this.heatmap.dispose(); + this.heatmap && this.heatmap.dispose(); this.heatmap = null; }, data() { return { - heatmap: null, week_data: weeklyInteractionConfig } } From e08d3f946f6afafc699b305e8bb968e1e90330d5 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Fri, 11 Mar 2022 16:39:33 +0000 Subject: [PATCH 055/113] #161 feat: badge ui component --- src/components/UI/Badge.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/components/UI/Badge.vue diff --git a/src/components/UI/Badge.vue b/src/components/UI/Badge.vue new file mode 100644 index 0000000..e48d882 --- /dev/null +++ b/src/components/UI/Badge.vue @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file From 0739fbbedf38fa364edc624b92bafc00d94305c7 Mon Sep 17 00:00:00 2001 From: JiahuiChen99 Date: Fri, 11 Mar 2022 16:40:18 +0000 Subject: [PATCH 056/113] #161 feat: emotions dataset layout - data list - import dataset --- src/pages/Settings/AI/AI.vue | 80 ++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/src/pages/Settings/AI/AI.vue b/src/pages/Settings/AI/AI.vue index 09d6fc3..ceb6de9 100644 --- a/src/pages/Settings/AI/AI.vue +++ b/src/pages/Settings/AI/AI.vue @@ -26,19 +26,74 @@