Achievements #1357

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

@@ -0,0 +1,13 @@
+<mat-card class="position">
+  <div class="card" fxLayout="column" fxLayoutAlign="start space-between">
+    <div class="wrap-for-details">
+      <mat-card-header>
+        <mat-card-title showTooltipIfTruncated matTooltipClass="tooltip"
+          class="card-title">title</mat-card-title>
+      </mat-card-header>
+      <mat-card-content fxLayout="column" fxLayoutAlign="space-between start">
+        <p class="card_text">description</p>
+      </mat-card-content>
+    </div>
+  </div>
+</mat-card>

src/app/shared/components/achievement-card/achievement-card/achievement-card.component.spec.ts

@@ -0,0 +1,37 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatIconModule } from '@angular/material/icon';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgxsModule } from '@ngxs/store';
+
+import { AchievementCardComponent } from './achievement-card.component';
+
+describe('AchievementCardComponent', () => {
+  let component: AchievementCardComponent;
+  let fixture: ComponentFixture<AchievementCardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        MatCardModule,
+        MatButtonModule,
+        NgxsModule.forRoot([]),
+        RouterTestingModule,
+        MatIconModule
+      ],
+      declarations: [ AchievementCardComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AchievementCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Achievement } from 'src/app/shared/models/achievement.model';
+
+@Component({
+  selector: 'app-achievement-card',
+  templateUrl: './achievement-card.component.html',
+  styleUrls: ['./achievement-card.component.scss'],
+})
+export class AchievementCardComponent implements OnInit {
+  @Input() achievement: Achievement;
+
+  constructor() {}
+
+  ngOnInit(): void {}
+}

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

@@ -24,10 +24,16 @@
       </mat-card-content>
 
       <mat-card-footer *ngIf="!isCreateApplicationView" class="card-footer">
-        <a class="more-details" [routerLink]="['/details/workshop', workshopData.workshopId ]">
-          <span class="card_link">Детальніше</span>
-          <mat-icon>arrow_forward</mat-icon>
-        </a>
+        <div>
+          <a class="more-details" [routerLink]="['/create-achievement', workshopData.workshopId]">
+            <mat-icon>add</mat-icon>
+            <span class="card_link">Додати досягнення</span>
+          </a>  
+          <a class="more-details" [routerLink]="['/details/workshop', workshopData.workshopId]">
+            <span class="card_link">Детальніше</span>
+            <mat-icon>arrow_forward</mat-icon>
+          </a>  
+        </div>      
       </mat-card-footer>
     </div>
   </div>

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

@@ -83,6 +83,9 @@
   border-radius: 20px;
   margin-bottom: 20px;
 }
+.more-details {
+  width: 144px;
+}
 
 @media (max-width: 750px) {
   :host.application-workshop .horizontal {
@@ -121,10 +124,7 @@
     }
     ::ng-deep .mat-card-header-text {
       margin: 0;
-    }
-    .card-footer {
-      flex-direction: row;
-    }
+    }    
     .card-title, .mat-card-header{
       font-size: 15px;
     }

src/app/shared/constants/constants.ts

@@ -42,7 +42,6 @@ export class Constants {
   static readonly MODAL_SMALL = '500px';
   static readonly MODAL_MEDIUM = '1024px';
 }
-
 export class PaginationConstants {
   static readonly FIRST_PAGINATION_PAGE = 1;
   static readonly MAX_PAGE_PAGINATOR_DISPLAY = 7;
@@ -64,6 +63,16 @@ export const MOMENT_DATE_FORMATS: MatDateFormats = {
   }
 };
 
+export const AchievementsTitle = [
+  { id: 1, name: "Переможці міжнародних та всеукраїнських спортивних змагань (індивідуальних та командних)" },
+  { id: 2, name: "Призери та учасники міжнародних, всеукраїнських та призери регіональних конкурсів і виставок наукових, технічних, дослідницьких, інноваційних, ІТ проектів" },
+  { id: 3, name: "Реципієнти міжнародних грантів" },
+  { id: 4, name: "Призери міжнародних культурних конкурсів та фестивалів" },
+  { id: 5, name: "Соціально активні категорії учнів" },
+  { id: 6, name: "Цифрові інструменти Google для закладів вищої та фахової передвищої освіти" },
+  { id: 7, name: "Переможці та учасники олімпіад міжнародного та всеукраїнського рівнів" }
+];
+
 export const WorkingDaysValues: WorkingDaysToggleValue[] = [
   {
     value: WorkingDays.monday,

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

@@ -15,6 +15,7 @@ export enum ModalConfirmationType {
   createApplication = 'createApplication',
   approveApplication = 'approveApplication',
   rejectApplication = 'rejectApplication',
+  createAchievement = 'createAchievement',
   createDirection = 'createDirection',
   editDirection = 'editDirection',
   createDepartment = 'createDepartment',
@@ -71,6 +72,7 @@ export enum ModalConfirmationText {
   leavePage = 'Ви впевнені, що хочете залишити сторінку?',
   rate = 'Поставте будь ласка оцінку цьому гуртку',
   createApplication = 'Ви впевнені, що хочете подати заявку у гурток',
+  createAchievement = 'Ви впевнені, що хочете додати досягнення',
   approveApplication = 'Ви впевнені, що хочете перевести заявку в статус "Зарахувати"?',
   rejectApplication = 'Ви впевнені, що хочете перевести заяву у статус ”Відмовлено”?',
   createProviderAdmin = 'Ви впевнені, що хочете додати адміністратора гуртка?',

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

@@ -6,5 +6,6 @@ export enum NoResultsTitle {
   noDirections = 'За результатами нічого не знайдено',
   noUsers = 'Користувачів поки немає',
   noTeachers = 'Викладачів поки немає',
+  noAchievements = 'Досягнень поки немає',
   noReviews = 'Відгуків поки немає',
 }

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

@@ -0,0 +1,20 @@
+
+export class Achievement {
+  id?: string;
+  title: string;
+  achievementDate: string;
+  workshopId: string;
+  achievementTypeId: number;
+  childrenIDs?: string[];
+  teachers?: string[];
+
+  constructor(info, workshopId, childrenIDs, teachers) {
+    this.title = info.title,
+    this.achievementDate = info.achievementDate,
+    this.workshopId = workshopId;
+    this.achievementTypeId = info.achievementTypeId,
+    this.childrenIDs = childrenIDs,
+    this.teachers = teachers;
+  }
+
+}

src/app/shared/services/achievements/achievements.service.spec.ts

@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AchievementsService } from './achievements.service';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+
+describe('AchievementsService', () => {
+  let service: AchievementsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+    });
+    service = TestBed.inject(AchievementsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { Achievement } from '../../models/achievement.model';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AchievementsService {
+  constructor(private http: HttpClient) {}
+
+  getAchievementsByWorkshopId(id: string): Observable<Achievement[]> {
+    return this.http.get<Achievement[]>(
+      `/api/v1//api/v1/Achievement/GetByWorkshopId/${id}`
+    );
+  }
+
+  createAchievement(achievement: Achievement): Observable<object> {
+    return this.http.post('/api/v1/Achievement/Create', achievement, { observe: 'response' });
+  }
+}

src/app/shared/services/workshops/user-workshop/user-workshop.service.ts

@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngxs/store';
 import { Observable } from 'rxjs';
 import { FeaturesList } from 'src/app/shared/models/featuresList.model';
-import { Teacher } from 'src/app/shared/models/teacher.model';
 import { MetaDataState } from 'src/app/shared/store/meta-data.state';
 import { Workshop, WorkshopCard } from '../../../models/workshop.model';
 

src/app/shared/shared.module.ts

@@ -67,6 +67,7 @@ import { InstitutionHierarchyComponent } from './components/institution-hierarch
 import { ImageCropperModule } from 'ngx-image-cropper';
 import { ImageCropperModalComponent } from './components/image-cropper-modal/image-cropper-modal.component';
 import { InfoFormComponent } from './components/info-form/info-form.component';
+import { AchievementCardComponent } from './components/achievement-card/achievement-card/achievement-card.component';
 import { EntityCheckboxDropdownComponent } from './components/entity-checkbox-dropdown/entity-checkbox-dropdown.component';
 
 @NgModule({
@@ -131,6 +132,7 @@ import { EntityCheckboxDropdownComponent } from './components/entity-checkbox-dr
     InstitutionHierarchyComponent,
     ImageCropperModalComponent,
     InfoFormComponent,
+    AchievementCardComponent,
   ],
   imports: [
     MaterialModule,

src/app/shared/store/user.actions.ts

@@ -6,11 +6,16 @@ import { Provider } from '../models/provider.model';
 import { User } from '../models/user.model';
 import { Workshop, WorkshopCard } from '../models/workshop.model';
 import { ProviderAdmin } from '../models/providerAdmin.model';
+import { Achievement } from '../models/achievement.model';
 
 export class GetWorkshopsByProviderId {
   static readonly type = '[user] get Workshops By Provider Id';
   constructor(public payload: string) { }
 }
+export class GetAchievementsByWorkshopId {
+  static readonly type = '[user] get Achievements By Wokrshop Id';
+  constructor(public payload) { }
+}
 export class GetWorkshopById {
   static readonly type = '[user] get Workshop By Wokrshop Id';
   constructor(public payload: string) { }
@@ -150,6 +155,18 @@ export class OnDeleteProviderAdminFail {
   static readonly type = '[user] delete Provider Admin fail';
   constructor(public payload) { }
 }
+export class CreateAchievement {
+  static readonly type = '[user] create Achievement';
+  constructor(public payload: Achievement) {}
+}
+export class OnCreateAchievementFail {
+  static readonly type = '[user] create Achievement fail';
+  constructor(public payload: HttpErrorResponse) {}
+}
+export class OnCreateAchievementSuccess {
+  static readonly type = '[user] create Achievement success';
+  constructor(public payload) {}
+}
 export class CreateApplication {
   static readonly type = '[user] create Application';
   constructor(public payload: Application) { }