selector fixed partially

src/app/components/components-mixins.ts

@@ -1,7 +1,7 @@
 import { Directive, Input } from '@angular/core';
 import { EditionLevelType, TextFlow } from '../app.config';
 import { HighlightData } from '../models/evt-models';
-// import { HighlightDataLem } from '../models/evt-models';
+import { HighlightDataLem } from '../models/evt-models';
 import { EntitiesSelectItem } from './entities-select/entities-select.component';
 import { LemsSelectItem } from './lems-select/lems-select.component';
 
@@ -9,7 +9,7 @@ import { LemsSelectItem } from './lems-select/lems-select.component';
 // tslint:disable-next-line: directive-class-suffix
 export class Highlightable {
   @Input() highlightData: HighlightData;
-  // @Input() highlightDataLem: HighlightDataLem;
+  @Input() highlightDataLem: HighlightDataLem;
   @Input() itemsToHighlight: EntitiesSelectItem[];
   @Input() itemsLemsToHighlight: LemsSelectItem[];
 }

src/app/components/content-viewer/content-viewer.component.ts

@@ -88,8 +88,8 @@ export class ContentViewerComponent implements OnDestroy {
         console.log('proviamo se lems', itemsLemsToHighlight )
         return {
           data,
-          highlightData: this.getHighlightData(data, itemsToHighlight) && this.getHighlightDataLem(data, itemsLemsToHighlight),
-          // highlightDataLem: this.getHighlightDataLem(data, itemsLemsToHighlight),
+          highlightData: this.getHighlightData(data, itemsToHighlight),
+          highlightDataLem: this.getHighlightDataLem(data, itemsLemsToHighlight),
           itemsToHighlight,
           itemsLemsToHighlight,
           editionLevel,

src/app/components/lemmatized-entity-ref/lemmatized-entity-ref.component.html

@@ -1,15 +1,15 @@
-<span class="lemmatizedEntityRef {{ data.entityLemType }}" (click)="toggleLemEntityData($event)" [ngClass]="{
+<span class="lemmatizedEntityRef {{ data.entityLemType }} " (click)="toggleLemEntityData($event)" [ngClass]="{
         opened: opened,
         lemmaHighlight: (evtStatusService.currentLemmatizedEntityId$ | async) === data.entityLemId && !opened,
         noDetails: (availableLemEntities$ | async) === false
-    }"  [evtHtmlAttributes]="data?.attributes">
+    }" [evtHighlight]="highlightDataLem" [evtHtmlAttributes]="data?.attributes">
     <evt-content-viewer *ngFor="let element of data.content" [content]="element" [editionLevel]="editionLevel" [itemsLemsToHighlight]="itemsLemsToHighlight" [textFlow]="textFlow"></evt-content-viewer>
 </span>
 <ng-container *ngIf="availableLemEntities$ | async">
     <div *ngIf="opened" class="lemmatizedEntityRefDetail {{ data.entityLemType }}">
-        <ng-container *ngIf="lementity$ | async as lementity; else loading">
-            <span *ngIf="lementity === 'notFound'" class="d-block p-2 pl-3 font-italic font-weight-light not-found-msg">{{ 'entityNotFound' | translate }}</span>
-            <evt-lemmatized-entity *ngIf="lementity !== 'notFound'" [inList]="true" [data]="lementity"> </evt-lemmatized-entity>
+        <ng-container *ngIf="entity$ | async as entity; else loading">
+            <span *ngIf="entity === 'notFound'" class="d-block p-2 pl-3 font-italic font-weight-light not-found-msg">{{ 'entityNotFound' | translate }}</span>
+            <evt-lemmatized-entity *ngIf="entity !== 'notFound'" [inList]="true" [data]="entity"> </evt-lemmatized-entity>
         </ng-container>
         <ng-template #loading>Loading...</ng-template>
     </div>

src/app/components/lemmatized-entity-ref/lemmatized-entity-ref.component.ts

@@ -21,7 +21,7 @@ export class LemmatizedEntityRefComponent {
     map(ne => ne.all.lementities.length > 0),
   );
 
-  lementity$ = this.evtModelService.lemmatizedEntities$.pipe(
+  entity$ = this.evtModelService.lemmatizedEntities$.pipe(
     map(ne => ne.all.lementities.find(e => e.id === this.data.entityLemId) || 'notFound'),
   );
 

src/app/components/named-entity-ref/named-entity-ref.component.html

@@ -1,4 +1,4 @@
-<span class="namedEntityRef {{ data.entityType }}" (click)="toggleEntityData($event)" [ngClass]="{
+<span class="namedEntityRef {{ data.entityType }} " (click)="toggleEntityData($event)" [ngClass]="{
         opened: opened,
         entityHighlight: (evtStatusService.currentNamedEntityId$ | async) === data.entityId && !opened,
         noDetails: (availableEntities$ | async) === false

src/app/models/evt-models.ts

@@ -19,10 +19,12 @@ export interface HighlightData {
     highlight: boolean;
     highlightColor: string;
 }
-// export interface HighlightDataLem  {
-//     highlightLem: boolean;
-//     highlightColorLem: string;
-// }
+
+export interface HighlightDataLem  {
+    highlightLem: boolean;
+    highlightColorLem: string;
+}
+
 export class GenericElement {
     // tslint:disable-next-line: no-any
     type: Type<any>;

src/app/services/xml-parsers/lemmatized-entity-parsers.ts

@@ -92,7 +92,8 @@ export class LemmatizedEntityRefParser extends EmptyParser implements Parser<XML
         const ref = xml.getAttribute('ref');
         if (!ref) { return this.elementParser.parse(xml); }
         const neLemTypeMap: { [key: string]: LemmatizedEntityType } = {
-            w: 'lem',
+            w: 'w',
+            lemmas: 'w',
             lem: 'lem',
             item: 'item'
         };
@@ -100,7 +101,7 @@ export class LemmatizedEntityRefParser extends EmptyParser implements Parser<XML
         return {
             type: LemmatizedEntityRef,
             entityLemId: getLemEntityID(ref),
-            entityLemType: neLemTypeMap[xml.tagName.toLowerCase()],
+            entityLemType: neLemTypeMap[xml.tagName],
             path: xpath(xml),
             content: parseChildren(xml, this.genericParse),
             attributes: this.attributeParser.parse(xml),

src/assets/config/edition_config.json

@@ -56,8 +56,8 @@
 			"items": [
 				
 				{
-					"value": "w[type='s.m.']",
-					"label": "Sostantivo maschile",
+					"value": "w",
+					"label": "lemmas",
 					"color": "rgb(139, 98, 236)"
 				},
 				{

src/styles.scss

@@ -230,4 +230,9 @@ evt-lemmatized-entity.ng-star-inserted div.ne-detail-content.ng-star-inserted {
       }
     }
 
+}
+
+// Provvisorio 
+.lemmatizedEntityRef.highlighted {
+    background-color: antiquewhite;
 }