From b0ff54d1575b5c7af8873bf0456cdd1bffb158d0 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Thu, 25 Jun 2020 09:47:53 +0200 Subject: [PATCH] Add dataenddate --- .../select-period-modal.component.scss | 45 +++---- projects/common/src/fm/models/item.ts | 1 + .../common/src/fm/services/folder.service.ts | 113 +++++++++--------- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.scss b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.scss index 3b024d8..9db689d 100644 --- a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.scss +++ b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.scss @@ -1,20 +1,25 @@ -.custom-day { - text-align: center; - padding: 0.185rem 0.25rem; - display: inline-block; - height: 2rem; - width: 2rem; -} - -.custom-day.focused { - background-color: #e6e6e6; -} - -.custom-day.range, .custom-day:hover { - background-color: rgb(2, 117, 216); - color: white; -} - -.custom-day.faded { - background-color: rgba(2, 117, 216, 0.5); -} +.custom-day { + text-align: center; + padding: 0.185rem 0.25rem; + display: inline-block; + height: 2rem; + width: 2rem; +} + +.custom-day.focused { + background-color: #e6e6e6; +} + +.custom-day.range, .custom-day:hover { + background-color: rgb(2, 117, 216); + color: white; +} + +.custom-day.faded { + background-color: rgba(2, 117, 216, 0.5); +} + +ngb-datepicker { + overflow: hidden; + max-width: calc(100vw - 3em); +} \ No newline at end of file diff --git a/projects/common/src/fm/models/item.ts b/projects/common/src/fm/models/item.ts index acb3c4d..4566d90 100644 --- a/projects/common/src/fm/models/item.ts +++ b/projects/common/src/fm/models/item.ts @@ -18,6 +18,7 @@ export class Item implements IItem { public created?: Date; public updated?: Date; public dataDate?: Date; + public dataEndDate?: Date; public itemType?: string; public sourceTask?: string; public size?: number; diff --git a/projects/common/src/fm/services/folder.service.ts b/projects/common/src/fm/services/folder.service.ts index 5ac8740..3e81ac1 100644 --- a/projects/common/src/fm/services/folder.service.ts +++ b/projects/common/src/fm/services/folder.service.ts @@ -1,56 +1,57 @@ -import { Injectable } from '@angular/core'; -import { Observable , Observer } from 'rxjs'; -import {map} from 'rxjs/operators'; -import { IListItem } from '../models/list.item'; -import { IItem } from '../models/item'; -import { HttpClient } from "@angular/common/http"; -import { AppConfig } from "../shared/app.config"; - -@Injectable({ - providedIn: 'root', -}) -export class FolderService { - - constructor(public httpClient: HttpClient, public appConfig: AppConfig) { - } - - ApiEndpoint() { - return this.appConfig.getConfig("apiEndPoint"); - } - - parseDates(item: any): IListItem { - item.created = new Date(Date.parse(item.created)); - item.updated = new Date(Date.parse(item.updated)); - item.dataDate = new Date(Date.parse(item.dataDate)); - return item; - } - - getFolder(code: string): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}`).pipe(map(i => this.parseDates(i))); - } - - getMyRoots(): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/my_roots`).pipe(map(ia => ia.map(i => this.parseDates(i)))); - } - - getFolderParents(code: string): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/parents`).pipe(map(ia => ia.map(i => this.parseDates(i)))); - } - - getChildFolders(code: string): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/listfolders`).pipe(map(ia => ia.map(i => this.parseDates(i)))); - } - - getItems(code: string,skip:number, take:number): Observable { - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/list?skip=${skip}&take=${take}`).pipe(map(ia => ia.map(i => this.parseDates(i)))); - } - - moveItem(itemCode: string, newParentCode: string): Observable { - const body = { itemCode: itemCode,newParentCode: newParentCode }; - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/move`, body).pipe(map(i => this.parseDates(i))); - } - - createFolder(folder: IItem): Observable { - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/folders/`, folder).pipe(map(i => this.parseDates(i))); - } -} +import { Injectable } from '@angular/core'; +import { Observable , Observer } from 'rxjs'; +import {map} from 'rxjs/operators'; +import { IListItem } from '../models/list.item'; +import { IItem } from '../models/item'; +import { HttpClient } from "@angular/common/http"; +import { AppConfig } from "../shared/app.config"; + +@Injectable({ + providedIn: 'root', +}) +export class FolderService { + + constructor(public httpClient: HttpClient, public appConfig: AppConfig) { + } + + ApiEndpoint() { + return this.appConfig.getConfig("apiEndPoint"); + } + + parseDates(item: any): IListItem { + item.created = new Date(Date.parse(item.created)); + item.updated = new Date(Date.parse(item.updated)); + item.dataDate = new Date(Date.parse(item.dataDate)); + item.dataEndDate = new Date(Date.parse(item.dataEndDate)); + return item; + } + + getFolder(code: string): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}`).pipe(map(i => this.parseDates(i))); + } + + getMyRoots(): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/my_roots`).pipe(map(ia => ia.map(i => this.parseDates(i)))); + } + + getFolderParents(code: string): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/parents`).pipe(map(ia => ia.map(i => this.parseDates(i)))); + } + + getChildFolders(code: string): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/listfolders`).pipe(map(ia => ia.map(i => this.parseDates(i)))); + } + + getItems(code: string,skip:number, take:number): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/folders/${code}/list?skip=${skip}&take=${take}`).pipe(map(ia => ia.map(i => this.parseDates(i)))); + } + + moveItem(itemCode: string, newParentCode: string): Observable { + const body = { itemCode: itemCode,newParentCode: newParentCode }; + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/move`, body).pipe(map(i => this.parseDates(i))); + } + + createFolder(folder: IItem): Observable { + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/folders/`, folder).pipe(map(i => this.parseDates(i))); + } +}