Merge pull request #73 from rahulramakrishnan3/KB-release-3.1.2

Kb release 3.1.2

Author: kiranharidas187

forms.json

@@ -63,6 +63,7 @@
     "cordova-plugin-screen-orientation": "^3.0.3",
     "cordova-sqlite-storage": "^6.1.0",
     "es6-promise-plugin": "^4.2.2",
+    "generic-chart": "^1.0.3",
     "ionic-plugin-deeplinks": "^1.0.24",
     "jwt-decode": "^3.1.2",
     "lodash-es": "^4.17.21",
@@ -72,6 +73,7 @@
     "papaparse": "^5.4.1",
     "rxjs": "~6.6.0",
     "rxjs-compat": "^6.6.7",
+    "sl-generic-table": "^1.1.6",
     "tslib": "^2.2.0",
     "yargs": "^17.7.2",
     "zone.js": "~0.11.4"

package-lock.json

@@ -50,6 +50,10 @@ export const MANAGERS_CREATE_SESSION_FORM: IFORM = {
 	"sub_type": "managersSessionForm",
 }
 
+export const BIG_NUMBER_DASHBOARD_FORM: IFORM = {
+	"type": "bignumberDashboard",
+	"sub_type": "bignumberDashboardForm"
+}
 export const DASHBOARD: IFORM = {
 	"type": "dashboard",
 	"sub_type": "dashboardForm",

package.json

@@ -64,6 +64,8 @@ export const urlConstants = {
         CHANGE_PASSWORD: "/user/v1/account/changePassword",
         UPDATE_LANGUAGE: "/user/v1/user/setLanguagePreference",
         LOGIN_ACTIVITY: "/user/v1/account/sessions",
-        ENTITY_LIST: "/mentoring/v1/entity/list?"
+        ENTITY_LIST: "/mentoring/v1/entity/list?",
+        DASHBOARD_REPORT_FILTER: "/mentoring/v1/reports/filterList?",
+        DASHBOARD_REPORT_DATA: "/mentoring/v1/reports/reportData?"
     }
 };

src/app/core/constants/formConstant.ts

@@ -176,6 +176,10 @@ export class ProfileService {
     var roles = userDetails.user_roles.map(function(item) {
       return item['title'];
     });
+    this.isMentor = roles.includes('mentor')?true:false;
+    if (!roles.includes("mentee")) {
+      roles.unshift("mentee");
+    }
     this.isMentor = roles.map(s => s.toLowerCase()).includes('mentor')?true:false;
     return roles
   }

src/app/core/constants/urlConstants.ts

@@ -14,7 +14,7 @@
           <div class="usr-div">
             <ion-label class="username"><strong>{{user?.name}}</strong></ion-label>
             <div class="user-role-labels">
-              <ion-label *ngIf="userRoles">{{ userRoles[0] | snakeCaseToUpperCase}}
+              <ion-label *ngIf="userRoles">{{ isMentor ? ('MENTOR' | translate): ('MENTEE' | translate)}}
               </ion-label>
               <ion-label class="view-roles" (click)="viewRoles()">{{"VIEW_ROLES" | translate}}</ion-label>
             </div>

src/app/core/services/profile/profile.service.ts

@@ -118,6 +118,7 @@ export class PrivatePage implements OnInit {
      this.db.init();
      setTimeout(async ()=>{
        this.userRoles = await this.localStorage.getLocalData(localKeys.USER_ROLES);
+       this.isMentor = this.userRoles.includes('mentor')?true:false;
      },1000);
      setTimeout(() => {
        document.querySelector('ion-menu')?.shadowRoot?.querySelector('.menu-inner')?.setAttribute('style', 'border-radius:8px 8px 0px 0px');

src/app/modules/private/private.page.html

@@ -2,16 +2,12 @@
   <div class="d-flex flex-justify-center my-8">
     <ion-searchbar class="search-bar" [debounce]="1000" placeholder="{{'HOME_SEARCH_PLACEHOLDER' | translate}}"  
     #event [value]="searchText"
-    (ionChange)="search(event.value)"
+    (keydown.enter)="search(event.value)"
     type="search"
     inputmode="search"
     cdkOverlayOrigin #trigger="cdkOverlayOrigin" (click)="isOpen = !isOpen">
     </ion-searchbar>
   </div>
-  <div [ngClass]="{'information_circle_is_mobile': isMobile}" style="text-align: center;">
-    <ion-icon style="vertical-align: middle;" name="information-circle-outline"></ion-icon>
-    {{"ENTER_MIN_CHARACTER" | translate}}
-  </div>
 </app-page-header>
 <ion-toolbar>
   <ng-template

src/app/modules/private/private.page.ts

@@ -95,7 +95,4 @@ ion-content {
         background-color: var(--ion-color-primary);
         color: white;
       }
-} 
-.information_circle_is_mobile{
-    font-size: x-small;
-}
+}