Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

package-lock.json

@@ -90,7 +90,7 @@
     },
     "dist/common": {
       "name": "@farmmaps/common",
-      "version": "4.12.0-prerelease.2528",
+      "version": "4.12.0-prerelease.2529",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -115,7 +115,7 @@
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.12.0-prerelease.2528",
+      "version": "4.12.0-prerelease.2529",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -130,7 +130,7 @@
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.12.0-prerelease.2528",
+      "version": "4.12.0-prerelease.2529",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -143,7 +143,7 @@
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.12.0-prerelease.2528",
+      "version": "4.12.0-prerelease.2529",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"

projects/common/src/fm/common-service.module.ts

@@ -13,6 +13,7 @@ import { SchemaService } from './services/schema.service';
 import { FolderService } from './services/folder.service';
 import { TimespanService } from './services/timespan.service';
 import { ItemService } from './services/item.service';
+import { TaskService } from './services/task.service';
 import { AdminService } from './services/admin.service';
 import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
@@ -44,6 +45,7 @@ export {
   ItemTypeService,
   TimespanService,
   ItemService,
+  TaskService,
   AdminService,
   EventService,
   TypeaheadService,

projects/common/src/fm/services/item.service.ts

@@ -1,14 +1,12 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { IItemType } from '../models/item.type';
-import { IItemLinkType } from '../models/itemlink.type';
-import { IUrlType } from '../models/url.type';
-import { IItem } from '../models/item';
-import { IJsonline } from '../models/json-line';
-import { IItemTask } from '../models/itemTask';
-import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
-import { AppConfig } from "../shared/app.config";
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import {IItemType} from '../models/item.type';
+import {IItemLinkType} from '../models/itemlink.type';
+import {IItem} from '../models/item';
+import {IJsonline} from '../models/json-line';
+import {IItemTask} from '../models/itemTask';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
+import {AppConfig} from '../shared/app.config';
 import {ItemTypeService} from './itemtype.service';
 import {IListItem} from '../models/list.item';
 
@@ -96,11 +94,11 @@ export class ItemService {
     if (sourceTask) params = params.append("sourceTask", sourceTask);
     if(skip) params = params.append("skip", skip);
     if(take) params = params.append("take", take);
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);    
+    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
     if(owner) params = params.append("owner", owner);
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
-  
+
   getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string,
     indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
     let params = new HttpParams();
@@ -129,8 +127,8 @@ export class ItemService {
     if (startDate) params = params.append("sDate", startDate.toISOString());
     if (endDate) params = params.append("eDate", endDate.toISOString());
     if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);  
-    
+    if(owner) params = params.append("owner", owner);
+
     if(skip) params = params.append("skip", skip);
     if(take) params = params.append("take", take);
     if(indexed) params = params.append("ind",indexed?"true":"false");

projects/common/src/fm/services/task.service.ts

@@ -0,0 +1,40 @@
+import {Injectable} from '@angular/core';
+import {HttpClient, HttpParams} from '@angular/common/http';
+import {AppConfig} from '../shared/app.config';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TaskService {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  }
+
+  ApiEndpoint() {
+    return this.appConfig.getConfig("apiEndPoint");
+  }
+
+  getTask(taskCode: string) {
+    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks/${taskCode}`)
+  }
+
+  getTasks(workflowCode: string, itemCode: string = null, taskType: string = null, skip = 0, take = 25) {
+    let params = new HttpParams();
+
+    if (workflowCode) {
+      params = params.append('workflowCode', workflowCode);
+    }
+
+    if (itemCode) {
+      params = params.append('itemCode', itemCode);
+    }
+
+    if (taskType) {
+      params = params.append('taskType', taskType);
+    }
+
+    params = params.append('skip', skip.toString());
+    params = params.append('take', take.toString());
+    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks`,
+      {params: params})
+  }
+}