-
Notifications
You must be signed in to change notification settings - Fork 30
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 #83 from GridProtectionAlliance/features/fix-issue…
…s-2.1.0-rc Features/fix issues 2.1.0 rc
- Loading branch information
Showing
12 changed files
with
3,007 additions
and
3,442 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
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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
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,36 +1,47 @@ | ||
| export class AnnotationsQueryCtrl { | ||
| static templateUrl = 'partials/annotations.editor.html'; | ||
|
|
||
| $scope: any; | ||
| annotation: any; | ||
| datasource: any; | ||
|
|
||
| /** @ngInject */ | ||
| constructor() { | ||
| constructor($scope: any) { | ||
| this.$scope = $scope; | ||
| this.annotation = $scope.ctrl.annotation; | ||
| this.datasource = $scope.ctrl.datasource; | ||
|
|
||
| // load defaults | ||
| this.annotation.query = this.annotation.query || {}; | ||
| this.annotation.databases = this.annotation.databases || []; | ||
| this.annotation.templates = this.annotation.templates || []; | ||
| this.annotation.regex = this.annotation.regex || {}; | ||
| this.annotation.attribute = this.annotation.attribute || {}; | ||
| this.annotation.showEndTime = this.annotation.showEndTime || false; | ||
| this.getDatabases(); | ||
|
|
||
| this.datasource.getAssetServer(this.datasource.afserver.name).then((result: any) => { | ||
| return this.getDatabases(result.WebId); | ||
| }); | ||
| } | ||
| templateChanged() { | ||
| // do nothing | ||
| } | ||
| databaseChanged() { | ||
| this.annotation.templates = []; | ||
| this.getEventFrames(); | ||
| } | ||
| getDatabases() { | ||
| getDatabases(webid: string) { | ||
| var ctrl = this; | ||
| // @ts-ignore | ||
| return ctrl.datasource.getDatabases(ctrl.datasource.afserver.webid!).then((dbs: any) => { | ||
| ctrl.datasource.getDatabases(webid).then((dbs: any) => { | ||
| ctrl.annotation.databases = dbs; | ||
| this.$scope.$apply(); | ||
| }); | ||
| } | ||
| getEventFrames() { | ||
| var ctrl = this; | ||
| // @ts-ignore | ||
| return ctrl.datasource.getEventFrameTemplates(this.annotation.database.WebId).then((templates: any) => { | ||
| ctrl.datasource.getEventFrameTemplates(this.annotation.database.WebId).then((templates: any) => { | ||
| ctrl.annotation.templates = templates; | ||
| this.$scope.$apply(); | ||
| }); | ||
| } | ||
| } |
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.