From 6d70e83cc6fdfe12408b1105b9f73bf8bbc43ef6 Mon Sep 17 00:00:00 2001 From: papi Date: Sun, 14 Jan 2024 10:13:39 +0300 Subject: [PATCH] Additional school demographics --- templates/core/dashboard.html | 187 ++++++++++++++++++---------------- 1 file changed, 99 insertions(+), 88 deletions(-) diff --git a/templates/core/dashboard.html b/templates/core/dashboard.html index bde9eef..5f5d9f2 100644 --- a/templates/core/dashboard.html +++ b/templates/core/dashboard.html @@ -150,17 +150,16 @@ } -
-

Dashboard

-
- -
+
Dashboard settings
- - +
@@ -189,19 +188,19 @@
-

+

- Lab Assistance -

500

+ Administrators +

{{ superuser_count }}

-

+

- Administrators -

{{ superuser_count }}

+ Lab Assistance +

500

@@ -256,53 +255,28 @@
-
-
-
-
-
Your recent activities
-
    -
  • Created a survey of something
    • -
  • Added new admin user
    • -
  • Deleted 1 video from CSE course
    • -
  • New documentation attached for Arch
    • -
  • Lorem ipsum dolor sit amet consectetur adipisicing elit.
    • -
  • Veniam magnam reiciendis modi explicabo sed aliquid natus
    • -
  • molestias corrupti suscipit similique ex adipisci praesentium
    • -
  • sint dolore, quo quibusdam ea, neque cupiditate.
    • -
-
-
-
-
-
Latest activities
-
    - {% for log in logs %} -
  • {{ log.message }} - {{ log.created_at }}
    • - {% empty %} - No recent activity - {% endfor %} -
-
-
-
-
-
-
- - +
+
+
Latest activities
+
    + {% for log in logs %}d-flex +
  • {{ log.message }} - {{ log.created_at }}
    • + {% empty %} +
  • No recent activity
    • + {% endfor %} +

-
School Demographics
+
School Demographics
@@ -417,7 +391,7 @@ hoverBorderWidth: 3, data: [45, 75, 70, 80, 20, 30, 90], }, { - label: 'Business Man', + label: 'Business M.', backgroundColor: 'rgba(0, 0, 0, 0.5)', borderColor: 'rgb(0, 0, 0)', hoverBorderWidth: 3, @@ -440,21 +414,6 @@ } }); - var attendance = document.getElementById('attendance'); - var chart = new Chart(attendance, { - type: 'doughnut', - data: data, - options: { - plugins: { - title: { - display: true, - text: 'Overall Attendance', - padding: 20 - } - } - } - }); - // Average grade setup const labelsGrade = [ '2017', @@ -466,25 +425,25 @@ const dataGrade = { labels: labelsGrade, datasets: [{ - label: 1, + label: "Comp sci.", backgroundColor: 'rgba(86, 224, 224, 0.5)', borderColor: 'rgb(86, 224, 224)', hoverBorderWidth: 3, data: [0, 10, 5, 2, 20, 30, 45] }, { - label: 2, + label: "Civil eng.", backgroundColor: 'rgba(253, 174, 28, 0.5)', borderColor: 'rgb(253, 174, 28)', hoverBorderWidth: 3, data: [20, 0, 15, 4, 6, 4, 60], }, { - label: 3, + label: "Architect.", backgroundColor: 'rgba(203, 31, 255, 0.5)', borderColor: 'rgb(203, 31, 255)', hoverBorderWidth: 3, data: [85, 30, 34, 20, 20, 55, 45], }, { - label: 4, + label: "Economics", backgroundColor: 'rgba(255, 19, 157, 0.5)', borderColor: 'rgb(255, 19, 157)', hoverBorderWidth: 3, @@ -523,26 +482,42 @@ // } // }); + // const dataGender = { + // labels: ['Man', 'Women'], + // datasets: [{ + // label: 'Man', + // backgroundColor: 'rgba(86, 224, 224, 0.5)', + // borderColor: 'rgb(86, 224, 224)', + // hoverBorderWidth: 3, + // data: 56 + // }, { + // label: 'Women', + // backgroundColor: 'rgba(253, 174, 28, 0.5)', + // borderColor: 'rgb(253, 174, 28)', + // hoverBorderWidth: 3, + // data: 44, + // }] + // }; + const dataGender = { - labels: ['Man', 'Women'], + labels: [ + 'Man', + 'Women' + ], datasets: [{ - label: 'Man', - backgroundColor: 'rgba(86, 224, 224, 0.5)', - borderColor: 'rgb(86, 224, 224)', - hoverBorderWidth: 3, - data: [56] - }, { - label: 'Women', - backgroundColor: 'rgba(253, 174, 28, 0.5)', - borderColor: 'rgb(253, 174, 28)', - hoverBorderWidth: 3, - data: [44], + label: "Students Gender Dataset", + data: [56, 44], + backgroundColor: [ + 'rgb(255, 99, 132)', + 'rgb(54, 162, 235)' + ], + hoverOffset: 4 }] }; var gender = document.getElementById('gender'); var chart = new Chart(gender, { - type: 'polarArea', + type: 'pie', data: dataGender, options: { plugins: { @@ -554,29 +529,65 @@ } } }); + + const dataQualification = { + labels: [ + 'PHD', + 'Masters', + 'BSc degree' + ], + datasets: [{ + label: "Lecturer Qualifications Dataset", + data: [24, 30, 26], + backgroundColor: [ + 'rgb(255, 99, 132)', + 'rgb(255, 193, 7)', + 'rgb(54, 162, 235)' + ], + hoverOffset: 4 + }] + }; var ethnicity = document.getElementById('ethnicity'); var chart = new Chart(ethnicity, { - type: 'polarArea', - data: dataGender, + type: 'pie', + data: dataQualification, options: { plugins: { title: { display: true, - text: 'Race/Ethnicity', + text: 'Lecturer qualifications', padding: 20 } } } }); + + const dataLevels = { + labels: [ + 'PHD', + 'Masters', + 'BSc degree' + ], + datasets: [{ + label: "Students level", + data: [14, 30, 56], + backgroundColor: [ + 'rgb(255, 99, 132)', + 'rgb(255, 193, 7)', + 'rgb(54, 162, 235)' + ], + hoverOffset: 4 + }] + }; var language = document.getElementById('language'); var chart = new Chart(language, { - type: 'polarArea', - data: dataGender, + type: 'pie', + data: dataLevels, options: { plugins: { title: { display: true, - text: 'Home Language', + text: 'Student levels', padding: 20 } }