diff --git a/seed/static/seed/js/controllers/data_upload_modal_controller.js b/seed/static/seed/js/controllers/data_upload_modal_controller.js index bd4db1fd83..7319988bf7 100644 --- a/seed/static/seed/js/controllers/data_upload_modal_controller.js +++ b/seed/static/seed/js/controllers/data_upload_modal_controller.js @@ -547,6 +547,18 @@ angular.module('BE.seed.controller.data_upload_modal', []) }); }; + $scope.reuse_import_file_to_import_meters = function () { + dataset_service.reuse_inventory_file_for_meters($scope.dataset.import_file_id).then(function (data) { + $scope.dataset.import_file_id = data.import_file_id; + $scope.uploader.progress = 50; + $scope.uploader.status_message = 'analyzing file'; + uploader_service + .pm_meters_preview($scope.dataset.import_file_id, $scope.organization.org_id) + .then(present_parsed_meters_confirmation) + .catch(present_meter_import_error); + }) + } + /** * save_raw_assessed_data: saves Assessed data * @@ -639,6 +651,11 @@ angular.module('BE.seed.controller.data_upload_modal', []) $scope.step_10_file_message = 'Warning(s)/Error(s) occurred while processing the file(s):\n' + JSON.stringify(progress_data.file_info, null, 2); } + // Toggle a meter import button if the imported file also has a meters tab + dataset_service.check_meters_tab_exists($scope.dataset.import_file_id).then(function(result) { + $scope.import_file_reusable_for_meters = result; + }); + // If merges against existing exist, provide slightly different feedback if ($scope.property_merges_against_existing + $scope.tax_lot_merges_against_existing > 0) { $scope.step.number = 8; diff --git a/seed/static/seed/js/services/dataset_service.js b/seed/static/seed/js/services/dataset_service.js index e3c5ac731b..5632c15a6c 100644 --- a/seed/static/seed/js/services/dataset_service.js +++ b/seed/static/seed/js/services/dataset_service.js @@ -87,5 +87,25 @@ angular.module('BE.seed.service.dataset', []).factory('dataset_service', [ }); }; + dataset_service.check_meters_tab_exists = function (file_id) { + debugger; + return $http.get('/api/v3/import_files/' + file_id + '/check_meters_tab_exists', { + params: { + organization_id: user_service.get_organization().id + } + }).then(function (response) { + return response.data + }); + } + + dataset_service.reuse_inventory_file_for_meters = function (file_id) { + return $http.post('/api/v3/import_files/reuse_inventory_file_for_meters/', { + import_file_id: file_id, + organization_id: user_service.get_organization().id + }).then(function (response) { + return response.data; + }); + }; + return dataset_service; }]); diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html index 941c6f7c1d..d3c079bb0b 100644 --- a/seed/static/seed/partials/data_upload_modal.html +++ b/seed/static/seed/partials/data_upload_modal.html @@ -399,6 +399,9 @@
Use Case Warnings
+
+ +
@@ -415,6 +418,9 @@
Use Case Warnings
+
+ +