From 780f515449d7da9464e2cb7a696813b78aac3c84 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 3 Jun 2021 11:41:05 +0300 Subject: [PATCH] add announcement service --- .../announcement/announcement.component.ts | 21 +++++++++++-- .../announcement.service.spec.ts | 12 ++++++++ .../announcement.service.ts | 30 +++++++++++++++++++ .../services/connector/connector.service.ts | 4 +-- 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 Mohem/src/app/hmg-common/services/announcement-services/announcement.service.spec.ts create mode 100644 Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts index 3b4379e7..b1fcb5e7 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts @@ -1,5 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { detachEmbeddedView } from '@angular/core/src/view'; +import { AnnouncementService } from 'src/app/hmg-common/services/announcement-services/announcement.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-announcement', @@ -7,8 +10,8 @@ import { detachEmbeddedView } from '@angular/core/src/view'; styleUrls: ['./announcement.component.scss'], }) export class AnnouncementComponent implements OnInit { - dt = new Date().toJSON().slice(0,10).replace(/-/g,'/'); - public arr =[ + dt = new Date().toJSON().slice(0, 10).replace(/-/g, '/'); + public arr = [ { title:"Basic Microsoft Excel Cource", body:" is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", @@ -33,10 +36,15 @@ export class AnnouncementComponent implements OnInit { ]; public arrList = []; - constructor() { } + constructor( + public announcementService: AnnouncementService, + public translate: TranslatorService, + public common: CommonService + ) { } ngOnInit() { this.arrList = this.arr; + this.getAnnouncementListService(); } filterList(event) { @@ -59,4 +67,11 @@ export class AnnouncementComponent implements OnInit { }); } + getAnnouncementListService(){ + this.announcementService.getAnnouncementListService().subscribe((result: any) => { + if (this.common.validResponse(result)) { + } + }); + } + } diff --git a/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.spec.ts b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.spec.ts new file mode 100644 index 00000000..4add8a78 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { AnnouncementService } from './announcement.service'; + +describe('AnnouncementService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: AnnouncementService = TestBed.get(AnnouncementService); + expect(service).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts new file mode 100644 index 00000000..0034c8ae --- /dev/null +++ b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts @@ -0,0 +1,30 @@ +import { Injectable } from '@angular/core'; +import { Request } from 'src/app/hmg-common/services/models/request'; +import { Observable } from 'rxjs'; +import { AuthenticationService } from '../authentication/authentication.service'; +import { ConnectorService } from '../connector/connector.service'; + +@Injectable({ + providedIn: 'root' +}) +export class AnnouncementService { + public static getAnnouncemntList = ''; + + constructor( + public authService: AuthenticationService, + public con: ConnectorService, + ) { } + + + getAnnouncementListService(onError ?: any , oerrorLable ?: any) { + const request = new Request(); + this.authService.authenticateRequest(request); + console.log(request); + return this.con.post( + AnnouncementService.getAnnouncemntList, + request, + onError, + oerrorLable + ); + } +} diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 9405295d..e3d2cc13 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; -// public static host = 'https://uat.hmgwebservices.com/'; - public static host = 'https://hmgwebservices.com/'; + public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService,