job history

REMEMBER.txt

@@ -22,6 +22,11 @@ ionic generate page jobactive
 ionic generate component taskactivities
 ionic generate component suggestedlist
 
+
+ionic generate component historyCompletedJobs
+
+
+
 ionic generate component add-family
 
 ionic generate component fastreward

src/app/pages/history/history.module.ts

@@ -7,6 +7,9 @@ import { IonicModule } from '@ionic/angular';
 import { HistoryPageRoutingModule } from './history-routing.module';
 
 import { HistoryPage } from './history.page';
+import {
+  HistoryCompletedJobsComponent
+} from "../../components/history/history-completed-jobs/history-completed-jobs.component";
 
 @NgModule({
   imports: [
@@ -15,6 +18,6 @@ import { HistoryPage } from './history.page';
     IonicModule,
     HistoryPageRoutingModule
   ],
-  declarations: [HistoryPage]
+  declarations: [HistoryPage,HistoryCompletedJobsComponent]
 })
 export class HistoryPageModule {}

src/app/pages/history/history.page.html

@@ -36,11 +36,12 @@
         </ion-col>
       </ion-row>
     </ion-grid>
+
+    <app-history-completed-jobs *ngIf="current_report==='COMPLETED_JOBS';"></app-history-completed-jobs>
+
   </div>
 
 
 
 
-
-
 </ion-content>

src/app/pages/history/history.page.ts

@@ -21,8 +21,11 @@ historyTypes:any=[];
     this.historyTypes= this.sessionDataProviderService.history_types;
   }
 
+  current_report:string = '';
   refreshReport(){
+    this.current_report = this.slected_report_type;
 
+    //alert(this.slected_report_type);
   }
   ngOnInit() {
   }

src/app/pages/mytasks/mytasks.page.html

@@ -153,6 +153,7 @@
         </div>
       </div>
     </div>
+
   </div>
 
 </ion-content>

src/app/services/wrench.service.ts

@@ -248,6 +248,9 @@ export class WrenchService {
         return this.getPostData("activetaskslist", usrData);
     }
 
+    getMyJobsReportData(usrData) {
+        return this.getPostData("tasksreport", usrData);
+    }
     addRecipientAccount(reqData){
         return this.getPostData("addrecipient", reqData);
     }

src/app/store/tasks-data.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import {Router} from "@angular/router";
 import {SessionDataProviderService} from "./session-data-provider.service";
 import {WrenchService} from "../services/wrench.service";
+import { apiConst} from "../../constants/constant";
 
 @Injectable({
   providedIn: 'root'
@@ -11,6 +12,8 @@ export class TasksDataService {
   active_job_count:number =0;
   pastdue_job_count:number =0;
   review_job_count:number =0;
+  completed_job_count:number =0;
+
   session_image_server:string='';
   curr_session:string='';
 
@@ -39,11 +42,13 @@ export class TasksDataService {
   jobsPastDueData: [];
 
   jobsTotalData:any;
+  jobsReportTotalData:any;
+
   jobsData: [];
   async getJobsData(){
 
     this.usrData = {
-      action:11200,
+      action: apiConst.WRENCHBOARD_JOB_USERACTIVE,
       member_id: this.sessionDataProviderService.member_id,
       uid: this.sessionDataProviderService.member_uid,
       sessionid: this.sessionDataProviderService.session ,
@@ -60,7 +65,7 @@ export class TasksDataService {
           console.log("getMyActiveJobsData RETURN->", this.jobsTotalData);
           this.session_image_server = this.jobsTotalData.session_image_server;
 
-          let AllResult = this.jobsTotalData.result_list;;
+          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')
@@ -71,4 +76,33 @@ export class TasksDataService {
         }
     );
   }
+
+    jobsTotalCompletedData:any;
+    jobsCompletedData: [];
+    async getJobsHistoryData(){
+
+        this.usrData = {
+            action: apiConst.WRENCHBOARD_JOB_REPORT,
+            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.getMyJobsReportData(this.usrData).subscribe(
+            jobsReportTotalData => {
+                this.jobsReportTotalData = jobsReportTotalData;
+                this.session_image_server = this.jobsReportTotalData.session_image_server;
+                let AllResult = this.jobsReportTotalData.result_list;
+                this.jobsCompletedData = AllResult.filter((item) => item.status_description == 'COMPLETED')
+                this.completed_job_count = this.jobsCompletedData?.length;
+                // debugger;
+            }
+        );
+    }
+
 }

src/constants/constant.ts

@@ -143,16 +143,16 @@ export const apiConst = {
     WRENCHBOARD_RESOURCE_MYFILES: 11307,
     WRENCHBOARD_MYFILES_LIST: 11309,
 
-    WRENCHBOARD_USER_DELETEACC:  11990,
-    WRENCHBOARD_ACCOUNT_END: 11999,
-    WRENCHBOARD_JOB_POSTAGREE: 13002,
-    WRENCHBOARD_JOB_LISTJOBS:  13005,
-    WRENCHBOARD_JOB_OFFERS:    13006,
-    WRENCHBOARD_JOB_ACTIVE:    13008,
-    WRENCHBOARD_JOB_USERACTIVE:13009,
+    WRENCHBOARD_USER_DELETEACC: 11990,
+    WRENCHBOARD_ACCOUNT_END:    11999,
+    WRENCHBOARD_JOB_POSTAGREE:  13002,
+    WRENCHBOARD_JOB_LISTJOBS:   13005,
+    WRENCHBOARD_JOB_OFFERS:     13006,
+    WRENCHBOARD_JOB_ACTIVE:     13008,
+    WRENCHBOARD_JOB_USERACTIVE: 13009,
 
-    WRENCHBOARD_JOB_CREATEJOB:13010 ,
-    WRENCHBOARD_JOB_DELETEJOB:13011 ,
+    WRENCHBOARD_JOB_CREATEJOB:  13010 ,
+    WRENCHBOARD_JOB_DELETEJOB:  13011 ,
 
     WRENCHBOARD_JOB_GROUP_MEMBER: 13015,
     WRENCHBOARD_JOB_DELETE_GROUPMEMBER:13017,
@@ -180,6 +180,8 @@ export const apiConst = {
 
     WRENCHBOARD_JOB_JOBGROUPS:    13045,
     WRENCHBOARD_JOB_JOBGROUPADD:  13046,
+    WRENCHBOARD_JOB_REPORT:  13047,
+
     WRENCHBOARD_GROUP_START: 12000,
     WRENCHBOARD_GROUP_CREATEGROUP: 12010,
     WRENCHBOARD_GROUP_INVITEGROUP: 12015,