Compare commits

..

4 Commits

Author SHA1 Message Date
21124ec2ad adapting list views 2020-09-12 12:02:25 +02:00
0ee5fc59d3 Adapting tests 2020-09-12 12:02:17 +02:00
b8dfef691e Fixing bug; Place did not show up on map 2020-09-12 11:58:45 +02:00
a1886b0b60 Adapting home view 2020-09-12 11:47:42 +02:00
7 changed files with 50 additions and 44 deletions

View File

@ -9,6 +9,7 @@ database.
import os
import uuid
from django.urls import reverse
from django.db import models
from django.contrib.auth.models import User
from django.db.models.signals import post_save

View File

@ -14,7 +14,7 @@
<article class="LP-TextSection">
</article>
{% include 'partials/osm_map.html' %}
{% include 'partials/osm_map.html' with config=map_config %}
<div class="LP-PlaceGrid">
<h1 class="LP-Headline LP-Headline">Explore the latest locations</h1>
<ul class="LP-PlaceGrid__Grid">

View File

@ -18,7 +18,7 @@
var vectorSource = new ol.source.Vector({
features: [
{% for config.point in point_list %}
{% for point in config.point_list %}
new ol.Feature({
geometry: new ol.geom.Point(
ol.proj.fromLonLat([{{point.longitude}},{{point.latitude}}])

View File

@ -10,7 +10,7 @@
{% block maincontent %}
{% include 'partials/osm_map.html' %}
{% include 'partials/osm_map.html' with config=map_config %}
<div class="LP-PlaceList">
<h1 class="LP-Headline">Listing our places</h1>
<ul class="LP-PlaceList__List">

View File

@ -68,6 +68,6 @@ class TestPlaceListView(ViewTestCase, TestCase):
self.client.login(username='testpeter', password='Develop123')
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')

View File

@ -23,7 +23,10 @@ class PlaceListView(IsAuthenticated, ListView):
def get_context_data(self, **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
class PlaceDetailView(IsAuthenticated, View):

View File

@ -27,10 +27,12 @@ class SignUpView(SuccessMessageMixin, CreateView):
class HomeView(IsAuthenticated, View):
def get(self, request, *args, **kwargs):
place_list = Place.objects.all().order_by('-submitted_when')[:10]
place_map_center = Place.average_latlon(place_list)
context = {
'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)