Merge branch 'analysis-packages' into development

dzhw · Dec 9, 2021 · 496ef7b · 496ef7b
2 parents f942b37 + b26799e
commit 496ef7b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage-list.html.tmpl b/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage-list.html.tmpl
@@ -1,3 +1,4 @@
+<script src="unitValuePicker.controller.js"></script>
 <md-card>
     <md-card-header>
         <md-card-header-text>
@@ -9,22 +10,27 @@
         <ul ng-if="geographicCoverages.length > 0">
             <li ng-repeat="geographicCoverage in geographicCoverages">
                 <div layout="row" layout-align="start stretch">
-                    <div layout="column" layout-align="center stretch" class="fdz-geographic-coverage-item-controls">
-                        <md-button class="md-icon-button md-primary" ng-disabled="$index === 0" ng-click="moveItemUp($index)" md-no-ink="true">
+                    <div layout="column" class="fdz-geographic-coverage-item-controls">
+                      <md-button class="md-icon-button md-primary mt18 mh0 pl0" aria-label="Delete geographic location" ng-click="deleteGeographicCoverage(geographicCoverage)" style="margin: 6px;">
+                        <md-tooltip md-direction="bottom" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                          {{'survey-management.geographic-coverage.tooltip.delete' | translate}}
+                        </md-tooltip>
+                        <md-icon>delete_forever</md-icon>
+                      </md-button>
+                        <md-button class="md-icon-button md-primary mt18 mh0 pl0" ng-disabled="$index === 0" ng-click="moveItemUp($index)" md-no-ink="true">
                             <md-icon md-font-set="material-icons" class="ng-scope material-icons" role="img" aria-hidden="true">keyboard_arrow_up</md-icon>
                             <md-tooltip md-direction="right" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
                                 {{'survey-management.geographic-coverage-list.tooltip.move-item-up'|translate}}
                             </md-tooltip>
                         </md-button>
-                        <md-button class="md-icon-button md-primary" ng-disabled="$index >= geographicCoverages.length - 1" ng-click="moveItemDown($index)" md-no-ink="true">
+                        <md-button class="md-icon-button md-primary mt18 mh0 pl0" ng-disabled="$index >= geographicCoverages.length - 1" ng-click="moveItemDown($index)" md-no-ink="true">
                             <md-icon md-font-set="material-icons" class="ng-scope material-icons" role="img" aria-hidden="true">keyboard_arrow_down</md-icon>
                             <md-tooltip md-direction="right" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
                                 {{'survey-management.geographic-coverage-list.tooltip.move-item-down'|translate}}
                             </md-tooltip>
                         </md-button>
                     </div>
                     <geographic-coverage geographic-coverage="geographicCoverage"
-                                         on-delete="deleteGeographicCoverage(geographicCoverage)"
                                          flex>
                     </geographic-coverage>
                 </div>

diff --git a/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage.directive.js b/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage.directive.js
@@ -7,8 +7,7 @@ angular.module('metadatamanagementApp')
       templateUrl: 'scripts/surveymanagement/directives/geographic-coverage' +
         '.html.tmpl',
       scope: {
-        geographicCoverage: '=',
-        onDelete: '&'
+        geographicCoverage: '='
       },
       controller: 'GeographicCoverageController'
     };

diff --git a/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage.html.tmpl b/src/main/webapp/scripts/surveymanagement/directives/geographic-coverage.html.tmpl
@@ -30,12 +30,6 @@
                 <div ng-message="md-require-match">{{'survey-management.geographic-coverage.errors.no-match' | translate}}</div>
             </div>
         </md-autocomplete>
-        <md-button class="md-icon-button md-primary" aria-label="Delete geographic location" ng-click="onDelete()" style="margin: 6px;">
-            <md-tooltip md-direction="bottom" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                {{'survey-management.geographic-coverage.tooltip.delete' | translate}}
-            </md-tooltip>
-            <md-icon>delete_forever</md-icon>
-        </md-button>
     </div>
     <div layout-gt-xs="column" layout-gt-sm="row" class="pr16">
         <md-input-container flex="grow" ng-class="{'mr10': isScreenGreaterSmall}">