Merge pull request #561 from rahulramakrishnan3/release-3.1.0

bug fix for 1654
ELEVATE-Project · Aug 12, 2024 · 817d3b8 · 817d3b8
2 parents 6eee52a + bb711f1
commit 817d3b8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/forms.json b/forms.json
@@ -482,7 +482,8 @@
               },
               "allow_custom_entities": true,
               "allow_filtering": true,
-              "addPopupType": "addCompetency"
+              "addPopupType": "addCompetency",
+              "labelForAddButton": "Select Recommended for"
             },
             "multiple": true
           },
@@ -513,13 +514,14 @@
               },
               "allow_custom_entities": true,
               "allow_filtering": true,
-              "addPopupType": "addCompetency"
+              "addPopupType": "addCompetency",
+              "labelForAddButton": "Select Categories"
             },
             "multiple": true
           },
           {
             "name": "medium",
-            "label": "Select medium",
+            "label": "Medium",
             "alertLabel": "medium",
             "class": "ion-no-margin",
             "value": "",
@@ -545,7 +547,8 @@
               },
               "allow_custom_entities": true,
               "allow_filtering": true,
-              "addPopupType": "addCompetency"
+              "addPopupType": "addCompetency",
+              "labelForAddButton": "Select Medium"
             },
             "multiple": true
           }
@@ -812,7 +815,8 @@
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
-              }
+              },
+              "labelForAddButton": "Select Recommended for"
             },
             "multiple": true
           },
@@ -859,13 +863,14 @@
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
-              }
+              },
+              "labelForAddButton": "Select Categories"
             },
             "multiple": true
           },
           {
             "name": "medium",
-            "label": "Select medium",
+            "label": "Medium",
             "alertLabel": "medium",
             "class": "ion-no-margin",
             "value": "",
@@ -895,7 +900,8 @@
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
-              }
+              },
+              "labelForAddButton": "Select Medium"
             },
             "multiple": true
           }

diff --git a/src/app/shared/components/search-and-select/search-and-select.component.html b/src/app/shared/components/search-and-select/search-and-select.component.html
@@ -24,14 +24,14 @@
   </ion-chip>
 
   <ng-container *ngFor="let data of selectedData; let i = index">
-    <ion-chip *ngIf="i < 3" class="color-red" [disabled]="control?.disabled">
+    <ion-chip *ngIf="i < 5" class="color-red" [disabled]="control?.disabled">
       <ion-icon class="icon" [name]="icon.name" [color]="icon.color" (click)="handleCloseIconClick($event, data)"></ion-icon>
       <ion-label class="capitalize">{{data.name || data.label}}</ion-label>
     </ion-chip>
   </ng-container>
 
-  <ion-chip *ngIf="selectedData.length > 3" (click)="viewSelectedList()" class="color-red" [disabled]="control?.disabled">
+  <ion-chip *ngIf="selectedData.length > 5" (click)="viewSelectedList()" class="color-red" [disabled]="control?.disabled">
     <ion-icon class="icon" name="add-outline" color="light"></ion-icon>
-    <ion-label>{{selectedData.length-3}} more</ion-label>
+    <ion-label>{{selectedData.length-5}} more</ion-label>
   </ion-chip>
 </div>
diff --git a/src/app/shared/components/search-competency/search-competency.component.html b/src/app/shared/components/search-competency/search-competency.component.html
@@ -1,6 +1,6 @@
 <ion-toolbar position="top" color="primary">
   <div class="container">
-    <h2 class="ion-padding-start ion-padding-top">{{data.control.label}}</h2>
+    <h2 class="ion-padding-start ion-padding-top">{{'SELECT'|translate}} {{data.control.label}}</h2>
     <div class="close-col">
       <ion-icon class="close-button" name="close-outline" (click)="closePopover()"></ion-icon>
     </div>
@@ -10,7 +10,7 @@ <h2 class="ion-padding-start ion-padding-top">{{data.control.label}}</h2>
 <ion-content>
   <div *ngIf="!data?.viewListMode" class="search-col d-flex flex-justify-center ion-padding-top ion-margin-top ion-margin-start">
     <ion-searchbar *ngIf="data.showSearch" class="search-style" debounce="1000" [(ngModel)]="searchText"
-      (ionChange)="onSearch()" placeholder="{{'SELECT'|translate}} {{data.control.label}}"></ion-searchbar>
+      (ionChange)="onSearch()" placeholder="{{'SEARCH'|translate}} {{data.control.label}}"></ion-searchbar>
     <h2 class="ion-padding-start label-button" (click)="clearAll()">{{ "CLEAR_ALL" | translate }}</h2>
   </div>
   <div *ngIf="entities && !data?.viewListMode" class="competency-list-wrapper">

diff --git a/src/app/shared/components/search-competency/search-competency.component.scss b/src/app/shared/components/search-competency/search-competency.component.scss
@@ -2,7 +2,8 @@
     --icon-color:var(--ion-color-primary);
     font-size:16px;
     height: 36px;
-    max-width: 80%;
+    max-width: max-content;
+    min-width: 75%;
     --box-shadow: 0 0 0 1px var(--ion-color-primary);
 }
 
@@ -13,8 +14,8 @@
   }
 
   .search-col {
-    flex: 11;
-    margin-left: 5px;
+    flex: 10;
+    justify-content: space-around;
   }
 
   .close-col {
@@ -32,8 +33,8 @@ ion-item {
   margin-bottom: 0px;
 }
 .competency-list-wrapper {
-  margin: 20px 20px 10px 20px;
-  padding-left: 50px;
+  margin: 20px 20px 10px 15px;
+  padding-left: 4%;
 }
 
 ion-checkbox {
@@ -42,4 +43,5 @@ ion-checkbox {
 }
 .label-button {
   cursor: pointer;
+  padding-left: 0px;
 }