Compare commits

..

4 Commits

Author SHA1 Message Date
reverend 21124ec2ad adapting list views 2020-09-12 12:02:25 +02:00
reverend 0ee5fc59d3 Adapting tests 2020-09-12 12:02:17 +02:00
reverend b8dfef691e Fixing bug; Place did not show up on map 2020-09-12 11:58:45 +02:00
reverend a1886b0b60 Adapting home view 2020-09-12 11:47:42 +02:00
7 changed files with 50 additions and 44 deletions
+1
View File
@@ -9,6 +9,7 @@ database.
import os import os
import uuid import uuid
from django.urls import reverse
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models.signals import post_save from django.db.models.signals import post_save
@@ -14,7 +14,7 @@
<article class="LP-TextSection"> <article class="LP-TextSection">
</article> </article>
{% include 'partials/osm_map.html' %} {% include 'partials/osm_map.html' with config=map_config %}
<div class="LP-PlaceGrid"> <div class="LP-PlaceGrid">
<h1 class="LP-Headline LP-Headline">Explore the latest locations</h1> <h1 class="LP-Headline LP-Headline">Explore the latest locations</h1>
<ul class="LP-PlaceGrid__Grid"> <ul class="LP-PlaceGrid__Grid">
@@ -18,7 +18,7 @@
var vectorSource = new ol.source.Vector({ var vectorSource = new ol.source.Vector({
features: [ features: [
{% for config.point in point_list %} {% for point in config.point_list %}
new ol.Feature({ new ol.Feature({
geometry: new ol.geom.Point( geometry: new ol.geom.Point(
ol.proj.fromLonLat([{{point.longitude}},{{point.latitude}}]) ol.proj.fromLonLat([{{point.longitude}},{{point.latitude}}])
@@ -10,7 +10,7 @@
{% block maincontent %} {% block maincontent %}
{% include 'partials/osm_map.html' %} {% include 'partials/osm_map.html' with config=map_config %}
<div class="LP-PlaceList"> <div class="LP-PlaceList">
<h1 class="LP-Headline">Listing our places</h1> <h1 class="LP-Headline">Listing our places</h1>
<ul class="LP-PlaceList__List"> <ul class="LP-PlaceList__List">
@@ -68,6 +68,6 @@ class TestPlaceListView(ViewTestCase, TestCase):
self.client.login(username='testpeter', password='Develop123') self.client.login(username='testpeter', password='Develop123')
response = self.client.get(reverse_lazy('place_list')) response = self.client.get(reverse_lazy('place_list'))
self._test_has_context_key(response, 'place_map_center') self._test_has_context_key(response, 'map_config')
@@ -23,7 +23,10 @@ class PlaceListView(IsAuthenticated, ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['place_map_center'] = Place.average_latlon(context['place_list']) context['map_config'] = {
'point_list': context['place_list'],
'map_center': Place.average_latlon(context['place_list'])
}
return context return context
class PlaceDetailView(IsAuthenticated, View): class PlaceDetailView(IsAuthenticated, View):
+4 -2
View File
@@ -27,10 +27,12 @@ class SignUpView(SuccessMessageMixin, CreateView):
class HomeView(IsAuthenticated, View): class HomeView(IsAuthenticated, View):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
place_list = Place.objects.all().order_by('-submitted_when')[:10] place_list = Place.objects.all().order_by('-submitted_when')[:10]
place_map_center = Place.average_latlon(place_list)
context = { context = {
'place_list': place_list, 'place_list': place_list,
'place_map_center': place_map_center 'map_config': {
'point_list': place_list,
'map_center': Place.average_latlon(place_list)
}
} }
return render(request, 'home.html', context) return render(request, 'home.html', context)