From 1f5e812bfaf87f5d55419e36a6b29e4eb63bd22a Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Tue, 27 Oct 2020 11:51:15 +0100 Subject: [PATCH] ui --- .../static/resources/html/pages/edit/edit.html | 13 +++++++++---- .../resources/html/parts/org_conflicts.html | 2 +- .../resources/html/parts/org_duplicates.html | 9 +++++++-- .../html/parts/org_metadata.form.html | 5 ++++- .../static/resources/js/organizations.js | 18 ++++++++---------- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html index 5a6239ca..f4e6ae18 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html @@ -13,7 +13,7 @@
  • Metadata Management
    • -
  • +
  • Duplicates new
  • @@ -33,13 +33,18 @@ -
    +
    - + +
    + +
    + +
    - +
    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html index 503a23bc..215d3788 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html @@ -22,7 +22,7 @@
    - +
    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html index 887afa07..acc76f65 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html @@ -22,7 +22,7 @@ {{sr.oaCountry}} Collected from: {{sr.oaCollectedFrom}}
    Original Id: {{sr.oaOriginalId}} -
    +
    @@ -33,12 +33,17 @@ value="is_similar" ng-class="{'active' : sr.relType == 'is_similar'}" />
    +
    + + + +
    -
    +
    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html index 291d6c32..5552e717 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_metadata.form.html @@ -1,7 +1,10 @@
    - This is a pending organization. Please evaluate it before approving. + This organization is not yet subsumed by an OpenOrg. You can resolve this anomaly by:
      +
    • creating a new OpenOrg ID for this organization, or
      • +
    • adding the organization as a duplicate of an existing OpenOrg
      • +
    {{org.status}} This organization is managed by the system. You can not edit. diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js index e913b499..b366bfeb 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js @@ -227,10 +227,11 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) { return { restrict: 'E', scope: { - 'orgId' : '@', - 'duplicates' : '=', - 'showSaveButton' : '@', - 'saveFunction' : '&' + 'orgId' : '@', + 'duplicates' : '=', + 'showButtons' : '@', + 'readonly' : '@', + 'saveFunction' : '&' }, templateUrl: 'resources/html/parts/org_duplicates.html', link: function(scope, element, attrs, ctrl) { @@ -248,16 +249,13 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) { 'relType' : 'is_similar' }); - call_http_get($http, 'api/organizations/duplicates?id=' + scope.newDuplicate.id, function(res) { angular.forEach(res.data, function(dup) { dup.localId = scope.orgId; scope.duplicates.push(dup); }); }); - } - } } }); @@ -266,9 +264,9 @@ orgsModule.directive('orgConflicts', function($http, $location, $route, $q) { return { restrict: 'E', scope: { - 'org' : '=', - 'conflicts' : '=', - 'showSaveButton' : '@' + 'org' : '=', + 'conflicts' : '=', + 'showButtons' : '@' }, templateUrl: 'resources/html/parts/org_conflicts.html', link: function(scope, element, attrs, ctrl) {