diff --git a/src/app/components/dash-toptool/dash-toptool.component.html b/src/app/components/dash-toptool/dash-toptool.component.html index c0e6ce8..43865fd 100644 --- a/src/app/components/dash-toptool/dash-toptool.component.html +++ b/src/app/components/dash-toptool/dash-toptool.component.html @@ -1,8 +1,8 @@
-
+
{{walletDescription}} + + (click)="myOffers()"> + + Offers + + Wallet
-
+
You have {{total_offers}} Offer(s)
-
+
-
New Offer Expires : {{item.expire | date}}
-
-
-
+
This Offer Expires : {{item.expire | date}}
+
+ + + +
-
{{(item.title.length > 65) ? item.title.substring(0,64)+"...": item.title }}
+
{{(item.title.length > 65) ? item.title.substring(0,64)+"...": item.title }}
-
{{item.price*0.01| number : '1.2-2'}} {{item.currency}}
-
+
{{item.price*0.01| number : '1.2-2'}} {{item.currency}}
+
- Reject + Reject
Start Now diff --git a/src/app/components/offers-received/offers-received.component.ts b/src/app/components/offers-received/offers-received.component.ts index a8fd2c0..0f30c49 100644 --- a/src/app/components/offers-received/offers-received.component.ts +++ b/src/app/components/offers-received/offers-received.component.ts @@ -25,17 +25,25 @@ export class OffersReceivedComponent implements OnInit { private loadingCtrl: LoadingController, public bannersDataService: BannersDataService ) { + this.curr_session = this.sessionDataProviderService.session; addEventListener('app-banner-ready', (data:any) => { - console.log("BANNER DATA ", data); + console.log("OFFER BANNER DATA ", data); // debugger; - console.log("BANNER REFRESH SEEN ********* OFFER RECIEVED"); - this.reduceOfferData(); + console.log("OFFER BANNER REFRESH SEEN ********* OFFER RECIEVED"); + // this.reduceOfferData(); + this.getMyOffersData(); + }); + + addEventListener('force-offers-refresh', (data) => { + console.log("OFFER FORCE BANNER DATA ", data); + this.getMyOffersData(); }); this.session_image_server = this.sessionDataProviderService.session_image_server; setInterval(()=>{ - this.reduceOfferData(); + //this.reduceOfferData(); + this.getMyOffersData(); this.session_image_server = this.sessionDataProviderService.session_image_server; }, 35000); } @@ -44,6 +52,7 @@ export class OffersReceivedComponent implements OnInit { this.reduceOfferData(); } + session_image_server:string=''; curr_session:string=''; @@ -158,7 +167,6 @@ export class OffersReceivedComponent implements OnInit { console.log("offerRespData RETURN->", this.offerRespData); const refresh_banner = new CustomEvent("app-banner-refresh-nocache"); dispatchEvent(refresh_banner); -//debugger; if( respType == 100 && this.offerRespData?.contract != undefined && this.offerRespData?.contract !='' ){ // only in acceptance approval this.findRemoveItemInArray(this.responseData.contract) this.router.navigate(['activetask'],{state: this.offerRespData}); @@ -174,9 +182,44 @@ export class OffersReceivedComponent implements OnInit { // console.log("AMEYE OFFER CODE ->", offer_code); //console.log("AMEYE BEFORE ->", this.offerData); this.offerData = this.offerData.filter((item)=> item.contract !== offer_code ) - //console.log("AMEYE AFTER ->", this.offerData); + console.log("OFFER FOR ME AFTER ->", this.offerData); //debugger; this.reduceOfferData(); } + + usrOfferData: { + action:number, member_id: number, uid: string, + sessionid: string, + limit:20, + page:1, offset:number + }; + + + myOffersTotalData:any; + myOffersData: []; + async getMyOffersData(){ + this.usrOfferData = {action:15010, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.curr_session , + limit:20, page:1,offset: 0} + + console.log("OFFER this.usrOfferData DATA ", this.usrOfferData); + + //this.curr_session = this.sessionDataProviderService.session; + this.wrenchService.getMyOffers(this.usrOfferData).subscribe( + myOffersTotalData => { + this.myOffersTotalData = myOffersTotalData; + this.session_image_server = this.myOffersTotalData.session_image_server; + console.log("myOffersTotalData RETURN->", this.myOffersTotalData); + this.myOffersData = this.myOffersTotalData.result_list; + console.log("myOffersData RETURN DATA->", this.myOffersData); + this.total_offers = this.myOffersData.length; + } + ); + + } + + } diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 32768d9..ba97eed 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -71,6 +71,10 @@ export class HomePage implements OnInit { addEventListener("dash_tool_mywallet", () => { this.myWallet(); }); + addEventListener("dash_tool_myoffers", () => { + this.myOffersPage(); + }); + // addEventListener("force_profile_refresh", () => { this.forceProfileRefresh(); @@ -282,6 +286,9 @@ export class HomePage implements OnInit { } } + myOffersPage() { + this.router.navigate(["/joboffers"]); + } myWallet() { this.router.navigate(["tabs/tab4"]); } diff --git a/src/app/pages/joboffers/joboffers.page.scss b/src/app/pages/joboffers/joboffers.page.scss index 6bca693..e7e468c 100644 --- a/src/app/pages/joboffers/joboffers.page.scss +++ b/src/app/pages/joboffers/joboffers.page.scss @@ -1,5 +1,6 @@ ion-content { + .offers_div{ background-color: aliceblue; border-radius: 10px; diff --git a/src/app/pages/joboffers/joboffers.page.ts b/src/app/pages/joboffers/joboffers.page.ts index 67ed306..95866de 100644 --- a/src/app/pages/joboffers/joboffers.page.ts +++ b/src/app/pages/joboffers/joboffers.page.ts @@ -25,9 +25,15 @@ export class JoboffersPage implements OnInit { ) { } ngOnInit() { - // this.getMyOffersData(); + + const offer_refresh = new CustomEvent("force-offers-refresh", {detail: { + offers: this.myOffersData + }}); + dispatchEvent(offer_refresh); + } + onBack() { this.navctr.back(); } diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index 4896935..3d6ad16 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -63,8 +63,8 @@ - Depends on : - + Depends on : + - Duration : - + Market Duration : + - Timeline : - + Timeline Strictness : + Place Task to the Market + (click)="sendOfferToMarket()">Place Task to the Market {{assign_mak_result}}