WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

approve kids

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-12-02 10:39:32 -05:00
parent e08207e0f7
commit a932344658
13 changed files with 349 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore-DEL
+14
View File
@@ -0,0 +1,14 @@
node_modules
.angular
.angular/*
*angular/*
.idea
.angular/cache/*
ios
andriod
www
www/*
.angular/cache
.angular/cache/14.2.0/*
# src\environments\*
# src/environments/*
REMEMBER.txt
+6 -1
View File
@@ -27,7 +27,7 @@ ionic generate component fastreward
ionic generate component familypending
ionic generate component InterestCard
ionic generate component PendingSuggested
ionic generate page logout
@@ -62,6 +62,9 @@ ionic generate service waiting-interest
ionic generate component tracking
ionic generate component myjob-offers
ionic generate component add-jobs
ionic generate component add-family
pendingoffers
@@ -98,6 +101,8 @@ ionic generate service loc-trc
ionic generate service recipients
ionic generate service familysuggest-pending
npm i @capacitor/camera @capacitor/filesystem
src/app/accounts/addcredit/addcredit.page.ts
+2 -8
View File
@@ -172,23 +172,17 @@ export class AddcreditPage implements OnInit {
this.wrenchService.topupResultFLTW(completeCredit).subscribe(
competeCreditResult => {
console.log("startCreditResult TOTAL RETURN->", this.startCreditResult);
const event = new Event("app-wallet-refresh");
dispatchEvent(event);
// debugger;
if ( competeCreditResult!=undefined && competeCreditResult.tx_ref!='' && competeCreditResult.confirmation!='' ){
this.credit_confirmation = competeCreditResult.confirmation;
// this.startCreditResult = startCreditResult;
// this.flutterwave_key = this.startCreditResult.flutterwave_key;
// this.isModalOpen = true;
// this.isModalOpenBackdrop= true;
const event = new Event("app-wallet-refresh");
dispatchEvent(event);
}
}
);
// ------------------------------------------------------
}
}
this.flutterwave.closePaymentModal(5)
}
)
src/app/components/pending-suggested/pending-suggested.component.html
+102
View File
@@ -0,0 +1,102 @@
<div class="video" style="background-color: #fbfdfd;" *ngFor="let item of familyPendingData" (click)="processFamilyPending(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item.banner+')'"></div>
<div class="text">
<ion-label class="bold_text name_bg_text">{{item.firstname}} </ion-label>
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
<ion-label class="extra_text"><span class="title">Added:</span> {{item.added}}</ion-label>
<ion-label class="extra_text"><span class="title">Status:</span> {{item.status_text}}</ion-label>
</div>
</div>
<div class="right">
<ion-icon name="chevron-forward-outline" color="medium"></ion-icon>
</div>
</div>
<div *ngIf="isModalOpenBackdrop==true">
<ion-backdrop [visible]="isModalOpenBackdrop"></ion-backdrop>
<ion-modal class="common_modal" [isOpen]="isModalOpen"><ng-template>
<ion-header>
<ion-toolbar>
<ion-title>{{modalTile}}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="setCloseModal()">Close</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content class="ion-padding">
<div>
<div class="t_label">Title</div>
<div class="t_item">{{selectedItem.title}}</div>
<div class="t_label">Description</div>
<div class="t_item">{{selectedItem.description}}</div>
<ion-grid style="background-color: aliceblue; margin-top: 10px; margin-bottom: 10px;">
<ion-row>
<ion-col>
<div class="t_label">Reward</div>
<div class="t_item">real_data_hrere</div>
</ion-col>
<ion-col>
<div class="t_label">Timeline</div>
<div class="t_item">_data_hrere</div>
</ion-col>
</ion-row>
</ion-grid>
<!-- <div class="t_label">Title</div>-->
<!-- <div class="t_item">The_real_data_hrere</div>-->
<div class="t_label">Delivery Details</div>
<div class="t_item">
<ion-textarea label="Fixed label" labelPlacement="fixed" placeholder="Enter text"></ion-textarea>
<!-- <ion-list>-->
<!-- -->
<!-- <ion-item>-->
<!-- <ion-textarea label="Fixed label" labelPlacement="fixed" placeholder="Enter text"></ion-textarea>-->
<!-- </ion-item>-->
<!-- <ion-item>-->
<!-- <ion-textarea label="Stacked label" labelPlacement="stacked" placeholder="Enter text"></ion-textarea>-->
<!-- </ion-item>-->
<!-- </ion-list>-->
</div>
</div>
</ion-content>
<ion-footer>
<ion-grid style="background-color: lightgray;">
<ion-row>
<ion-col>
<ion-button
(click)="setCloseModal()"
shape="round"
size="small"
color="danger">
Close
</ion-button>
</ion-col>
<ion-col></ion-col>
<ion-col>
<ion-button
shape="round"
size="small"
[disabled]="isProcessDisabled"
(click)="processPayment(processor)">Assign Task </ion-button>
</ion-col>
</ion-row>
</ion-grid>
</ion-footer>
</ng-template>
</ion-modal>
</div>
src/app/components/pending-suggested/pending-suggested.component.scss
+17
View File
@@ -0,0 +1,17 @@
.men_image{
min-width: 35px;
}
.t_label{
font-weight: bolder;
width: 100%;
text-align: left;
}
.t_item{
width: 100%;
text-align: left;
margin: 2px 0px 2px 5px;
padding: 2px;
background-color: whitesmoke;
font-size: 14px;
border-radius: 10px;
}
src/app/components/pending-suggested/pending-suggested.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { PendingSuggestedComponent } from './pending-suggested.component';
describe('PendingSuggestedComponent', () => {
let component: PendingSuggestedComponent;
let fixture: ComponentFixture<PendingSuggestedComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ PendingSuggestedComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(PendingSuggestedComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/components/pending-suggested/pending-suggested.component.ts
+78
View File
@@ -0,0 +1,78 @@
import { Component, OnInit } from '@angular/core';
import {NavController} from "@ionic/angular";
import {Router} from "@angular/router";
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {WrenchService} from "../../services/wrench.service";
import {FamilysuggestPendingService} from "../../store/familysuggest-pending.service";
@Component({
selector: 'app-pending-suggested',
templateUrl: './pending-suggested.component.html',
styleUrls: ['./pending-suggested.component.scss'],
})
export class PendingSuggestedComponent implements OnInit {
familyPendingData: [];
constructor( private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
public familysuggestPendingService: FamilysuggestPendingService) {
addEventListener('app-pending-suggested-closemodal', () => {
this.setCloseModal();
});
}
ngOnInit() {
//this.getFamilyPeningData();
this.familyPendingData = this.familysuggestPendingService.familyPendingData;
}
suggestion_total:number=0;
usrData: {
action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
};
//familyPendingTotalData:any;
// familyPendingData: [];
// getFamilyPeningData(){
// this.usrData = {action:22010,
// member_id: this.sessionDataProviderService.member_id,
// uid: this.sessionDataProviderService.member_uid,
// sessionid: this.sessionDataProviderService.session ,
// limit:20, page:1,offset: 0}
//
// this.wrenchService.getFamilyPeningList(this.usrData).subscribe(
// familyPendingTotalData => {
// this.familyPendingTotalData = familyPendingTotalData;
// console.log("familyPendingTotalData RETURN->", this.familyPendingTotalData);
// this.familyPendingData = this.familyPendingTotalData.result_list;
// // debugger;
// console.log("FAMILY familyPendingData DATA->", this.familyPendingData);
// this.suggestion_total = this.familyPendingData.length;
// }
// );
//
// }
isModalOpen:boolean = false;
isModalOpenBackdrop:boolean = false;
selectedItem:any;
modalTile:string='';
processFamilyPending(item){
console.log("SUGGESTED ITEM - >", item);
this.selectedItem = item;
this.modalTile = item.firstname+ ' Suggested Task';
this.isModalOpen = true;
this.isModalOpenBackdrop= true;
}
setCloseModal(){
this.isModalOpen = false;
setTimeout(()=>{
this.isModalOpenBackdrop= false;
},1000);
}
}
src/app/pages/family/family.module.ts
+2 -1
View File
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { FamilyPageRoutingModule } from './family-routing.module';
import { FamilyPage } from './family.page';
import {PendingSuggestedComponent} from "../../components/pending-suggested/pending-suggested.component";
@NgModule({
imports: [
@@ -15,6 +16,6 @@ import { FamilyPage } from './family.page';
IonicModule,
FamilyPageRoutingModule
],
declarations: [FamilyPage]
declarations: [FamilyPage,PendingSuggestedComponent]
})
export class FamilyPageModule {}
src/app/pages/family/family.page.html
+17 -15
View File
@@ -125,22 +125,24 @@
<!-- <ion-label class="color">See all</ion-label>-->
</div>
<div class="video" *ngFor="let item of familyPendingData" >
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item.banner+')'"></div>
<app-pending-suggested></app-pending-suggested>
<div class="text">
<ion-label class="bold_text name_bg_text">{{item.firstname}} </ion-label>
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
<ion-label class="extra_text"><span class="title">Added:</span> {{item.added}}</ion-label>
<ion-label class="extra_text"><span class="title">Status:</span> {{item.status_text}}</ion-label>
</div>
</div>
<div class="right">
<ion-icon name="chevron-forward-outline" color="medium"></ion-icon>
</div>
</div>
<!-- <div class="video" *ngFor="let item of familyPendingData" >-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item.banner+')'"></div>-->
<!-- <div class="text">-->
<!-- <ion-label class="bold_text name_bg_text">{{item.firstname}} </ion-label>-->
<!-- <ion-label class="bold_text">{{item.title}}</ion-label>-->
<!-- <ion-label class="grey_text">{{item.description}}</ion-label>-->
<!-- <ion-label class="extra_text"><span class="title">Added:</span> {{item.added}}</ion-label>-->
<!-- <ion-label class="extra_text"><span class="title">Status:</span> {{item.status_text}}</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <ion-icon name="chevron-forward-outline" color="medium"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="reviw_list" *ngFor="let item of familyPendingData">-->
<!-- <div class="profile">-->
src/app/pages/family/family.page.ts
+28 -16
View File
@@ -3,6 +3,7 @@ import {NavController} from "@ionic/angular";
import {Router} from "@angular/router";
import { WrenchService } from 'src/app/services/wrench.service';
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {FamilysuggestPendingService} from "../../store/familysuggest-pending.service";
@Component({
@@ -24,20 +25,25 @@ export class FamilyPage implements OnInit {
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
private wrenchService: WrenchService,
public familysuggestPendingService: FamilysuggestPendingService
) {
}
member_uid:string='';
ngOnInit() {
this.familysuggestPendingService.getFamilyPeningData(); // refresh data in store
this.member_uid= this.sessionDataProviderService.member_uid
this.getFamilyData();
this.familyPendingData = this.familysuggestPendingService.familyPendingData;
this.suggestion_total = this.familysuggestPendingService.suggestionTotal;
this.getFamilyPeningData();
this.getFamilyActiveJobsData();
}
onBack() {
dispatchEvent(new Event("app-pending-suggested-closemodal"));
this.navctr.back();
}
@@ -91,22 +97,28 @@ export class FamilyPage implements OnInit {
familyPendingTotalData:any;
familyPendingData: [];
getFamilyPeningData(){
this.usrData = {action:22010,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
sessionid: this.sessionDataProviderService.session ,
limit:20, page:1,offset: 0}
this.wrenchService.getFamilyPeningList(this.usrData).subscribe(
familyPendingTotalData => {
this.familyPendingTotalData = familyPendingTotalData;
console.log("familyPendingTotalData RETURN->", this.familyPendingTotalData);
this.familyPendingData = this.familyPendingTotalData.result_list;
// debugger;
console.log("FAMILY familyPendingData DATA->", this.familyPendingData);
this.suggestion_total = this.familyPendingData.length;
}
);
setTimeout(()=>{
this.familyPendingData = this.familysuggestPendingService.familyPendingData;
this.suggestion_total = this.familysuggestPendingService.suggestionTotal;
}, 5000);
// this.usrData = {action:22010,
// member_id: this.sessionDataProviderService.member_id,
// uid: this.sessionDataProviderService.member_uid,
// sessionid: this.sessionDataProviderService.session ,
// limit:20, page:1,offset: 0}
//
// this.wrenchService.getFamilyPeningList(this.usrData).subscribe(
// familyPendingTotalData => {
// this.familyPendingTotalData = familyPendingTotalData;
// console.log("familyPendingTotalData RETURN->", this.familyPendingTotalData);
// this.familyPendingData = this.familyPendingTotalData.result_list;
// // debugger;
// console.log("FAMILY familyPendingData DATA->", this.familyPendingData);
// this.suggestion_total = this.familyPendingData.length;
// }
// );
}
src/app/pages/joblist/joblist.page.ts
+1
View File
@@ -31,6 +31,7 @@ export class JoblistPage implements OnInit {
}
onBack() {
this. setCloseModal();
this.navctr.back();
}
src/app/store/familysuggest-pending.service.spec.ts
+16
View File
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { FamilysuggestPendingService } from './familysuggest-pending.service';
describe('FamilysuggestPendingService', () => {
let service: FamilysuggestPendingService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(FamilysuggestPendingService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/store/familysuggest-pending.service.ts
+42
View File
@@ -0,0 +1,42 @@
import { Injectable } from '@angular/core';
import {SessionDataProviderService} from "./session-data-provider.service";
import {WrenchService} from "../services/wrench.service";
@Injectable({
providedIn: 'root'
})
export class FamilysuggestPendingService {
constructor(
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) {
//this.getFamilyPeningData();
}
usrData: {
action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
};
suggestionTotal:number = 0;
familyPendingTotalData:any;
familyPendingData: [];
async getFamilyPeningData(){
this.usrData = {action:22010,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
sessionid: this.sessionDataProviderService.session ,
limit:20, page:1,offset: 0}
this.wrenchService.getFamilyPeningList(this.usrData).subscribe(
familyPendingTotalData => {
this.familyPendingTotalData = familyPendingTotalData;
console.log("familyPendingTotalData RETURN->", this.familyPendingTotalData);
this.familyPendingData = this.familyPendingTotalData.result_list;
// debugger;
console.log("FAMILY familyPendingData DATA->", this.familyPendingData);
this.suggestionTotal = this.familyPendingData.length;
}
);
}
}