From de10767b8f703d034c5057044207bc5639243284 Mon Sep 17 00:00:00 2001
From: Christian <chgottsc@uni-potsdam.de>
Date: Wed, 5 Sep 2018 00:00:41 +0200
Subject: [PATCH] feat. dummy dynamisch erzeugtes Diagramm
---
.../assets/js/AlertAssessmentOutlier.js | 32 +++++++++++++++----
.../main/webapp/pages/project-docent_CG.jsp | 3 +-
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js b/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
index 9cb1785d..3e999170 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
@@ -1,12 +1,32 @@
$(document).ready(function () {
- if(!$("#Diagramm").hidden){
- $("#Diagramm").hide();
- };
- document.getElementById("Diagramm").style.visibility="invisible";
+
$('#DiaBlende').on('click',function () {
- $("#Diagramm").show();
- document.getElementById("demo").innerHTML="verlauf";
+ var ctx = document.getElementById("Diagramm").getContext('2d');
+ var myChart = new Chart(ctx, {
+ type: 'line',
+ data: {
+ labels: ["Erstes Assessment", "Zweites Assessment", "Drittes Assessment", "Viertes Assessment", "Fünftes Assessment", "Sechstes Assessment"],
+ datasets: [{
+ label: 'Note Student 1',
+ data: [
+ {x:1,y:2},{x:2,y:3},{x:3,y:1},{x:4,y:4}, {x:5,y:1}, {x:6,y:3}],
+ borderColor: 'rgba(255,0,3,0.2)',
+ backgroundColor: 'rgba(255,0,3,0.2)',
+ fill:false
+ }
+ ,
+ {
+ label:"Note Student 2",
+ data: [{x:1,y:3},{x:2,y:2},{x:3,y:5},{x:4,y:5}, {x:5,y:5}, {x:6,y:1}]
+ ,borderColor: 'rgba(0,255,0,0.2)'
+ , backgroundColor: 'rgba(0,255,3,0.2)'
+ ,fill:false
+
+ }]
+ },
+ options: {scales: {yAxes: [{ticks: {beginAtZero:true}}]},layout:{padding:{left:50,right:50,top:50, bottom:50}}}
+ });
});
});
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
index 9b05704f..810fa851 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
@@ -12,6 +12,7 @@
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/AlertAssessmentOutlier.js"></script>
<script src="../assets/js/grading.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.js"></script>
</head>
@@ -106,7 +107,7 @@
</div>
<div class="col-md-4">
<button id="DiaBlende">Zeitlicher Verlauf</button>
- <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/74/Liniendiagramm-Beispiel.svg/750px-Liniendiagramm-Beispiel.svg.png", width="280", id = "Diagramm" >
+ <canvas height="280" width="280", id = "Diagramm" ></canvas>
</div>
<div class="col-md-4">
<div class="panel panel-default">
--
GitLab