Studium
/
Softwareprojektmanagement
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/SPM-11'

This commit is contained in:
Johannes Theiner 2019-05-28 15:31:31 +02:00
parent 005bc14a93 3e42b63290
commit 398c54fa8e
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/index.jsp
View File

@ -6,7 +6,7 @@
<!--Cards-->
<!--Analyse-Cards-->
<div id="analysis" class="row container">
<div id="analysis" class="row container black-text">
<!--Übersicht-->
<div class="col s12 m12">
<div id="overview" class="card white">
@ -16,7 +16,7 @@
<div class="card-content">
<div>
<canvas id="overview_chart" width="1000" height="400"></canvas>
<canvas class="black-text" id="overview_chart" width="1000" height="400"></canvas>
</div>
</div>
</div>

3
src/main/webapp/js/cache.js
View File

@ -1,3 +1,5 @@
Chart.defaults.global.defaultFontColor = "black";
$(document).ready(function () {
let dataset = $('#dataset');
request('files').then(results => {
@ -33,7 +35,6 @@ function updateCache() {
}
}
function updateAll(uuid) {
updateWeekOverviewChart(uuid);
updateShoppingTimesChart(uuid);

26
src/main/webapp/js/week_overview.js
View File

@ -5,13 +5,15 @@ let week_overview = new Chart($("#overview_chart"), {
data: {
labels: [0, 0, 0, 0, 0],
datasets: [{
label: "Warenanzahl",
label: "Kundenanzahl",
yAxisID: 'y-axis-1',
data: [0, 0, 0, 0, 0],
fill: true,
backgroundColor: 'rgba(104, 216, 154, 0.5)',
lineTension: 0
}, {
label: "Einnahmen in €",
yAxisID: 'y-axis-2',
data: [0, 0, 0, 0, 0],
fill: true,
backgroundColor: 'rgba(113, 114, 231, 1)',
@ -47,9 +49,25 @@ let week_overview = new Chart($("#overview_chart"), {
display: false
}
}],
yAxes: [{
display: true
}]
yAxes: [
{
display: true,
position: 'right',
id: 'y-axis-1',
scaleLabel: {
display: true,
labelString: 'Kundenanzahl'
}
},
{
display: true,
id: 'y-axis-2',
scaleLabel: {
display: true,
labelString: 'Einnahmen in €'
}
}
]
}
}
});