Repository: incubator-griffin Updated Branches: refs/heads/master c1f089815 -> 2430bc54e
Fix publish bugs Fix publish bugs Author: dodobel <[email protected]> Closes #253 from dodobel/button. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/2430bc54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2430bc54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2430bc54 Branch: refs/heads/master Commit: 2430bc54e0eb49fc9f09e039f2dca62259108346 Parents: c1f0898 Author: dodobel <[email protected]> Authored: Tue Apr 10 13:06:00 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue Apr 10 13:06:00 2018 +0800 ---------------------------------------------------------------------- .../app/measure/create-measure/pub/pub.component.css | 1 + .../app/measure/create-measure/pub/pub.component.html | 3 --- ui/angular/src/app/measure/measure.component.css | 1 + ui/angular/src/app/measure/measure.component.html | 2 +- ui/angular/src/app/measure/measure.component.ts | 14 ++++++++++---- 5 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2430bc54/ui/angular/src/app/measure/create-measure/pub/pub.component.css ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.css b/ui/angular/src/app/measure/create-measure/pub/pub.component.css index 194a251..5af6bbe 100644 --- a/ui/angular/src/app/measure/create-measure/pub/pub.component.css +++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.css @@ -201,6 +201,7 @@ under the License. background-color: #000000; border-radius: 5px; padding: 10px; + max-height: 600px; /*height:800px;*/ } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2430bc54/ui/angular/src/app/measure/create-measure/pub/pub.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.html b/ui/angular/src/app/measure/create-measure/pub/pub.component.html index b6e847f..2dd80ac 100644 --- a/ui/angular/src/app/measure/create-measure/pub/pub.component.html +++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.html @@ -121,9 +121,6 @@ under the License. </fieldset> </div> <div class="form-group btn-container"> - <button class="btn btn-primary btn-o back-step btn-wide pull-left" (click)="prev(Form)"> - <i class="fa fa-arrow-circle-left"></i> Back - </button> <toaster-container></toaster-container> <button type="submit" (click)="submit(prForm)" class="btn btn-primary btn-o next-step btn-wide pull-right"> Submit http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2430bc54/ui/angular/src/app/measure/measure.component.css ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/measure.component.css b/ui/angular/src/app/measure/measure.component.css index 7381878..ba60eab 100644 --- a/ui/angular/src/app/measure/measure.component.css +++ b/ui/angular/src/app/measure/measure.component.css @@ -67,6 +67,7 @@ under the License. background-color: #000000; border-radius: 5px; padding: 10px; + max-height: 600px; /*height:800px;*/ } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2430bc54/ui/angular/src/app/measure/measure.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/measure.component.html b/ui/angular/src/app/measure/measure.component.html index 9ac777e..67f3fa8 100644 --- a/ui/angular/src/app/measure/measure.component.html +++ b/ui/angular/src/app/measure/measure.component.html @@ -105,7 +105,7 @@ under the License. {{deletedRow["dq.type"]}} </div> </div> - <div class="row"> + <div class="row" *ngIf="sourceTable"> <label class="col-md-4 col-lg-4 col-sm-4"> DataAsset: </label> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2430bc54/ui/angular/src/app/measure/measure.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/measure.component.ts b/ui/angular/src/app/measure/measure.component.ts index f50a6ec..6f5acbb 100644 --- a/ui/angular/src/app/measure/measure.component.ts +++ b/ui/angular/src/app/measure/measure.component.ts @@ -65,14 +65,17 @@ export class MeasureComponent implements OnInit { } remove(row) { + console.log(row); this.visible = true; setTimeout(() => (this.visibleAnimate = true), 100); this.deleteId = row.id; this.deleteIndex = this.results.indexOf(row); this.deletedRow = row; - var sourcedata = this.deletedRow["data.sources"][0].connectors[0].config; - this.sourceTable = sourcedata["table.name"]; - if (this.deletedRow.type === "accuracy") { + if(this.deletedRow["measure.type"]!=="external"){ + var sourcedata = this.deletedRow["data.sources"][0].connectors[0].config; + this.sourceTable = sourcedata["table.name"]; + } + if (this.deletedRow["dq.type"] === "accuracy") { var targetdata = this.deletedRow["data.sources"][1].connectors[0].config; this.targetTable = targetdata["table.name"]; } else { @@ -116,7 +119,10 @@ export class MeasureComponent implements OnInit { } return measure; }); - this.results = Object.assign([],trans).reverse(); + // this.results = Object.assign([],trans).reverse(); + this.results = Object.assign([],trans).sort(function(a,b){ + return b.id - a.id; + }); }); } } \ No newline at end of file
