#791

src/app/shared/components/category-card/category-card.component.html

@@ -8,6 +8,11 @@
         <mat-icon>edit</mat-icon>
       </button>
     </a>
+    <div class="del-icon" (click)="onDelete()" >
+    <button mat-button class="del-button">
+      <mat-icon>delete</mat-icon>
+    </button>
+  </div>
   </ng-container>
 
   <div class="details">

src/app/shared/components/category-card/category-card.component.scss

@@ -23,7 +23,7 @@
     color: #3849F9;
     text-align: center;
     text-decoration: none;
-    a {
+    a span{
       display: flex;
       justify-content: center;
       align-items: center;
@@ -40,7 +40,24 @@
 .config_edit-icon {
   position: absolute;
   top: 12px;
-  right: 16px;
+  right: 32px;
+  z-index: 2;
+  color : #3849F9;
+  .mat-icon {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+  }
+  .mat-button {
+    padding: 0px;
+    min-width:auto;
+    line-height: 16px;
+  }
+}
+.del-icon {
+  position: absolute;
+  top: 12px;
+  right: 12px;
   z-index: 2;
   color : #3849F9;
   .mat-icon {
@@ -57,4 +74,4 @@
 
 .config-support p {
   margin: 0;
-}
+}

src/app/shared/components/category-card/category-card.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { Store } from '@ngxs/store';
 import { CategoryIcons } from '../../enum/category-icons';
 import { Direction } from '../../models/category.model';
@@ -14,6 +14,7 @@ export class CategoryCardComponent implements OnInit {
   @Input() isEditMode: boolean;
   @Input() direction: Direction;
   @Input() icons: {};
+  @Output() deleteDirection = new EventEmitter<Direction>();
   public categoryIcons = CategoryIcons;
 
   constructor(private store: Store) {
@@ -22,6 +23,10 @@ export class CategoryCardComponent implements OnInit {
   ngOnInit(): void {
   }
 
+  onDelete(): void {
+    this.deleteDirection.emit(this.direction);
+  }
+
   selectDirection(direction: Direction): void {
     this.store.dispatch(new SetDirections([direction]));
   }

src/app/shared/components/image-form-control/image-form-control.component.html

@@ -18,4 +18,4 @@
       </mat-grid-tile>
     </mat-grid-list>
   </div>
-</form>
+</form>

src/app/shared/components/paginator/paginator.component.ts

@@ -11,6 +11,8 @@ export class PaginatorComponent implements OnInit, OnChanges {
 
   @Input() currentPage: PaginationElement;
   @Input() totalEntities: number;
+  @Input() totalEntitiesDir: number;
+
   @Output() pageChange = new EventEmitter<PaginationElement>();
 
   carouselPageList: PaginationElement[] = [];
@@ -57,7 +59,7 @@ export class PaginatorComponent implements OnInit, OnChanges {
   }
 
   private getTotalPageAmount(): number {
-    return Math.ceil(this.totalEntities / Constants.ITEMS_PER_PAGE);
+    return Math.ceil(this.totalEntities / Constants.ITEMS_PER_PAGE) || Math.ceil(this.totalEntitiesDir / Constants.ITEMS_PER_PAGE_DIR);
   }
 
   private createDisplayedPageList(): PaginationElement[] {

src/app/shared/constants/constants.ts

@@ -1,3 +1,4 @@
+import { Input } from '@angular/core';
 import { MatDateFormats } from '@angular/material/core';
 import { WorkingDays } from '../enum/enumUA/working-hours';
 import { City } from '../models/city.model';
@@ -25,7 +26,7 @@ export class Constants {
   static readonly PHONE_PREFIX = '+380';
   static readonly PROVIDER_ENTITY_TYPE = 1;
   static readonly WORKSHOP_ENTITY_TYPE = 2;
-
+  static readonly ITEMS_PER_PAGE_DIR =10;
   static readonly ITEMS_PER_PAGE = 2 * Math.floor(window.innerWidth / (332));
 
   static readonly RATE_ONE_STAR = 1;
@@ -106,4 +107,4 @@ export const WorkingDaysValues: WorkingDaysToggleValue[] = [
 
 export class NotificationsConstants {
   static readonly NO_MESSAGE = 'У вас немає нових повідомлень';
-}
+}

src/app/shared/enum/modal-confirmation.ts

@@ -1,5 +1,7 @@
 export enum ModalConfirmationType {
   delete = 'delete',
+
+  deleteDirection = 'deleteDirection',
   deleteTeacher = 'deleteTeacher',
   deleteProviderAdmin = 'deleteProviderAdmin',
   deleteProviderAdminDeputy = 'deleteProviderAdminDeputy',
@@ -12,11 +14,18 @@ export enum ModalConfirmationType {
   createApplication = 'createApplication',
   approveApplication = 'approveApplication',
   rejectApplication = 'rejectApplication',
+  createDirection = 'createDirection',
+  createDepartment = 'createDepartment',
+  createClass = 'createClass',
   createProviderAdmin = 'createProviderAdmin',
   createProviderAdminDeputy = 'createProviderAdminDeputy',
 }
 export enum ModalConfirmationTitle {
-  delete = 'ВИДАЛИТИ ГУРТОК',
+  delete = 'ВИДАЛИТИ ГУРТОК?',
+  deleteDirection = 'ВИДАЛИТИ НАПРЯМОК?',
+  createDirection = 'CТВОРИТИ НАПРЯМОК?',
+  createDepartment = 'CТВОРИТИ ВІДДІЛЕННЯ?',
+  createClass = 'CТВОРИТИ КЛАС?',
   deleteChild = 'ВИЛУЧИТИ ДАНІ ПРО ДИТИНУ?',
   deleteTeacher = 'ВИЛУЧИТИ ДАНІ ПРО ВЧИТЕЛЯ',
   deleteProviderAdmin = 'ВИДАЛИТИ АДМІНІСТРАТОРА ГУРТКА',
@@ -34,6 +43,10 @@ export enum ModalConfirmationTitle {
 
 export enum ModalConfirmationText {
   delete = 'Ви впевнені, що хочете видалити гурток',
+  deleteDirection = 'Ви впевнені, що хочете видалити напрямок',
+  createDirection = 'Ви впевнені, що хочете створити напрямок?',
+  createDepartment = 'Ви впевнені, що хочете створити відділення?',
+  createClass = 'Ви впевнені, що хочете створити клас?',
   deleteChild = 'Ви впевнені, що хочете вилучити дані про дитину',
   deleteTeacher = 'Ви впевнені, що хочете вилучити дані про вчителя ?',
   deleteProviderAdmin = 'Ви впевнені, що хочете видалити адміністратора гуртка',

src/app/shared/enum/navigation-bar.ts

@@ -16,6 +16,7 @@ export enum NavBarName {
   EditInformationAboutChild = 'Редагувати дані про дитину',
   EditInstitutions = 'Редагувати заклад',
   EditInformationAbout = 'Редагування особистої інформації',
+  EditDirection = 'Редагування напрямку',
   Platform = 'Портал',
   NewWorkshop = 'Новий гурток',
   EditWorkshop = 'Редагування гуртка',

src/app/shared/enum/no-results.ts

@@ -1,7 +1,8 @@
 export enum NoResultsTitle {
   noApplication = 'Заявок поки немає',
   noResultWorkshops = 'За результатами нічого не знайдено',
-  noParentWorkshops = 'Тут буде відображатися інформація про гуртки, секцію або школу для навчання. Ще жодної заяви на гурток не подано.',
+  noParentWorkshops = 'Тут буде відображатися інформація про гуртки, секцію фбо школу для навчання. Ще жодної заяви на гурток не подано.',
   noFavoriteWorkshops = 'Улюблених гуртків поки немає',
+  noDirections = 'За результатами нічого не знайдено',
   noProviderAdmins = 'Користувачів поки немає',
 }

src/app/shared/enum/provider-admin.ts

@@ -14,3 +14,8 @@ export enum ProviderAdminIcons {
   Accepted = 'fas fa-user-check',
   Blocked = 'fas fa-user-times',
 }
+export enum createDirectionSteps {
+  'direction',
+  'department',
+  'class'
+}

src/app/shared/enum/provider.ts

@@ -45,3 +45,4 @@ export enum createProviderSteps {
   'contacts',
   'description'
 }
+

src/app/shared/models/category.model.ts

@@ -1,18 +1,45 @@
-export interface Direction {
+export class Direction {
   id: number;
   title: string;
   description: string;
+
+  constructor(info, id?) {
+    this.id = id;
+    this.title = info.title;
+    this.description = info.title;
+
+  }
 }
-export interface Department {
+
+export class Department {
   id: number;
   directionId: number;
   title: string;
   description: string;
+
+  constructor(info, directionId, id?) {
+    this.id = id;
+    this.directionId = directionId;
+    this.title = info.title;
+    this.description = info.title;
+  }
 }
 
-export interface IClass {
+export class IClass {
   id: number;
+  departmentId: number;
   title: string;
   description: string;
-  departmentId: number;
+
+ constructor(info, departmentId, id?) {
+    this.id = id,
+    this.departmentId = departmentId,
+    this.title = info.title,
+    this.description = info.title
+  }
+}
+
+export interface DirectionsFilter {
+  totalAmount: number;
+  entities: Direction[];
 }

src/app/shared/services/categories/categories.service.ts

@@ -1,7 +1,9 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { IClass, Department, Direction } from '../../models/category.model';
+import { Constants } from '../../constants/constants';
+import { IClass, Department, Direction, DirectionsFilter } from '../../models/category.model';
+import { AdminStateModel } from '../../store/admin.state';
 
 @Injectable({
   providedIn: 'root'
@@ -10,19 +12,60 @@ export class CategoriesService {
 
   constructor(private http: HttpClient) { }
 
+  private setParams(filters: AdminStateModel): HttpParams {
+    let params = new HttpParams();
+
+    if (filters.searchQuery) {
+      params = params.set('Name', filters.searchQuery);
+    }
+
+    if (filters.currentPage) {
+      const size: number = Constants.ITEMS_PER_PAGE_DIR;
+      const from: number = size * (+filters.currentPage.element - 1);
+
+      params = params.set('Size', size.toString());
+      params = params.set('From', from.toString());
+    }
+    return params;
+  }
+
+  getFilteredDirections(filters: AdminStateModel): Observable<DirectionsFilter> {
+    const options = { params: this.setParams(filters) };
+    return this.http.get<DirectionsFilter>('/api/v1/Direction/GetByFilter', options);
+  }
+
   getDirections(): Observable<Direction[]> {
     return this.http.get<Direction[]>('/api/v1/Direction/Get');
   }
 
   getTopDirections(): Observable<Direction[]> {
     return this.http.get<Direction[]>(`/api/v1/Statistic/GetDirections`);
   }
+  createDirection(direction: Direction): Observable<Direction> {
+    return this.http.post<Direction>('/api/v1/Direction/Create', direction);
+  }
+  createDepartment(department: Department): Observable<Department> {
+    return this.http.post<Department>('/api/v1/Department/Create', department);
+  }
+  updateDirection(direction: Direction): Observable<object> {
+    return this.http.put('/api/v1/Direction/Update', direction);
+  }
+  deleteDirection(id: number): Observable<object> {
+    return this.http.delete(`/api/v1/Direction/Delete/${id}`);
+  }
 
-  getDepartmentsBytDirectionId(id: number): Observable<Department[]> {
+  getDepartmentsByDirectionId(id: number): Observable<Department[]> {
     return this.http.get<Department[]>(`/api/v1/Department/GetByDirectionId/${id}`);
   }
 
   getClassByDepartmentId(id: number): Observable<IClass[]> {
     return this.http.get<IClass[]>(`/api/v1/Class/GetByDepartmentId/${id}`);
   }
+
+  getDirectionById(id: number): Observable<Direction> {
+    return this.http.get<Direction>(`/api/v1/Direction/GetById/${id}`);
+  }
+  createClass(classes: IClass[]): Observable<IClass[]> {
+    return this.http.post<IClass[]>('/api/v1/Class/CreateMultiple', classes);
+  }
 }