Repository: incubator-griffin Updated Branches: refs/heads/master b2f334a35 -> 9e7fdfa3d
modify version to 0.2.0, and fix bug of frontend when create job data range with time unit Author: Lionel Liu <bhlx3l...@163.com> Closes #223 from bhlx3lyx7/tmst. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/9e7fdfa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/9e7fdfa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/9e7fdfa3 Branch: refs/heads/master Commit: 9e7fdfa3d0b926746baa6330213cfc01e841d1f3 Parents: b2f334a Author: Lionel Liu <bhlx3l...@163.com> Authored: Mon Feb 12 16:40:12 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Mon Feb 12 16:40:12 2018 +0800 ---------------------------------------------------------------------- measure/pom.xml | 2 +- pom.xml | 2 +- service/pom.xml | 2 +- .../app/job/create-job/create-job.component.ts | 28 +++++++++++++++----- .../measure/create-measure/pr/pr.component.ts | 4 +-- ui/pom.xml | 2 +- 6 files changed, 28 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/measure/pom.xml ---------------------------------------------------------------------- diff --git a/measure/pom.xml b/measure/pom.xml index a0ff838..8cecb71 100644 --- a/measure/pom.xml +++ b/measure/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.griffin</groupId> <artifactId>griffin</artifactId> - <version>0.1.7-incubating-SNAPSHOT</version> + <version>0.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>measure</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dbc9f93..a3698d2 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. <groupId>org.apache.griffin</groupId> <artifactId>griffin</artifactId> - <version>0.1.7-incubating-SNAPSHOT</version> + <version>0.2.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Griffin ${project.version}</name> <url>http://griffin.incubator.apache.org</url> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/service/pom.xml ---------------------------------------------------------------------- diff --git a/service/pom.xml b/service/pom.xml index 502b312..eb1e066 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.griffin</groupId> <artifactId>griffin</artifactId> - <version>0.1.7-incubating-SNAPSHOT</version> + <version>0.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>service</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/ui/angular/src/app/job/create-job/create-job.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/job/create-job/create-job.component.ts b/ui/angular/src/app/job/create-job/create-job.component.ts index 1c55bc1..4ec7c57 100644 --- a/ui/angular/src/app/job/create-job/create-job.component.ts +++ b/ui/angular/src/app/job/create-job/create-job.component.ts @@ -161,17 +161,21 @@ export class CreateJobComponent implements OnInit, AfterViewChecked { ] }; for (let i = 0; i < this.dropdownList.length; i++) { + var connector = this.dropdownList[i]; + var begin = this.someKeyboard[i][0]; var length = this.someKeyboard[i][1] - this.someKeyboard[i][0]; + var beginStr = this.getTimeByUnit(begin, connector.size); + var lengthStr = this.getTimeByUnit(length, connector.size); this.newJob["data.segments"].push({ - "data.connector.name": this.dropdownList[i].connectorname, + "data.connector.name": connector.connectorname, "as.baseline": true, "segment.range": { - begin: this.someKeyboard[i][0], - length: length + begin: beginStr, + length: lengthStr } }); - this.originBegin.push(this.someKeyboard[i][0]); - this.originLength.push(length); + this.originBegin.push(beginStr); + this.originLength.push(lengthStr); } if (this.dropdownList.length == 2) { delete this.newJob["data.segments"][1]["as.baseline"]; @@ -235,6 +239,18 @@ export class CreateJobComponent implements OnInit, AfterViewChecked { $("#md-datepicker-0").height(250); } + getTimeByUnit(multiplier, unit) { + var regex = /^(\d+)([a-zA-Z]+)$/g; + var arr = regex.exec(unit); + if (arr.length > 2) { + var n = parseInt(arr[1]); + var unitStr = arr[2]; + return ((n * multiplier).toString() + arr[2]); + } else { + return multiplier.toString(); + } + } + getMeasureId() { for (let index in this.Measures) { if (this.measure == this.Measures[index].name) { @@ -372,4 +388,4 @@ export class CreateJobComponent implements OnInit, AfterViewChecked { ngAfterViewChecked() { this.resizeWindow(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/ui/angular/src/app/measure/create-measure/pr/pr.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts index c324013..2fa9989 100644 --- a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts +++ b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts @@ -413,7 +413,7 @@ export class PrComponent implements AfterViewChecked, OnInit { { type: "file.exist", config: { - "root.path": this.location, + "root.path": this.srclocation, path: this.path } } @@ -668,4 +668,4 @@ export class PrComponent implements AfterViewChecked, OnInit { ngAfterViewChecked() { this.resizeWindow(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e7fdfa3/ui/pom.xml ---------------------------------------------------------------------- diff --git a/ui/pom.xml b/ui/pom.xml index 83bfd88..707f7c1 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.griffin</groupId> <artifactId>griffin</artifactId> - <version>0.1.7-incubating-SNAPSHOT</version> + <version>0.2.0-incubating-SNAPSHOT</version> </parent> <artifactId>ui</artifactId> <packaging>pom</packaging>
