Kurocon/wieheeftdetapperssleutel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix graph layout

Browse source
This commit is contained in:
Kevin Alberts 2019-11-12 13:58:30 +01:00
parent 504a9f6515
commit 93cb146eb3
Signed by: Kurocon
GPG key ID: BCD496FEBA0C6BC1
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tapperssleutel/views.py
View file

@ -32,6 +32,7 @@ class HomePage(CreateView):
dates = Kwijtgeraakt.objects.all().order_by('date') dates = Kwijtgeraakt.objects.all().order_by('date')
context['tapperlist'] = [x.name for x in Tapper.objects.all()] context['tapperlist'] = [x.name for x in Tapper.objects.all()]
context['datelist'] = [x.date.strftime("%Y-%m-%d") for x in dates]
context['tappersdata'] = {} context['tappersdata'] = {}
current_counts = {tapper.name: 0 for tapper in Tapper.objects.all()} current_counts = {tapper.name: 0 for tapper in Tapper.objects.all()}
for date in dates: for date in dates:
@ -59,9 +60,12 @@ class DetailPage(FormView):
context['tappers'] = Tapper.objects.all().annotate(amount=Count('kwijtgeraakt')) context['tappers'] = Tapper.objects.all().annotate(amount=Count('kwijtgeraakt'))
context['detailform'] = form context['detailform'] = form
context['start_date'] = form.cleaned_data['start_date']
context['end_date'] = form.cleaned_data['end_date']
dates = Kwijtgeraakt.objects.filter(date__gte=form.cleaned_data['start_date'], date__lte=form.cleaned_data['end_date']).order_by('date') dates = Kwijtgeraakt.objects.filter(date__gte=form.cleaned_data['start_date'], date__lte=form.cleaned_data['end_date']).order_by('date')
context['tapperlist'] = [x.name for x in Tapper.objects.all()] context['tapperlist'] = [x.name for x in Tapper.objects.all()]
context['datelist'] = [x.date.strftime("%Y-%m-%d") for x in dates]
context['tappersdata'] = {} context['tappersdata'] = {}
current_counts = {tapper.name: 0 for tapper in Tapper.objects.all()} current_counts = {tapper.name: 0 for tapper in Tapper.objects.all()}
for date in dates: for date in dates:

9
templates/detail.html
View file

@ -54,10 +54,12 @@
<!-- Show chart --> <!-- Show chart -->
<script type="text/javascript" src="{% static 'js/gchart_loader.js' %}"></script> <script type="text/javascript" src="{% static 'js/gchart_loader.js' %}"></script>
{{ tapperlist|json_script:"tapperlist" }} {{ tapperlist|json_script:"tapperlist" }}
{{ datelist|json_script:"datelist" }}
{{ tappersdata|json_script:"tapperdata" }} {{ tappersdata|json_script:"tapperdata" }}
<script type="text/javascript"> <script type="text/javascript">
var data_headers = JSON.parse(document.getElementById('tapperlist').textContent); var data_headers = JSON.parse(document.getElementById('tapperlist').textContent);
var data_dates = JSON.parse(document.getElementById('datelist').textContent);
var data_content = JSON.parse(document.getElementById('tapperdata').textContent); var data_content = JSON.parse(document.getElementById('tapperdata').textContent);
var chartData = []; var chartData = [];
@ -66,7 +68,7 @@
chartData.push(headerRow); chartData.push(headerRow);
// Add first row with all zeroes on start date of form // Add first row with all zeroes on start date of form
var startDate = new Date("{{ detailform.start_date.value|date:"Y-m-d" }}"); var startDate = new Date("{{ start_date|date:"Y-m-d" }}");
rowData = [startDate]; rowData = [startDate];
for (var index in data_headers) { for (var index in data_headers) {
if (data_headers[index] !== "Date") { if (data_headers[index] !== "Date") {
@ -76,7 +78,8 @@
chartData.push(rowData); chartData.push(rowData);
// Add rest of rows // Add rest of rows
for (var date in data_content) { for (var date_id in data_dates) {
var date = data_dates[date_id];
rowData = [new Date(date)]; rowData = [new Date(date)];
for (var index in data_headers) { for (var index in data_headers) {
if (data_headers[index] !== "Date") { if (data_headers[index] !== "Date") {
@ -87,7 +90,7 @@
} }
// Add last row with max values on end date of form // Add last row with max values on end date of form
var endDate = new Date("{{ detailform.end_date.value|date:"Y-m-d" }}"); var endDate = new Date("{{ end_date|date:"Y-m-d" }}");
rowData = [endDate]; rowData = [endDate];
for (var index in data_headers) { for (var index in data_headers) {
if (data_headers[index] !== "Date") { if (data_headers[index] !== "Date") {

5
templates/home.html
View file

@ -88,10 +88,12 @@
<!-- Show chart --> <!-- Show chart -->
<script type="text/javascript" src="{% static 'js/gchart_loader.js' %}"></script> <script type="text/javascript" src="{% static 'js/gchart_loader.js' %}"></script>
{{ tapperlist|json_script:"tapperlist" }} {{ tapperlist|json_script:"tapperlist" }}
{{ datelist|json_script:"datelist" }}
{{ tappersdata|json_script:"tapperdata" }} {{ tappersdata|json_script:"tapperdata" }}
<script type="text/javascript"> <script type="text/javascript">
var data_headers = JSON.parse(document.getElementById('tapperlist').textContent); var data_headers = JSON.parse(document.getElementById('tapperlist').textContent);
var data_dates = JSON.parse(document.getElementById('datelist').textContent);
var data_content = JSON.parse(document.getElementById('tapperdata').textContent); var data_content = JSON.parse(document.getElementById('tapperdata').textContent);
var chartData = []; var chartData = [];
@ -110,7 +112,8 @@
chartData.push(rowData); chartData.push(rowData);
// Add rest of rows // Add rest of rows
for (var date in data_content) { for (var date_id in data_dates) {
var date = data_dates[date_id];
rowData = [new Date(date)]; rowData = [new Date(date)];
for (var index in data_headers) { for (var index in data_headers) {
if (data_headers[index] !== "Date") { if (data_headers[index] !== "Date") {