Fix for #6 + Google analytics

nicoverbruggen · nicoverbruggen · commit cdabf5b83d69 · 2014-06-05T17:57:02.000+02:00
diff --git a/app/controllers/RouteController.php b/app/controllers/RouteController.php
@@ -14,25 +14,13 @@ public function index(){
 
         switch ($val){
             case "text/html":
-                return View::make('route.planner');
-                break;
-            case "application/ld+json":
-                try{
-                    $from =  Input::get('from'); // required
-                    $to = Input::get('to'); // required
-                    $data = json_decode($this::getJSON());
-                    return var_dump($data);
-                    // TODO: format JSON-LD
-                }
-                catch(ErrorException $ex){
-                    return "We could not retrieve data. Ensure that you have provided all required parameters: to, from, date, time, timeSel.";
-                }
+                return Response::view('route.planner')->header('Content-Type', "text/html")->header('Vary', 'accept');
                 break;
             case "application/json":
-                return $this::getJSON();
+                return Response::make($this::getJSON())->header('Content-Type', "text/html")->header('Vary', 'accept');
                 break;
             default:
-                return View::make('route.planner');
+                return Response::view('route.planner')->header('Content-Type', "text/html")->header('Vary', 'accept');
                 break;
         }
     }
diff --git a/app/controllers/StationController.php b/app/controllers/StationController.php
@@ -2,7 +2,7 @@
 
 class StationController extends \BaseController {
 
-	public function index(){
+    public function index(){
         // TODO: content delegation with list of all stations
         return View::make('stations.search');
     }
@@ -17,9 +17,7 @@ public function liveboard($id){
         $acceptHeader = Request::header('accept');
         $priorities = array('text/html', 'application/json', '*/*');
         $result = $negotiator->getBest($acceptHeader, $priorities);
-
         $val = $result->getValue();
-
         switch ($val){
             case "text/html":
                 $station = \hyperRail\StationString::convertToString($id);
@@ -34,8 +32,23 @@ public function liveboard($id){
                 $jsonLD = (string)json_encode($newData);
                 return Response::make($jsonLD, 200)->header('Content-Type', 'application/ld+json')->header('Vary', 'accept');
                 break;
+            /*case "text/turtle":
+                $stationStringName = \hyperRail\StationString::convertToString($id);
+                $URL = "http://api.irail.be/liveboard/?station=" . $stationStringName->name . "&fast=true&lang=nl&format=json";
+                $data = file_get_contents($URL);
+                $newData = \hyperRail\iRailFormatConverter::convertLiveboardData($data, $id);
+                $jsonLD = (string)json_encode($newData);
+                $graph = new EasyRdf_Graph();
+                // NO PARSER YET IN STABLE :(
+                $graph->parse($jsonLD, EasyRdf_Format::getFormat('json-ld'));
+                $output = $graph->serialise(EasyRdf_Format::getFormat('turtle'));
+                return Response::make($output, 200)->header('Content-Type', 'text/turtle')->header('Vary', 'accept');
+                break;
+            */
             default:
-                return Response::view('stations.liveboard')->header('Content-Type', "text/html")->header('Vary', 'accept');
+                $station = \hyperRail\StationString::convertToString($id);
+                $data = array('station' => $station);
+                return Response::view('stations.liveboard', $data)->header('Content-Type', "text/html")->header('Vary', 'accept');
                 break;
         }
     }
diff --git a/app/views/core/footer.blade.php b/app/views/core/footer.blade.php
@@ -1,4 +1,13 @@
 <footer class="footer container">
     <hr/>
     <p class="small"><a href="{{ URL::to('language') }}">{{Lang::get('client.language')}}</a> | &copy; 2014, OKFN Belgium. {{Lang::get('client.isPartOf')}} <a href="http://okfn.be/" target="_blank">Open Knowledge Foundation Belgium</a>. </p>
-</footer>
+</footer>
+<script>
+    var _gaq = [['_setAccount', 'UA-263695-8'], ['_trackPageview']];
+    (function(d, t) {
+        var g = d.createElement(t),
+            s = d.getElementsByTagName(t)[0];
+        g.src = '//www.google-analytics.com/ga.js';
+        s.parentNode.insertBefore(g, s);
+    }(document, 'script'));
+</script>
diff --git a/app/views/route/planner.blade.php b/app/views/route/planner.blade.php
@@ -16,34 +16,34 @@
                     <div class="form-group">
                         <label for="departure">{{Lang::get('client.fromStation')}}</label>
                         <div class="input-group">
-                        <input type="text" ng-model="departure" placeholder="{{Lang::get('client.typeFromStation')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg" tabindex=1>
+                        <input type="text" ng-model="departure" placeholder="{{Lang::get('client.typeFromStation')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg">
                         <a class="input-group-addon" ng-show="departure.id" href="stations/NMBS/@{{departure.id}}" target="_blank" data-toggle="tooltip" data-placement="left" title="{{Lang::get('client.viewLiveboard')}}"><i class="fa fa-clock-o"></i></a>
                         <span class="input-group-addon" ng-hide="departure.id"></span>
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="destination">{{Lang::get('client.toStation')}}</label>
                         <div class="input-group">
-                            <input type="text" ng-model="destination" placeholder="{{Lang::get('client.typeToStation')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg" tabindex=2>
+                            <input type="text" ng-model="destination" placeholder="{{Lang::get('client.typeToStation')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" typeahead-on-select='focusOnConfirm()' class="form-control input-lg">
                             <a class="input-group-addon btn" ng-show="destination.id" href="stations/NMBS/@{{destination.id}}" target="_blank" data-toggle="tooltip" data-placement="left" title="{{Lang::get('client.viewLiveboard')}}"><i class="fa fa-clock-o"></i></a>
                             <span class="input-group-addon" ng-hide="destination.id"></span>
                         </div>
                     </div>
                     <label for="destination">{{Lang::get('client.chooseDate')}}</label>
                     <div class="datepicker">
-                        <datepicker ng-class="time" ng-model="mydate" show-weeks="false" tabindex=3></datepicker>
+                        <datepicker ng-class="time" ng-model="mydate" show-weeks="false" ></datepicker>
                     </div>
                     <br/>
                 </div>
                 <div class="col-sm-6">
                     <label for="destination">{{Lang::get('client.chooseTime')}}</label>
-                    <select class="form-control input-lg timepicker" ng-model="timeoption" tabindex=4>
+                    <select class="form-control input-lg timepicker" ng-model="timeoption">
                         <option value="depart">{{Lang::get('client.departureAtHour')}}</option>
                         <option value="arrive">{{Lang::get('client.arrivalAtHour')}}</option>
                     </select>
-                    <timepicker ng-model="mytime" ng-change="changed()" minute-step="15" show-meridian="ismeridian" tabindex=5></timepicker>
+                    <timepicker ng-model="mytime" ng-change="changed()" minute-step="15" show-meridian="ismeridian"></timepicker>
                     <br/>
-                    <input type="submit" class="btn btn-default btn-lg btn-primary btn-wide" ng-click="save()" value="{{Lang::get('client.confirmSearch')}}" ng-hide="departure == destination" tabindex=6>
+                    <input type="submit" id="submit" class="btn btn-default btn-lg btn-primary btn-wide" ng-click="save()" value="{{Lang::get('client.confirmSearch')}}" ng-hide="departure == destination">
                     <div class="alert alert-danger" ng-show="data === null">
                         <p ng-show="stationnotfound === true">{{Lang::get('client.errorCheckInput')}}</p>
                     </div>
diff --git a/app/views/stations/search.blade.php b/app/views/stations/search.blade.php
@@ -15,9 +15,9 @@
                     </script>
                     <div class="form-group">
                         <label for="departure">{{Lang::get('client.stationName')}}</label>
-                        <input type="text" ng-model="departure" placeholder="{{Lang::get('client.stationSearchPlaceholder')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg">
+                        <input type="text" ng-model="departure" placeholder="{{Lang::get('client.stationSearchPlaceholder')}}" typeahead="station as station.name for station in stations.stations | filter:{name:$viewValue} | limitTo:5" typeahead-template-url="customTemplate.html" class="form-control input-lg" typeahead-on-select='focus()'>
                     </div>
-                    <a href="{{ URL::to('stations/NMBS') }}/@{{departure.id}}" ng-show="departure.id" class="btn btn-primary btn-wide btn-lg bounceIn">{{Lang::get('client.viewLiveboard')}}</a>
+                    <a id="confirm" href="{{ URL::to('stations/NMBS') }}/@{{departure.id}}" ng-show="departure.id" class="btn btn-primary btn-wide btn-lg bounceIn">{{Lang::get('client.viewLiveboard')}}</a>
                 </div>
             </div>
         </div>
diff --git a/public/js/irailapp/app.js b/public/js/irailapp/app.js
@@ -16,15 +16,12 @@
         // Init departure and destination as undefined
         $scope.departure = undefined;
         $scope.destination = undefined;
-
         // Time and date are automatically set
         $scope.mytime = new Date();
         $scope.mydate = new Date();
         // Timeoption defaults to arrive at set hour
         $scope.timeoption = 'depart';
-
         // Default states
-        // TODO: unless &auto is set (which automatically searches)
         $scope.planning = true; // When planning is set to true, you can enter stations and set time
         $scope.loading = false; // When loading is set to true, you see a spinner
         $scope.results = false; // When results is set to true, results are displayed
@@ -33,6 +30,12 @@
          * FUNCTIONS THAT CAN BE CALLED
          *-------------------------------------------------------*/
 
+        $(document).keypress(function(e) {
+            if(e.which == 13 && $scope.planning == true){
+                $scope.confirmRouteSearch();
+            }
+        });
+
         /**
          *  Check if we can dump the data
           */
@@ -251,6 +254,12 @@
             $scope.stations = data;
         });
 
+        $(document).keypress(function(e) {
+            if(e.which == 13){
+                $('#confirm').focus();
+            }
+        });
+
         $scope.resetplanner = function(){
             // Should not do anything
         }
