Issue #SB-000 merge: Merge pull request #3501 from shikshalokam/release-5.1.0.10

Release 5.1.0.10

Author: swayangjit

build_config

@@ -7,7 +7,7 @@ cordova-plugin=cordova-plugin-x-socialsharing
 cordova-plugin=cordova-plugin-androidx-adapter
 cordova-plugin=cordova-plugin-device
 cordova-plugin=cordova-plugin-file
-cordova-plugin=https://github.com/vishwanath1004/cordova-plugin-file-transfer
+cordova-plugin=https://github.com/shikshalokam/cordova-plugin-file-transfer.git
 cordova-plugin=cordova-plugin-inappbrowser
 cordova-plugin=cordova-plugin-network-information
 cordova-plugin=cordova-plugin-statusbar
@@ -20,20 +20,20 @@ cordova-plugin=cordova-plugin-android-permissions
 cordova-plugin=cordova.plugins.diagnostic
 cordova-plugin=com.telerik.plugins.nativepagetransitions
 cordova-plugin=cordova-plugin-secure-storage-echo
-cordova-plugin=cordova-plugin-chooser
+cordova-plugin=https://github.com/shikshalokam/cordova-plugin-chooser.git
 cordova-plugin=cordova-plugin-appavailability
 cordova-plugin=cordova-plugin-filepicker
 cordova-plugin=cordova-plugin-document-viewer
 cordova-plugin=com-sarriaroman-photoviewer
-cordova-plugin=https://github.com/vishwanath1004/cordova-plugin-filepath.git
+cordova-plugin=https://github.com/shikshalokam/cordova-plugin-filepath.git
 cordova-plugin=https://github.com/greybax/cordova-plugin-proguard.git
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-4.1.0
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-4.6.0
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git#release-5.0.2 --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
 cordova-plugin=cordova-sqlite-storage
 cordova plugin=cordova-plugin-googleplus
-cordova-plugin=https://github.com/vishwanath1004/cordova-plugin-camera.git
+cordova-plugin=https://github.com/shikshalokam/cordova-plugin-camera.git
 [email protected]
 cordova-plugin=cordova-plugin-filechooser
 cordova-plugin=cordova-plugin-media

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({})),

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'
     },

src/app/manage-learn/core/services/attachment/attachment.service.ts

@@ -130,7 +130,6 @@ export class AttachmentService {
           text: this.texts["FRMELEMENTS_LBL_UPLOAD_FILE"],
           icon: "document",
           handler: () => {
-            // this.openAllFile()
             this.openFile();
             return false;
           },
@@ -273,8 +272,8 @@ export class AttachmentService {
       const file = await this.chooser.getFile('application/pdf');
       let sizeOftheFile: number = file.data.length
       if (sizeOftheFile > localStorageConstants.FILE_LIMIT) {
-        this.actionSheetController.dismiss();
-        this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_FILE_SIZE_LIMIT"]);
+        this.presentToast(this.texts["FRMELEMNTS_LBL_FILE_SIZE_EXCEEDED"]);
+        this.actionSheetOpen ?  this.actionSheetController.dismiss() :'';
       } else {
         const pathToWrite = path ? path :this.directoryPath();
         const newFileName = this.createFileName(file.name)
@@ -292,7 +291,11 @@ export class AttachmentService {
       }
 
     } catch (error) {
-      this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+      if(error == "OutOfMemory"){
+        this.presentToast(this.texts["FRMELEMNTS_LBL_FILE_SIZE_EXCEEDED"]);
+      }else{
+        this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+      }
     }
   }
 
@@ -342,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;

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",