From bbb58332ac9d2ee819b611cb66d11841985d63fc Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 9 Dec 2023 11:09:07 -0500
Subject: [PATCH] Notification fix

---
 REMEMBER.txt                                  |  4 +-
 .../pages/notification/notification.page.html |  2 +-
 src/app/services/wrench.service.ts            |  4 +-
 src/app/store/jobgroup-data.service.spec.ts   | 16 ++++++++
 src/app/store/jobgroup-data.service.ts        | 38 +++++++++++++++++++
 5 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 src/app/store/jobgroup-data.service.spec.ts
 create mode 100644 src/app/store/jobgroup-data.service.ts

diff --git a/REMEMBER.txt b/REMEMBER.txt
index 012ccb3..3f49235 100644
--- a/REMEMBER.txt
+++ b/REMEMBER.txt
@@ -25,6 +25,8 @@ ionic generate component suggestedlist
 ionic generate component fastreward
 
 ionic generate component familypending
+ionic generate component job-group
+
 
 ionic generate component InterestCard
 ionic generate component PendingSuggested
@@ -78,7 +80,7 @@ ionic generate service tasks-data
 ionic generate service banners-data
 ionic generate service usersoffers-data
 ***ionic generate service pendingjob-data
-
+ionic generate service jobgroup-data
 
 https://masteringionic.com/blog/working-with-capacitor-googlemaps-in-ionic
 ionic generate interface interfaces/location
diff --git a/src/app/pages/notification/notification.page.html b/src/app/pages/notification/notification.page.html
index 1a5daa1..e469e53 100644
--- a/src/app/pages/notification/notification.page.html
+++ b/src/app/pages/notification/notification.page.html
@@ -19,7 +19,7 @@
     <div class="flex" *ngFor="let item of notificationData">
       <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/notifications/'+item.icon+')'"></div>
       <div class="text">
-        <ion-label class="bold_text">{{item.date}}</ion-label>
+        <ion-label class="bold_text">{{item.date | date}}</ion-label>
         <ion-label class="grey_text">{{item.title}}</ion-label>
       </div>
     </div>
diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts
index b17ef8b..56b0db6 100644
--- a/src/app/services/wrench.service.ts
+++ b/src/app/services/wrench.service.ts
@@ -179,7 +179,9 @@ export class WrenchService {
         return this.getPostData("getwallets", usrData);
     }
 
-
+    jobGroupData(reqData){
+        return this.getPostData("jobgrouplist", reqData);
+    }
     getFamilyWallets(reqData) {
         return this.getPostData("familywallet", reqData);
     }
diff --git a/src/app/store/jobgroup-data.service.spec.ts b/src/app/store/jobgroup-data.service.spec.ts
new file mode 100644
index 0000000..c429bc8
--- /dev/null
+++ b/src/app/store/jobgroup-data.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { JobgroupDataService } from './jobgroup-data.service';
+
+describe('JobgroupDataService', () => {
+  let service: JobgroupDataService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(JobgroupDataService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/store/jobgroup-data.service.ts b/src/app/store/jobgroup-data.service.ts
new file mode 100644
index 0000000..77f0257
--- /dev/null
+++ b/src/app/store/jobgroup-data.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import {SessionDataProviderService} from "./session-data-provider.service";
+import {WrenchService} from "../services/wrench.service";
+import {LoadingController} from "@ionic/angular";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class JobgroupDataService {
+
+  constructor(public sessionDataProviderService: SessionDataProviderService,
+              private wrenchService: WrenchService,
+              private loadingCtrl: LoadingController) { }
+
+
+  jobGroupDataTotalResult: any;
+  jobGroupDataResult: any;
+
+  async getjobGroupData(){
+
+    var reqData = {
+      action:13025,
+      member_id: this.sessionDataProviderService.member_id,
+      uid: this.sessionDataProviderService.member_uid,
+      sessionid: this.sessionDataProviderService.session,
+
+    };
+
+    this.wrenchService.jobGroupData(reqData).subscribe(
+        jobGroupDataTotalResult => {
+          this.jobGroupDataTotalResult = jobGroupDataTotalResult;
+          console.log("jobGroupDataTotalResult  RETURN->", this.jobGroupDataTotalResult);
+          this.jobGroupDataResult = this.jobGroupDataTotalResult.result_list;
+        }
+    );
+  }
+
+}