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

home icons

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-02-10 14:37:27 -05:00
parent 9afa27da5f
commit 293761d49b
14 changed files with 554 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
REMEMBER.txt
-2
View File
@@ -22,8 +22,6 @@ ionic generate page jobactive
ionic generate component taskactivities
ionic generate component suggestedlist
ionic generate component extra2box
ionic generate page addjob
src/app/components/jobowner-dash/jobowner-dash.component.html
+3
View File
@@ -0,0 +1,3 @@
<p>
<!-- jobowner-dash works!-->
</p>
src/app/components/jobowner-dash/jobowner-dash.component.scss
View File
src/app/components/jobowner-dash/jobowner-dash.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { JobownerDashComponent } from './jobowner-dash.component';
describe('JobownerDashComponent', () => {
let component: JobownerDashComponent;
let fixture: ComponentFixture<JobownerDashComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ JobownerDashComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(JobownerDashComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/components/jobowner-dash/jobowner-dash.component.ts
+14
View File
@@ -0,0 +1,14 @@
import {Component, Input, OnInit} from '@angular/core';
@Component({
selector: 'app-jobowner-dash',
templateUrl: './jobowner-dash.component.html',
styleUrls: ['./jobowner-dash.component.scss'],
})
export class JobownerDashComponent implements OnInit {
@Input('bannerData') bannerData:any;
constructor() { }
ngOnInit() {}
}
src/app/components/workers-dash/workers-dash.component.html
+96
View File
@@ -0,0 +1,96 @@
<div style="height: 320px;" *ngIf="BANNER_MODE == 3; ">
<ion-grid class="extra-grid">
<ion-row>
<ion-col class="ext-col" (click)="activeTasks()">
<div class="ext-in bg">
<div class="ban-text">Go to active task(s)</div>
<div class="small-text">You have {{active_job_count}} active task(s)</div>
</div>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="ext-col" (click)="pastDue()">
<div class="ext-in l past-due">
<div class="ban-text">{{pastdue_job_count}} Past Due Task(s) </div>
</div>
</ion-col>
<ion-col class="ext-col" (click)="reView()">
<div class="ext-in r review">
<div class="ban-text">{{review_job_count}} Task(s) in Review</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<div style="height: 160px;" *ngIf="BANNER_MODE == 1 && active_job_count > 0 ;" >
<ion-grid class="extra-grid">
<ion-row>
<ion-col class="ext-col" (click)="pastDue()">
<div class="ban-text">You have {{active_job_count}} active task(s)</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<div style="height: 160px;" *ngIf="BANNER_MODE == 2 && active_job_count == 0 ;" >
<ion-grid class="extra-grid">
<ion-row>
<ion-col class="ext-col" (click)="pastDue()">
<div class="ext-in l past-due">
<div class="ban-text">{{pastdue_job_count}} Past Due Task(s) </div>
</div>
</ion-col>
<ion-col class="ext-col" (click)="reView()">
<div class="ext-in r review">
<div class="ban-text">{{review_job_count}} Task(s) in Review</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<!--<ion-grid class="extra-grid">-->
<!-- <ion-row>-->
<!-- <ion-col class="ext-col" (click)="lAction()">-->
<!-- <div class="ext-in l">-->
<!-- <div class="ban-text">Add Kids</div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- <ion-col class="ext-col" (click)="rAction()">-->
<!-- <div class="ext-in r">-->
<!-- <div class="ban-text">Wallet</div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<!--</ion-grid>-->
<div
*ngFor="let item of bannerData; let i = index"
class="bg_white {{item.short_style}} {{item.card_type}} "
(click)="onDetails(item)"
>
<div class="list">
<div *ngIf="item.banner_location === 'URL' ">
<!-- code to render a large video block-->
<div
class="bg_image back_image banner_image"
[style.backgroundImage]="'url('+item.banner+')'"
></div>
</div>
<div *ngIf="item.banner_location === 'LOCAL' ">
<div
class="bg_image back_image banner_image"
[style.backgroundImage]="'url(assets/images/'+item.banner+')'"
></div>
</div>
<div class="detail">
<ion-label class="name">{{item.short_title}}</ion-label>
<ion-label class="bg_text ovf" style="background-color: white"
>{{item.short_description}}</ion-label
>
</div>
</div>
<!-- <ion-icon slot="end" name="bookmark-outline" class="save" color="primary"></ion-icon>-->
</div>
src/app/components/workers-dash/workers-dash.component.scss
+223
View File
@@ -0,0 +1,223 @@
.p-w{
height:180px;
background-color: rgba(46, 9, 52, 0.47);
border-radius: 10px;
box-shadow: 1px 1px lightgray;
}
.extra-grid{
margin: 10px 0px 10px 0px;
padding: 0px;
height: 160px;
.ext-col{
padding: 5px;
//background-color: #2dd36f;
height: 160px;
.ext-in{
&.bg{
background-image: url("https://www.wrenchboard.com/assets/images/apps/xt/task.png");
background-size: cover;
}
&.l{
background-color: #1f1f3b;
//background-image: linear-gradient(to right, #1f1f3b, #152f49,#152f49,#1f1f3b);
background-size: cover;
color: white;
&.past-due{
background-image: url("https://www.wrenchboard.com/assets/images/apps/xt/pastdue.png");
background-color: darkred;
}
}
&.r{
background-color: #866508;
//background-image: linear-gradient(to right, #866508, #906D0B,#866508);
// background-image: url("https://www.wrenchboard.com/assets/images/apps/xt/wallet.png");
background-size: cover;
color: white;
&.review{
background-image: url("https://www.wrenchboard.com/assets/images/apps/xt/review.png");
background-color: #866508;
}
}
background-color: antiquewhite;
height: 150px;
border-radius: 10px;
box-shadow: 1px 1px lightgray;
text-align: center;
.ban-text{
font-size: 24px;
font-weight: bolder;
padding-top: 60px;
padding-left: 20px;
// color: #8b198e;
}
}
}
}
.bg_white {
display: flex;
align-items: flex-start;
background-color: white;
padding: 5px;
box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1);
border-radius: 10px;
margin-bottom: 20px;
&.OFFERS{
background-color: #186875;
.name{
color: white;
}
.bg_text{
--background-color: white;
}
}
&.INTEREST{
background-color: #6b6b08;
.name{
color: white;
}
}
&.PASTDUEJOB{
background-color: #e0b4b4;
}
&.REVIEWJOB{
background-color: #dbefda;
}
&.bg_alice{
background-color: aliceblue;
padding: 1px;
ion-row{
padding:1px;
}
.detail{
font-size: 14px;
font-weight: bolder;
margin-top: 15px;
}
}
.list {
display: flex;
align-items: center;
width: 100%;
.back_image {
height: 95px;
width: 95px;
border-radius: 10px;
}
.banner_image{
min-width: 90px;
}
.detail {
width: 100%;
margin-left: 10px;
.bg_text {
color: var(--ion-color-primary);
background-color: rgba(246, 246, 248, 0.9);
font-size: 12px;
padding: 2px 5px;
border-radius: 5px;
//width: 80px;
text-align: center;
height: 38px;
width: 100%;
overflow: hidden;
.ovf{
overflow: hidden;
}
}
.name {
font-family: 'bold';
margin-top: 5px;
padding: 5px;
}
.price {
margin-top: 3px;
color: var(--ion-color-primary);
font-family: 'semi-bold';
}
.row {
display: flex;
align-items: center;
margin-top: 3px;
ion-icon {
font-size: 18px;
}
.small {
margin-left: 8px;
color: grey;
font-size: 14px;
}
}
}
}
.blog_list {
//background-color: lightgrey !important;
display: flex;
align-items: center;
.back_image {
height: 95px;
width: 95px !important;
border-radius: 10px;
}
.banner_image{
min-width: 90px;
//float: right;
//display: flex;
//justify-content: flex-end
}
.detail {
margin-left: 10px;
.bg_text {
color: var(--ion-color-primary);
background-color: #dfe1f3;
font-size: 12px;
padding: 2px 5px;
border-radius: 5px;
//width: 80px;
text-align: center;
}
.name {
font-family: 'bold';
margin-top: 5px;
}
.price {
margin-top: 3px;
color: var(--ion-color-primary);
font-family: 'semi-bold';
}
.row {
display: flex;
align-items: center;
margin-top: 3px;
ion-icon {
font-size: 18px;
}
.small {
margin-left: 8px;
color: grey;
font-size: 14px;
}
}
}
}
}
src/app/components/workers-dash/workers-dash.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { WorkersDashComponent } from './workers-dash.component';
describe('WorkersDashComponent', () => {
let component: WorkersDashComponent;
let fixture: ComponentFixture<WorkersDashComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ WorkersDashComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(WorkersDashComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/components/workers-dash/workers-dash.component.ts
+143
View File
@@ -0,0 +1,143 @@
import {Component, Input, OnInit} from '@angular/core';
import {TasksDataService} from "../../store/tasks-data.service";
import {UsersoffersDataService} from "../../store/usersoffers-data.service";
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {Router} from "@angular/router";
@Component({
selector: 'app-workers-dash',
templateUrl: './workers-dash.component.html',
styleUrls: ['./workers-dash.component.scss'],
})
export class WorkersDashComponent implements OnInit {
@Input('bannerData') bannerData:any;
active_offers_count:number =0;
active_job_count:number =0;
pastdue_job_count:number =0;
review_job_count:number =0;
session_image_server:string='';
curr_session:string='';
jobsTotalInReviewData:any;
jobsInReviewData: [];
jobsTotalPastDueData:any;
jobsPastDueData: [];
jobsTotalData:any;
jobsData: [];
myOffersData :[];
BANNER_MODE: number =0;
constructor(
public tasksDataService:TasksDataService,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
public usersoffersDataService:UsersoffersDataService) {
this.refreshJobsData();
}
ngOnInit() {}
async refreshJobsData(){
this.BANNER_MODE = 0;
this.jobsData = this.tasksDataService.jobsData;
this.jobsPastDueData = this.tasksDataService.jobsPastDueData;
this.jobsInReviewData = this.tasksDataService.jobsInReviewData;
this.session_image_server = this.tasksDataService.session_image_server;
this.active_job_count = this.tasksDataService.active_job_count;
this.pastdue_job_count = this.tasksDataService.pastdue_job_count;
this.review_job_count = this.tasksDataService.review_job_count;
this.myOffersData = this.usersoffersDataService.myOffersData;
this.active_offers_count = this.usersoffersDataService.total_offers;
if ( this.active_job_count> 0 ){
this.BANNER_MODE = this.BANNER_MODE +1;
}
if ( this.pastdue_job_count > 0 ){
this.BANNER_MODE = this.BANNER_MODE +1;
}
if ( this.review_job_count > 0 ){
this.BANNER_MODE = this.BANNER_MODE +1;
}
console.log("Any OFFERRRR-> :::: ",this.active_offers_count);
console.log("Any BANNER_MODE-> :::: ",this.BANNER_MODE);
}
async getJobsData(){
this.curr_session = this.sessionDataProviderService.session;
var interval = setInterval( ()=> {
this.refreshJobsData();
}, 5000);
}
pastDue(){
//this.router.navigate(['activetask'],{state: item});
this.router.navigate(['tabs/mytasks']);
}
reView(){
///tabs/mytasks
this.router.navigate(['tabs/mytasks']);
}
activeTasks(){
this.router.navigate(['tabs/mytasks']);
}
onDetails(item) {
// var pageToNavigate = 'detail';
var pageToNavigate = '';
// alert(item.link_path);
switch (item.link_path){
case 'referral':
pageToNavigate = 'invite';
break;
case 'mytask': // offers waiting to start
pageToNavigate = 'joboffers';
break;
case 'my-coupon':
pageToNavigate = 'mycoupons';
break;
case 'blog-page':
// this.blogDetails(this.getOneBlog(item));
// this.getOneBlog(item);
break;
case 'my-review-jobs':
pageToNavigate = 'jobmanager';
break
case 'my-pastdue-jobs':
pageToNavigate = 'jobmanager';
break
case 'pend-interest':
pageToNavigate ='pendinterest';
break;
case 'offer-interest':
pageToNavigate = 'jobinterest';
break
case 'acc-family':
pageToNavigate = 'family';
break;
}
if(pageToNavigate !=''){
this.router.navigate([pageToNavigate],{state: item});
}
}
}
src/app/pages/home/home.module.ts
+5 -1
View File
@@ -20,6 +20,8 @@ import {FamiliyNotaskComponent} from "../../components/familycards/familiy-notas
import {FamiliyAddfamilyComponent} from "../../components/familycards/familiy-addfamily/familiy-addfamily.component";
import {FamiliyAllowanceComponent} from "../../components/familycards/familiy-allowance/familiy-allowance.component";
import {DashToptoolComponent} from "../../components/dash-toptool/dash-toptool.component";
import {JobownerDashComponent} from "../../components/jobowner-dash/jobowner-dash.component";
import {WorkersDashComponent} from "../../components/workers-dash/workers-dash.component";
// @NgModule({
// schemas: [CUSTOM_ELEMENTS_SCHEMA]
@@ -39,7 +41,9 @@ import {DashToptoolComponent} from "../../components/dash-toptool/dash-toptool.c
FamiliyDashComponent,FamiliyNokidsComponent,
FamiliyNotaskComponent,FamiliyAddfamilyComponent,
FamiliyAllowanceComponent,
DashToptoolComponent
DashToptoolComponent,
JobownerDashComponent,
WorkersDashComponent
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
src/app/pages/home/home.page.html
+20 -15
View File
@@ -89,29 +89,29 @@
</ion-card-content>
</ion-card>
<div
*ngFor="let item of bannerData; let i = index"
class="bg_white {{item.short_style}} {{item.card_type}} "
(click)="onDetails(item)"
*ngFor="let item of bannerData; let i = index"
class="bg_white {{item.short_style}} {{item.card_type}} "
(click)="onDetails(item)"
>
<div class="list">
<div *ngIf="item.banner_location === 'URL' ">
<!-- code to render a large video block-->
<div
class="bg_image back_image banner_image"
[style.backgroundImage]="'url('+item.banner+')'"
class="bg_image back_image banner_image"
[style.backgroundImage]="'url('+item.banner+')'"
></div>
</div>
<div *ngIf="item.banner_location === 'LOCAL' ">
<div
class="bg_image back_image banner_image"
[style.backgroundImage]="'url(assets/images/'+item.banner+')'"
class="bg_image back_image banner_image"
[style.backgroundImage]="'url(assets/images/'+item.banner+')'"
></div>
</div>
<div class="detail">
<ion-label class="name">{{item.short_title}}</ion-label>
<ion-label class="bg_text ovf" style="background-color: white"
>{{item.short_description}}</ion-label
>{{item.short_description}}</ion-label
>
</div>
</div>
@@ -119,10 +119,18 @@
</div>
</div>
<div *ngIf="home_dash_type=='FAMILY_PARENT_DASH'; ">
<app-familiy-dash [bannerData]="bannerData"></app-familiy-dash>
<!-- <app-tracking></app-tracking>-->
</div>
<div *ngIf="home_dash_type=='FAMILY_PARENT_DASH'; ">
<app-familiy-dash [bannerData]="bannerData"></app-familiy-dash>
<!-- <app-tracking></app-tracking>-->
</div>
<div *ngIf="home_dash_type=='JOBOWNER_HOME_DASH'; ">
<app-jobowner-dash [bannerData]="bannerData"></app-jobowner-dash>
</div>
<div *ngIf="home_dash_type=='WORKER_HOME_DASH'; ">
<app-workers-dash [bannerData]="bannerData"></app-workers-dash>
</div>
<div *ngIf="homebannerCount <3;">
<!-- <div class="offer">-->
@@ -130,9 +138,6 @@
<!-- </div>-->
</div>
<div class="flex">
<ion-label class="bold_text">Recent Blog</ion-label>
<ion-label class="color_text" (click)="allBlog()">See all</ion-label>
src/app/pages/inbox/inbox.page.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export class InboxPage implements OnInit {
onMessage() {
this.router.navigate(['message']);
}
activeSeleted(item) {
activeSelected(item) {
this.router.navigate(['activetask'],{state: item});
}
src/app/pages/my-course/my-course.page.html
-1
View File
@@ -26,7 +26,6 @@
<div class="lesson">
<div class="flex">
<ion-label class="bold">Available Task(s)</ion-label>
<!-- <ion-label class="color">.</ion-label>-->
</div>
<div class="video" *ngFor="let item of jobsData;" (click)="viewMarketItem( item )">
<div class="left">
src/app/pages/mytasks/mytasks.page.ts
+1 -29
View File
@@ -40,7 +40,7 @@ export class MytasksPage implements OnInit {
startOfferPage(){
this.router.navigate(['joboffers']);
}
activeSeleted(item) {
activeSelected(item) {
this.router.navigate(['activetask'],{state: item});
}
@@ -88,34 +88,6 @@ export class MytasksPage implements OnInit {
this.refreshJobsData();
}, 5000);
// this.usrData = {
// action:11200,
// member_id: this.sessionDataProviderService.member_id,
// uid: this.sessionDataProviderService.member_uid,
// sessionid: this.sessionDataProviderService.session ,
// limit:20,
// page:0,
// offset:0,
// job_mode: 'ACTIVE',
// allstatus: 100
// };
// this.curr_session = this.sessionDataProviderService.session;
// this.wrenchService.getMyActiveJobsData(this.usrData).subscribe(
// jobsTotalData => {
// this.jobsTotalData = jobsTotalData;
// console.log("getMyActiveJobsData RETURN->", this.jobsTotalData);
// this.session_image_server = this.jobsTotalData.session_image_server;
//
// let AllResult = this.jobsTotalData.result_list;;
// this.jobsData = AllResult.filter((item) => item.status_description == 'ACTIVE')
// this.jobsPastDueData =AllResult.filter((item) => item.status_description == 'PASTDUE')
// this.jobsInReviewData =AllResult.filter((item) => item.status_description == 'REVIEW')
// this.active_job_count = this.jobsData.length;
// this.review_job_count = this.jobsInReviewData.length;
// this.pastdue_job_count = this.jobsPastDueData.length;
// // debugger;
// }
// );
}