modified: Gemfile

modified:   Gemfile.lock
modified:   app/assets/javascripts/application.js
modified:   app/assets/stylesheets/application.css.scss
deleted:    vendor/assets/javascripts/select2-release-3.2/LICENSE
deleted:    vendor/assets/javascripts/select2-release-3.2/README.md
deleted:    vendor/assets/javascripts/select2-release-3.2/index.js
deleted:    vendor/assets/javascripts/select2-release-3.2/release.sh
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.css
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.js
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.min
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.png
deleted:    vendor/assets/javascripts/select2-release-3.2/select2x2.png
deleted:    vendor/assets/javascripts/select2-release-3.2/spinner.gif
	-- added select2 gem to make it easier to deal with assets

modified:   app/assets/stylesheets/partials/_annotation_viewer.css.scss
modified:   app/assets/javascripts/angular/controllers/annotation_viewer.js
modified:   app/assets/javascripts/angular/controllers/listen.js
modified:   app/assets/javascripts/angular/filters/filters.js
modified:   app/assets/stylesheets/_base.css.scss
	-- worked on tag resolution (tag id's are now resolved to their proper text)

modified:   app/assets/templates/listen.html
	-- removed unecessary data viewer

modified:   app/serializers/audio_event_serializer.rb
	-- fixed serialization bug (it should send back attached audio_tag_events by defaults,  rather than tags)

app/assets/javascripts/angular/controllers/annotation_viewer.js

@@ -7,17 +7,17 @@
  * @param $attrs
  * @param $transclude
  * @constructor
+ * @param Tag
  */
-function AnnotationViewerCtrl($scope, $element, $attrs, $transclude) {
+function AnnotationViewerCtrl($scope, $element, $attrs, $transclude, Tag) {
 
     $scope.getTag = function getTag(id) {
-        id = parseInt(id);
-        if (id) {
-            // TODO: SOME MAGIC, get tag label from a list that has hopefully already been loaded somewhere
-            return "Magic Name " + id;
+        var tagObject = Tag.resolve(id);
+        if (tagObject) {
+            return tagObject.text;
         }
         else {
-            return "Unknown Tag Label";
+            return "<unknown>";
         }
     };
 
@@ -80,4 +80,4 @@ function Annotation(localIdOrResource, audioRecordingId) {
     }
 }
 
-AnnotationViewerCtrl.$inject = ['$scope', '$element', '$attrs', '$transclude'];
+AnnotationViewerCtrl.$inject = ['$scope', '$element', '$attrs', '$transclude', 'Tag'];

app/assets/javascripts/angular/controllers/listen.js

@@ -93,7 +93,7 @@ function ListenCtrl($scope, $resource, $routeParams, $route, Media, AudioEvent,
 
 
         // download all the tags and store them in Tag service cache
-        Tag.query({}, {}, function(){
+        $scope.tags = Tag.query({}, {}, function(){
 
         }, undefined);
 

app/assets/javascripts/angular/filters/filters.js

@@ -1,3 +1,5 @@
+'strict';
+
 /* http://docs.angularjs.org/#!angular.filter */
 (function() {
     var bawfs = angular.module('bawApp.filters', []);
@@ -40,13 +42,14 @@
        return function(input, method) {
 
            if (input) {
-               var restOfArguments = Array.prototype.slice.call(arguments, 2, arguments.length)
+               var restOfArguments = Array.prototype.slice.call(arguments, 2, arguments.length);
 
                var  m = moment(input);
                return m[method].apply(m, restOfArguments);
 
            }
 
+           return "";
        }
     });
 
@@ -68,4 +71,28 @@
         }
     });
 
+
+    /**
+     * Output a tag name when given an ID
+     */
+    bawfs.filter('tagName', ['Tag', function(Tag) {
+        return function(input) {
+
+            var id = parseInt(input, 10);
+
+            if (id && !isNaN(id)) {
+                var tag = Tag.resolve(id);
+
+                if (tag) {
+                    return tag.text;
+                }
+
+                return "";
+            }
+            else {
+                return "";
+            }
+        }
+    }]);
+
 })();

app/assets/javascripts/application.js

@@ -15,6 +15,7 @@
 // require jquery.ui.all // disabled because slow
 // require jquery.ui.datepicker // disabled because slow
 //= require moment
+//= require select2
 //= require angular.js
 //= require angular-resource.js
 //= require angular-ui.js

app/assets/stylesheets/_base.css.scss

@@ -48,6 +48,8 @@ $standard-border-radius: 4px;
 
 $standard-glow-alpha: 0.2;
 
+$standard-line-height: 1em;
+
 /*
  *
  *  Specific styles

app/assets/stylesheets/application.css.scss

@@ -10,6 +10,7 @@
  *
  *= require_self
  * require jquery.ui.all # disabled because slow
+ *= require select2
  *= require_tree ../../../vendor/assets/stylesheets/.
  *= require_tree ../images/.
  *= require vendor

app/assets/stylesheets/partials/_annotation_viewer.css.scss

@@ -17,13 +17,14 @@ baw-annotation-viewer {
       position:  relative;
       height:  60px;
       //overflow: none;
+      line-height: $standard-line-height;
 
       li {
         border-bottom: red solid 1px;
-        margin-left: -6px;
+        margin-left: -4px;
         position: absolute;
-        top:  42px;
-
+        bottom:  -1px;
+        padding-left: 2px;
 
         @include vendor-prefix(transform-origin, 0 0);
         @include vendor-prefix(transform, rotate3d(0,0,1,-20deg));

app/assets/templates/listen.html

@@ -78,14 +78,9 @@ <h3>
                             <input type="checkbox" ng-model="selectedEvent.isReference">&nbsp;Is reference tag?
                         </label>
                     </fieldset>
-                    <p>
-                        data for tag: ({{selectedEvent.startTimeSeconds}}, {{selectedEvent.endTimeSeconds}});
-                        ({{selectedEvent.lowFrequencyHertz}}, {{selectedEvent.highFrequencyHertz}});
-                        {{selectedEvent.isReference}};
-                        <span ng-bind="selectedEvent.tags"></span>
-                    </p>
-                    <button type="button" ng-click="reset()">Clear</button>
-                    <button ng-click="addAnnotation()">Add annotation</button>
+
+                    <!--<button type="button" ng-click="reset()">Clear</button>-->
+                    <!--<button ng-click="addAnnotation()">Add annotation</button>-->
 
                 </form>
             </div>
@@ -133,7 +128,7 @@ <h3>Annotations</h3>
                         <td>{{ae.deleterId}}</td>
                         <td>{{ae.updatedAt}}</td>
                         <td>{{ae.updaterId}}</td>
-                        <td><span ng-repeat="t in ae.audioEventTags">{{t.tagId}}{{!$last && ',' || ''}}</span></td>
+                        <td><span ng-repeat="t in ae.audioEventTags">{{t.tagId | tagName}}{{!$last && ',' || ''}}</span></td>
                         <td>{{ae.startTimeSeconds | number:3}} - {{ae.endTimeSeconds | number:3}}</td>
                         <td>{{ae.lowFrequencyHertz  | number:3}} - {{ae.highFrequencyHertz | number:3}}</td>
                     </tr>

app/serializers/audio_event_serializer.rb

@@ -14,7 +14,8 @@ class AudioEventSerializer < CommonAttributesSerializer
   attributes :id, :audio_recording_id, :end_time_seconds, :high_frequency_hertz, :is_reference,
              :low_frequency_hertz, :start_time_seconds
 
-  has_many :tags, :serializer => AudioEventTagsInAESerializer
+  #has_many :tags, :serializer => AudioEventTagsInAESerializer
+  has_many :audio_event_tags #, :serializer => AudioEventTagsInAESerializer
   has_one :audio_recording, :serializer => AudioRecordingIdsSerializer