project restructuring and updates

rost/admin.py → busroutes/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
-from models import Stage, Route, StageSeq
-from django.core.urlresolvers import reverse
+from busroutes.models import Route, Stage, StageSequence
 
+
+# Register your models here.
 class RouteAdmin(admin.ModelAdmin):
-    list_display = ( 'name', 'start', 'end',)
+    list_display = ( 'name', 'start_stage', 'end_stage',)
     search_fields = [ 'name', 'stages__name' ]
     ordering = ( 'name', )
 
@@ -20,12 +21,12 @@ def show_url(self, instance):
     show_url.allow_tags = True
     show_url.short_description = "Url of this stage"
     '''
-    
+
 class StageSeqAdmin(admin.ModelAdmin):
     list_display = ( 'id', 'route', 'stage', 'sequence',)
     search_fields = [ 'route__name' ]
     ordering = ( 'route', )
 
 admin.site.register(Route,RouteAdmin)
 admin.site.register(Stage,StageAdmin)
-admin.site.register(StageSeq,StageSeqAdmin)
+admin.site.register(StageSequence,StageSeqAdmin)

busroutes/migrations/0001_initial.py

@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import geoposition.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BusRouteTiming',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('time', models.TimeField()),
+                ('is_ac', models.BooleanField()),
+            ],
+            options={
+                'verbose_name': 'Bus Route Timing',
+                'verbose_name_plural': 'Bus Route Timings',
+            },
+        ),
+        migrations.CreateModel(
+            name='Route',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('direction', models.CharField(max_length=2)),
+                ('ac_bus_available', models.BooleanField(default=False)),
+            ],
+            options={
+                'verbose_name': 'Route',
+                'verbose_name_plural': 'Routes',
+            },
+        ),
+        migrations.CreateModel(
+            name='Stage',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(unique=True, max_length=64)),
+                ('coordinates', geoposition.fields.GeopositionField(max_length=42)),
+            ],
+            options={
+                'verbose_name': 'Stage',
+                'verbose_name_plural': 'Stages',
+            },
+        ),
+        migrations.CreateModel(
+            name='StageSequence',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('sequence', models.IntegerField()),
+                ('route', models.ForeignKey(to='busroutes.Route')),
+                ('stage', models.ForeignKey(to='busroutes.Stage')),
+            ],
+            options={
+                'verbose_name': 'Stage Sequence',
+                'verbose_name_plural': 'Stage Sequences',
+            },
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='end_stage',
+            field=models.ForeignKey(related_name='end_stage', to='busroutes.Stage'),
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='stages',
+            field=models.ManyToManyField(to='busroutes.Stage', through='busroutes.StageSequence'),
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='start_stage',
+            field=models.ForeignKey(related_name='start_stage', to='busroutes.Stage'),
+        ),
+        migrations.AddField(
+            model_name='busroutetiming',
+            name='route',
+            field=models.ForeignKey(to='busroutes.Route'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='stagesequence',
+            unique_together=set([('route', 'stage', 'sequence')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='route',
+            unique_together=set([('name', 'start_stage', 'end_stage'), ('name', 'direction')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='busroutetiming',
+            unique_together=set([('route', 'time', 'is_ac')]),
+        ),
+    ]

busroutes/migrations/0002_auto_20150711_1945.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('busroutes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='route',
+            name='direction',
+            field=models.CharField(max_length=4),
+        ),
+    ]

busroutes/models.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+from django.db import models
+from geoposition.fields import GeopositionField
+
+
+class Stage(models.Model):
+    name = models.CharField(max_length=64,unique=True)
+    coordinates = GeopositionField()
+
+    class Meta:
+        verbose_name = "Stage"
+        verbose_name_plural = "Stages"
+
+    def __unicode__(self):
+        return self.name
+
+
+class BusRouteTiming(models.Model):
+    route = models.ForeignKey('Route')
+    time = models.TimeField()
+    is_ac = models.BooleanField()  # is air-conditioned
+
+    class Meta:
+        verbose_name = "Bus Route Timing"
+        verbose_name_plural = "Bus Route Timings"
+
+        unique_together=(('route','time','is_ac'),)
+
+
+class Route(models.Model):
+    name = models.CharField(max_length=64)
+    start_stage = models.ForeignKey(Stage, related_name='start_stage')
+    end_stage = models.ForeignKey(Stage, related_name='end_stage')
+    direction = models.CharField(max_length=4)  # up or down
+    ac_bus_available = models.BooleanField(default=False)
+    stages = models.ManyToManyField(
+        Stage, through="StageSequence",through_fields=('route', 'stage'))
+
+    class Meta:
+        verbose_name = "Route"
+        verbose_name_plural = "Routes"
+
+        unique_together = (('name','direction'),('name','start_stage','end_stage'),)
+
+    def __unicode__(self):
+        return self.name
+
+
+class StageSequence(models.Model):
+    route = models.ForeignKey(Route)
+    stage = models.ForeignKey(Stage)
+    sequence = models.IntegerField()
+
+    class Meta:
+        verbose_name = "Stage Sequence"
+        verbose_name_plural = "Stage Sequences"
+
+        unique_together = (('route','stage','sequence'),)
+
+    def __unicode__(self):
+        return str(self.route.id)+' | '+str(self.stage.id)+'('+str(self.sequence)+')'

busroutes/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

rost/views.py → busroutes/views.py

@@ -5,7 +5,7 @@
 from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
 
-from models import Stage, Route, StageSeq
+from models import Stage, Route, StageSequence
 
 def server_error(request):
     return render(request,template_name="500.html")
@@ -29,7 +29,7 @@ def search_by_num(request):
 
 
 def bus_by_id(request,busid=None):
-    stops = StageSeq.objects.select_related().filter(
+    stops = StageSequence.objects.select_related().filter(
                  route=busid).order_by('sequence')
     if stops:
         return render(request, "results_by_num.html",
@@ -60,11 +60,10 @@ def search_by_stage(request):
             buses = None
 
         if buses:
-            data,buslist = payloadmaker(buses, startstage, endstage)
+            data_payload = payloadmaker(buses, startstage, endstage)
             payload = {'startstage': startstage,
                        'endstage': endstage,
-                       'data': data,
-                       'buslist':buslist
+                       'data': data_payload,
                        }
             return render(request, "results_by_stage.html", payload)
         else:
@@ -79,14 +78,15 @@ def search_by_stage(request):
 def payloadmaker(buses, startstage, endstage):
     data = {}
     for bus in buses:
-        stops = StageSeq.objects.select_related().filter(route__name=bus.name)
+        stops = StageSequence.objects.select_related().filter(route__name=bus.name)
         x = stops.get(stage__name__icontains=startstage).sequence
         y = stops.get(stage__name__icontains=endstage).sequence
         stops = stops[min(x, y)-1:max(x, y)]
         data[bus.name] = [it.stage.name for it in stops]
         if data[bus.name][0] != startstage:
             data[bus.name].reverse()
-        
+
     shortest = min(data,key=lambda item:len(data[item]))
     buslist = [shortest] + [ i for i in data.keys() if i!=shortest ]
-    return (data,buslist)
+    payload = [(bus,data[bus]) for bus in buslist]
+    return payload

dtc_bus_routes/urls.py

@@ -0,0 +1,31 @@
+"""dtc_bus_routes URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.8/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Add an import:  from blog import urls as blog_urls
+    2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
+"""
+from django.conf.urls import include, url
+from django.contrib import admin
+
+from django.views.generic import TemplateView
+
+urlpatterns = [
+    url(r'^admin/', include(admin.site.urls)),
+
+    url(r'^$', TemplateView.as_view(template_name="home.html"), name='home'),
+
+    url(r'route/search/$','busroutes.views.search_by_stage',name='search_by_stage'),
+    url(r'search/$','busroutes.views.search_by_num',name='search_by_num'),
+  # url(r'stage/(?P<stageid>\d+)/$','buroutes.views.stage_by_id',name='stage_by_id')   #not implemented yet
+    url(r'route/(?P<busid>\d+)/$','busroutes.views.bus_by_id',name='bus_by_id'),
+    url(r'ajax/bus/$','busroutes.views.ajax_bus',name='ajax_bus'),
+]

dtc_bus_routes/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for dtc_bus_routes project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dtc_bus_routes.settings")
+
+application = get_wsgi_application()