diff --git a/src/app/components/job-group/job-group.component.html b/src/app/components/job-group/job-group.component.html
index c52bad6..c3870b9 100644
--- a/src/app/components/job-group/job-group.component.html
+++ b/src/app/components/job-group/job-group.component.html
@@ -8,7 +8,12 @@
- Create a group
+ Create a group
@@ -34,6 +39,7 @@
+Group
@@ -55,13 +61,13 @@
Delete
-
- Add Member
-
+
+ Add Member
+
@@ -70,4 +76,180 @@
+
+
+
+
+
+ Job Groups
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{group_created_result}}
+
+
+
+ Add Group
+
+
+
+
+
+
+
+ {{item.group_name}}
+
+
+ Delete
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Groups Members
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{group_created_result}}
+
+
+
+ Add Group
+
+
+
+
+
+
+
+ {{item.firstname}} {{item.lastname}}
+ {{item.email}}
+
+
+
+ Delete
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/job-group/job-group.component.ts b/src/app/components/job-group/job-group.component.ts
index 7f0c303..d22bfcd 100644
--- a/src/app/components/job-group/job-group.component.ts
+++ b/src/app/components/job-group/job-group.component.ts
@@ -11,6 +11,8 @@ import {JobgroupDataService} from "../../store/jobgroup-data.service";
})
export class JobGroupComponent implements OnInit {
@ViewChild('job_group') job_group;
+@ViewChild('new_group_name') new_group_name;
+
@Input('jobData') jobData:any;
constructor( public sessionDataProviderService: SessionDataProviderService,
@@ -25,6 +27,8 @@ export class JobGroupComponent implements OnInit {
group_count:number = 0;
group_member_count:number = 0;
+ presentingElement = null;
+
ngOnInit() {
this.jobgroupDataService.getjobGroupData();
@@ -34,6 +38,8 @@ export class JobGroupComponent implements OnInit {
},
3000
);
+ this.presentingElement = document.querySelector('.ion-page');
+
}
refreshData(){
@@ -143,8 +149,92 @@ export class JobGroupComponent implements OnInit {
assigResult:any;
assign_ind_result:string='';
assign_mak_result:string='';
+ isDisabled:boolean=true;
+ group_created_result: string="";
+ createGroupResult:any;
+
+ isModalOpen:boolean = false;
+ isModalOpenBackdrop:boolean = false;
+
+ setCloseModal(){
+ this.isModalOpen = false;
+ setTimeout(()=>{
+ this.isModalOpenBackdrop= false;
+ },1000);
+ }
+
addGroup(){
+ this.isModalOpen = true;
+ this.isModalOpenBackdrop= true;
+ }
+
+ inVerifyNewGroup(){
+ // debugger;
+ this.isDisabled= true;
+ if (this.new_group_name.length> 5){
+ this.isDisabled= false;
+ }
+ }
+
+ reqCreateGroupData: {
+ action:number,
+ member_id: number,
+ uid: string,
+ sessionid: string,
+ group_name: string
+ };
+
+ processAddGroup(){
+ this.isDisabled= true;
+ this.reqCreateGroupData ={
+ action:13025,
+ member_id: this.sessionDataProviderService.member_id,
+ uid: this.sessionDataProviderService.member_uid,
+ sessionid: this.sessionDataProviderService.session,
+ group_name: this.new_group_name
+ };
+
+ this.wrenchService.jobGroupAdd(this.reqCreateGroupData).subscribe(
+ createGroupResult => {
+ this.createGroupResult = createGroupResult;
+ console.log("createGroupResult RETURN->", this.createGroupResult);
+ if ( this.createGroupResult != undefined && this.createGroupResult.internal_return > 0){
+ this.group_created_result = "New group added.";
+ this.new_group_name='';
+ this.jobgroupDataService.getjobGroupData();
+ //const event = new Event("app-myjob-offers-refresh");
+ // Dispatch the event.
+ // dispatchEvent(event);
+ setTimeout(() => {
+ this.group_created_result ='';
+ }, 3000);
+ }
+ else
+ {
+
+ }
+ }
+ );
}
+
+ setCloseMemberModal(){
+ this.isModalMemberOpen = false;
+ setTimeout(()=>{
+ this.isModalMemberOpenBackdrop= false;
+ },1000);
+ }
+
+ isModalMemberOpen:boolean = false;
+ isModalMemberOpenBackdrop:boolean = false;
+ addGroupMember(){
+ this.isModalMemberOpen = true;
+ this.isModalMemberOpenBackdrop= true;
+ }
+
+ // jobGroupAdd(reqData){
+ // return this.getPostData("jobgroupadd", reqData);
+ // }
+
}
diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts
index fef50e8..aa7bde4 100644
--- a/src/app/services/wrench.service.ts
+++ b/src/app/services/wrench.service.ts
@@ -204,6 +204,11 @@ export class WrenchService {
jobGroupData(reqData){
return this.getPostData("jobgrouplist", reqData);
}
+
+ jobGroupAdd(reqData){
+ return this.getPostData("jobgroupadd", reqData);
+ }
+
getFamilyWallets(reqData) {
return this.getPostData("familywallet", reqData);
}