timeline working, need to fix up scaling

QutEcoacoustics · Oct 31, 2014 · e70ba1a · e70ba1a
1 parent dfe53e6
commit e70ba1a
Show file tree

Hide file tree

Showing 3 changed files with 293 additions and 251 deletions.
diff --git a/src/app/d3Bindings/calendarView/calendarView.js b/src/app/d3Bindings/calendarView/calendarView.js
@@ -194,7 +194,7 @@ angular.module("bawApp.d3.calendarView", ["bawApp.d3"])
                 });
             },
             controller: "bawCalendarViewController"
-        }
+        };
     }])
     .controller("bawCalendarViewController", ["$scope", "$element", "$attrs",
         function ($scope, $element, $attrs) {

diff --git a/src/app/d3Bindings/d3TestPage.js b/src/app/d3Bindings/d3TestPage.js
@@ -15,7 +15,7 @@ bawD3.controller('D3TestPageCtrl', ['$scope', 'conf.paths', '$http', function ($
             }
         },
         "projection": {
-            "include": ["id", "recorded_date", "duration_seconds"]
+            "include": ["id", "recorded_date", "duration_seconds", "site_id"]
         }//,
         //"paging":{
         //    "page":2,
-Original file line number
+Diff line change
@@ Expand Up / @@ -194,7 +194,7 @@ angular.module("bawApp.d3.calendarView", ["bawApp.d3"]) @@
                     });
                 },
                 controller: "bawCalendarViewController"
-            }
+            };
         }])
         .controller("bawCalendarViewController", ["$scope", "$element", "$attrs",
             function ($scope, $element, $attrs) {
@@ Expand Down @@