#1296 Separate rows and column into different line

metatron-app · Jan 28, 2019 · d0053c8 · d0053c8
1 parent 1c70892
commit d0053c8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/...n/dataflow/dataflow-detail/component/dataset-info-popup/dataset-info-popup.component.html b/...n/dataflow/dataflow-detail/component/dataset-info-popup/dataset-info-popup.component.html
@@ -125,7 +125,7 @@
     </div>
 
     <dl class="ddp-dl-detail" *ngFor="let item of datasetInformationList">
-      <dt>
+      <dt [ngStyle]="{'color': item.name === 'S' ? '#f6f6f7' : null } ">
         {{item.name}}
       </dt>
       <dd>

diff --git a/...ion/dataflow/dataflow-detail/component/dataset-info-popup/dataset-info-popup.component.ts b/...ion/dataflow/dataflow-detail/component/dataset-info-popup/dataset-info-popup.component.ts
@@ -292,18 +292,12 @@ export class DatasetInfoPopupComponent extends AbstractComponent implements OnIn
   /** get rows */
   public get getRows() {
     let rows = '0';
-
-    if(true==Number.isInteger(this.selectedDataSet.totalLines)) {
+    if(Number.isInteger(this.selectedDataSet.totalLines)) {
       if (this.selectedDataSet.totalLines === -1) {
         rows = '(counting)';
       } else {
-        rows = new Intl.NumberFormat().format(this.selectedDataSet.totalLines);
+        rows = new Intl.NumberFormat().format(this.selectedDataSet.totalLines) + ' row(s)';
         this.clearExistingInterval();
-        if (rows === '0' || rows === '1') {
-          rows = rows + ` row`;
-        } else {
-          rows = rows + ` rows`;
-        }
       }
     }
     return rows;
@@ -693,8 +687,10 @@ export class DatasetInfoPopupComponent extends AbstractComponent implements OnIn
 
     // WRANGLED
     if (dataset.dsType === DsType.WRANGLED) {
-      this.datasetInformationList = [{ name : this.translateService.instant('msg.comm.th.type') , value : dataset.dsType },
-        {name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${cols } ${ cols === '1' || cols === '0' ? 'column': 'columns'}` }
+      this.datasetInformationList = [
+        { name : this.translateService.instant('msg.comm.th.type') , value : dataset.dsType },
+        {name : this.translateService.instant('msg.dp.th.summary'), value :this.getRows},
+        {name : 'S', value : cols + ' column(s)'}
       ];
 
       // FILE
@@ -714,7 +710,10 @@ export class DatasetInfoPopupComponent extends AbstractComponent implements OnIn
         this.datasetInformationList.push({name : this.translateService.instant('msg.comm.detail.size'), value : this.getTotalBytes });
       }
 
-      this.datasetInformationList.push({name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${ cols } ${ cols === '1' || cols === '0' ? 'column': 'columns'}`})
+      this.datasetInformationList.push(
+        {name : this.translateService.instant('msg.dp.th.summary'), value :this.getRows},
+        {name : 'S', value : cols + ' column(s)'}
+        )
 
 
       // STAGING OR DB
@@ -747,7 +746,8 @@ export class DatasetInfoPopupComponent extends AbstractComponent implements OnIn
       }
 
       this.datasetInformationList.push(
-        { name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${ cols } ${ cols === '1' || cols === '0' ? 'column': 'columns'}` })
+        {name : this.translateService.instant('msg.dp.th.summary'), value :this.getRows},
+        {name : 'S', value : cols + ' column(s)'})
 
     }
   }

diff --git a/discovery-frontend/src/app/data-preparation/dataset/dataset-detail.component.ts b/discovery-frontend/src/app/data-preparation/dataset/dataset-detail.component.ts
@@ -361,12 +361,7 @@ export class DatasetDetailComponent extends AbstractComponent implements OnInit,
       if (this.dataset.totalLines === -1) {
         rows = '(counting)';
       } else {
-        rows = new Intl.NumberFormat().format(this.dataset.totalLines);
-        if (rows === '0' || rows === '1') {
-          rows = rows + ' row';
-        } else {
-          rows = rows + ' rows';
-        }
+        rows = new Intl.NumberFormat().format(this.dataset.totalLines) + ' row(s)';
         clearInterval(this.interval);
         this.interval = undefined;
       }
@@ -472,9 +467,9 @@ export class DatasetDetailComponent extends AbstractComponent implements OnInit,
     // WRANGLED
     if (dataset.dsType === DsType.WRANGLED) {
       this.datasetInformationList = [{ name : this.translateService.instant('msg.comm.th.type') , value : dataset.dsType },
-        {name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${this.dataset.gridResponse.colCnt } ${this.dataset.gridResponse.colCnt === '1' || this.dataset.gridResponse.colCnt === '0' ? 'column': 'columns'}` }
-      ]
-
+        {name : this.translateService.instant('msg.dp.th.summary'), value : this.getRows },
+          {name : '', value : this.dataset.gridResponse.colCnt + ' column(s)' }
+        ]
       // FILE
     }  else if (dataset.importType === ImportType.UPLOAD || dataset.importType === ImportType.URI) {
       let filepath : string = dataset.importType === ImportType.UPLOAD? dataset.filenameBeforeUpload : dataset.storedUri;
@@ -489,8 +484,11 @@ export class DatasetDetailComponent extends AbstractComponent implements OnInit,
         this.datasetInformationList.push({name : this.translateService.instant('msg.dp.th.sheet'), value : this.getSheetName() })
       }
 
-      this.datasetInformationList.push({name : this.translateService.instant('msg.comm.detail.size'), value : this.getTotalBytes },
-        {name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${this.dataset.gridResponse.colCnt} ${this.dataset.gridResponse.colCnt === '1' || this.dataset.gridResponse.colCnt === '0' ? 'column': 'columns'}`})
+      this.datasetInformationList.push(
+        {name : 'URI', value : this.dataset.storedUri},
+        {name : this.translateService.instant('msg.comm.detail.size'), value : this.getTotalBytes },
+        {name : this.translateService.instant('msg.dp.th.summary'), value : this.getRows },
+        {name : '', value : this.dataset.gridResponse.colCnt + ' column(s)' })
 
 
       // STAGING OR DB
@@ -523,7 +521,8 @@ export class DatasetDetailComponent extends AbstractComponent implements OnInit,
       }
 
       this.datasetInformationList.push(
-        { name : this.translateService.instant('msg.dp.th.summary'), value : `${this.getRows} / ${ this.dataset.gridResponse.colCnt } ${ this.dataset.gridResponse.colCnt === '1' || this.dataset.gridResponse.colCnt === '0' ? 'column': 'columns'}` })
+        {name : this.translateService.instant('msg.dp.th.summary'), value : this.getRows },
+        {name : '', value : this.dataset.gridResponse.colCnt + ' column(s)' })
 
     }
   }

diff --git a/discovery-frontend/src/app/data-preparation/dataset/dataset.component.html b/discovery-frontend/src/app/data-preparation/dataset/dataset.component.html
@@ -67,7 +67,7 @@
         <col width="100px">
         <col width="*">
         <col width="10%">
-        <col width="15%">
+        <col width="20%">
         <col width="20%">
       </colgroup>
       <thead>