From 22fdfbd433451bc0918dff57912ca7bfa09a98b7 Mon Sep 17 00:00:00 2001 From: GSuma21 <21gsuma@gmail.com> Date: Tue, 23 Jan 2024 18:13:22 +0530 Subject: [PATCH 1/3] issue #feat prod issues resolved and delete functionality done in manage session page --- .../admin-workspace/admin-workapce.service.ts | 25 ++++++++++++++++++- .../manage-session.component.ts | 11 +++++--- src/app/pages/language/language.page.ts | 2 +- src/app/shared/shared.module.ts | 6 ++--- src/deployment/ansible.yml | 2 +- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/app/core/services/admin-workspace/admin-workapce.service.ts b/src/app/core/services/admin-workspace/admin-workapce.service.ts index 80b12f84..ffc5c3a9 100644 --- a/src/app/core/services/admin-workspace/admin-workapce.service.ts +++ b/src/app/core/services/admin-workspace/admin-workapce.service.ts @@ -2,12 +2,17 @@ import { Injectable } from '@angular/core'; import { HttpService } from '../http/http.service'; import { urlConstants } from '../../constants/urlConstants'; import * as _ from 'lodash-es'; +import { UtilService } from '../util/util.service'; +import { CommonRoutes } from 'src/global.routes'; +import { SessionService } from '../session/session.service'; +import { ToastService } from '../toast.service'; +import { Router } from '@angular/router'; @Injectable({ providedIn: 'root' }) export class AdminWorkapceService { - constructor(private httpService: HttpService) { } + constructor(private httpService: HttpService,private utilService:UtilService, private sessionService:SessionService,private toast:ToastService, private router:Router) { } async createdSessionBySessionManager(obj:any) { const config = { @@ -22,6 +27,24 @@ export class AdminWorkapceService { return false } } + deleteSession(id) { + let msg = { + header: 'DELETE_SESSION', + message: 'DELETE_CONFIRM_MSG', + cancel: "DON'T_DELETE", + submit: 'YES_DELETE' + } + this.utilService.alertPopup(msg).then(async data => { + if (data) { + let result = await this.sessionService.deleteSession(id); + if (result.responseCode == "OK") { + this.toast.showToast(result.message, "success"); + this.router.navigate([`/${CommonRoutes.TABS}/${CommonRoutes.MANAGE_SESSION}`], { replaceUrl: true }); + } + } + }).catch(error => { }) + } + // async downloadcreatedSessionsBySessionManager(obj:any){ // const config = { diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts index 537bbddc..8431d036 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.ts +++ b/src/app/modules/admin/components/manage-session/manage-session.component.ts @@ -6,6 +6,8 @@ import { AdminWorkapceService } from 'src/app/core/services/admin-workspace/admi import { CommonRoutes } from 'src/global.routes'; import { ModalController } from '@ionic/angular'; import { FilterPopupComponent } from 'src/app/shared/components/filter-popup/filter-popup.component'; +import { UtilService } from 'src/app/core/services'; +import { SessionService } from 'src/app/core/services/session/session.service'; @Component({ selector: 'app-manage-session', @@ -20,7 +22,7 @@ export class ManageSessionComponent implements OnInit { // label: 'MANAGE_SESSION' }; receivedEventData: any; - constructor(private adminWorkapceService: AdminWorkapceService, private router: Router, private modalCtrl: ModalController) { } + constructor(private adminWorkapceService: AdminWorkapceService, private router: Router, private modalCtrl: ModalController,private utilService:UtilService, private sessionService:SessionService) { } headingText = "SESSION_LIST" download = "DOWNLOAD"; page = 1; @@ -100,7 +102,7 @@ export class ManageSessionComponent implements OnInit { this.fetchSessionList() } - onCLickEvent(data: any) { + async onCLickEvent(data: any) { this.receivedEventData = data; switch (this.receivedEventData.action) { case 'mentor_name': @@ -110,7 +112,8 @@ export class ManageSessionComponent implements OnInit { this.router.navigate([`${CommonRoutes.ADMIN}/${CommonRoutes.MANAGERS_SESSION}`], { queryParams: { id: this.receivedEventData.element.id }}); break; case 'DELETE': - + await this.adminWorkapceService.deleteSession(this.receivedEventData.element.id); + break; default: this.router.navigate([CommonRoutes.SESSIONS_DETAILS, this.receivedEventData.element.id]); } @@ -176,4 +179,6 @@ export class ManageSessionComponent implements OnInit { this.router.navigate([`${CommonRoutes.ADMIN}/${CommonRoutes.MANAGERS_SESSION}`]); } + + } diff --git a/src/app/pages/language/language.page.ts b/src/app/pages/language/language.page.ts index 042660f0..2e378db0 100644 --- a/src/app/pages/language/language.page.ts +++ b/src/app/pages/language/language.page.ts @@ -30,7 +30,7 @@ export class LanguagePage implements OnInit { ngOnInit() { this.localStorage.getLocalData(localKeys.SELECTED_LANGUAGE).then(data =>{ - this.selectedLanguage = data; + this.selectedLanguage = data.value; }) } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index b6be1238..41d3a169 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -83,7 +83,9 @@ import { FilterPopupComponent } from './components/filter-popup/filter-popup.com FormsModule, ReactiveFormsModule, MatButtonModule, - NgxMatMomentModule + NgxMatMomentModule, + MatTableModule, + MatPaginatorModule ], exports: [ DynamicFormComponent, @@ -106,8 +108,6 @@ import { FilterPopupComponent } from './components/filter-popup/filter-popup.com MentorCardComponent, JoinDialogBoxComponent, GenericTableComponent, - MatTableModule, - MatPaginatorModule, SearchAndSelectComponent, SearchPopoverComponent, HasPermissionDirective, diff --git a/src/deployment/ansible.yml b/src/deployment/ansible.yml index eccb29cf..07bda3f1 100644 --- a/src/deployment/ansible.yml +++ b/src/deployment/ansible.yml @@ -37,6 +37,6 @@ - name: Remove www folder shell: rm -rf www - name: Build pwa app - shell: cd {{project_path}} && ionic build + shell: cd {{project_path}} && ionic build --prod - name: Start pm2 shell: cd {{project_path}} && pm2 start pm2.config.json \ No newline at end of file From 9d14e860cd888076ac8b8ed3c9e9bab5ad5bd655 Mon Sep 17 00:00:00 2001 From: GSuma21 <21gsuma@gmail.com> Date: Tue, 23 Jan 2024 19:05:14 +0530 Subject: [PATCH 2/3] issue #fix comments --- .../admin-workspace/admin-workapce.service.ts | 36 ++++++++++--------- .../manage-session.component.ts | 7 +++- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/app/core/services/admin-workspace/admin-workapce.service.ts b/src/app/core/services/admin-workspace/admin-workapce.service.ts index ffc5c3a9..b6da3b12 100644 --- a/src/app/core/services/admin-workspace/admin-workapce.service.ts +++ b/src/app/core/services/admin-workspace/admin-workapce.service.ts @@ -3,7 +3,6 @@ import { HttpService } from '../http/http.service'; import { urlConstants } from '../../constants/urlConstants'; import * as _ from 'lodash-es'; import { UtilService } from '../util/util.service'; -import { CommonRoutes } from 'src/global.routes'; import { SessionService } from '../session/session.service'; import { ToastService } from '../toast.service'; import { Router } from '@angular/router'; @@ -27,24 +26,27 @@ export class AdminWorkapceService { return false } } - deleteSession(id) { - let msg = { - header: 'DELETE_SESSION', - message: 'DELETE_CONFIRM_MSG', - cancel: "DON'T_DELETE", - submit: 'YES_DELETE' - } - this.utilService.alertPopup(msg).then(async data => { - if (data) { - let result = await this.sessionService.deleteSession(id); - if (result.responseCode == "OK") { - this.toast.showToast(result.message, "success"); - this.router.navigate([`/${CommonRoutes.TABS}/${CommonRoutes.MANAGE_SESSION}`], { replaceUrl: true }); - } + deleteSession(id:any): Promise { + return new Promise((resolve) => { + let msg = { + header: 'DELETE_SESSION', + message: 'DELETE_CONFIRM_MSG', + cancel: "DON'T_DELETE", + submit: 'YES_DELETE' } - }).catch(error => { }) + this.utilService.alertPopup(msg).then(async data => { + if (data) { + let result = await this.sessionService.deleteSession(id); + if (result.responseCode == "OK") { + this.toast.showToast(result.message, "success"); + resolve(result); + } + } + }).catch(error => { }) + + }); } - + // async downloadcreatedSessionsBySessionManager(obj:any){ // const config = { diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts index 8431d036..4af907a4 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.ts +++ b/src/app/modules/admin/components/manage-session/manage-session.component.ts @@ -112,7 +112,12 @@ export class ManageSessionComponent implements OnInit { this.router.navigate([`${CommonRoutes.ADMIN}/${CommonRoutes.MANAGERS_SESSION}`], { queryParams: { id: this.receivedEventData.element.id }}); break; case 'DELETE': - await this.adminWorkapceService.deleteSession(this.receivedEventData.element.id); + await this.adminWorkapceService.deleteSession(this.receivedEventData.element.id) + .then((data) => { + if(data.responseCode == "OK"){ + this.fetchSessionList() + } + }) break; default: this.router.navigate([CommonRoutes.SESSIONS_DETAILS, this.receivedEventData.element.id]); From 59b7fe64a8181874e5b3c7062d800da1fa8f4843 Mon Sep 17 00:00:00 2001 From: GSuma21 <21gsuma@gmail.com> Date: Tue, 23 Jan 2024 20:24:55 +0530 Subject: [PATCH 3/3] issue #fix added reject --- .../services/admin-workspace/admin-workapce.service.ts | 10 +++++++--- .../manage-session/manage-session.component.ts | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/core/services/admin-workspace/admin-workapce.service.ts b/src/app/core/services/admin-workspace/admin-workapce.service.ts index b6da3b12..81b8b5bd 100644 --- a/src/app/core/services/admin-workspace/admin-workapce.service.ts +++ b/src/app/core/services/admin-workspace/admin-workapce.service.ts @@ -27,7 +27,7 @@ export class AdminWorkapceService { } } deleteSession(id:any): Promise { - return new Promise((resolve) => { + return new Promise((resolve, reject) => { let msg = { header: 'DELETE_SESSION', message: 'DELETE_CONFIRM_MSG', @@ -37,12 +37,16 @@ export class AdminWorkapceService { this.utilService.alertPopup(msg).then(async data => { if (data) { let result = await this.sessionService.deleteSession(id); - if (result.responseCode == "OK") { + if (result?.responseCode == "OK") { this.toast.showToast(result.message, "success"); resolve(result); + }else{ + reject(result) } } - }).catch(error => { }) + }).catch(error => { + reject(error) + }) }); } diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts index 4af907a4..04b3a258 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.ts +++ b/src/app/modules/admin/components/manage-session/manage-session.component.ts @@ -114,10 +114,12 @@ export class ManageSessionComponent implements OnInit { case 'DELETE': await this.adminWorkapceService.deleteSession(this.receivedEventData.element.id) .then((data) => { - if(data.responseCode == "OK"){ + if(data?.responseCode == "OK"){ this.fetchSessionList() } }) + .catch((error) => { + }); break; default: this.router.navigate([CommonRoutes.SESSIONS_DETAILS, this.receivedEventData.element.id]);