Merge pull request #562 from rahulramakrishnan3/release-3.1.0

form update
ELEVATE-Project · Aug 13, 2024 · a1ffe9a · a1ffe9a
2 parents 817d3b8 + 2b08e40
commit a1ffe9a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/forms.json b/forms.json
@@ -380,7 +380,7 @@
   {
     "type": "session",
     "sub_type": "sessionForm",
-    "action": "update",
+    "action": "skip",
     "data": {
       "templateName": "defaultTemplate",
       "fields": {
@@ -677,7 +677,8 @@
                   }
                 ]
               },
-              "filterType": "mentor"
+              "filterType": "mentor",
+              "addPopupType": "addUser"
             },
             "info": [
               {
@@ -722,7 +723,8 @@
                   }
                 ]
               },
-              "filterType": "mentee"
+              "filterType": "mentee",
+              "addPopupType": "addUser"
             },
             "position": "floating",
             "info": [
@@ -776,7 +778,7 @@
             "label": "Recommended for",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -812,10 +814,14 @@
               "addNewPopupHeader": "Recommended for",
               "addNewPopupSubHeader": "Who is this session for?",
               "showSelectAll": true,
+              "multiSelect": true,
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
               },
+              "allow_custom_entities": true,
+              "allow_filtering": true,
+              "addPopupType": "addCompetency",
               "labelForAddButton": "Select Recommended for"
             },
             "multiple": true
@@ -825,7 +831,7 @@
             "label": "Categories",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -858,12 +864,17 @@
             ],
             "meta": {
               "entityType": "categories",
-              "addNewPopupHeader": "Add a new category",
+              "addNewPopupHeader": "Add new category",
+              "addNewPopupSubHeader": "Categories for the session",
               "showSelectAll": true,
+              "multiSelect": true,
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
               },
+              "allow_custom_entities": true,
+              "allow_filtering": true,
+              "addPopupType": "addCompetency",
               "labelForAddButton": "Select Categories"
             },
             "multiple": true
@@ -874,7 +885,7 @@
             "alertLabel": "medium",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -895,12 +906,17 @@
             ],
             "meta": {
               "entityType": "medium",
-              "addNewPopupHeader": "Add new language",
+              "addNewPopupHeader": "Add new medium",
+              "addNewPopupSubHeader": "Medium for the session",
               "showSelectAll": true,
+              "multiSelect": true,
               "showAddOption": {
                 "showAddButton": true,
                 "addChipLabel": ""
               },
+              "allow_custom_entities": true,
+              "allow_filtering": true,
+              "addPopupType": "addCompetency",
               "labelForAddButton": "Select Medium"
             },
             "multiple": true
@@ -1077,4 +1093,4 @@
       }
     }
   }
-]
+]
diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts
@@ -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
       }