Merge pull request #439 from shikshalokam/5.1.0.10_33

ISSUE #000 fix : 5.1 API 33 level issue fix
Sunbird-Ed · Oct 12, 2023 · 0cb034e · 0cb034e
2 parents 0ad1903 + 3c2859e
commit 0cb034e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/src/app/home/user-home/user-home.page.spec.ts b/src/app/home/user-home/user-home.page.spec.ts
@@ -496,7 +496,7 @@ describe('UserHomePage', () => {
                 'ekstep_ncert_k-12': {
                     teacher: [
                         {
-                            name: 'observation',
+                            name: 'observations',
                             icon: {
                                 web: 'assets/images/mask-image/observation_category.png',
                                 app: 'assets/imgs/observation_category.png',
@@ -522,7 +522,7 @@ describe('UserHomePage', () => {
                 'CBSE': {
                     teacher: [
                         {
-                            name: 'observation',
+                            name: 'observations',
                             icon: {
                                 web: 'assets/images/mask-image/observation_category.png',
                                 app: 'assets/imgs/observation_category.png',
@@ -586,7 +586,7 @@ describe('UserHomePage', () => {
                 'CBSE': {
                     teacher: [
                         {
-                            name: 'observation',
+                            name: 'observations',
                             icon: {
                                 web: 'assets/images/mask-image/observation_category.png',
                                 app: 'assets/imgs/observation_category.png',
@@ -618,7 +618,7 @@ describe('UserHomePage', () => {
       describe('should handle click action of otherCategories', () => {
         it('should show login prompt', (done) => {
             userHomePage.guestUser = true;
-            let event = { data: [{ value: {name:'observation'} }] };
+            let event = { data: [{ value: {name:'observations'} }] };
             mockPopoverController.create = jest.fn(() =>
               Promise.resolve({
                 present: jest.fn(() => Promise.resolve({})),
@@ -636,7 +636,7 @@ describe('UserHomePage', () => {
 
           it('should navigate to observation listing page', (done) => {
             userHomePage.guestUser = false;
-            let event = { data: [{ value: {name:'observation'} }] };
+            let event = { data: [{ value: {name:'observations'} }] };
             mockPopoverController.create = jest.fn(() =>
               Promise.resolve({
                 present: jest.fn(() => Promise.resolve({})),

diff --git a/src/app/manage-learn/core/constants/actions.constants.ts b/src/app/manage-learn/core/constants/actions.constants.ts
@@ -104,9 +104,16 @@ export const actions = {
       id:'camera'
     },
     {
-      title: "FRMELEMNTS_LBL_GALLERY",
+      title: "FRMELEMENTS_LBL_UPLOAD_IMAGE",
       icon: "images",
-      action: "openGallery",
+      action: "openImage",
+      color: 'primary',
+      id:'images'
+    },
+    {
+      title: "FRMELEMENTS_LBL_UPLOAD_VIDEO",
+      icon: "videocam",
+      action: "openVideo",
       color: 'primary',
       id:'images'
     },

diff --git a/src/app/manage-learn/core/services/attachment/attachment.service.ts b/src/app/manage-learn/core/services/attachment/attachment.service.ts
@@ -345,6 +345,12 @@ export class AttachmentService {
       case 'openGallery':
         this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
         break;
+      case 'openImage':
+        this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY, this.camera.MediaType.PICTURE);
+        break;
+      case 'openVideo':
+        this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY, this.camera.MediaType.VIDEO);
+        break;
       case 'openFiles':
         this.openFile();
         break;

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -1021,9 +1021,9 @@
   "FRMELEMENTS_LBL_FILES": "Files",
   "FRMELEMENTS_LBL_ADD_IMAGE": "Add images",
   "FRMELEMENTS_LBL_CAMERA": "Camera",
-  "FRMELEMENTS_LBL_UPLOAD_FILE": "Upload file",
-  "FRMELEMENTS_LBL_UPLOAD_IMAGE": "Upload image",
-  "FRMELEMENTS_LBL_UPLOAD_VIDEO":"Upload video",
+  "FRMELEMENTS_LBL_UPLOAD_FILE": "File",
+  "FRMELEMENTS_LBL_UPLOAD_IMAGE": "Image",
+  "FRMELEMENTS_LBL_UPLOAD_VIDEO":"Video",
   "FRMELEMENTS_LBL_DATE": "Date",
   "FRMELEMENTS_LBL_CAPTURE": "Capture",
   "FRMELEMNTS_LBL_ENTITIES": "Entities",