diff --git a/REMEMBER.txt b/REMEMBER.txt index 21779fe..6818b10 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -20,6 +20,8 @@ ionic generate page jobactive ionic generate component taskactivities ionic generate component suggestedlist +ionic generate component fastreward + ionic generate component familypending ionic generate page logout diff --git a/src/app/components/fastreward/fastreward.component.html b/src/app/components/fastreward/fastreward.component.html new file mode 100644 index 0000000..d66bbf0 --- /dev/null +++ b/src/app/components/fastreward/fastreward.component.html @@ -0,0 +1,19 @@ + + + Send Reward + + + + + + + 1 + + + 2 + + + + + + \ No newline at end of file diff --git a/src/app/components/fastreward/fastreward.component.scss b/src/app/components/fastreward/fastreward.component.scss new file mode 100644 index 0000000..4c180b5 --- /dev/null +++ b/src/app/components/fastreward/fastreward.component.scss @@ -0,0 +1,10 @@ +ion-card{ + margin:20px 0px 0px 0px; + height: 250px; + padding: 0px; + --background: red; + .left-col{ + background-color: yellow; + height: 100%; + } +} diff --git a/src/app/components/fastreward/fastreward.component.spec.ts b/src/app/components/fastreward/fastreward.component.spec.ts new file mode 100644 index 0000000..39935bf --- /dev/null +++ b/src/app/components/fastreward/fastreward.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { FastrewardComponent } from './fastreward.component'; + +describe('FastrewardComponent', () => { + let component: FastrewardComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ FastrewardComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(FastrewardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/fastreward/fastreward.component.ts b/src/app/components/fastreward/fastreward.component.ts new file mode 100644 index 0000000..5059ae6 --- /dev/null +++ b/src/app/components/fastreward/fastreward.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-fastreward', + templateUrl: './fastreward.component.html', + styleUrls: ['./fastreward.component.scss'], +}) +export class FastrewardComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/components/waitinterest/waitinterest.component.html b/src/app/components/waitinterest/waitinterest.component.html index e9423c6..c545945 100644 --- a/src/app/components/waitinterest/waitinterest.component.html +++ b/src/app/components/waitinterest/waitinterest.component.html @@ -2,7 +2,7 @@
-
+
{{item.title}} diff --git a/src/app/components/waitinterest/waitinterest.component.scss b/src/app/components/waitinterest/waitinterest.component.scss index b953f65..449cb3b 100644 --- a/src/app/components/waitinterest/waitinterest.component.scss +++ b/src/app/components/waitinterest/waitinterest.component.scss @@ -35,9 +35,10 @@ } .men_image { - height: 40px; - width: 40px; + height: 50px; + width: 50px; border-radius: 100%; + min-width: 50px; } .text { diff --git a/src/app/components/waitinterest/waitinterest.component.ts b/src/app/components/waitinterest/waitinterest.component.ts index 9f273a9..cdedcef 100644 --- a/src/app/components/waitinterest/waitinterest.component.ts +++ b/src/app/components/waitinterest/waitinterest.component.ts @@ -9,7 +9,10 @@ import {WrenchService} from "../../services/wrench.service"; }) export class WaitinterestComponent implements OnInit { //@Input('interestJobsData') interestJobsData:any; - constructor( public sessionDataProviderService: SessionDataProviderService, + session_image_server:string=''; + curr_session:string=''; + + constructor( public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService) { } ngOnInit() { @@ -24,6 +27,7 @@ export class WaitinterestComponent implements OnInit { total_jobs: number = 0; getInterestList() { + this.curr_session = this.sessionDataProviderService.session; this.usrData = { action: 13005, member_id: this.sessionDataProviderService.member_id, @@ -37,6 +41,7 @@ export class WaitinterestComponent implements OnInit { this.interestTotalData = interestTotalData; console.log("interestTotalData RETURN->", this.interestTotalData); this.interestJobsData = this.interestTotalData.result_list; + this.session_image_server = this.interestTotalData.session_image_server; this.total_jobs = this.interestJobsData.length; console.log("jobManagerJobsData RETURN DATA->", this.interestJobsData); } diff --git a/src/app/pages/edit-profile/edit-profile.page.html b/src/app/pages/edit-profile/edit-profile.page.html index f9df9ca..b896969 100644 --- a/src/app/pages/edit-profile/edit-profile.page.html +++ b/src/app/pages/edit-profile/edit-profile.page.html @@ -13,7 +13,7 @@
-
+
diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index a88a38c..5209a79 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -31,12 +31,14 @@ export class EditProfilePage implements OnInit { lastname:string=''; email:string=''; online_name:string=''; + profilePicture:string=''; ngOnInit() { this.firstname = this.sessionDataProviderService.firstname; this.lastname = this.sessionDataProviderService.lastname; this.email = this.sessionDataProviderService.email; this.online_name = this.sessionDataProviderService.online_name; + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); } onBack() { diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts index 31bf1be..22258a9 100644 --- a/src/app/pages/home/home.module.ts +++ b/src/app/pages/home/home.module.ts @@ -10,7 +10,7 @@ import { HomePage } from './home.page'; import { SuggestedlistComponent } from "../../components/suggestedlist/suggestedlist.component"; import {FamilypendingComponent} from "../../components/familypending/familypending.component"; import { TrackingComponent } from "../../components/tracking/tracking.component"; - +import { FastrewardComponent } from "../../components/fastreward/fastreward.component"; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; // @NgModule({ @@ -24,7 +24,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; IonicModule, HomePageRoutingModule ], - declarations: [HomePage,SuggestedlistComponent,FamilypendingComponent,TrackingComponent], + declarations: [HomePage,SuggestedlistComponent,FamilypendingComponent,TrackingComponent,FastrewardComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class HomePageModule { } diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 7c01afe..f412f61 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -119,6 +119,10 @@ + + + + diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 03e9e5b..ef2c6f2 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -59,7 +59,7 @@ export class HomePage implements OnInit { } //debugger; - this.profilePicture = this.sessionDataProviderService.profilePicture(); + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); this.walletPresentation(); diff --git a/src/app/pages/joblist/joblist.page.html b/src/app/pages/joblist/joblist.page.html index d10b37b..8eea4e7 100644 --- a/src/app/pages/joblist/joblist.page.html +++ b/src/app/pages/joblist/joblist.page.html @@ -51,7 +51,7 @@
-
+
{{item.title}} diff --git a/src/app/pages/joblist/joblist.page.scss b/src/app/pages/joblist/joblist.page.scss index 8fd1874..52352ea 100644 --- a/src/app/pages/joblist/joblist.page.scss +++ b/src/app/pages/joblist/joblist.page.scss @@ -95,6 +95,7 @@ ion-content { height: 50px; width: 50px; border-radius: 100%; + min-width: 80px; } .bold { @@ -155,9 +156,10 @@ ion-content { } .men_image { - height: 40px; - width: 40px; + height: 50px; + width: 50px; border-radius: 100%; + min-width: 50px; } .text { diff --git a/src/app/pages/joblist/joblist.page.ts b/src/app/pages/joblist/joblist.page.ts index ad3cae3..6fe0167 100644 --- a/src/app/pages/joblist/joblist.page.ts +++ b/src/app/pages/joblist/joblist.page.ts @@ -12,13 +12,17 @@ import {NavController} from "@ionic/angular"; export class JoblistPage implements OnInit { tabs = 'about'; - + session_image_server:string=''; + curr_session:string=""; constructor( private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService - ) { } + ) { + + + } ngOnInit() { this.getJobManagerList(); @@ -43,6 +47,7 @@ export class JoblistPage implements OnInit { total_jobs:number=0; getJobManagerList(){ + this.curr_session = this.sessionDataProviderService.session; this.usrData = {action:13005, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, @@ -55,6 +60,7 @@ export class JoblistPage implements OnInit { console.log("jobManagerJobsTotalData RETURN->", this.jobManagerJobsTotalData); this.jobManagerJobsData = this.jobManagerJobsTotalData.result_list; // debugger; + this.session_image_server = this.jobManagerJobsTotalData.session_image_server; this.total_jobs=this.jobManagerJobsData.length; console.log("jobManagerJobsData RETURN DATA->", this.jobManagerJobsData); } diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 381b4f9..0d47e10 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -72,7 +72,7 @@
-
+
{{item.title}} @@ -94,7 +94,7 @@
-
+
{{item.title}} {{item.description}} @@ -114,7 +114,7 @@
-
+
{{item.title}} {{item.description}} diff --git a/src/app/pages/jobmanager/jobmanager.page.scss b/src/app/pages/jobmanager/jobmanager.page.scss index 1f421f2..0182bce 100644 --- a/src/app/pages/jobmanager/jobmanager.page.scss +++ b/src/app/pages/jobmanager/jobmanager.page.scss @@ -163,9 +163,10 @@ ion-content { } .men_image { - height: 40px; - width: 40px; + height: 50px; + width: 50px; border-radius: 100%; + min-width: 50px; } .text { diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts index 8fb411a..08d271e 100644 --- a/src/app/pages/jobmanager/jobmanager.page.ts +++ b/src/app/pages/jobmanager/jobmanager.page.ts @@ -14,7 +14,8 @@ export class JobmanagerPage implements OnInit { menuData:any; tabs = 'active'; - + session_image_server:string=''; + curr_session:string=''; constructor( private navctr: NavController, private router: Router, @@ -34,6 +35,7 @@ menuData:any; } ngOnInit() { + this.curr_session = this.sessionDataProviderService.session; this.getManagerJobsData("ACTIVE"); this.getManagerJobsData("PASTDUE"); this.getManagerJobsData("REVIEW"); @@ -89,6 +91,7 @@ menuData:any; jobManagerTotalData => { this.jobManagerActiveTotalData = jobManagerTotalData; console.log("getManagerJobsData RETURN->", this.jobManagerActiveTotalData); + this.session_image_server = this.jobManagerActiveTotalData.session_image_server; // debugger; switch (job_mode){ case "ACTIVE": diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html index 4422bd6..908e75d 100644 --- a/src/app/pages/my-course/my-course.page.html +++ b/src/app/pages/my-course/my-course.page.html @@ -30,7 +30,7 @@
-
+
diff --git a/src/app/pages/my-course/my-course.page.ts b/src/app/pages/my-course/my-course.page.ts index 79b9374..20a5452 100644 --- a/src/app/pages/my-course/my-course.page.ts +++ b/src/app/pages/my-course/my-course.page.ts @@ -10,6 +10,8 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv export class MyCoursePage implements OnInit { tabs: any = 'on'; + session_image_server:string=''; + curr_session:string=''; constructor( private router: Router, @@ -30,6 +32,7 @@ export class MyCoursePage implements OnInit { } + usrData: { action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:1 }; @@ -37,12 +40,16 @@ export class MyCoursePage implements OnInit { jobsTotalData:any; jobsData: []; getJobsData(){ + this.curr_session = this.sessionDataProviderService.session; + this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , limit:20, page:1} this.wrenchService.getJobsData(this.usrData).subscribe( jobsTotalData => { this.jobsTotalData = jobsTotalData; console.log("PAH HX RETURN->", this.jobsTotalData); this.jobsData = this.jobsTotalData.result_list; + this.session_image_server = this.jobsTotalData.session_image_server; + // debugger; console.log("JOBS RETURN DATA->", this.jobsData); // this.blogDataService.setBlogData(this.blogResult.blog_data); diff --git a/src/app/pages/pendingoffers/pendingoffers.page.html b/src/app/pages/pendingoffers/pendingoffers.page.html index 6082214..68e5ccd 100644 --- a/src/app/pages/pendingoffers/pendingoffers.page.html +++ b/src/app/pages/pendingoffers/pendingoffers.page.html @@ -37,7 +37,7 @@
-
+
{{item.title}} diff --git a/src/app/pages/pendingoffers/pendingoffers.page.scss b/src/app/pages/pendingoffers/pendingoffers.page.scss index 1c3cf7a..bd4f5ba 100644 --- a/src/app/pages/pendingoffers/pendingoffers.page.scss +++ b/src/app/pages/pendingoffers/pendingoffers.page.scss @@ -155,9 +155,10 @@ ion-content { } .men_image { - height: 40px; - width: 40px; + height: 50px; + width: 50px; border-radius: 100%; + min-width: 50px; } .text { diff --git a/src/app/pages/pendingoffers/pendingoffers.page.ts b/src/app/pages/pendingoffers/pendingoffers.page.ts index 081697b..cc7c567 100644 --- a/src/app/pages/pendingoffers/pendingoffers.page.ts +++ b/src/app/pages/pendingoffers/pendingoffers.page.ts @@ -12,7 +12,8 @@ import {WrenchService} from "../../services/wrench.service"; export class PendingoffersPage implements OnInit { tabs = 'about'; - + session_image_server:string=''; + curr_session:string=""; constructor( private navctr: NavController, private router: Router, @@ -36,6 +37,7 @@ export class PendingoffersPage implements OnInit { jobManagerOffersTotalData:any; jobManagerOffersData: []; getPendingOffersData(){ + this.curr_session = this.sessionDataProviderService.session; this.usrData = {action:11309, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, @@ -47,6 +49,8 @@ export class PendingoffersPage implements OnInit { this.jobManagerOffersTotalData = jobManagerOffersTotalData; console.log("jobManagerOffersTotalData RETURN->", this.jobManagerOffersTotalData); this.jobManagerOffersData = this.jobManagerOffersTotalData.result_list; + this.session_image_server = this.jobManagerOffersTotalData.session_image_server; + // debugger; console.log("jobManagerOffersData RETURN DATA->", this.jobManagerOffersTotalData); } diff --git a/src/app/pages/profile/profile.page.html b/src/app/pages/profile/profile.page.html index 792f70a..c5e07b0 100644 --- a/src/app/pages/profile/profile.page.html +++ b/src/app/pages/profile/profile.page.html @@ -97,7 +97,7 @@
-
+
diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts index 9bad6f0..c180741 100644 --- a/src/app/pages/profile/profile.page.ts +++ b/src/app/pages/profile/profile.page.ts @@ -27,7 +27,7 @@ export class ProfilePage implements OnInit { this.firstname = this.sessionDataProviderService.firstname; this.lastname = this.sessionDataProviderService.lastname; this.email = this.sessionDataProviderService.username; - this.profilePicture = this.sessionDataProviderService.profilePicture(); + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); } onFamily() { diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index 889da8a..37e034f 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { environment } from 'src/environments/environment'; @Injectable({ providedIn: 'root' @@ -185,7 +186,7 @@ export class SessionDataProviderService { this.isPedningJob = 0; this.isOfferJob = 0; } - profilePicture(){ + profilePicture(sessionID, memberUID){ var defualtProfilePicture = "https://www.wrenchboard.com/assets/images/profile.jpg"; var profile_p = ''; if (this.profile_pic_url !=''){ @@ -195,6 +196,10 @@ export class SessionDataProviderService { else{ profile_p = defualtProfilePicture; } + profile_p = `${environment.baseUrl}/getmedia/${sessionID}/profile/${memberUID}`; + console.log("profile_p->", profile_p); + //https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/0B6246CE2B89EC948618711E6E6D2DD532797C7F750C69A237FE3F650ECA6B14/profile/3119b744-42ad-4834-bb83-b737588754ca + //https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/81EAF85BBD946518E8CAE81C2CEBCCB8134985203325343F5703E874BED476E2/profile/3119b744-42ad-4834-bb83-b737588754ca return profile_p; } }