Merge pull request #138 from OpenDataSTL/develop

Merge develop to master for 1.1.0 release

Author: abobwhite

.bowerrc

@@ -1,3 +1,4 @@
 {
-  "directory": "bower_components"
+  "directory": "bower_components",
+  "strict-ssl": false
 }

app/data/questionAnswers.json

@@ -1,7 +1,7 @@
 {
   "ticket-faq":[
     {"q":"I know I got a ticket but I can't find it in YourSTLCourts.",
-     "a":"Currently the municipalities listed below have opted to participate in YourSTLCourts. If you can't locate your ticket information, it may be that the court where you received your ticket is not participating in YourSTLCourts. We encourage you to call City Hall and/or court to ask that they participate in YourSTLCours. You can find contact information for any court in St. Louis County by clicking <a href=\"\\\">here</a>.",
+     "a":"Currently the municipalities listed below have opted to participate in YourSTLCourts. If you can't locate your ticket information, it may be that the court where you received your ticket is not participating in YourSTLCourts. We encourage you to call City Hall and/or court to ask that they participate in YourSTLCourts. You can find contact information for any court in St. Louis County by clicking <a href=\"\\\">here</a>.",
      "keywords":[],
      "fill-in":"supportedMunicipalities"},
     {"q":"I know I need to appear in court soon. I lost my ticket but remember where I was pulled over. How can I find my court date and location?",

app/index.html

@@ -5,6 +5,8 @@
     <title>Your STL Courts</title>
     <base href="/">
     <meta name="description" content="">
+    <meta name="fragment" content="!">
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale = 1.0">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <link rel="shortcut icon" href="images/favicon.ico">
@@ -91,14 +93,14 @@
     <script src="bower_components/angular-touch/angular-touch.js"></script>
     <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
     <script src="bower_components/angularjs-toaster/toaster.js"></script>
-    <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="bower_components/angular-ui-select/dist/select.js"></script>
     <script src="bower_components/moment/moment.js"></script>
     <script src="bower_components/leaflet/dist/leaflet-src.js"></script>
     <script src="bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
     <script src="bower_components/angular-moment/angular-moment.js"></script>
     <script src="bower_components/lodash/lodash.js"></script>
     <script src="bower_components/Autolinker.js/dist/Autolinker.js"></script>
+    <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
@@ -155,6 +157,7 @@
     <script src="scripts/directives/scrollable.dir.js"></script>
     <script src="scripts/directives/navBarMenuCloseable.dir.js"></script>
     <script src="scripts/directives/loading.dir.js"></script>
+    <script src="scripts/directives/stlCourtsFocus.dir.js"></script>
 
     <script src="scripts/components/stlCourtsHeader.comp.js"></script>
     <script src="scripts/components/stlCourtsFooter.comp.js"></script>

app/scripts/app.js

@@ -136,7 +136,7 @@ angular.module('yourStlCourts').config(function ($stateProvider, $urlRouterProvi
       }
     })
     .state('citations', {
-      url: '/citations/{citationId}',
+      url: '/tickets/{citationId}/info',
       templateUrl: 'views/citations.html',
       controller: 'CitationsCtrl as ctrl',
       resolve: {
@@ -146,7 +146,7 @@ angular.module('yourStlCourts').config(function ($stateProvider, $urlRouterProvi
         }
     })
     .state('noCitationsFound',{
-      url: '/citations/error/notFound',
+      url: '/tickets/error/notFound',
       templateUrl: 'views/citationsNotFound.html',
       controller: 'NoCitationsFoundCtrl as ctrl',
       resolve: {

app/scripts/controllers/citationInfo.ctrl.js

@@ -2,10 +2,39 @@
 
 angular.module('yourStlCourts').controller('CitationInfoCtrl', function (faqData,$state, $window, citations,municipalities,courts,Courts,Session,moment,$anchorScroll) {
   var ctrl = this;
+  var PLACEHOLDER_DL_NUM = "NO_DL_NUM";
+
   ctrl.faqData = faqData;
   ctrl.selectedCitation = null;
   ctrl.paymentUrl = "";
   ctrl.citationCourtLocations = {};
+  ctrl.groupedCitations = {};
+
+  ctrl.groupCitationsByDL = function(){
+    var dlNum = "";
+    var dlState = "";
+    var groupedCitations = {};
+
+    citations.forEach(function(citation){
+      dlNum = citation.drivers_license_number;
+      dlState = citation.drivers_license_state;
+      if (dlNum === ""){
+        //in the event the defendant does not have a DL Num assign one so the object has a key
+        dlNum = PLACEHOLDER_DL_NUM;
+      }
+      if (!groupedCitations[dlNum+dlState]){
+        groupedCitations[dlNum+dlState] = [];
+      }
+      groupedCitations[dlNum+dlState].push(citation);
+    });
+
+    return groupedCitations;
+  };
+
+  ctrl.issueMultiplePeopleWarning = function(){
+
+    return (_.size(ctrl.groupedCitations) > 1);
+  };
 
   ctrl.selectCitation = function(citation,idToScrollTo){
     ctrl.selectedCitation = citation;
@@ -44,6 +73,7 @@ angular.module('yourStlCourts').controller('CitationInfoCtrl', function (faqData
     $state.go('home');
   } else {
     ctrl.citations = citations;
+    ctrl.groupedCitations = ctrl.groupCitationsByDL();
     for(var citationCount = 0; citationCount < citations.length; citationCount++){
       var courtId = citations[citationCount].court_id;
       var foundCourt = _.find(courts, {id: courtId});

app/scripts/controllers/locationPickerMap.ctrl.js

@@ -97,7 +97,7 @@ angular.module('yourStlCourts').controller('LocationPickerMapCtrl', function ($s
   function getMunicipalityFromMapName(muniMapName){
     function getName(nameString){
       if (nameString.toLowerCase() == "unincorporated"){
-        nameString = "St. Louis County - Unincorporated";
+        nameString = "St. Louis County Municipal";
       }
 
       return nameString.replace("&", "and");

app/scripts/controllers/ticketFinder.ctrl.js

@@ -44,6 +44,7 @@ angular.module('yourStlCourts').controller('TicketFinderCtrl', function (TicketF
   ctrl.getDOB = function(){
     if(ctrl.ticketForm.$valid) {
       var modalInstance = $uibModal.open({
+        animation:false, //allows focus cursor to stay in input box on edge & IE browsers
         templateUrl: 'views/dobPicker.html',
         controller: 'dobPickerCtrl as ctrl',
         size: 'sm'

app/scripts/directives/stlCourtsDatepicker.dir.js

@@ -12,11 +12,13 @@ angular.module('yourStlCourts').directive('stlCourtsDatepicker', function($timeo
       dateObject:'=?',  //returns javascript Date
       dateField:'=?',  //returns date String formatted to "MM/dd/yyyy"
       dateValid:'=?',
-      dateOver18:'=?'
+      dateOver18:'=?',
+      okButtonId:'@'
     },
     templateUrl: 'views/stlCourtsDatepicker.html',
     controller: 'StlCourtsDatepicker as ctrl',
     link: function($scope,element,attrs){
+      var scope = $scope;
       var keys = {
         backspace:8,
         delete:46,
@@ -56,9 +58,14 @@ angular.module('yourStlCourts').directive('stlCourtsDatepicker', function($timeo
             updateDateString();
             if (numberOfExistingDigits === Number(maxLength)){
               //tab to the next field
-              if ($(event.target).next("span") !== $()){
+              if ($(event.target).next("span").length !== 0){
                 clearInputElement($(event.target).next().next());
                 $(event.target).next().next().focus();
+              }else{
+                if (scope.okButtonId) {
+                  //last date field is filled in go to OK button
+                  $("#" + scope.okButtonId).focus();
+                }
               }
             }
           }else{
@@ -152,6 +159,10 @@ angular.module('yourStlCourts').directive('stlCourtsDatepicker', function($timeo
             uibDatePickerDateJustChangedDateString = true;
             $scope.ctrl.dateString = formatDateObjToDateFormat();
             loadDateStringToElement();
+            if (scope.okButtonId) {
+              //user just selected a date from the datePicker and it filled in the whole date
+              $("#" + scope.okButtonId).focus();
+            }
           }else{
             initialDTSet = false;
           }

app/scripts/directives/stlCourtsFocus.dir.js

@@ -0,0 +1,14 @@
+'use strict';
+
+angular.module('yourStlCourts').directive('stlCourtsFocus', function ($timeout) {
+  return {
+    restrict: 'A',
+
+    link: function ($scope, element, attr) {
+      var scope = $scope;
+      $timeout(function(){
+        $(element).get(0).focus();
+      });
+    }
+  };
+});

app/scripts/services/Session.svc.js

@@ -9,6 +9,7 @@ angular.module('yourStlCourts').factory('Session', function () {
 
   function setLatestCitations(citations){
     latestCitations = citations;
+    clearLastSelectedCitation();
   }
 
   function getLastSelectedCitation(){
@@ -19,6 +20,10 @@ angular.module('yourStlCourts').factory('Session', function () {
     lastSelectedCitation = citation;
   }
 
+  function clearLastSelectedCitation(){
+    lastSelectedCitation = null;
+  }
+
   var svc = {
     getLatestCitations: getLatestCitations,
     setLatestCitations: setLatestCitations,