Usody2018: Merge devel into master

app/common/components/account/shared-with-me/shared-with-me.directive.html

@@ -1,6 +1,6 @@
 <li uib-dropdown data-e2e="shared-with-me">
   <a uib-dropdown-toggle>
-    <i class="fa fa-users fa-fw fa-lg"></i>Shared to me<span class="caret"></span>
+    <i class="fa fa-users fa-fw fa-lg"></i>Shared with me<span class="caret"></span>
   </a>
   <ul class="dropdown-menu dropdown-menu-right">
     <li class="disabled" ng-show="session.account.shared.length == 0">

app/common/components/device/certificate/certificate-button/certificate-button.directive.js

@@ -1,27 +1,30 @@
-function certificateButton (dhModal) {
+function certificateButton (dhModal, ResourceListSelector) {
   return {
     template: require('./certificate-button.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
+    scope: {},
     link: $scope => {
       $scope.dropDownIsOpen = false
-      $scope.$watchCollection('resources', resources => {
-        $scope.allComputers = _.every(resources, {'@type': 'Computer'})
-      })
+
+      function setView () {
+        $scope.resources = ResourceListSelector.getAllSelectedDevices()
+        $scope.allComputers = _.every($scope.resources, {'@type': 'Computer'})
+      }
+      setView()
+      ResourceListSelector.callbackOnSelection(setView)
+
       $scope.certificates = [
         {
           title: 'Erasure',
           icon: 'fa-eraser',
           description: 'Shows a brief and the details of the hard-drives erased.'
         }
       ]
-      /*{
+      /* {
        title: 'Receipt',
        icon: ResourceSettings('resources:Receive').settings.fa,
        description: 'Generates a legal receipt for a receiver to sign.'
-       }*/
+       } */
       $scope.openDropdown = function ($event) {
         if ($scope.allComputers && $scope.resources.length > 0) $scope.dropDownIsOpen = true
         $event.stopPropagation()  // https://github.com/angular-ui/bootstrap/issues/6038

app/common/components/elements/header-nav/header-nav.directive.sass

@@ -7,7 +7,7 @@ header-nav
     user-select: none
     .navbar-brand
       float: left
-      padding: 2px $navbar-padding-horizontal
+      padding: $navbar-padding-vertical $navbar-padding-horizontal
       font-size: $font-size-h2
       line-height: $headings-line-height
       height: $navbar-height
@@ -22,6 +22,6 @@ header-nav
   .navbar-toggle
     padding: 5px 10px
 
-  @media (min-width: $grid-float-breakpoint)
-    .navbar > .container, .navbar > .container-fluid
-      margin-left: -$navbar-padding-horizontal
+  //@media (min-width: $grid-float-breakpoint)
+  //  .navbar > .container, .navbar > .container-fluid
+  //    margin-left: -$navbar-padding-horizontal

app/common/components/elements/new-button/new-button.directive.html

@@ -36,29 +36,9 @@
       Placeholders
     </a></li>
     <li role="menuitem" class="dropdown-header">New group</li>
-    <li role="menuitem"><a ng-click="open.group('Place')">
-      <resource-icon resource-type="Place"></resource-icon>
-      Place
-    </a></li>
     <li role="menuitem"><a ng-click="open.group('Lot')">
       <resource-icon resource-type="Lot"></resource-icon>
-      lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('IncomingLot')">
-      <resource-icon resource-type="Lot"></resource-icon>
-      Incoming lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('OutgoingLot')">
-      <resource-icon resource-type="Lot"></resource-icon>
-      Outgoing lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('Package')">
-      <resource-icon resource-type="Package"></resource-icon>
-      Package
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('Pallet')">
-      <resource-icon resource-type="Pallet"></resource-icon>
-      Pallet
+      Lot
     </a></li>
   </ul>
 </li>

app/common/components/event/manual-events-button/manual-events-button.directive.html

@@ -2,7 +2,7 @@
   <button id="event-button"
           type="button"
           class="btn"
-          ng-class="{'btn-primary': resources.length > 0}"
+          ng-class="{'btn-primary': selector.getAllSelectedDevices().length > 0}"
           uib-dropdown-toggle
   >
     <i class="fa fa-plus fa-fw"></i>New event<span class="caret"></span>
@@ -14,7 +14,7 @@
         tooltip-placement="right"
         tooltip-append-to-body="true"
     >
-      <a ng-click="openModal(eventSettings.type, resources)">
+      <a ng-click="openModal(eventSettings.type)">
         <resource-icon resource-type="{{::eventSettings.type}}" fill-to="true"></resource-icon>
         {{::eventSettings.humanName}}
       </a>

app/common/components/event/manual-events-button/manual-events-button.directive.js

@@ -1,15 +1,17 @@
-function manualEventsButton (ResourceSettings, dhModal) {
+function manualEventsButton (ResourceSettings, dhModal, ResourceListSelector) {
   return {
     template: require('./manual-events-button.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
+    scope: {},
     link: $scope => {
+      $scope.selector = ResourceListSelector
       $scope.events = ResourceSettings('devices:DeviceEvent').getSubResources()
       // If the passed-in resources are groups, we won't use the 'devices' field of the event, and otherwise
 
-      $scope.openModal = require('./../open-event-modal')(ResourceSettings, dhModal)
+      $scope.openModal = (eventType) => {
+        let resources = ResourceListSelector.getAllSelectedDevices()
+        require('./../open-event-modal')(ResourceSettings, dhModal)(eventType, resources)
+      }
     }
   }
 }

app/common/components/group/group-resource-action/group-resource-remove.directive.spec.js

@@ -23,7 +23,7 @@ describe('Test resourceRemove', () => {
                            success="_success()"
     ></group-resource-remove>`)
 
-  it('enables to remove only groups with presence in at least one device', () => {
+  it('displays only groups of given resources', () => {
     const params = {
       resources: [
         {

app/common/components/group/group-resource-button/group-resource-button.directive.html

@@ -1,7 +1,6 @@
 <div class="btn-group" uib-dropdown is-open="status.isopen">
   <button type="button"
-          class="btn"
-          ng-class="{'btn-primary': resources.length > 0}"
+          class="btn btn-primary"
           uib-dropdown-toggle
 
           uib-popover-template="popover.templateUrl"
@@ -14,7 +13,7 @@
           ng-click="closePopover()"
   >
     <span class="">
-      <i class="fa fa-folder fa-fw"></i>Organize <span class="caret"></span>
+      <i class="fa fa-folder fa-fw"></i>Edit lots<span class="caret"></span>
     </span>
   </button>
   <ul uib-dropdown-menu role="menu" class="dropdown-menu-right">

app/common/components/group/group-resource-button/group-resource-button.directive.js

@@ -3,20 +3,30 @@ function groupResourceButton () {
    * @ngdoc directive
    * @name groupResourceButton
    * @description Button with drop-down to add, move and remove resources within groups.
-   * @param {'resource'[]} resources - The resources.
    * @param {string} resourceType - The type of the resources.
    * @param {expression} success - Callback executed when an action has been executed successfully.
    */
   return {
-    templateUrl: require('./__init__').PATH + '/group-resource-button.directive.html',
+    template: require('./group-resource-button.directive.html'),
     restrict: 'E',
     scope: {
-      resources: '=',
       resourceType: '@',
-      success: '&'
+      success: '&',
+      getResources: '&',
+      registerToResourcesUpdate: '&',
+      resource: '='
     },
     link: $scope => {
-      let menu = [
+      function setView () {
+        $scope.resources = $scope.getResources()
+      }
+      if ($scope.resource) {
+        $scope.resources = [ $scope.resource ]
+      } else {
+        setView()
+        $scope.registerToResourcesUpdate({ callback: setView })
+      }
+      $scope.menu = [
         // {title: 'Lot', group: 'Lot', resourceTypes: ['Package', 'Device', 'Lot', 'Pallet']},
         {
           label: 'Add to lot',
@@ -37,59 +47,7 @@ function groupResourceButton () {
           tooltip: `Removes the items from a lot.`,
           fa: 'fa-minus'
         }
-        // {title: 'Package', group: 'Package', resourceTypes: ['Device', 'Package']},
-        // {
-        //   label: 'Move to package',
-        //   action: 'move',
-        //   group: 'Package',
-        //   resourceTypes: ['Device'],
-        //   tooltip: 'Replaces the package of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from packages',
-        //   action: 'remove',
-        //   group: 'Package',
-        //   resourceTypes: ['Device'],
-        //   tooltip: 'Removes the items from their packages.',
-        //   fa: 'fa-minus'
-        // },
-        // {title: 'Place', group: 'Place', resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet']},
-        // {
-        //   label: 'Move to place',
-        //   action: 'move',
-        //   group: 'Place',
-        //   resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet'],
-        //   tooltip: 'Replaces the place of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from places',
-        //   action: 'remove',
-        //   group: 'Place',
-        //   resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet'],
-        //   tooltip: 'Removes the items from their places.',
-        //   fa: 'fa-minus'
-        // },
-        // {title: 'Pallet', group: 'Pallet', resourceTypes: ['Device', 'Package']},
-        // {
-        //   label: 'Move to pallet',
-        //   action: 'move',
-        //   group: 'Pallet',
-        //   resourceTypes: ['Device', 'Package'],
-        //   tooltip: 'Replaces the pallet of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from pallets',
-        //   action: 'remove',
-        //   group: 'Pallet',
-        //   resourceTypes: ['Device', 'Package'],
-        //   tooltip: 'Removes the items from their pallet.',
-        //   fa: 'fa-minus'
-        // }
       ]
-      $scope.menu = _(menu).remove(menuItem => _.includes(menuItem.resourceTypes, $scope.resourceType)).value()
 
       $scope.popover = {
         templateUrl: require('./__init__').PATH + '/group-resource-button.popover.template.html',