diff --git a/REMEMBER.txt b/REMEMBER.txt
index 1dc10be..a1029b0 100644
--- a/REMEMBER.txt
+++ b/REMEMBER.txt
@@ -60,6 +60,11 @@ ionic generate service user-wallet
ionic generate service waiting-interest
ionic generate component tracking
+ionic generate component myjob-offers
+
+
+pendingoffers
+
ionic generate page addcredit
ionic generate page ownersjob
@@ -69,6 +74,7 @@ ionic generate component latest-market
ionic generate service tasks-data
ionic generate service banners-data
+***ionic generate service pendingjob-data
https://masteringionic.com/blog/working-with-capacitor-googlemaps-in-ionic
diff --git a/src/app/components/myjob-offers/myjob-offers.component.html b/src/app/components/myjob-offers/myjob-offers.component.html
new file mode 100644
index 0000000..dcaaa73
--- /dev/null
+++ b/src/app/components/myjob-offers/myjob-offers.component.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.description}}
+ {{item.offer_code}} {{item.price*0.01}} {{item.currency}}
+ Expire: {{item.expire |date}}
+ Send to : {{item.job_to}}
+
+
+
+
+
+
+
+
diff --git a/src/app/components/myjob-offers/myjob-offers.component.scss b/src/app/components/myjob-offers/myjob-offers.component.scss
new file mode 100644
index 0000000..de10fa4
--- /dev/null
+++ b/src/app/components/myjob-offers/myjob-offers.component.scss
@@ -0,0 +1,60 @@
+
+
+.lesson {
+ margin-top: 20px;
+
+ .bold {
+ font-family: 'semi-bold';
+ }
+
+ .color {
+ color: var(--ion-color-primary);
+ }
+
+ .grey {
+ color: grey;
+ }
+
+ .sec {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 10px;
+ }
+
+ .video {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ background-color: white;
+ padding: 15px;
+ box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 10px;
+ margin-top: 20px;
+
+ .left {
+ display: flex;
+ }
+
+ .men_image {
+ height: 50px;
+ width: 50px;
+ border-radius: 100%;
+ min-width: 50px;
+ }
+
+ .text {
+ margin-left: 10px;
+ }
+
+ .bold_text {
+ font-size: 16px;
+ font-family: 'bold';
+ }
+
+ .grey_text {
+ font-size: 14px;
+ color: grey;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/myjob-offers/myjob-offers.component.spec.ts b/src/app/components/myjob-offers/myjob-offers.component.spec.ts
new file mode 100644
index 0000000..0004a5f
--- /dev/null
+++ b/src/app/components/myjob-offers/myjob-offers.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MyjobOffersComponent } from './myjob-offers.component';
+
+describe('MyjobOffersComponent', () => {
+ let component: MyjobOffersComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ MyjobOffersComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(MyjobOffersComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/myjob-offers/myjob-offers.component.ts b/src/app/components/myjob-offers/myjob-offers.component.ts
new file mode 100644
index 0000000..f09b0e5
--- /dev/null
+++ b/src/app/components/myjob-offers/myjob-offers.component.ts
@@ -0,0 +1,64 @@
+import { Router } from '@angular/router';
+import {Component, OnInit, Input } from '@angular/core';
+import { NavController } from '@ionic/angular';
+import {SessionDataProviderService} from "../../store/session-data-provider.service";
+import {WrenchService} from "../../services/wrench.service";
+
+@Component({
+ selector: 'app-myjob-offers',
+ templateUrl: './myjob-offers.component.html',
+ styleUrls: ['./myjob-offers.component.scss'],
+})
+export class MyjobOffersComponent implements OnInit {
+ @Input('jobData') jobData:any;
+
+
+ tabs = 'about';
+ session_image_server:string='';
+ curr_session:string="";
+ constructor(
+ private navctr: NavController,
+ private router: Router,
+ public sessionDataProviderService: SessionDataProviderService,
+ private wrenchService: WrenchService
+ ) {
+
+ this.getPendingOffersData();
+ }
+
+ ngOnInit() {
+ console.log('AMEYE===>', this.jobData);
+ }
+ usrData: {
+ action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
+ };
+
+ jobManagerOffersTotalData:any;
+ jobManagerOffersData: [];
+ async getPendingOffersData(){
+ this.curr_session = this.sessionDataProviderService.session;
+ this.usrData = {action:11309,
+ member_id: this.sessionDataProviderService.member_id,
+ uid: this.sessionDataProviderService.member_uid,
+ sessionid: this.sessionDataProviderService.session ,
+ limit:20, page:1,offset: 0}
+
+ this.wrenchService.jobmanageroffers(this.usrData).subscribe(
+ jobManagerOffersTotalData => {
+ this.jobManagerOffersTotalData = jobManagerOffersTotalData;
+ console.log("jobManagerOffersTotalData RETURN->", this.jobManagerOffersTotalData);
+ if (this.jobData !=undefined && this.jobData.job_uid !=''){
+ this.jobManagerOffersData = this.jobManagerOffersTotalData.result_list.filter((item)=>item.job_uid==this.jobData.job_uid);
+ }
+ else{
+ 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/ownersjob/ownersjob.module.ts b/src/app/pages/ownersjob/ownersjob.module.ts
index 3816a06..e9c6dcc 100644
--- a/src/app/pages/ownersjob/ownersjob.module.ts
+++ b/src/app/pages/ownersjob/ownersjob.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { OwnersjobPageRoutingModule } from './ownersjob-routing.module';
import { OwnersjobPage } from './ownersjob.page';
+import {MyjobOffersComponent} from "../../components/myjob-offers/myjob-offers.component";
@NgModule({
imports: [
@@ -15,6 +16,6 @@ import { OwnersjobPage } from './ownersjob.page';
IonicModule,
OwnersjobPageRoutingModule
],
- declarations: [OwnersjobPage]
+ declarations: [OwnersjobPage,MyjobOffersComponent]
})
export class OwnersjobPageModule {}
diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html
index 9be11c1..0a275dc 100644
--- a/src/app/pages/ownersjob/ownersjob.page.html
+++ b/src/app/pages/ownersjob/ownersjob.page.html
@@ -129,6 +129,10 @@
+
+ Current Assignments
+
+
diff --git a/src/app/pages/ownersjob/ownersjob.page.scss b/src/app/pages/ownersjob/ownersjob.page.scss
index 39db006..c991e8b 100644
--- a/src/app/pages/ownersjob/ownersjob.page.scss
+++ b/src/app/pages/ownersjob/ownersjob.page.scss
@@ -34,7 +34,7 @@ ion-content {
.row {
display: flex;
align-items: center;
- margin-top: 10px;
+ margin-top: 30px;
.bg_text {
color: var(--ion-color-primary);
@@ -106,6 +106,11 @@ ion-content {
font-weight: bold;
color: #2dd36f;
}
+ .curr_ass{
+ font-weight: bolder;
+ font-size: 16px;
+ padding-top: 30px;
+ }
}
.about {
diff --git a/src/app/pages/pendingoffers/pendingoffers.page.html b/src/app/pages/pendingoffers/pendingoffers.page.html
index d535b4c..db2f2ca 100644
--- a/src/app/pages/pendingoffers/pendingoffers.page.html
+++ b/src/app/pages/pendingoffers/pendingoffers.page.html
@@ -63,7 +63,6 @@
-