Merge pull request #539 from Cafnanc/release-3.0.1

Release 3.0.1
ELEVATE-Project · Aug 6, 2024 · d93e02e · d93e02e
2 parents babc909 + 3d41f99
commit d93e02e
Show file tree

Hide file tree

Showing 23 changed files with 26,866 additions and 59 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,22 @@
-FROM node:14 AS build
+FROM node:17 AS build
 
 WORKDIR /app
 
 RUN npm install -g @angular/[email protected]
 
 RUN npm install -g @ionic/[email protected]
 
+RUN rm -rf node_modules
+
 COPY package*.json ./
 
-RUN npm install
+RUN npm install --force
 
 COPY . .
 
 RUN ionic build --prod
 
-FROM node:14 AS final
+FROM node:17 AS final
 
 WORKDIR /usr/src/app
 

diff --git a/angular.json b/angular.json
@@ -19,8 +19,6 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "baseHref": "/mentorship/",
-            "deployUrl": "/mentorship/",
             "assets": [
               {
                 "glob": "**/*",

diff --git a/forms.json b/forms.json
@@ -380,7 +380,7 @@
   {
     "type": "session",
     "sub_type": "sessionForm",
-    "action": "skip",
+    "action": "update",
     "data": {
       "templateName": "defaultTemplate",
       "fields": {
@@ -442,8 +442,8 @@
             "name": "end_date",
             "label": "End date",
             "class": "ion-no-margin",
-            "value": "",
             "position": "floating",
+            "value": "",
             "displayFormat": "DD/MMM/YYYY HH:mm",
             "dependedParent": "start_date",
             "type": "date",
@@ -460,7 +460,7 @@
             "label": "Recommended for",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -475,10 +475,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"
             },
             "multiple": true
           },
@@ -487,7 +491,7 @@
             "label": "Categories",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -499,12 +503,17 @@
             "options": [],
             "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"
             },
             "multiple": true
           },
@@ -514,7 +523,7 @@
             "alertLabel": "medium",
             "class": "ion-no-margin",
             "value": "",
-            "type": "chip",
+            "type": "search",
             "position": "",
             "disabled": false,
             "errorMessage": {
@@ -526,12 +535,17 @@
             "options": [],
             "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"
             },
             "multiple": true
           }
@@ -1057,4 +1071,4 @@
       }
     }
   }
-]
+]