From dc718865083f693c5971153ed188761ba73f35db Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 30 Sep 2024 23:57:05 -0400 Subject: [PATCH] Learn more added --- src/app/app-routing.module.ts | 5 ++++ .../offers-received.component.ts | 6 +++++ src/app/pages/activetask/activetask.page.ts | 1 + .../learnmore/learnmore-routing.module.ts | 17 +++++++++++++ src/app/pages/learnmore/learnmore.module.ts | 20 ++++++++++++++++ src/app/pages/learnmore/learnmore.page.html | 9 +++++++ src/app/pages/learnmore/learnmore.page.scss | 0 .../pages/learnmore/learnmore.page.spec.ts | 24 +++++++++++++++++++ src/app/pages/learnmore/learnmore.page.ts | 15 ++++++++++++ 9 files changed, 97 insertions(+) create mode 100644 src/app/pages/learnmore/learnmore-routing.module.ts create mode 100644 src/app/pages/learnmore/learnmore.module.ts create mode 100644 src/app/pages/learnmore/learnmore.page.html create mode 100644 src/app/pages/learnmore/learnmore.page.scss create mode 100644 src/app/pages/learnmore/learnmore.page.spec.ts create mode 100644 src/app/pages/learnmore/learnmore.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f8d896d..efe5f6f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -298,6 +298,11 @@ const routes: Routes = [ path: 'familyconnectaction', loadChildren: () => import('./pages/familyconnectaction/familyconnectaction.module').then(m => m.FamilyconnectactionPageModule) }, + { + path: 'learnmore', + loadChildren: () => import('./pages/learnmore/learnmore.module').then(m => m.LearnmorePageModule) + }, + // { // path: 'startlogin', // loadChildren: () => import('./pages/startlogin/startlogin.module').then(m => m.StartloginPageModule) diff --git a/src/app/components/offers-received/offers-received.component.ts b/src/app/components/offers-received/offers-received.component.ts index 2c77549..0ac9d70 100644 --- a/src/app/components/offers-received/offers-received.component.ts +++ b/src/app/components/offers-received/offers-received.component.ts @@ -81,6 +81,8 @@ export class OffersReceivedComponent implements OnInit { handler: () => { this.sendOfferResponse(item, 100); this.reduceOfferData(); // = this.bannersDataService.offerData; + // redirect to task page + // this.router.navigate(['activetask'],{state: item}); }, }, ], @@ -156,6 +158,10 @@ export class OffersReceivedComponent implements OnInit { const refresh_banner = new CustomEvent("app-banner-refresh-nocache"); dispatchEvent(refresh_banner); + if( respType == 100 ){ // only in acceptance approval + this.router.navigate(['activetask'],{state: this.offerRespData}); + } + this.reduceOfferData(); } ); diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts index 32f9b0e..375a8c8 100644 --- a/src/app/pages/activetask/activetask.page.ts +++ b/src/app/pages/activetask/activetask.page.ts @@ -38,6 +38,7 @@ export class ActivetaskPage implements OnInit { ) { this.yourmessage=''; this.jobData = this.router.getCurrentNavigation().extras.state; + // debugger; console.log("XXXXX 1", this.router.getCurrentNavigation().extras); console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); diff --git a/src/app/pages/learnmore/learnmore-routing.module.ts b/src/app/pages/learnmore/learnmore-routing.module.ts new file mode 100644 index 0000000..f9a6ca2 --- /dev/null +++ b/src/app/pages/learnmore/learnmore-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { LearnmorePage } from './learnmore.page'; + +const routes: Routes = [ + { + path: '', + component: LearnmorePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class LearnmorePageRoutingModule {} diff --git a/src/app/pages/learnmore/learnmore.module.ts b/src/app/pages/learnmore/learnmore.module.ts new file mode 100644 index 0000000..edd0eed --- /dev/null +++ b/src/app/pages/learnmore/learnmore.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { LearnmorePageRoutingModule } from './learnmore-routing.module'; + +import { LearnmorePage } from './learnmore.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + LearnmorePageRoutingModule + ], + declarations: [LearnmorePage] +}) +export class LearnmorePageModule {} diff --git a/src/app/pages/learnmore/learnmore.page.html b/src/app/pages/learnmore/learnmore.page.html new file mode 100644 index 0000000..1076253 --- /dev/null +++ b/src/app/pages/learnmore/learnmore.page.html @@ -0,0 +1,9 @@ + + + learnmore + + + + + + diff --git a/src/app/pages/learnmore/learnmore.page.scss b/src/app/pages/learnmore/learnmore.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/learnmore/learnmore.page.spec.ts b/src/app/pages/learnmore/learnmore.page.spec.ts new file mode 100644 index 0000000..cc44890 --- /dev/null +++ b/src/app/pages/learnmore/learnmore.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { LearnmorePage } from './learnmore.page'; + +describe('LearnmorePage', () => { + let component: LearnmorePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ LearnmorePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(LearnmorePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/learnmore/learnmore.page.ts b/src/app/pages/learnmore/learnmore.page.ts new file mode 100644 index 0000000..f4bca87 --- /dev/null +++ b/src/app/pages/learnmore/learnmore.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-learnmore', + templateUrl: './learnmore.page.html', + styleUrls: ['./learnmore.page.scss'], +}) +export class LearnmorePage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}