-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #504 from mycontroller-org/development
release 1.5.0
- Loading branch information
Showing
135 changed files
with
5,903 additions
and
750 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| language: java | ||
| jdk: | ||
| - oraclejdk8 | ||
| - openjdk8 | ||
| branches: | ||
| only: | ||
| - master | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright 2015-2018 Jeeva Kandasamy ([email protected]) | ||
| * Copyright 2015-2019 Jeeva Kandasamy ([email protected]) | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
|
|
@@ -567,6 +567,20 @@ myControllerModule.config(function($stateProvider, $urlRouterProvider) { | |
| data: { | ||
| requireLogin: true | ||
| } | ||
| }).state('settingsExportList', { | ||
| url:"/settings/export/list", | ||
| templateUrl: "partials/export/export-list.html?mcv=${mc.gui.version}", | ||
| controller: "ExportControllerList", | ||
| data: { | ||
| requireLogin: true | ||
| } | ||
| }).state('settingsExportAuto', { | ||
| url:"/settings/export/settings", | ||
| templateUrl: "partials/export/automatic-export-settings.html?mcv=${mc.gui.version}", | ||
| controller: "ExportControllerAutoSettings", | ||
| data: { | ||
| requireLogin: true | ||
| } | ||
| }) | ||
|
|
||
| /* Login */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,224 @@ | ||
| /* | ||
| * Copyright 2015-2019 Jeeva Kandasamy ([email protected]) | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| myControllerModule.controller('ExportControllerList', function(alertService, $scope, $filter, displayRestError, ExportImportFactory, $filter, mchelper, CommonServices, $uibModal) { | ||
| //GUI page settings | ||
| $scope.headerStringList = $filter('translate')('EXPORTS_DETAIL'); | ||
| $scope.noItemsSystemMsg = $filter('translate')('NO_EXPORTS_SETUP'); | ||
| $scope.noItemsSystemIcon = "fa fa-upload"; | ||
|
|
||
| //load empty, configuration, etc., | ||
| $scope.mchelper = mchelper; | ||
| $scope.filteredList=[]; | ||
|
|
||
| //data query details | ||
| $scope.currentPage = 1; | ||
| $scope.query = CommonServices.getQuery(); | ||
| $scope.queryResponse = {}; | ||
|
|
||
| //Get min number | ||
| $scope.getMin = function(item1, item2){ | ||
| return CommonServices.getMin(item1, item2); | ||
| }; | ||
|
|
||
| //get all items | ||
| $scope.getAllItems = function(){ | ||
| ExportImportFactory.getAll($scope.query, function(response) { | ||
| $scope.queryResponse = response; | ||
| $scope.filteredList = $scope.queryResponse.data; | ||
| $scope.filterConfig.resultsCount = $scope.queryResponse.query.filteredCount; | ||
| },function(error){ | ||
| $scope.queryResponse.$resolved = true; | ||
| displayRestError.display(error); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| //Hold all the selected item ids | ||
| $scope.itemIds = []; | ||
|
|
||
| $scope.selectAllItems = function(){ | ||
| CommonServices.selectAllItems($scope, 'name'); | ||
| }; | ||
|
|
||
| $scope.selectItem = function(item){ | ||
| CommonServices.selectItem($scope, item, 'name'); | ||
| }; | ||
|
|
||
| //On page change | ||
| $scope.pageChanged = function(newPage){ | ||
| CommonServices.updatePageChange($scope, newPage); | ||
| }; | ||
|
|
||
| //Filter change method | ||
| var filterChange = function (filters) { | ||
| //Reset filter fields and update items | ||
| CommonServices.updateFiltersChange($scope, filters); | ||
| }; | ||
|
|
||
| $scope.filterConfig = { | ||
| fields: [ | ||
| { | ||
| id: 'name', | ||
| title: $filter('translate')('NAME'), | ||
| placeholder: $filter('translate')('FILTER_BY_NAME'), | ||
| filterType: 'text' | ||
| } | ||
| ], | ||
| resultsCount: $scope.filteredList.length, | ||
| appliedFilters: [], | ||
| onFilterChange: filterChange | ||
| }; | ||
|
|
||
| //Sort columns [*** NOT IN USE ***] | ||
| var sortChange = function (sortId, isAscending) { | ||
| //Reset sort type and update items | ||
| CommonServices.updateSortChange($scope, sortId, isAscending); | ||
| }; | ||
|
|
||
| $scope.sortConfig = { | ||
| fields: [ | ||
| { | ||
| id: 'name', | ||
| title: $filter('translate')('NAME'), | ||
| sortType: 'text' | ||
| } | ||
| ], | ||
| onSortChange: sortChange | ||
| }; | ||
|
|
||
| //Pre load | ||
| $scope.disableRunExport = false; | ||
|
|
||
| //Delete item(s) | ||
| $scope.delete = function (size) { | ||
| var modalInstance = $uibModal.open({ | ||
| templateUrl: 'partials/common-html/delete-modal.html', | ||
| controller: 'ControllerDeleteModal', | ||
| size: size, | ||
| resolve: {} | ||
| }); | ||
|
|
||
| modalInstance.result.then(function () { | ||
| ExportImportFactory.deleteIds($scope.itemIds, function(response) { | ||
| alertService.success($filter('translate')('ITEMS_DELETED_SUCCESSFULLY')); | ||
| //Update display table | ||
| $scope.getAllItems(); | ||
| $scope.itemIds = []; | ||
| },function(error){ | ||
| displayRestError.display(error); | ||
| }); | ||
| }), | ||
| function () { | ||
| //console.log('Modal dismissed at: ' + new Date()); | ||
| } | ||
| }; | ||
|
|
||
| //export now | ||
| $scope.exportNow = function(){ | ||
| $scope.disableRunExport = true; | ||
| ExportImportFactory.exportNow({"rowLimit": 1000}, function(){ | ||
| $scope.getAllItems(); | ||
| alertService.success($filter('translate')('EXPORT_TRIGGERED_SUCCESSFULLY')); | ||
| $scope.disableRunExport = false; | ||
| },function(error){ | ||
| displayRestError.display(error); | ||
| $scope.disableRunExport = false; | ||
| }); | ||
| }; | ||
|
|
||
| //Import | ||
| $scope.importItemFn = function (size) { | ||
| var addModalInstance = $uibModal.open({ | ||
| templateUrl: 'partials/export/import-confirmation-modal.html', | ||
| controller: 'ExportControllerImport', | ||
| size: size, | ||
| resolve: {fileName: function () {return {'name': $scope.itemIds[0]}}} | ||
| }); | ||
|
|
||
| addModalInstance.result.then(function () { | ||
| ExportImportFactory.importNow({"fileName": $scope.itemIds[0]}, function(response) { | ||
| alertService.success($filter('translate')('IMPORT_INITIATED_SUCCESSFULLY')+' '+response.message); | ||
| },function(error){ | ||
| displayRestError.display(error); | ||
| }); | ||
| }), | ||
| function () { | ||
| //console.log('Modal dismissed at: ' + new Date()); | ||
| } | ||
| }; | ||
|
|
||
| }); | ||
|
|
||
| //restore Modal | ||
| myControllerModule.controller('ExportControllerImport', function ($scope, $uibModalInstance, $filter, fileName) { | ||
| $scope.header = $filter('translate')('IMPORT_CONFIRMATION_TITLE', fileName); | ||
| $scope.rebootMsg = $filter('translate')('IMPORT_CONFIRMATION_MESSAGE', fileName); | ||
| $scope.importNow = function() {$uibModalInstance.close(); }; | ||
| $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); } | ||
| }); | ||
|
|
||
| //Automatice export settings | ||
| myControllerModule.controller('ExportControllerAutoSettings', function ($scope, ExportImportFactory, mchelper, alertService, displayRestError, $filter, CommonServices) { | ||
| $scope.mchelper = mchelper; | ||
| $scope.item = {}; | ||
| $scope.item.enabled = false; | ||
| $scope.cs = CommonServices; | ||
|
|
||
| $scope.resetSettings = function(){ | ||
| ExportImportFactory.getSettings(function(response) { | ||
| $scope.item = response; | ||
| //Update dropdown | ||
| if($scope.item.interval % 86400000 == 0){ | ||
| $scope.intervalLocal = $scope.item.interval / 86400000; | ||
| $scope.intervalTimeConstant = "86400000"; | ||
| $scope.intervalTimeConstantString = $filter('translate')('DAYS'); | ||
| }else if($scope.item.interval % 3600000 == 0){ | ||
| $scope.intervalLocal = $scope.item.interval / 3600000; | ||
| $scope.intervalTimeConstant = "3600000"; | ||
| $scope.intervalTimeConstantString = $filter('translate')('Hours'); | ||
| }else if($scope.item.interval % 60000 == 0){ | ||
| $scope.intervalLocal = $scope.item.interval / 60000; | ||
| $scope.intervalTimeConstant = "60000"; | ||
| $scope.intervalTimeConstantString = $filter('translate')('Minutes'); | ||
| } | ||
| },function(error){ | ||
| displayRestError.display(error); | ||
| }); | ||
| } | ||
|
|
||
| //GUI page settings | ||
| $scope.saveProgress = false; | ||
|
|
||
| //Load details | ||
| $scope.resetSettings(); | ||
|
|
||
| $scope.save = function(){ | ||
| if($scope.item.enabled){ | ||
| //Update time | ||
| $scope.item.interval = $scope.intervalLocal * $scope.intervalTimeConstant; | ||
| } | ||
| $scope.saveProgress = true; | ||
| ExportImportFactory.updateSettings($scope.item,function(response) { | ||
| $scope.saveProgress = false; | ||
| $scope.editEnable.exportSettings = false; | ||
| $scope.resetSettings(); | ||
| },function(error){ | ||
| displayRestError.display(error); | ||
| $scope.saveProgress = false; | ||
| }); | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.