From f44adac1b7b84ce6fbd8db2ac72af09e9e8ca9aa Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 27 Dec 2020 14:50:21 +0300 Subject: [PATCH] nfc design completed --- Mohem/src/app/hmg-common/hmg-common.module.ts | 7 +++- .../services/common/common.service.ts | 3 ++ .../attendance-options.component.html | 35 ++++++++++++++++++ .../attendance-options.component.scss | 12 ++++++ .../attendance-options.component.spec.ts | 27 ++++++++++++++ .../attendance-options.component.ts | 14 +++++++ Mohem/src/app/home/home.module.ts | 7 +++- Mohem/src/app/home/home.page.ts | 7 +++- Mohem/src/assets/imgs/asset (1).png | Bin 0 -> 3653 bytes Mohem/src/assets/imgs/asset (2).png | Bin 0 -> 1419 bytes Mohem/src/assets/imgs/asset (3).png | Bin 0 -> 1335 bytes Mohem/src/assets/localization/i18n.json | 4 ++ 12 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 Mohem/src/app/home/attendance-options/attendance-options.component.html create mode 100644 Mohem/src/app/home/attendance-options/attendance-options.component.scss create mode 100644 Mohem/src/app/home/attendance-options/attendance-options.component.spec.ts create mode 100644 Mohem/src/app/home/attendance-options/attendance-options.component.ts create mode 100644 Mohem/src/assets/imgs/asset (1).png create mode 100644 Mohem/src/assets/imgs/asset (2).png create mode 100644 Mohem/src/assets/imgs/asset (3).png diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index bf854d07..d0fe51ad 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -119,6 +119,7 @@ import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/dat import { ChartModule } from 'primeng/chart'; import { GenericHeaderComponent } from './ui/generic-header/generic-header.component'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component'; @NgModule({ imports: [ @@ -202,7 +203,8 @@ import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx' CircleCalendarComponent, DateInfoModalComponent, Modal, - GenericHeaderComponent + GenericHeaderComponent, + AttendanceOptionsComponent ], exports: [ FabButtonComponent, @@ -273,7 +275,8 @@ import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx' ChartModule, FileUploadModule, Modal, - GenericHeaderComponent + GenericHeaderComponent, + AttendanceOptionsComponent ], providers: [ AttendScanService, diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 557390a6..a79420c1 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1078,6 +1078,9 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(['/attendance-tracking/home']); } + public openAttendanceOptionsComponent(){ + this.nav.navigateForward(['/home/attendance-option']); + } public openEitListPage() { this.nav.navigateForward(['/eit/eit-list']); } diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.html b/Mohem/src/app/home/attendance-options/attendance-options.component.html new file mode 100644 index 00000000..b09fabce --- /dev/null +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.html @@ -0,0 +1,35 @@ + + + + + + + +


+ +
+
+ + +

Select Method to Mark your Attendance

+
+
+ + +
+ +

NFC

+
+
+ +
+ +

QR Code

+
+
+
+
+
+ diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.scss b/Mohem/src/app/home/attendance-options/attendance-options.component.scss new file mode 100644 index 00000000..000a0944 --- /dev/null +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.scss @@ -0,0 +1,12 @@ +.buttonStyle{ + border: 1px solid black; + border-radius: 16px; + height: 135px; + text-align: -webkit-center; + padding: 10px; +} + +.textAndIcon{ + width: 80px; +} + diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.spec.ts b/Mohem/src/app/home/attendance-options/attendance-options.component.spec.ts new file mode 100644 index 00000000..95b52668 --- /dev/null +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AttendanceOptionsComponent } from './attendance-options.component'; + +describe('AttendanceOptionsComponent', () => { + let component: AttendanceOptionsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AttendanceOptionsComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AttendanceOptionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.ts b/Mohem/src/app/home/attendance-options/attendance-options.component.ts new file mode 100644 index 00000000..11dd1af6 --- /dev/null +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-attendance-options', + templateUrl: './attendance-options.component.html', + styleUrls: ['./attendance-options.component.scss'], +}) +export class AttendanceOptionsComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/Mohem/src/app/home/home.module.ts b/Mohem/src/app/home/home.module.ts index 8aea1549..4a14d328 100644 --- a/Mohem/src/app/home/home.module.ts +++ b/Mohem/src/app/home/home.module.ts @@ -7,11 +7,16 @@ import { IonicModule } from '@ionic/angular'; import { HomePage } from './home.page'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { WorklistMainService } from '../notification/service/work-list.main.service'; +import { AttendanceOptionsComponent } from './attendance-options/attendance-options.component'; const routes: Routes = [ { path: '', component: HomePage, + }, + { + path:'attendance-option', + component:AttendanceOptionsComponent, } ]; @@ -24,7 +29,7 @@ const routes: Routes = [ RouterModule.forChild(routes) ], declarations: [ - HomePage + HomePage, ], providers: [ BarcodeScanner, diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index e97a1c77..00392f67 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -738,11 +738,16 @@ openattentracking() { this.common.openAttenTrackingpage(); } +showAttendanceOptions() { + this.common.openAttendanceOptionsComponent(); +} + openStatsButton(link: any) { // tslint:disable-next-line: triple-equals if (link == '0') { this.isFakeLocationUsed = false; - this.getDeviceLocation(); + // this.getDeviceLocation(); + this.showAttendanceOptions(); // tslint:disable-next-line: triple-equals } else if (link == '1') { this.common.startLoading(); diff --git a/Mohem/src/assets/imgs/asset (1).png b/Mohem/src/assets/imgs/asset (1).png new file mode 100644 index 0000000000000000000000000000000000000000..0b7c6d2f98fd6acadfb748e64bf150511f867b53 GIT binary patch literal 3653 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