diff --git a/seed/static/seed/js/controllers/organization_access_level_tree_controller.js b/seed/static/seed/js/controllers/organization_access_level_tree_controller.js index da3809ea8c..56ab9b63ca 100644 --- a/seed/static/seed/js/controllers/organization_access_level_tree_controller.js +++ b/seed/static/seed/js/controllers/organization_access_level_tree_controller.js @@ -12,6 +12,7 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) 'urls', '$window', 'spinner_utility', + // eslint-disable-next-line func-names function ( $scope, $uibModal, @@ -46,10 +47,11 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) } }; - $scope.open_add_level_modal = function () { + $scope.open_add_level_modal = () => { $uibModal.open({ templateUrl: `${urls.static_url}seed/partials/organization_add_access_level_modal.html`, controller: 'organization_add_access_level_modal_controller', + backdrop: 'static', resolve: { org_id: () => $scope.org.id, current_access_level_names: () => $scope.access_level_names @@ -60,10 +62,11 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) }); }; - $scope.open_add_level_instance_modal = function () { + $scope.open_add_level_instance_modal = () => { $uibModal.open({ templateUrl: `${urls.static_url}seed/partials/organization_add_access_level_instance_modal.html`, controller: 'organization_add_access_level_instance_modal_controller', + backdrop: 'static', resolve: { org_id: () => $scope.org.id, level_names: () => $scope.access_level_names, @@ -75,11 +78,12 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) }); }; - $scope.open_upload_al_instances_modal = function () { + $scope.open_upload_al_instances_modal = () => { const step = 20; // this is the step that corresponds to uploading access levels $uibModal.open({ templateUrl: `${urls.static_url}seed/partials/data_upload_modal.html`, controller: 'data_upload_modal_controller', + backdrop: 'static', resolve: { cycles: () => [], step: () => step, @@ -91,16 +95,17 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) }); }; - $scope.open_delete_al_instance_modal = function(instance_id, instance_name) { + $scope.open_delete_al_instance_modal = (instance_id, instance_name) => { $uibModal.open({ - templateUrl: urls.static_url + 'seed/partials/organization_delete_access_level_instance_modal.html', + templateUrl: `${urls.static_url}seed/partials/organization_delete_access_level_instance_modal.html`, controller: 'organization_delete_access_level_instance_modal_controller', + backdrop: 'static', resolve: { - org_id: function() {return $scope.org.id}, - instance_id: function() {return instance_id}, - instance_name: function() {return instance_name} - }, - }).result.then(function () { + org_id: () => $scope.org.id, + instance_id: () => instance_id, + instance_name: () => instance_name + } + }).result.then(() => { spinner_utility.show(); $window.location.reload(); }); @@ -110,6 +115,7 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) $uibModal.open({ templateUrl: `${urls.static_url}seed/partials/organization_delete_access_level_instance_modal.html`, controller: 'organization_delete_access_level_instance_modal_controller', + backdrop: 'static', resolve: { org_id: () => $scope.org.id, instance_id: () => instance_id, @@ -121,10 +127,11 @@ angular.module('BE.seed.controller.organization_access_level_tree', []) }); }; - $scope.open_edit_al_instance_modal = function (instance_id, instance_name) { + $scope.open_edit_al_instance_modal = (instance_id, instance_name) => { $uibModal.open({ templateUrl: `${urls.static_url}seed/partials/organization_edit_access_level_instance_modal.html`, controller: 'organization_edit_access_level_instance_modal_controller', + backdrop: 'static', resolve: { org_id: () => $scope.org.id, instance_id: () => instance_id, diff --git a/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js b/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js index 29e6e3e25e..928218236d 100644 --- a/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js +++ b/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js @@ -11,6 +11,7 @@ angular.module('BE.seed.controller.organization_add_access_level_modal', []) 'org_id', 'current_access_level_names', 'Notification', + // eslint-disable-next-line func-names function ( $scope, $state, @@ -20,16 +21,13 @@ angular.module('BE.seed.controller.organization_add_access_level_modal', []) current_access_level_names, Notification ) { - $scope.current_access_level_names = [...current_access_level_names]; - $scope.new_access_level_names = current_access_level_names; + $scope.new_access_level_names = angular.copy(current_access_level_names); - $scope.is_modifed = () => !_.isEqual($scope.current_access_level_names, $scope.new_access_level_names); + $scope.is_modified = () => !_.isEqual(current_access_level_names, $scope.new_access_level_names); - $scope.save_access_level_names = function () { + $scope.save_access_level_names = () => { organization_service.update_organization_access_level_names(org_id, $scope.new_access_level_names) - .then( - (_) => $uibModalInstance.close() - ) + .then(() => $uibModalInstance.close()) .catch((err) => { console.log(err.data.message); Notification.error(err.data.message); @@ -41,7 +39,7 @@ angular.module('BE.seed.controller.organization_add_access_level_modal', []) }; $scope.add_level = () => { - $scope.new_access_level_names.push(""); + $scope.new_access_level_names.push(''); }; $scope.cancel = () => { diff --git a/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js b/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js index 926570f36a..c999588df0 100644 --- a/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js +++ b/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js @@ -12,6 +12,7 @@ angular.module('BE.seed.controller.organization_edit_access_level_instance_modal 'instance_id', 'instance_name', 'Notification', + // eslint-disable-next-line func-names function ( $scope, $state, @@ -25,13 +26,15 @@ angular.module('BE.seed.controller.organization_edit_access_level_instance_modal $scope.instance_id = instance_id; $scope.level_instance_name = instance_name; - $scope.edit_level_instance = function () { + $scope.save_if_changed = () => { + if (instance_name === $scope.level_instance_name) $scope.cancel(); + organization_service.edit_organization_access_level_instance(org_id, $scope.instance_id, $scope.level_instance_name) - .then((_) => $uibModalInstance.close()) + .then(() => $uibModalInstance.close()) .catch((err) => { Notification.error(err); }); }; - $scope.cancel = function () { + $scope.cancel = () => { $uibModalInstance.dismiss('cancel'); }; }]); diff --git a/seed/static/seed/partials/analyses.html b/seed/static/seed/partials/analyses.html index 6edc5f5d73..56fe006af9 100644 --- a/seed/static/seed/partials/analyses.html +++ b/seed/static/seed/partials/analyses.html @@ -55,7 +55,7 @@ {$:: analysis.created_at | date : 'MM-dd-yyyy HH:mm' $} - + {$ analysis.status $} {$:: analysis.start_time | date : 'MM-dd-yyyy HH:mm' $} diff --git a/seed/static/seed/partials/analysis_card.html b/seed/static/seed/partials/analysis_card.html index 29c9fbf49c..959ae17c88 100644 --- a/seed/static/seed/partials/analysis_card.html +++ b/seed/static/seed/partials/analysis_card.html @@ -2,7 +2,7 @@

{$:: analysis.name $} Run #{$:: analysis.views[0] $}

- + {$ analysis.status $} diff --git a/seed/static/seed/partials/analysis_details.html b/seed/static/seed/partials/analysis_details.html index c3ecbe0dbf..ea7c41350a 100644 --- a/seed/static/seed/partials/analysis_details.html +++ b/seed/static/seed/partials/analysis_details.html @@ -27,7 +27,7 @@ {$:: analysis.created_at | date : 'MM-dd-yyyy HH:mm' $} - + {$ analysis.status $} {$:: (messages | filter : {'analysis_property_view':null})[0]['user_message'] $} diff --git a/seed/static/seed/partials/at_scenarios.html b/seed/static/seed/partials/at_scenarios.html index 459cb806ed..37891a24af 100644 --- a/seed/static/seed/partials/at_scenarios.html +++ b/seed/static/seed/partials/at_scenarios.html @@ -48,7 +48,7 @@ - +
MEASURES
Successful upload! ng-if="uploader.progress_last_updated != null && uploader.progress_last_checked != null && (uploader.progress_last_checked - uploader.progress_last_updated) / 1000 > 60" class="progress_bar_copy_bottom" > - + SEED is still working. Please do not refresh or leave this page. (Last updated at {$ uploader.progress_last_checked | date:'hh:mm a' $})
diff --git a/seed/static/seed/partials/data_upload_modal_progress.html b/seed/static/seed/partials/data_upload_modal_progress.html index aac65b93a9..f1098c2854 100644 --- a/seed/static/seed/partials/data_upload_modal_progress.html +++ b/seed/static/seed/partials/data_upload_modal_progress.html @@ -3,8 +3,8 @@
{$ uploader.progress | number:0 $}% {$:: 'Complete' | translate $} {$ uploader.status_message ? ': ' + uploader.status_message : '' $}
diff --git a/seed/static/seed/partials/inventory_detail.html b/seed/static/seed/partials/inventory_detail.html index b5ec908787..eb278e9cb9 100644 --- a/seed/static/seed/partials/inventory_detail.html +++ b/seed/static/seed/partials/inventory_detail.html @@ -239,7 +239,7 @@

- Loading... + Loading... {$ item_derived_values[col.id] $} diff --git a/seed/static/seed/partials/mapping.html b/seed/static/seed/partials/mapping.html index 6cea44fa8c..87e5e74dd6 100644 --- a/seed/static/seed/partials/mapping.html +++ b/seed/static/seed/partials/mapping.html @@ -279,7 +279,7 @@

- - + @@ -103,36 +102,30 @@

Current Access Level Tree:

data-toggle="collapse" data-target="#target-{$ child.id $}" > -
-
- - - + + - -
{$:: 'Level' | translate $} {$ level+1 $}: {$ access_level_names[level] $} ItemsActionsActions
- - - {$ child.data.name $} - {$ child.children.length || 0 $} - - - + + {$ child.data.name $} + + + +
+
-
-
+
+
-
@@ -142,11 +135,3 @@

Current Access Level Tree:

- diff --git a/seed/static/seed/partials/organization_add_access_level_instance_modal.html b/seed/static/seed/partials/organization_add_access_level_instance_modal.html index e373bfc8b7..947a3336f9 100644 --- a/seed/static/seed/partials/organization_add_access_level_instance_modal.html +++ b/seed/static/seed/partials/organization_add_access_level_instance_modal.html @@ -1,44 +1,38 @@
-

{$:: 'Add Level Instance (Node) to the Organizational Structure' | translate $}

+

{$:: 'Add Level Instance (Node) to the Organizational Structure' | translate $}

-
-
- - -
+
+
+ +
-
-
- - -
+
+
+
+ +
-
-
- - -
+
+
+
+ +
+
-
- -
-
- -
+ +
diff --git a/seed/static/seed/partials/organization_add_access_level_modal.html b/seed/static/seed/partials/organization_add_access_level_modal.html index cb8ab1d641..52293c47c8 100644 --- a/seed/static/seed/partials/organization_add_access_level_modal.html +++ b/seed/static/seed/partials/organization_add_access_level_modal.html @@ -1,35 +1,27 @@
-

{$:: 'Add Levels to the Organizational Structure Tree' | translate $}

+

{$:: 'Add Levels to the Organizational Structure Tree' | translate $}

-
- - -
-
- -
-
- -
-
- - +
+
+
-
- - +
+
+
+
+
+ + +
+
-
- -
-
- -
+ +
diff --git a/seed/static/seed/partials/organization_edit_access_level_instance_modal.html b/seed/static/seed/partials/organization_edit_access_level_instance_modal.html index efccde8b38..ad44728407 100644 --- a/seed/static/seed/partials/organization_edit_access_level_instance_modal.html +++ b/seed/static/seed/partials/organization_edit_access_level_instance_modal.html @@ -1,21 +1,15 @@
-

{$:: 'Edit Access Level Instance Name' | translate $}

+

{$:: 'Edit Access Level Instance Name' | translate $}

-
-
- - -
+
+
+ + +
-
- -
-
- -
+ +
diff --git a/seed/static/seed/scss/style.scss b/seed/static/seed/scss/style.scss index 575ae11ac1..3f0e3c4a4a 100755 --- a/seed/static/seed/scss/style.scss +++ b/seed/static/seed/scss/style.scss @@ -4830,13 +4830,17 @@ ul.r-list { } .accordion-header[aria-expanded='true'] i { - transform: rotate(90deg); - transition: transform 0.5s; + &:not(.fa-pencil):not(.fa-trash) { + transform: rotate(90deg); + transition: transform 0.5s; + } } .accordion-header[aria-expanded='false'] i { - transform: rotate(0deg); - transition: transform 0.5s; + &:not(.fa-pencil):not(.fa-trash) { + transform: rotate(0deg); + transition: transform 0.5s; + } } .measure-elec { @@ -5005,10 +5009,31 @@ ul.r-list { border-color: #2e6da4; } +.access-level-tree { + .hidden-row { + padding: 0 !important; + + &:not(:has(> .collapse.in, > .collapsing)) { + // No border if collapsed + border-bottom-width: 0 !important; + } + } +} + .levels-header { font-weight: bold; padding: 0; - background: #efefef; +} + +.level-child { + &:has(> i.fa-chevron-right) { + cursor: pointer; + } + + span { + margin-bottom: -1px; + padding-left: 8px; + } } .levels-table-item-detail { @@ -5075,6 +5100,7 @@ ul.r-list { border-bottom: 1px solid #ddd; } } + .portfolio-summary-wrapper { display: flex; flex-direction: column; @@ -5083,9 +5109,11 @@ ul.r-list { padding: 10px; padding-bottom: 0; } + .goal-actions-wrapper { display: flex; margin: 0 10px; + div { margin: 0 10px; } @@ -5094,9 +5122,11 @@ ul.r-list { display: flex; min-height: 30px; margin: 15px; + .goal-select-label { margin: auto; } + .goal-selection { #goal-select { width: 30vw; @@ -5106,12 +5136,14 @@ ul.r-list { padding: 5px; } } + button { margin-left: 10px; height: 100%; } } } + #portfolio-summary-selection-wrapper { margin: 10px 7px; display: flex; @@ -5125,6 +5157,7 @@ ul.r-list { font-size: 10px; padding: 4px 0 6px 0; } + .portfolio-summary-constant { border: 1px solid gray; border-radius: 2px; @@ -5134,9 +5167,11 @@ ul.r-list { text-overflow: ellipsis; padding-left: 4px; } + .starting-legend { background-color: #f8f1cf; } + .ending-legend { background-color: #f8d0c4; } @@ -5154,10 +5189,12 @@ ul.r-list { border-bottom: 1px solid rgb(199, 199, 199); } } + .portfolio-summary-btn { height: 28px; padding: 0 10px; } + #portfolio-summary-grid { margin: 0 24px; } @@ -5204,6 +5241,7 @@ ul.r-list { } } } + .portfolio-summary-loading { border: 1px solid rgb(188, 188, 188); border-radius: 5px; @@ -5213,6 +5251,7 @@ ul.r-list { background: rgba(128, 128, 128, 0.1); color: rgb(128, 128, 128); } + .portfolio-summary-item-count { margin: 0 24px; margin-top: 2px; @@ -5233,11 +5272,13 @@ ul.r-list { .goal-details-column { .goal-detail { display: flex; + .goal-detail-key { text-align: right; width: 120px; padding-right: 10px; } + .goal-detail-value { font-weight: bold; white-space: nowrap; @@ -5264,20 +5305,24 @@ ul.r-list { .goal-label { width: 150px; } + .goal-form-control { height: unset; padding: 0; } } + #goal-list { max-height: 485px; } + #goal-messages { margin: 10px; padding: 10px; border-radius: 10px; text-align: left; } + .analysis-results-section { padding: 5px 10px; margin: 0; @@ -5300,7 +5345,7 @@ ul.r-list { } .al-label { - margin-top: 15px; + margin: 0; font-size: 1.1em; } @@ -5365,10 +5410,12 @@ tags-input .tags .tag-item { background: #337ab7; } } + .goal-name { overflow: hidden; text-overflow: ellipsis; } + .tooltip-long { word-wrap: break-word; } diff --git a/seed/views/v3/access_levels.py b/seed/views/v3/access_levels.py index 2b00760a49..0c584a3571 100644 --- a/seed/views/v3/access_levels.py +++ b/seed/views/v3/access_levels.py @@ -279,7 +279,7 @@ def importer(self, request, organization_pk=None): # but not the other way around wrong_headers = False # handle having the root level in file or not - level_names = org.access_level_names + level_names = org.access_level_names.copy() if headers[0] != level_names[0]: level_names.pop(0) @@ -298,7 +298,7 @@ def importer(self, request, organization_pk=None): for chunk in the_file.chunks(): temp_file.write(chunk) - return JsonResponse({'success': True, "tempfile": temp_file.name}) + return JsonResponse({'success': True, 'tempfile': temp_file.name}) @swagger_auto_schema( manual_parameters=[