diff --git a/Dockerfile b/Dockerfile index 6d48919c4..80348fb4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,8 @@ RUN npm install -g @ionic/cli@6.0.0 RUN rm -rf node_modules +RUN rm -rf www + COPY package*.json ./ RUN npm install --force diff --git a/forms.json b/forms.json index ca6169097..df038770f 100644 --- a/forms.json +++ b/forms.json @@ -2,7 +2,7 @@ { "type": "editProfile", "sub_type": "editProfileForm", - "action": "skip", + "action": "update", "data": { "templateName": "defaultTemplate", "fields": { @@ -459,40 +459,39 @@ "name": "competencies", "label": "Competencies", "class": "ion-no-margin", - "value": "", + "value": [], "type": "search", "position": "", "disabled": false, "errorMessage": { - "required": "Enter competencies" + "required": "Enter competencies" }, "validators": { - "required": true + "required": true }, - "options": [ - ], + "options": [], "meta": { - "entityType": "competencies", - "addNewPopupHeader": "Competencies", - "addNewPopupSubHeader": "Who is this session for?", - "showSelectAll": true, - "multiSelect": true, - "showAddOption": { - "showAddButton": true, - "addChipLabel": "" - }, - "allow_custom_entities": true, - "allow_filtering": true, - "addPopupType": "addCompetency" + "entityType": "competencies", + "addNewPopupHeader": "Competencies", + "addNewPopupSubHeader": "Who is this session for?", + "showSelectAll": true, + "multiSelect": true, + "showAddOption": { + "showAddButton": true, + "addChipLabel": "" + }, + "allow_custom_entities": true, + "allow_filtering": true, + "addPopupType": "addCompetency" }, "multiple": true - }, + }, { "name": "medium", - "label": "Select medium", + "label": "Medium", "alertLabel": "medium", "class": "ion-no-margin", - "value": "", + "value": [], "type": "search", "position": "", "disabled": false, @@ -502,11 +501,19 @@ "validators": { "required": true }, - "options": [], + "options": [ + { + "label": "English", + "value": "en_in" + }, + { + "label": "Hindi", + "value": "hi" + } + ], "meta": { "entityType": "medium", - "addNewPopupHeader": "Add new medium", - "addNewPopupSubHeader": "Medium for the session", + "addNewPopupHeader": "Add new language", "showSelectAll": true, "multiSelect": true, "showAddOption": { @@ -526,7 +533,7 @@ { "type": "managersSession", "sub_type": "managersSessionForm", - "action": "skip", + "action": "update", "data": { "template_name": "defaultTemplate", "fields": { @@ -672,7 +679,7 @@ "searchData": [], "maxCount": "MAX_MENTEE_ENROLLMENT_COUNT", "labelForListButton": "View Mentee List", - "labelForAddButton": "Add New Mentee", + "labelForAddButton": "Add Mentee", "filters": { "entity_types": [ { @@ -742,8 +749,8 @@ "name": "recommended_for", "label": "Recommended for", "class": "ion-no-margin", - "value": "", - "type": "chip", + "value": [], + "type": "search", "position": "", "disabled": false, "errorMessage": { @@ -790,8 +797,8 @@ "name": "categories", "label": "Categories", "class": "ion-no-margin", - "value": "", - "type": "chip", + "value": [], + "type": "search", "position": "", "disabled": false, "errorMessage": { @@ -838,8 +845,8 @@ "label": "Select medium", "alertLabel": "medium", "class": "ion-no-margin", - "value": "", - "type": "chip", + "value": [], + "type": "search", "position": "", "disabled": false, "errorMessage": { @@ -876,7 +883,7 @@ { "type": "helpApp", "sub_type": "helpAppForm", - "action": "skip", + "action": "update", "data": { "fields": { "forms": [ @@ -941,7 +948,7 @@ { "type": "mentorQuestionnaire", "sub_type": "mentorQuestionnaireForm", - "action": "skip", + "action": "update", "data": { "templateName": "defaultTemplate", "fields": { @@ -1040,5 +1047,102 @@ ] } } + }, + { + "type": "dashboard", + "sub_type": "dashboardForm", + "action": "create", + "data": { + "template_name": "defaultTemplate", + "fields": { + "mentor": [ + { + "type": "bar", + "data": { + "labels": [ + "Total sessions created", + "Total sessions conducted" + ], + "datasets": [ + { + "label": "", + "data": [ + "total_session_created", + "total_session_hosted" + ], + "backgroundColor": [ + "#4e81bd", + "#fdc107", + "#5ab251" + ], + "borderWidth": 1, + "barThickness": 50 + } + ] + }, + "options": { + "responsive": true, + "maintainAspectRatio": false, + "plugins": { + "legend": { + "display": false + } + }, + "scales": { + "y": { + "ticks": { + "stepSize": 0 + }, + "grid": { + "display": false + } + }, + "x": { + "grid": { + "display": false + } + } + } + } + } + ], + "mentee": [ + { + "type": "pie", + "data": { + "labels": [ + "Total sessions enrolled", + "Total sessions attended" + ], + "datasets": [ + { + "label": "", + "data": [ + "total_session_enrolled", + "total_session_attended" + ], + "backgroundColor": [ + "#ffdf00", + "#7b7b7b" + ], + "borderWidth": 1, + "barThickness": 50 + } + ] + }, + "options": { + "responsive": true, + "maintainAspectRatio": false, + "plugins": { + "legend": { + "display": false + } + }, + "scales": {} + } + } + ] + } + } } ] diff --git a/formsManager.js b/formsManager.js index e0790225a..d1617ee9b 100644 --- a/formsManager.js +++ b/formsManager.js @@ -5,6 +5,10 @@ const path = require("path"); const authToken = process.env.AUTH_TOKEN; const apiUrl = process.env.API_URL; +const authorization = process.env.AUTHORIZATION; +const adminAuthToken = process.env.ADMIN_AUTH_TOKEN; +const organizationId = process.env.ORGANIZATION_ID; + const args = process.argv.slice(2); const actionsApplicable = ["skip", "update","create"] @@ -17,7 +21,7 @@ const createForm = async (form) => { const response = await axios.post( `${apiUrl}/mentoring/v1/form/create`, form, - { headers: { 'X-auth-token': `bearer ${authToken}` } } + { headers: { 'x-authenticated-user-token': `${authToken}`, 'Authorization': `bearer ${authorization}`, 'admin-auth-token': `${adminAuthToken}`, 'organization-id': `${organizationId}` } } ); if(response){ console.log("Form created successfully:", response.data); @@ -33,7 +37,7 @@ const updateForm = async (form) => { const response = await axios.put( `${apiUrl}/mentoring/v1/form/update`, form, - { headers: { 'X-auth-token': `bearer ${authToken}` } } + { headers: { 'x-authenticated-user-token': `${authToken}`, 'Authorization': `bearer ${authorization}`, 'admin-auth-token': `${adminAuthToken}`, 'organization-id': `${organizationId}` } } ); if(response){ console.log("Form updated successfully:", response.data); @@ -82,4 +86,4 @@ const createOrUpdateForms = async () => { saveFormsToFile(); }; -createOrUpdateForms(); \ No newline at end of file +createOrUpdateForms(); diff --git a/src/app/core/constants/formConstant.ts b/src/app/core/constants/formConstant.ts index 874d57d6c..e8aa650dc 100644 --- a/src/app/core/constants/formConstant.ts +++ b/src/app/core/constants/formConstant.ts @@ -48,4 +48,9 @@ export const SAMPLE_CSV_DOWNLOAD_URL = { export const MANAGERS_CREATE_SESSION_FORM: IFORM = { "type": "managersSession", "sub_type": "managersSessionForm", +} + +export const DASHBOARD: IFORM = { + "type": "dashboard", + "sub_type": "dashboardForm", } \ No newline at end of file diff --git a/src/app/core/services/auth/auth.service.ts b/src/app/core/services/auth/auth.service.ts index e97fd27ad..dc9583408 100644 --- a/src/app/core/services/auth/auth.service.ts +++ b/src/app/core/services/auth/auth.service.ts @@ -149,9 +149,9 @@ export class AuthService { await this.db.clear() this.userService.token = null; this.userService.userEvent.next(null); - this.router.navigate([environment.unauthorizedRedirectUrl], { + this.router.navigate([window['env']['unauthorizedRedirectUrl']], { replaceUrl: true }); this.translate.use("en") } -} \ No newline at end of file +} diff --git a/src/app/core/services/form/form.service.ts b/src/app/core/services/form/form.service.ts index aaced72fe..e15c4e829 100644 --- a/src/app/core/services/form/form.service.ts +++ b/src/app/core/services/form/form.service.ts @@ -83,7 +83,7 @@ export class FormService { await entityList.map((entityName)=>{ if(Array.isArray(existingData[entityName])){ existingData[entityName] = existingData[entityName].map((data)=>{ - return { label : data.label, value : data.value == 'other' ? data.label : data.value } + return { label : data.label, value : data.value == 'other' ? data.label : data.value, type: data.value } }) } }) diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts index 7d2ea6b01..0f19fe4da 100644 --- a/src/app/core/services/http/http.service.ts +++ b/src/app/core/services/http/http.service.ts @@ -13,6 +13,7 @@ import { AlertController, ModalController } from '@ionic/angular'; import { FeedbackPage } from 'src/app/pages/feedback/feedback.page'; import { CapacitorHttp } from '@capacitor/core'; import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; @Injectable({ @@ -28,7 +29,6 @@ export class HttpService { private userService: UserService, private network: NetworkService, private toastService: ToastService, - private loaderService: LoaderService, private localStorage: LocalStorageService, private injector: Injector, private modalController: ModalController, @@ -57,7 +57,6 @@ export class HttpService { headers[key] = this.extraHeaders[key]; }); } - console.log(JSON.stringify(headers)) return headers; } @@ -211,6 +210,10 @@ export class HttpService { } public handleError(result) { + console.log(result) + if(result.data.responseCode == 'UNAUTHORIZED') { + this.triggerLogoutConfirmationAlert(result) + } let msg = result.data.message; switch (result.status) { case 400: @@ -220,8 +223,9 @@ export class HttpService { this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') break case 401: + case 419: + case 302: this.triggerLogoutConfirmationAlert(result) - break default: this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') @@ -255,7 +259,7 @@ export class HttpService { }); this.isAlertOpen = true; const alert = await this.alert.create({ - message: msg, + message: msg || 'Session expired. Please login again', buttons: [ { text: texts['OK'], @@ -271,8 +275,14 @@ export class HttpService { await alert.present(); let data = await alert.onDidDismiss(); if (data.role == 'cancel') { - let auth = this.injector.get(AuthService); - auth.logoutAccount(true); + if(window['env']['isAuthBypassed']) { + let auth = this.injector.get(AuthService); + auth.clearLocalData(); + location.href = window['env']['unauthorizedRedirectUrl'] + } else { + let auth = this.injector.get(AuthService); + auth.logoutAccount(true); + } } return false; } else { diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts index 634ff0f3b..a8a5c2bc6 100644 --- a/src/app/core/services/profile/profile.service.ts +++ b/src/app/core/services/profile/profile.service.ts @@ -232,6 +232,7 @@ export class ProfileService { } catch (error) { showLoader ? await this.loaderService.stopLoader() : ''; + return error } } diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.html b/src/app/modules/admin/components/manage-session/manage-session.component.html index 1c8e6ccfe..380b911b8 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.html +++ b/src/app/modules/admin/components/manage-session/manage-session.component.html @@ -42,7 +42,7 @@ -
+
- +
diff --git a/src/app/modules/private/private.page.scss b/src/app/modules/private/private.page.scss index 07670eb3b..5f852f871 100644 --- a/src/app/modules/private/private.page.scss +++ b/src/app/modules/private/private.page.scss @@ -76,6 +76,7 @@ display: grid; height: fit-content; align-self: end; + font-family: 'Montserrat'; } .usr-div a { background-color: transparent; @@ -114,4 +115,4 @@ pointer-events: none; /* Disable all pointer events (clicks, hovers, etc.) */ opacity: 0.5; /* Make the header appear grayed out */ background-color: lightgray; -} \ No newline at end of file +} diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts index 6dabcc8fd..5f967e158 100644 --- a/src/app/pages/create-session/create-session.page.ts +++ b/src/app/pages/create-session/create-session.page.ts @@ -260,7 +260,7 @@ export class CreateSessionPage implements OnInit { this.formData.controls[i].id = this.id; if(this.formData.controls[i].meta.multiSelect){ this.formData.controls[i].meta.searchData = existingData[this.formData.controls[i].name] - this.formData.controls[i].value = this.formData.controls[i].meta.searchData.map(obj => obj.id || obj.value); + this.formData.controls[i].value = this.formData.controls[i].meta.searchData ? this.formData.controls[i].meta.searchData.map(obj => obj.id || obj.value) : []; } else { this.formData.controls[i].meta.searchData = [{ label: `${existingData.mentor_name}, ${existingData.organization.name}`, @@ -409,7 +409,6 @@ export class CreateSessionPage implements OnInit { if (data.data) { event.formControl.selectedData = data.data; const values = event.formControl.control.meta.multiSelect ? data.data.map(obj => obj.value) : data.data[0].value; - console.log(values, event.formControl) event.formControl.onChange(values); event.formControl.icon = event.formControl.selectedData.length ? event.formControl.closeIconLight : event.formControl.addIconDark } diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index 1fa3215ab..e29e1a8b8 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -2,7 +2,9 @@
diff --git a/src/app/pages/home-search/home-search.page.scss b/src/app/pages/home-search/home-search.page.scss index 802dfea79..57e3a6040 100644 --- a/src/app/pages/home-search/home-search.page.scss +++ b/src/app/pages/home-search/home-search.page.scss @@ -7,7 +7,7 @@ font-size:16px; height: 36px; max-width: 600px; - min-width: 350px; + min-width: 300px; } ion-content { --padding: 0; @@ -60,7 +60,7 @@ ion-content { width: 20px; height: 20px; border-radius: 50%; - background-color: #832215; + background-color: var(--ion-color-primary); display: flex; align-items: center; justify-content: center; @@ -95,4 +95,4 @@ ion-content { background-color: var(--ion-color-primary); color: white; } -} \ No newline at end of file +} diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index da7af5fbb..7090a85a3 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -82,14 +82,16 @@ export class HomeSearchPage implements OnInit { this.filterData = await this.utilService.transformToFilterData(data, obj); } - search(event) { - if (event.length >= 3) { - this.searchText = event; - this.showSelectedCriteria = this.criteriaChip; - this.isOpen = false; - this.fetchSessionList() - } else { - this.toast.showToast("ENTER_MIN_CHARACTER","danger"); + search(searchText, event) { + if (event.key === 'Enter') { + if (searchText.length >= 3) { + this.searchText = searchText; + this.showSelectedCriteria = this.criteriaChip; + this.isOpen = false; + this.fetchSessionList(); + } else { + this.toast.showToast("ENTER_MIN_CHARACTER", "danger"); + } } } diff --git a/src/app/pages/mentor-details/mentor-details.page.ts b/src/app/pages/mentor-details/mentor-details.page.ts index e35b760ab..f3445d2f4 100644 --- a/src/app/pages/mentor-details/mentor-details.page.ts +++ b/src/app/pages/mentor-details/mentor-details.page.ts @@ -33,10 +33,6 @@ export class MentorDetailsPage implements OnInit { detailData = { form: [ - { - title: 'ABOUT', - key: 'about', - }, { title: "DESIGNATION", key: "designation" @@ -46,20 +42,9 @@ export class MentorDetailsPage implements OnInit { key: "organizationName" }, { - title: 'YEAR_OF_EXPERIENCE', - key: 'experience', - }, - { - title: 'KEY_AREAS_OF_EXPERTISE', - key: 'area_of_expertise', - }, - { - title: "EDUCATION_QUALIFICATION", - key: "education_qualification" - }, - { - title: "LANGUAGES", - key: "languages" + title: "Competencies", + key: "competency", + info: 'Competencies associated with this mentor' } ], data: { @@ -87,7 +72,7 @@ export class MentorDetailsPage implements OnInit { routerParams.params.subscribe(params => { this.mentorId = this.buttonConfig.meta.id = params.id; this.userService.getUserValue().then(async (result) => { - if (result) { + if (result || window['env']['isAuthBypassed']) { this.getMentor(); } else { this.router.navigate([`/${CommonRoutes.AUTH}/${CommonRoutes.LOGIN}`], { queryParams: { mentorId: this.mentorId } }) diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html index 4f6f9a394..b8b8e36dd 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html @@ -2,7 +2,9 @@
@@ -73,9 +75,9 @@ - {{"MENTOR_SEARCH_RESULT" | translate}} "{{searchText}}" + {{"MENTOR_SEARCH_RESULT" | translate}} "{{searchText}}"
-
+
{{totalCount}} {{"SEARCH_RESULT" | translate}}
@@ -91,7 +93,7 @@ -
+
- \ No newline at end of file + diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 089d38c67..4e488b5ca 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -66,13 +66,15 @@ export class MentorSearchDirectoryPage implements OnInit { this.filterData = await this.utilService.transformToFilterData(data, obj); } - onSearch(event){ - if (event.length >= 3) { - this.searchText = event; - this.showSelectedCriteria = this.selectedChipLabel; - this.getMentors(); - } else { - this.toast.showToast("ENTER_MIN_CHARACTER","danger"); + onSearch(searchText, event){ + if (event.key === 'Enter') { + if (searchText.length >= 3) { + this.searchText = searchText; + this.showSelectedCriteria = this.selectedChipLabel; + this.getMentors(); + } else { + this.toast.showToast("ENTER_MIN_CHARACTER","danger"); + } } } @@ -185,6 +187,9 @@ export class MentorSearchDirectoryPage implements OnInit { this.isOpen = false; this.data = data.result.data; this.totalCount = data.result.count; + }else{ + this.data = []; + this.totalCount = []; } } diff --git a/src/app/pages/tabs/dashboard/dashboard.page.ts b/src/app/pages/tabs/dashboard/dashboard.page.ts index e78aaca1c..8c1bc8b7f 100644 --- a/src/app/pages/tabs/dashboard/dashboard.page.ts +++ b/src/app/pages/tabs/dashboard/dashboard.page.ts @@ -2,8 +2,10 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { IonContent } from '@ionic/angular'; import { TranslateService } from '@ngx-translate/core'; import { Chart } from 'chart.js/auto'; +import { DASHBOARD } from 'src/app/core/constants/formConstant'; import { urlConstants } from 'src/app/core/constants/urlConstants'; import { HttpService } from 'src/app/core/services'; +import { FormService } from 'src/app/core/services/form/form.service'; import { ProfileService } from 'src/app/core/services/profile/profile.service'; @Component({ @@ -35,13 +37,19 @@ export class DashboardPage implements OnInit { ]; loading: boolean = false; chartData: any; + completeDashboardForms: any; + chartCreationJson: any; constructor( private translate: TranslateService, private profile: ProfileService, - private apiService: HttpService) { } + private apiService: HttpService, + private form: FormService) { } - ngOnInit() { } + async ngOnInit() { + let data = await this.form.getForm(DASHBOARD); + this.completeDashboardForms = data.data.fields; + } ionViewWillEnter() { this.isMentor = this.profile.isMentor; @@ -93,6 +101,7 @@ export class DashboardPage implements OnInit { } createChart() { + this.chartCreationJson = this.segment === 'mentor' ? JSON.parse(JSON.stringify(this.completeDashboardForms.mentor)) : JSON.parse(JSON.stringify(this.completeDashboardForms.mentee)) const maxDataValue = Math.max( ...( this.segment === 'mentor' ? @@ -100,48 +109,21 @@ export class DashboardPage implements OnInit { [this.chartData.total_session_enrolled, this.chartData.total_session_attended] ) ); - this.chart = new Chart('MyChart', { - type: this.segment === 'mentor' ? 'bar': 'pie', - data: { - labels: this.segment === 'mentor' ? ['Total sessions created', 'Total sessions assigned', 'Total sessions conducted'] : ['Total sessions enrolled', 'Total sessions attended'], - datasets: [{ - label: '', - data: this.segment === 'mentor' ? [this.chartData.total_session_created, this.chartData.total_session_assigned, this.chartData.total_session_hosted,] : [this.chartData.total_session_enrolled, this.chartData.total_session_attended], - backgroundColor: this.segment === 'mentor' ?['#4e81bd', '#fdc107', '#5ab251']: ['#ffdf00', '#7b7b7b'], - borderWidth: 1, - barThickness: 50, - }], - }, - options: { - responsive: true, - maintainAspectRatio: false, - plugins: { - legend: { - display: false, - } - }, - scales: this.segment === 'mentor' ?{ - y: { - ticks: { - stepSize: this.calculateStepSize(maxDataValue), - }, - grid: { - display: false, - }, - }, - x:{ - grid: { - display: false, - }, - } - }:{} - } - }); + this.chartCreationJson.forEach(chart => { + if (chart.options && chart.options.scales && chart.options.scales.y && chart.options.scales.y.ticks) { + chart.options.scales.y.ticks.stepSize = this.calculateStepSize(maxDataValue); + } + if (chart.data && chart.data.datasets) { + chart.data.datasets.forEach(dataset => { + dataset.data = dataset.data.map(item => this.chartData[item] || 0); + }); + } + }); + this.chart = new Chart('MyChart', this.chartCreationJson[0]); this.dataAvailable = !!(this.chartData?.total_session_created ||this.chartData?.total_session_enrolled ||this.chartData?.total_session_assigned ||this.chartData?.total_session_hosted); } calculateStepSize(maxDataValue) { - return Math.ceil(maxDataValue / 5); } } \ No newline at end of file diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html index 2286981dd..e023463b8 100644 --- a/src/app/pages/tabs/home/home.page.html +++ b/src/app/pages/tabs/home/home.page.html @@ -10,7 +10,9 @@

+ type="search" + inputmode="search" + (keydown)="search(searchText, $event)">