Fixed some issue

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html

@@ -1,10 +1,11 @@
 <div class="spacer"></div>
-<div *ngIf="item;let item">
+<div *ngIf="selectedItem();let item">
   <div class="card border-0">
     <div class="card-body">
       <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
       <div class="card menu-card">
         <h1>{{item.name}}</h1>
+        <h3>{{item.dataDate|date}}</h3>
       </div>
       <div class="legend-container" *ngIf="item?.data.layers;let layers">
         <div class="card menu-card">
@@ -18,11 +19,10 @@
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
-          <!--<li><a href="/api/v1/items/{{item.code}}/file" class="mt-1 mr-1" i18n><i class="fa fa-download" aria-hidden="true" title="Download"></i> Download</a></li>-->
           <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a></li>
           <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item)" class="mt-1 mr-1" i18n><i class="fa fa-eye" aria-hidden="true" title="Add as layer"></i> Add as overlay</a></li>
-          <li *ngIf="hasNext()"><a href="#" (click)="handleNextTemporal($event)" class="mt-1 mr-1" i18n>Next</a></li>
+          <li *ngIf="hasNext()"><a href="#" (click)="handleNextTemporal($event)" class="mt-1 mr-1" i18n>Next <span>({{nextDate()|date}})</span></a></li>
-          <li *ngIf="hasPrevious()"><a href="#" (click)="handlePreviousTemporal($event)" class="mt-1 mr-1" i18n>Previous</a></li>
+          <li *ngIf="hasPrevious()"><a href="#" (click)="handlePreviousTemporal($event)" class="mt-1 mr-1" i18n>Previous <span>({{previousDate()|date}})</span></a></li>
         </ul>
       </div>
     </div>

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts

@@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { commonReducers, ItemTypeService, ItemService, FolderService,IItem } from '@farmmaps/common';
 import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
@@ -34,11 +34,25 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     return temporalItemLayer && temporalItemLayer.nextItemLayer != null;
   }
 
+  nextDate():Date {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    if(temporalItemLayer.nextItemLayer.item) 
+      return temporalItemLayer.nextItemLayer.item.dataDate;
+    return null;
+  }
+
   hasPrevious():boolean {
     let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
     return temporalItemLayer && temporalItemLayer.previousItemLayer != null;
   }
 
+  previousDate():Date {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    if(temporalItemLayer.previousItemLayer.item) 
+      return temporalItemLayer.previousItemLayer.item.dataDate;
+    return null;
+  }
+
   handleNextTemporal(event:MouseEvent) {
     this.store.dispatch(new mapActions.NextTemporal());
     event.preventDefault();    
@@ -48,4 +62,12 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     this.store.dispatch(new mapActions.PreviousTemporal());
     event.preventDefault();
   }
+
+  selectedItem():IItem {
+    let temporalItemLayer = this.itemLayer as ITemporalItemLayer;
+    if(temporalItemLayer && temporalItemLayer.selectedItemLayer) {
+       return temporalItemLayer.selectedItemLayer.item;
+    }
+    return null;
+  }  
 }

projects/common-map/src/fm-map/effects/map.effects.ts

@@ -178,8 +178,11 @@ export class MapEffects {
       switchMap((action:mapActions.SelectItemSuccess) => {
         if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
           return this.itemService$.getChildItemList(action.item.code,null).pipe(
-            map(items => items.sort((a, b) => b.dataDate.getTime() - a.dataDate.getTime())),
+            map(items => new mapActions.SelectTemporalItemsSuccess(
-            map((items) =>  new mapActions.SelectTemporalItemsSuccess(items )),
+              items.sort((a, b) => 
+                 -(b.dataDate.getTime() - a.dataDate.getTime())
+              )
+            )),
             catchError(error => of(new commonActions.Fail(error))));
         } else {
            return [];

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -194,10 +194,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
           return state;
         } else {
           temporalLayer.previousItemLayer = temporalLayer.selectedItemLayer;
-          if( temporalLayer.previousItemLayer)  temporalLayer.nextItemLayer.opacity=0;
+          if( temporalLayer.previousItemLayer)  temporalLayer.previousItemLayer.opacity=0;
           temporalLayer.selectedItemLayer = temporalLayer.nextItemLayer;
           if( temporalLayer.selectedItemLayer)  temporalLayer.selectedItemLayer.opacity=1;
-          temporalLayer.nextItemLayer = index+1 < temporalLayer.temporalItems.length? new ItemLayer(temporalLayer.temporalItems[index+1],0):null;
+          temporalLayer.nextItemLayer = index+2 < temporalLayer.temporalItems.length ? new ItemLayer(temporalLayer.temporalItems[index+2],0):null;
           if( temporalLayer.nextItemLayer)  temporalLayer.nextItemLayer.opacity=0;
           return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
         }
@@ -216,8 +216,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
           if( temporalLayer.nextItemLayer)  temporalLayer.nextItemLayer.opacity=0;
           temporalLayer.selectedItemLayer = temporalLayer.previousItemLayer;
           if( temporalLayer.selectedItemLayer)  temporalLayer.selectedItemLayer.opacity=1;
-          temporalLayer.previousItemLayer = index-1 >=0? new ItemLayer(temporalLayer.temporalItems[index-1]):null;
+          temporalLayer.previousItemLayer = index-2 >=0? new ItemLayer(temporalLayer.temporalItems[index-2],0):null;
-          if( temporalLayer.previousItemLayer)  temporalLayer.nextItemLayer.opacity=0;
+          if( temporalLayer.previousItemLayer)  temporalLayer.previousItemLayer.opacity=0;
           return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
         }
       } else {