Conflicts resolved
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 952 B After Width: | Height: | Size: 949 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 123 KiB |
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 181 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 216 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 193 KiB |
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 230 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 164 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 236 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 145 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 234 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 243 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
@ -0,0 +1,10 @@
|
||||
|
||||
@media only screen and (min-width: 540px) and (max-width: 767px) {
|
||||
.biggerPhone {
|
||||
.rocket-image {
|
||||
img {
|
||||
height: 350px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { IonicModule } from '@ionic/angular';
|
||||
|
||||
import { NotificationCenterPage } from './notification-center.page';
|
||||
import { DetailComponent } from './notification-detail/detail.component';
|
||||
import { HmgCommonModule } from '../hmg-common/hmg-common.module';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: DetailComponent
|
||||
}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
FormsModule,
|
||||
IonicModule,
|
||||
HmgCommonModule,
|
||||
RouterModule.forChild(routes)
|
||||
],
|
||||
declarations: [NotificationCenterPage, DetailComponent]
|
||||
})
|
||||
export class NotificationCenterPageModule { }
|
||||
@ -0,0 +1,6 @@
|
||||
|
||||
|
||||
|
||||
<ion-content>
|
||||
<ion-router-outlet></ion-router-outlet>
|
||||
</ion-content>
|
||||
@ -0,0 +1,27 @@
|
||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { NotificationCenterPage } from './notification-center.page';
|
||||
|
||||
describe('NotificationCenterPage', () => {
|
||||
let component: NotificationCenterPage;
|
||||
let fixture: ComponentFixture<NotificationCenterPage>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ NotificationCenterPage ],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(NotificationCenterPage);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,15 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-notification-center',
|
||||
templateUrl: './notification-center.page.html',
|
||||
styleUrls: ['./notification-center.page.scss'],
|
||||
})
|
||||
export class NotificationCenterPage implements OnInit {
|
||||
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
|
||||
|
||||
<ion-content class="item-background" padding>
|
||||
<div class="close-icon">
|
||||
<img src="assets/imgs/close.svg" (click)="backLogin()" />
|
||||
</div>
|
||||
<ion-grid>
|
||||
<ion-row class="ion-justify-content-center">
|
||||
<ion-col [size]="11">
|
||||
<p>{{data.image_Text}}</p>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
<ion-row class="ion-justify-content-center">
|
||||
<ion-col [size]="11">
|
||||
<img [src]="data.image_URL" class="full-width">
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
|
||||
<page-trailer></page-trailer>
|
||||
</ion-content>
|
||||
@ -0,0 +1,84 @@
|
||||
.vertical_space {
|
||||
height: 0.5cm;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 0.38cm;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.info-icon ion-icon {
|
||||
font-size: 90px;
|
||||
margin: 10px auto;
|
||||
display: block;
|
||||
margin-bottom: 0;
|
||||
color: var(--ion-color-danger);
|
||||
}
|
||||
|
||||
.info-icon h1 {
|
||||
margin: auto;
|
||||
font-size: 22px;
|
||||
text-align: center;
|
||||
margin-top: 10%;
|
||||
}
|
||||
|
||||
.info-icon {
|
||||
padding: 20px;
|
||||
background: #fff;
|
||||
margin: 20px;
|
||||
margin-top: 15%;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
.info-icon .line {
|
||||
width: 100%;
|
||||
height: 1px;
|
||||
background: #ccddcc;
|
||||
margin: 15px auto;
|
||||
}
|
||||
|
||||
.info-icon .instruction p {
|
||||
display: block;
|
||||
margin: 0px;
|
||||
margin-top: 7%;
|
||||
color: #000;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.info-icon b {
|
||||
bottom: 11px;
|
||||
margin: 18px;
|
||||
color: var(--ion-color-danger);
|
||||
}
|
||||
|
||||
.instruction b {
|
||||
color: var(--ion-color-danger);
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
.stop-icon {
|
||||
display: flex;
|
||||
margin: 10px auto;
|
||||
width: 45%;
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
p.otherwise {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
|
||||
.close-icon {
|
||||
position: relative;
|
||||
height: 60px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.close-icon img {
|
||||
|
||||
height: 35px;
|
||||
width: 35px;
|
||||
right: 0;
|
||||
position: absolute;
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { DetailComponent } from './detail.component';
|
||||
|
||||
describe('DetailComponent', () => {
|
||||
let component: DetailComponent;
|
||||
let fixture: ComponentFixture<DetailComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ DetailComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(DetailComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,42 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { NotificationModel } from 'src/app/hmg-common/services/push/models/notification.model';
|
||||
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
|
||||
import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service';
|
||||
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
|
||||
// import { NotificationsCenterService } from '../service/notifications-center.service';
|
||||
import { Route, Router, ActivatedRoute, ActivationEnd } from '@angular/router';
|
||||
import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser';
|
||||
|
||||
@Component({
|
||||
selector: 'app-detail',
|
||||
templateUrl: './detail.component.html',
|
||||
styleUrls: ['./detail.component.scss']
|
||||
})
|
||||
export class DetailComponent implements OnInit {
|
||||
|
||||
public notification: NotificationModel;
|
||||
public video_link: string;
|
||||
public trustedVideoUrl: SafeResourceUrl;
|
||||
public direction: any;
|
||||
public data: any;
|
||||
constructor(
|
||||
public cs: CommonService,
|
||||
public ts: TranslatorService,
|
||||
public sharedData: SharedDataService,
|
||||
// public notifyService: NotificationsCenterService,
|
||||
public router: Router,
|
||||
private domSanitizer: DomSanitizer,
|
||||
public route: ActivatedRoute
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.direction = TranslatorService.getCurrentDirection();
|
||||
|
||||
this.data = this.sharedData.getSharedData(NotificationModel.SHARED_DATA, true);
|
||||
}
|
||||
backLogin() {
|
||||
this.cs.openLogin();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
import { Request } from 'src/app/hmg-common/services/models/request';
|
||||
|
||||
export class COCRequest extends Request {
|
||||
public ItgPageSize: number;
|
||||
public ItgPageNo: number;
|
||||
public Date: string;
|
||||
public EmployeeNumber: string;
|
||||
}
|
||||