Prechádzať zdrojové kódy

✨ re-introduce dataset descriptions

jmacura 3 rokov pred
rodič
commit
4adfbf2e2e

+ 3 - 1
src/adjuster/adjuster-presets.service.ts

@@ -133,7 +133,9 @@ export class AdjusterPresetsService {
               id: datasetEntity['@id'],
               labels:
                 datasetEntity['http://www.w3.org/2000/01/rdf-schema#label'],
-              desc: '',
+              desc: datasetEntity[
+                'http://www.semanticweb.org/attractiveness#description'
+              ]?.[0]['@value'], //so far descriptions are only written in en
               included: true,
             };
           }

+ 2 - 0
src/adjuster/adjuster.module.ts

@@ -14,6 +14,7 @@ import {AdjusterService} from './adjuster.service';
 import {AdjusterSimplePanelComponent} from './adjuster-simple-panel/adjuster-simple-panel.component';
 import {AttractivenessClustersService} from './attractiveness-clusters.service';
 import {AttractivenessIndexService} from './attractiveness-index.service';
+import {DatasetItemComponent} from './dataset-item/dataset-item.component';
 import {DatasetListComponent} from './dataset-list/dataset-list.component';
 import {MetadataDialogComponent} from './metadata-dialog/metadata-dialog.component';
 
@@ -32,6 +33,7 @@ import {MetadataDialogComponent} from './metadata-dialog/metadata-dialog.compone
     AdjusterLoaderComponent,
     AdjusterSimplePanelComponent,
     DatasetListComponent,
+    DatasetItemComponent,
     MetadataDialogComponent,
   ],
   providers: [

+ 12 - 0
src/adjuster/dataset-item/dataset-item.component.html

@@ -0,0 +1,12 @@
+<button type="button" class="btn btn-sm btn-light hs-lm-item-visibility"
+      [ngClass]="dataset.included ? 'hs-checkmark' : 'hs-uncheckmark'"
+      (click)="dataset.included = !dataset.included;$event.stopPropagation()"></button>
+    <span class="glyphicon cursor-pointer text-secondary"
+      [ngClass]="descriptionVisible ? 'icon-chevron-down' : 'icon-chevron-right'"
+      (click)="descriptionVisible = !descriptionVisible"></span>
+    <!--label class="ps-2 cursor-pointer text-secondary"
+      (click)="descriptionVisible = !descriptionVisible">{{dataset.name}}</label-->
+    <label><!-- FIXME: a class="text-info non-underlined-link" (click)="showMetadataWindow(dataset)"-->{{getLabelInCurrentLang(dataset.labels)}}<!--/a--></label>
+    <div class="p-2 mb-2 text-info" [hidden]="!descriptionVisible">
+      {{dataset.desc}}
+    </div>

+ 30 - 0
src/adjuster/dataset-item/dataset-item.component.ts

@@ -0,0 +1,30 @@
+import {Component, Input} from '@angular/core';
+
+import {HsDialogContainerService} from 'hslayers-ng';
+
+import {AdjusterPresetsService} from '../adjuster-presets.service';
+import {MetadataDialogComponent} from '../metadata-dialog/metadata-dialog.component';
+
+@Component({
+  selector: 'pra-dataset-item',
+  templateUrl: 'dataset-item.component.html',
+})
+export class DatasetItemComponent {
+  @Input() dataset;
+  descriptionVisible = false;
+
+  constructor(
+    public adjusterPresetsService: AdjusterPresetsService,
+    public hsDialogContainerService: HsDialogContainerService
+  ) {}
+
+  getLabelInCurrentLang(labels) {
+    return this.adjusterPresetsService.getLabelInCurrentLang(labels);
+  }
+
+  showMetadataWindow(dataset) {
+    this.hsDialogContainerService.create(MetadataDialogComponent, {
+      title: dataset.name,
+    });
+  }
+}

+ 1 - 13
src/adjuster/dataset-list/dataset-list.component.html

@@ -11,18 +11,6 @@
   max="1.0" step="0.05">
 <div [hidden]="!datasetlistVisible">
   <div *ngFor="let dataset of factor.datasets">
-    <button type="button" class="btn btn-sm btn-light hs-lm-item-visibility"
-      [ngClass]="dataset.included ? 'hs-checkmark' : 'hs-uncheckmark'"
-      (click)="dataset.included = !dataset.included;$event.stopPropagation()"></button>
-    <!-- commented because we do not have descriptions yet -->
-    <!--span class="glyphicon cursor-pointer text-secondary"
-      [ngClass]="descriptionVisible ? 'icon-chevron-down' : 'icon-chevron-right'"
-      (click)="descriptionVisible = !descriptionVisible"></span-->
-    <!--label class="ps-2 cursor-pointer text-secondary"
-      (click)="descriptionVisible = !descriptionVisible">{{dataset.name}}</label-->
-      <label><!-- FIXME: a class="text-info non-underlined-link" (click)="showMetadataWindow(dataset)"-->{{getLabelInCurrentLang(dataset.labels)}}<!--/a--></label>
-    <!--div class="p-2 mb-2 text-info" [hidden]="!descriptionVisible">
-      {{dataset.desc}}
-    </div-->
+    <pra-dataset-item [dataset]="dataset"></pra-dataset-item>
   </div>
 </div>

+ 3 - 16
src/adjuster/dataset-list/dataset-list.component.ts

@@ -1,32 +1,19 @@
-import {Component, Input, OnInit} from '@angular/core';
-
-import {HsDialogContainerService} from 'hslayers-ng';
+import {Component, Input} from '@angular/core';
 
 import {AdjusterPresetsService} from '../adjuster-presets.service';
-import {MetadataDialogComponent} from '../metadata-dialog/metadata-dialog.component';
 
 @Component({
   selector: 'pra-dataset-list',
   templateUrl: './dataset-list.component.html',
   styleUrls: ['./dataset-list.component.scss'],
 })
-export class DatasetListComponent implements OnInit {
+export class DatasetListComponent {
   @Input() factor;
   datasetlistVisible = false;
-  constructor(
-    public adjusterPresetsService: AdjusterPresetsService,
-    public hsDialogContainerService: HsDialogContainerService
-  ) {}
 
-  ngOnInit() {}
+  constructor(public adjusterPresetsService: AdjusterPresetsService) {}
 
   getLabelInCurrentLang(labels) {
     return this.adjusterPresetsService.getLabelInCurrentLang(labels);
   }
-
-  showMetadataWindow(dataset) {
-    this.hsDialogContainerService.create(MetadataDialogComponent, {
-      title: dataset.name,
-    });
-  }
 }