Annotations: added Active List Selection menu and renamed angular module to...

Annotations: added Active List Selection menu and renamed angular module to use more comprehensive names

annotations/bower.json

@@ -9,7 +9,8 @@
     "angular-loader": "~1.2.x",
     "angular-resource": "~1.2.x",
     "bootstrap": "~3.x",
-    "angular-cookies": "1.2"
+    "angular-cookies": "1.2",
+    "bootstrap-select": "silviomoreto/bootstrap-select#~1.7.3"
   },
   "resolutions": {
     "angular": "~1.2.x"

annotations/static/annotations/activelists.js

@@ -20,29 +20,31 @@
       $rootScope.$watchCollection('activeLists', function (newValue, oldValue) {
         if (newValue === undefined) return;
         $timeout(function() {
-          $('.selectpicker').selectpicker();
-          $('.selectpicker').selectpicker('val', ['MiamList']);
           $('.selectpicker').selectpicker('refresh');
         });
       });
 
       $rootScope.$watchCollection('lists', function (newValue, oldValue) {
         if (newValue === undefined) return;
+        // reformat lists to allListsSelect
         var allListsSelect = [];
         angular.forEach($rootScope.lists, function(value, key) {
           this.push({
             'id': key,
             'label': value
           });
+          // initialize activeLists with the MiamList by default
           if (value == 'MiamList') {
             $rootScope.activeLists = {};
             $rootScope.activeLists[key] = value;
           }
         }, allListsSelect);
+
         $rootScope.allListsSelect = allListsSelect;
 
         $timeout(function() {
           $('.selectpicker').selectpicker();
+          $('.selectpicker').selectpicker('val', ['MiamList']);
         });
         console.log($rootScope.allListsSelect);
       });

annotations/templates/annotations/main.html

@@ -13,6 +13,8 @@
         <meta name="description" content="Gargantext">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
+        <link rel="stylesheet" href="{% static 'bower_components/bootstrap-select/dist/css/bootstrap-select.min.css' %}">
+
         <link rel="stylesheet" href="{% static 'bower_components/angular/angular-csp.css' %}">
         <link rel="stylesheet" href="{% static 'annotations/app.css' %}">
         <script src="{% static 'bower_components/jquery/dist/jquery.min.js' %}"></script>
@@ -21,7 +23,7 @@
     <!-- TODO integrate this later into the any other django template -->
     <div id="annotationsApp">
       <div class="container-fluid">
-        <div class="row-fluid main-panel" ng-controller="IntraTextController">
+        <div class="row-fluid main-panel" ng-controller="NGramHighlightController">
           <div class="col-md-4 col-xs-4 tabbable words-panel">
             <ul class="nav nav-pills nav-justified">
               <li ng-repeat="(listId, listName) in activeLists" ng-class="{active: $first == true}">
@@ -29,14 +31,14 @@
               </li>
             </ul>
             <div class="tab-content">
-              <div ng-controller="ExtraTextPaginationController" ng-repeat="(listId, listName) in activeLists" ng-class="{active: $first == true}" class="tab-pane" id="tab-{[{listId}]}">
+              <div ng-controller="NgramListPaginationController" ng-repeat="(listId, listName) in activeLists" ng-class="{active: $first == true}" class="tab-pane" id="tab-{[{listId}]}">
                 <div ng-if="extraNgramList[listId].length == 0" class="alert alert-info" role="alert">
                   Input any keyword you want to link to this article and the list named '{[{listName}]}'
                 </div>
 
                 <ul class="list-group words-list clearfix">
                   <li ng-repeat="keyword in extraNgramList[listId] | startFrom:currentListPage * pageSize | limitTo:pageSize" class="list-group-item">
-                    <div ng-controller="ExtraAnnotationController" keyword-template class="keyword-container"></div>
+                    <div ng-controller="NgramListController" keyword-template class="keyword-container"></div>
                   </li>
                 </ul>
 
@@ -48,11 +50,17 @@
                 </nav>
 
                 <div class="form-group">
-                  <input type="text" class="form-control" id="{[{ listId }]}-input" ng-keypress="onListSubmit($event, listId)">
+                  <input type="text" class="form-control" id="{[{listId}]}-input" ng-keypress="onListSubmit($event, listId)">
                   <button type="submit" class="form-control btn btn-default btn-primary" ng-click="onListSubmit($event, listId)">Add to {[{listName}]}</button>
                 </div>
               </div>
             </div>
+            <div>
+              <h5>Select lists</h5>
+              <select class="selectpicker" multiple ng-change="activeListsChange()" ng-model="lists" ng-controller="ActiveListsController">
+                  <option ng-repeat="item in allListsSelect" id="list---{[{item.id}]}" ng-disabled="{[{ item.label == 'MiamList' }]}">{[{item.label}]}</option>
+              </select>
+            </div>
           </div>
           <div class="col-md-8 col-xs-8 text-panel" ng-controller="DocController" id="document">
             <div class="row-fluid clearfix">
@@ -87,7 +95,7 @@
         </div> <!-- end of the main row -->
       </div>
       <!-- this menu is over the text on mouse selection -->
-      <div ng-controller="AnnotationMenuController" id="selection" class="selection-menu">
+      <div ng-controller="TextSelectionMenuController" id="selection" class="selection-menu">
         <ul class="noselection">
           <li ng-repeat="item in menuItems" class="{[{item.listName}]}" ng-click="onMenuClick($event, item.action, item.listId)">{[{item.verb}]} {[{item.listName}]}</li>
         </ul>

annotations/views.py

@@ -47,8 +47,9 @@ class NgramList(APIView):
 
         # ngrams of list_id of corpus_id:
         doc_ngram_list = listNgramIds(corpus_id=corpus_id, doc_id=doc_id, user_id=request.user.id)
-        doc_ngram_list = [(i, 'miam', i, 1931) for i in range(500)]
-        doc_ngram_list += [(i, 'stop', i, 1932) for i in range(501, 600)]
+        # TODO remove these debug values
+        doc_ngram_list = [(i, 'miam', i, 1931) for i in range(500)] + [(700, 'syndromes', 700, 1931)]
+        doc_ngram_list += [(i, 'stop', i, 1932) for i in range(501, 600)] + [(701, 'VCAM-1', 701, 1932)]
         # doc_ngram_list = [(1, 'miam', 2, 1931), (2, 'stop', 2, 1932), (3, 'Potassium channels', 4, 1931)]
 
         data = { '%s' % corpus_id : {