edited fuzzystops to indicate first/last stop

chaloBEST/mumbai/models.py

@@ -315,6 +315,13 @@ class UniqueRoute(models.Model):
     def get_stop_choices(self):
         return Stop.objects.filter(routedetail__route=self.route).order_by('routedetail')
 
+
+class FuzzyStopMatch(models.Model):
+    unr = models.OneToOneField(UniqueRoute)
+    checked = models.BooleanField(default=True)
+
+    
+
 class RouteSchedule(models.Model):
     unique_route = models.ForeignKey(UniqueRoute)
     schedule_type = models.CharField(max_length=16)

chaloBEST/mumbai/views.py

@@ -3,7 +3,9 @@ from models import *
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
+from django.views.decorators.csrf import csrf_exempt
 from fuzzywuzzy import process as fuzzprocess
+from django.http import HttpResponse
 
 def index(request):
     return render_to_response("index.html", {})
@@ -105,33 +107,97 @@ def stats(request):
     return render_to_response("stats.html", context)
 
 
-
 @login_required
 def fuzzystops(request):
-#    import pdb
+    unrs = []
-    froms_arr = []
-    tos_arr = []
     for unr in UniqueRoute.objects.all():
-        s1 = unr.from_stop.name.lower()
+        if FuzzyStopMatch.objects.filter(unr=unr).filter(checked=True).count() > 0:
-        s2 = unr.from_stop_txt.lower()
+            continue
-        from_ratio = fuzzprocess.ratio(s1,s2)
+        rds = RouteDetail.objects.filter(route=unr.route).order_by('serial')
-        if from_ratio < 70:
+        unrd = {}
-            froms_arr.append(
+        fs = False
-                (unr, from_ratio,)
+        ls = False
-            ) 
+        if unr.from_stop==rds[0]:
-        s3 = unr.to_stop.name.lower()
+            fs=True
-        s4 = unr.to_stop_txt.lower()
+        else:
-        to_ratio = fuzzprocess.ratio(s3,s4)
+            fs=False
-        if to_ratio < 70:
-            tos_arr.append(
-                (unr, to_ratio,)
-            )
 
-    froms_arr.sort(key=lambda item: item[1])
+        if unr.to_stop==rds[len(rds)-1]:
-    tos_arr.sort(key=lambda item: item[1])
+            ls=True
-    context = RequestContext(request, {
+        else:
-        'fuzzy_froms': [item[0] for item in froms_arr],
+            ls=False
-        'fuzzy_tos': [item[0] for item in tos_arr]
+
-    })
+        unrs.append({'unr':unr,'stop_is_first':fs,'stop_is_last':ls})
+#    import pdb
 #    pdb.set_trace()
+    context = RequestContext(request, {
+        'unrs': unrs[0:100]
+    })
     return render_to_response("fuzzystops.html", context)
+
+
+@login_required
+@csrf_exempt
+def fuzzystops_edit(request):
+    unr_id = request.POST.get("id", 0)
+    unr = UniqueRoute.objects.get(pk=unr_id)
+    from_stop_id = int(request.POST.get("from_stop"))
+    to_stop_id = int(request.POST.get("to_stop"))    
+    unr.from_stop_id = from_stop_id
+    unr.to_stop_id = to_stop_id
+    unr.save()
+    change_all = request.POST.get("change_all", False)
+    if change_all:
+        from_stop_txt = unr.from_stop_txt
+        to_stop_txt = unr.to_stop_txt
+        for u in UniqueRoute.objects.filter(from_stop_txt=from_stop_txt):
+            u.from_stop = from_stop_id
+            u.save()
+        for u in UniqueRoute.objects.filter(to_stop_txt=from_stop_txt):
+            u.to_stop = from_stop_id
+            u.save()
+        for u in UniqueRoute.objects.filter(to_stop_txt=to_stop_txt):
+            u.to_stop = to_stop_id
+            u.save()
+        for u in UniqueRoute.objects.filter(from_stop_txt=to_stop_txt):
+            u.from_stop = to_stop_id
+            u.save()
+    mark_checked = request.POST.get("mark_checked", False)
+    if mark_checked:
+        fsm, created = FuzzyStopMatch.objects.get_or_create(unr=unr)
+        fsm.checked = True
+        fsm.save()
+    return HttpResponse("ok")
+
+
+        
+
+#@login_required
+#def fuzzystops(request):
+##    import pdb
+#    froms_arr = []
+#    tos_arr = []
+#    for unr in UniqueRoute.objects.all():
+#        s1 = unr.from_stop.name.lower()
+#        s2 = unr.from_stop_txt.lower()
+#        from_ratio = fuzzprocess.ratio(s1,s2)
+#        if from_ratio < 70:
+#            froms_arr.append(
+#                (unr, from_ratio,)
+#            ) 
+#        s3 = unr.to_stop.name.lower()
+#        s4 = unr.to_stop_txt.lower()
+#        to_ratio = fuzzprocess.ratio(s3,s4)
+#        if to_ratio < 70:
+#            tos_arr.append(
+#                (unr, to_ratio,)
+#            )
+#            
+#    froms_arr.sort(key=lambda item: item[1])
+#    tos_arr.sort(key=lambda item: item[1])
+#    context = RequestContext(request, {
+#        'fuzzy_froms': [item[0] for item in froms_arr],
+#        'fuzzy_tos': [item[0] for item in tos_arr]
+#    })
+##    pdb.set_trace()
+#    return render_to_response("fuzzystops.html", context)

chaloBEST/templates/fuzzystops.html

@@ -1,3 +1,4 @@
+{% comment %}
 <h2> Likely Mismatched From stops: </h2>
 {% for f in fuzzy_froms %}
 
@@ -12,3 +13,107 @@
     <a href="/admin/mumbai/uniqueroute/{{ t.id }}">{{ t.route.alias}}</a> - {{ t.to_stop.name }} - {{ t.to_stop_txt }} <br />
 
 {% endfor %}
+
+{% endcomment %}
+
+
+<!doctype html>
+<html>
+<head>
+    <script type="text/javascript" src="/static/js/jquery-1.7.1.min.js"></script> 
+    <script type="text/javascript">
+$(function() {
+    $('.submitFuzzyEdit').click(function() {
+        var that = this;
+        saveUNR(that, false);
+    });
+    $('.markChecked').click(function() {
+        var that = this;
+        saveUNR(that, true);
+    });
+});
+
+function saveUNR(elem, markChecked) {
+    var $that = $(elem);
+    var oldTxt = $that.text();
+    $that.text("Saving...");
+    var $tr = $that.parents('tr');
+    var params = {
+        'id': $tr.attr("data-id"),
+        'from_stop': $tr.find('.fromStopSelect').val(),
+        'to_stop': $tr.find('.toStopSelect').val(),
+        'mark_checked': markChecked
+    };
+    var xhr = $.post("/fuzzystops_edit/", params, function(response) {
+        if (response != 'ok') {
+            alert("error saving data");
+            return;
+        }
+        if (markChecked) {
+            $tr.slideUp();
+        } else {
+            $that.text(oldTxt);
+        }
+    });
+    xhr.fail(function() {
+        alert("error saving data");
+    });
+
+}
+
+    </script>    
+
+</head>
+<body>
+    <table id="unrTable">
+        <thead>
+            <tr>
+                <th>Bus No</th>
+                <th>From Txt</th>
+                <th>From Stop</th>
+                <th>To Txt</th>
+                <th>To Stop</th>
+                <th></th>
+
+            </tr>
+        </thead>
+        <tbody>
+            {% for u in unrs %}
+            <tr data-id="{{ u.id }}">
+                <td>{{ u.unr.route.alias }}</td>
+                <td>{{ u.unr.from_stop_txt }}</td>
+                <td>
+                    <select class="fromStopSelect {% if u.fs %} firstStop {% endif %}" > 
+                        {% for stop in u.unr.get_stop_choices %}
+                        <option value="{{ stop.id }}" {% ifequal u.unr.from_stop stop %} selected="selected" {% endifequal %}>
+                            {{ stop.display_name }}
+                        </option>
+                        {% endfor %}
+                    </select>
+                </td>
+
+                <td>{{ u.unr.to_stop_txt }}</td>
+                <td>
+                    <select class="toStopSelect {% if u.fs %} lastStop {% endif %}" >
+                        {% for stop in u.unr.get_stop_choices %}
+                        <option value="{{ stop.id }}" {% ifequal u.unr.to_stop stop %} selected="selected" {% endifequal %}>
+                            {{ stop.display_name }}
+                        </option>
+                        {% endfor %}
+                    </select>
+                </td>
+                <td>
+                    <!-- Change all: <input type="checkbox" class="changeAll" /> &nbsp; -->
+                    
+                    <button class="submitFuzzyEdit">Save</button> &nbsp;
+                    <button class="markChecked">Checked</button> &nbsp;                    
+
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</body>
+
+</html>

chaloBEST/urls.py

@@ -33,7 +33,8 @@ urlpatterns = patterns('',
     #(r'^grappelli/', include('grappelli.urls')),
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
-    (r'^fuzzystops/$', 'mumbai.views.fuzzystops'),
+    (r'^matchstops/$', 'mumbai.views.fuzzystops'),
+    (r'^fuzzystops_edit/$', 'mumbai.views.fuzzystops_edit'),
     
 )