Merge branch 'bugfixes'

JBEI · Jan 12, 2015 · 000c9a2 · 000c9a2
2 parents c3b3b77 + 24fc0c5
commit 000c9a2
Show file tree

Hide file tree

Showing 5 changed files with 388 additions and 357 deletions.
diff --git a/src/main/webapp/scripts/admin/adminController.js b/src/main/webapp/scripts/admin/adminController.js
@@ -58,10 +58,16 @@ angular.module('ice.admin.controller', [])
         var menuOption = $stateParams.option;
 
         var menuOptions = $scope.profileMenuOptions = [
-            {url:'/scripts/admin/settings.html', display:'Settings', selected:true, icon:'fa-cogs'},
-            {id:'web', url:'/scripts/admin/wor.html', display:'Web of Registries', selected:false, icon:'fa-globe'},
-            {id:'users', url:'/scripts/admin/users.html', display:'Users', selected:false, icon:'fa-user'},
-            {id:'groups', url:'/scripts/admin/groups.html', display:'Groups', selected:false, icon:'fa-group'},
+            {url: '/scripts/admin/settings.html', display: 'Settings', selected: true, icon: 'fa-cogs'},
+            {
+                id: 'web',
+                url: '/scripts/admin/wor.html',
+                display: 'Web of Registries',
+                selected: false,
+                icon: 'fa-globe'
+            },
+            {id: 'users', url: '/scripts/admin/users.html', display: 'Users', selected: false, icon: 'fa-user'},
+            {id: 'groups', url: '/scripts/admin/groups.html', display: 'Groups', selected: false, icon: 'fa-group'},
             {
                 id: 'transferred', url: '/scripts/admin/transferred.html', display: 'Transferred Entries',
                 selected: false, icon: 'fa-list'
@@ -132,7 +138,7 @@ angular.module('ice.admin.controller', [])
             });
         };
     })
-    .controller('AdminTransferredEntriesController', function ($rootScope, $filter, $location, $scope, Folders) {
+    .controller('AdminTransferredEntriesController', function ($rootScope, $cookieStore, $filter, $location, $scope, Folders, Entry) {
         $scope.maxSize = 5;
         $scope.currentPage = 1;
         var params = {folderId: 'transferred'};
@@ -168,13 +174,23 @@ angular.module('ice.admin.controller', [])
         };
 
         $scope.showEntryDetails = function (entry, index) {
-            if (!$scope.params.offset) {
-                $scope.params.offset = index;
+            if (!params.offset) {
+                params.offset = index;
             }
-            $rootScope.collectionContext = $scope.params;
+            $rootScope.collectionContext = params;
             $location.path("/entry/" + entry.id);
         };
 
+        $scope.transferredTooltip = function (entry) {
+            $scope.tooltip = undefined;
+            Entry($cookieStore.get("sessionId")).tooltip({partId: entry.id},
+                function (result) {
+                    $scope.tooltip = result;
+                }, function (error) {
+                    console.error(error);
+                });
+        };
+
         $scope.pageCounts = function (currentPage, resultCount) {
             var maxPageCount = 15;
             var pageNum = ((currentPage - 1) * maxPageCount) + 1;

diff --git a/src/main/webapp/scripts/admin/transferred-tooltip.html b/src/main/webapp/scripts/admin/transferred-tooltip.html
@@ -0,0 +1,25 @@
+<div class="font-90em">
+    <div><b style="color: #888">Alias</b>: {{tooltip.alias}}</div>
+    <div><b style="color: #888">Selection Markers</b>: {{tooltip.selectionMarkers.toString()}}</div>
+    <div ng-if="tooltip.backbone"><b style="color: #888">Backbone</b>: {{tooltip.backbone}}</div>
+    <div><b style="color: #888">Creator</b>: {{tooltip.creator}}</div>
+    <div ng-if="tooltip.originOfReplication"><b style="color: #888">Origin of Replication</b>:
+        {{tooltip.originOfReplication}}
+    </div>
+    <div><b style="color: #888">Owner</b>: {{tooltip.owner}}</div>
+    <div ng-if="tooltip.links"><b style="color: #888">Links</b>: {{tooltip.links}}</div>
+    <div ng-if="tooltip.replicatesIn"><b style="color: #888">Replicates In</b>: {{tooltip.replicatesIn}}
+    </div>
+    <div><b style="color: #888">Status</b>: {{tooltip.status | capitalize}}</div>
+    <div><b style="color: #888">Bio Safety Level</b>: {{tooltip.bioSafetyLevel}}</div>
+    <div ng-if="tooltip.promoters"><b style="color: #888">Promoters</b>: {{tooltip.promoters}}</div>
+    <div ng-if="tooltip.keywords"><b style="color: #888">Keywords</b>: {{tooltip.keywords}}</div>
+    <div ng-if="tooltip.references"><b style="color: #888">References</b>: {{tooltip.references}}</div>
+    <div><b style="color: #888">Funding Source</b>: {{tooltip.fundingSource}}</div>
+    <div class="no_wrap"><b style="color: #888">Principal Investigator</b>: {{tooltip.principalInvestigator}}
+    </div>
+    <div><b style="color: #888">Modified</b>: {{tooltip.modificationTime | date:'medium'}}</div>
+    <div ng-if="tooltip.intellectualProperty"><b style="color: #888">IP Information</b>:
+        {{tooltip.intellectualProperty}}
+    </div>
+</div>
diff --git a/src/main/webapp/scripts/admin/transferred.html b/src/main/webapp/scripts/admin/transferred.html
@@ -83,8 +83,8 @@
                 </td>
                 <td>{{entry.type | capitalize}}</td>
                 <td><a ng-click="showEntryDetails(entry, $index)" class="cell_mouseover form-group"
-                       popover-trigger="mouseenter" ng-mouseover="tooltipDetails(entry)"
-                       popover-template="/views/template.html" popover-title="{{entry.partId}}"
+                       popover-trigger="mouseenter" ng-mouseover="transferredTooltip(entry)"
+                       popover-template="/scripts/admin/transferred-tooltip.html" popover-title="{{entry.partId}}"
                        popover-placement="right">{{entry.partId}}</a>
                 </td>
                 <td>