diff --git a/ofu_app/apps/donar/management/commands/import_locations.py b/ofu_app/apps/donar/management/commands/import_locations.py new file mode 100644 index 0000000..46aff78 --- /dev/null +++ b/ofu_app/apps/donar/management/commands/import_locations.py @@ -0,0 +1,77 @@ +from django.core.management.base import BaseCommand, CommandError +from apps.donar.models import VGN_Coords + + +def migrate_locations(): + locations = [] + locations.append( + {'location': 'Erba', 'vgn_key': 'coord%3A4418901%3A629758%3ANAV4%3ABamberg%2C An der Weberei 5', + 'lat': '49.90316', + 'lon': '10.86932'}) + locations.append( + {'location': 'Feki', 'vgn_key': 'coord%3A4421412%3A629361%3ANAV4%3ABamberg%2C Feldkirchenstraße 21', + 'lat': '49,9070328', + 'lon': '10,9041714'}) + locations.append( + {'location': 'Markushaus', 'vgn_key': 'coord%3A4419902%3A630599%3ANAV4%3ABamberg%2C Markusplatz 3', + 'lat': '49.89552', + 'lon': '10.88348'}) + locations.append( + {'location': 'Austraße', 'vgn_key': 'coord%3A4420153%3A630781%3ANAV4%3ABamberg%2C An der Universität 7', + 'lat': '49.89411', + 'lon': '10.88726'}) + locations.append( + {'location': 'Kranen', 'vgn_key': 'coord%3A4420141%3A630965%3ANAV4%3ABamberg%2C Am Kranen 10', + 'lat': '49.89259', + 'lon': '10.88701'}) + locations.append( + {'location': 'Kärntenstr', 'vgn_key': 'coord%3A4421130%3A628738%3ANAV4%3ABamberg%2C Kärntenstraße 7', + 'lat': '49.91256', + 'lon': '10.90028'}) + locations.append( + {'location': 'Kapellenstr', 'vgn_key': 'coord%3A4421682%3A631169%3ANAV4%3ABamberg%2C Kapellenstraße 13', + 'lat': '49.89063', + 'lon': '10.90846'}) + locations.append( + {'location': 'Volkspark', 'vgn_key': 'coord%3A4423077%3A629976%3ANAV4%3ABamberg%2C Pödeldorfer Straße 180', + 'lat': '49.90087', + 'lon': '10.92998'}) + locations.append( + {'location': 'K16', 'vgn_key': 'coord%3A4420069%3A630807%3ANAV4%3ABamberg%2C Kapuzinerstraße 16', + 'lat': '48.127', + 'lon': '11.5572'}) + locations.append( + {'location': 'Zwinger', 'vgn_key': 'coord%3A4420461%3A631411%3ANAV4%3ABamberg%2C Am Zwinger 4', + 'lat': '49.88843', + 'lon': '10.8918'}) + locations.append( + {'location': 'AULA', 'vgn_key': 'coord%3A4420062%3A631052%3ANAV4%3ABamberg%2C Dominikanerstraße 2', + 'lat': '49.89165', + 'lon': '10.88602'}) + locations.append( + {'location': 'Fischstr', 'vgn_key': 'coord%3A4420141%3A630930%3ANAV4%3ABamberg%2C Fischstraße 5', + 'lat': '49.89277', + 'lon': '10.88717'}) + locations.append( + {'location': 'Fleischstr', 'vgn_key': 'coord%3A4420204%3A630739%3ANAV4%3ABamberg%2C Fleischstraße 2', + 'lat': '49.89453', + 'lon': '10.88791'}) + for location in locations: + location_obj, created = VGN_Coords.objects.get_or_create(name=location['location'], coords=location['vgn_key'], + latitude=location['lat'], longitude=location['lon']) + if not created: + print("Duplicate! Start Update: " + location['location']) + location_obj.name = location['location'] + location_obj.coords = location['vgn_key'] + location_obj.latitude = location['lat'] + location_obj.longitude = location['lon'] + + +class Command(BaseCommand): + help = "Imports Rooms from Univis PRG" + + def add_arguments(self, parser): + pass + + def handle(self, *args, **options): + migrate_locations() diff --git a/ofu_app/apps/donar/migrations/0004_vgn_coords.py b/ofu_app/apps/donar/migrations/0004_vgn_coords.py new file mode 100644 index 0000000..d20ed2a --- /dev/null +++ b/ofu_app/apps/donar/migrations/0004_vgn_coords.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-10-17 13:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0003_auto_20171004_0211'), + ] + + operations = [ + migrations.CreateModel( + name='VGN_Coords', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('name', models.CharField(default='', max_length=60, unique=True)), + ('coords', models.CharField(default='', max_length=60, unique=True)), + ], + ), + ] diff --git a/ofu_app/apps/donar/migrations/0005_auto_20171017_1603.py b/ofu_app/apps/donar/migrations/0005_auto_20171017_1603.py new file mode 100644 index 0000000..744056d --- /dev/null +++ b/ofu_app/apps/donar/migrations/0005_auto_20171017_1603.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-10-17 14:03 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0004_vgn_coords'), + ] + + operations = [ + migrations.AddField( + model_name='vgn_coords', + name='latitude', + field=models.CharField(default=0, max_length=60, unique=True), + preserve_default=False, + ), + migrations.AddField( + model_name='vgn_coords', + name='longitude', + field=models.CharField(default=0, max_length=60, unique=True), + preserve_default=False, + ), + migrations.AlterField( + model_name='vgn_coords', + name='coords', + field=models.CharField(max_length=60, unique=True), + ), + migrations.AlterField( + model_name='vgn_coords', + name='name', + field=models.CharField(max_length=60, unique=True), + ), + ] diff --git a/ofu_app/apps/donar/models.py b/ofu_app/apps/donar/models.py index bf8b61a..8ec7b91 100644 --- a/ofu_app/apps/donar/models.py +++ b/ofu_app/apps/donar/models.py @@ -17,3 +17,9 @@ class Room(models.Model): description = models.CharField(max_length=200, default="") +class VGN_Coords(models.Model): + id = models.AutoField(primary_key=True) + name = models.CharField(max_length=MAX_LENGTH, unique=True) + coords = models.CharField(max_length=MAX_LENGTH, unique=True) + longitude = models.CharField(max_length=MAX_LENGTH, unique=True) + latitude = models.CharField(max_length=MAX_LENGTH, unique=True) \ No newline at end of file diff --git a/ofu_app/apps/donar/views.py b/ofu_app/apps/donar/views.py index 06edf8f..afedf45 100644 --- a/ofu_app/apps/donar/views.py +++ b/ofu_app/apps/donar/views.py @@ -1,6 +1,7 @@ from django.shortcuts import render from apps.donar.models import Room +from apps.donar.models import VGN_Coords # Create your views here. @@ -26,3 +27,7 @@ def search_room(request): def show_room(request, room): room = Room.objects.get(short=room) return render(request, 'donar/show_room.jinja', {'room': room}) + + +def bus_connections(request): + return render(request, '') \ No newline at end of file diff --git a/ofu_app/templates/donar/vgn_connections.jinja b/ofu_app/templates/donar/vgn_connections.jinja new file mode 100644 index 0000000..e7f1120 --- /dev/null +++ b/ofu_app/templates/donar/vgn_connections.jinja @@ -0,0 +1,10 @@ +{% extends 'base.jinja' %} + +{% block headline %} +
Donar
+{% endblock %} +{% block content %} + {% for location in locations %} + {% endfor %} +{% endblock %}