Issue #SB-000 merge: Merge branch 'release-5.0.0' into release-5.0.1

src/app.scss

@@ -2132,6 +2132,28 @@ ion-icon.mg-popup-btn-icon.md.hydrated{
     filter: invert(0) !important;
     background: var(--app-secondary-background);
   }
+  .task-card .display-flex-space-btn .title-break{
+    color: #fff !important;
+  }
+  .success{
+    color: #FFD954 !important;
+  }
+  .task-card {
+    .mandatory-ribben-label{
+      color: #000 !important;
+      background-color: #FFD954  !important;
+    }
+    .action-btn{
+      color: #000 !important;
+      --background: #FFD954  !important;
+  }
+
+  }
+  .attachments-list{
+    .card-text{
+      color: #000 !important;
+    }
+  }
   .segment-button-has-label-only.segment-button-layout-icon-top.ion-activatable.ion-activatable-instant.ion-focusable.hydrated.segment-button-checked ion-label {
     color: black !important;
   }
@@ -2385,11 +2407,11 @@ app-metadata-details,app-add-file {
     background: black;
   }
 .segment-card{
-    background: #fff;
+    background: var(--sb-pill-bg);
     border-radius: 12px;
     box-shadow: var(--button-style-shadow) !important;
     ion-segment-button{
-        margin: 0px 10px;
+        margin: 0px 0px;
         text-transform: none;
       ion-label {
         font-size: 0.875rem;

src/app/components/application-header/application-header.component.ts

@@ -520,9 +520,8 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
 
   private refreshLoginInButton() {
     const profileType = this.appGlobalService.getGuestUserType();
-    this.showLoginButton = (this.commonUtilService.isAccessibleForNonStudentRole(profileType)
-            && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER) ||
-        (profileType === ProfileType.STUDENT && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT);
+    this.showLoginButton = this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER ||
+        this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT;
   }
 
   private async checkCurrentOrientation() {

src/app/manage-learn/core/constants/localStorageConstants.ts

@@ -8,5 +8,5 @@ export const localStorageConstants = {
     USER_DETAILS:"usersInfo",
     SELECTED_LANGUAGE: "selectedLanguage",
     LIBRARY_CATEGORIES:"libraryCategories",
-    FILE_LIMIT:30000000
+    FILE_LIMIT:50000000
 };

src/app/manage-learn/core/constants/mimTypes.ts

@@ -2,7 +2,7 @@ export const FILE_EXTENSION_HEADERS = {
     aac: "audio/aac",
     abw: "application/x-abiword",
     arc: "application/x-freearc",
-    avi: "video/x-msvideo",
+    avi: "video/mp4",
     azw: "application/vnd.amazon.ebook",
     bin: "application/octet-stream",
     bmp: "image/bmp",
@@ -32,13 +32,13 @@ export const FILE_EXTENSION_HEADERS = {
     midi: "audio/midi",
     mjs: "text/javascript",
     mp3: "audio/mpeg",
-    mpeg: "video/mpeg",
+    mpeg: "video/mp4",
     mpkg: "application/vnd.apple.installer+xml",
     odp: "application/vnd.oasis.opendocument.presentation",
     ods: "application/vnd.oasis.opendocument.spreadsheet",
     odt: "application/vnd.oasis.opendocument.text",
     oga: "audio/ogg",
-    ogv: "video/ogg",
+    ogv: "video/mp4",
     ogx: "application/ogg",
     otf: "font/otf",
     png: "image/jpeg",
@@ -58,7 +58,7 @@ export const FILE_EXTENSION_HEADERS = {
     vsd: "application/vnd.visio",
     wav: "audio/wav",
     weba: "audio/webm",
-    webm: "video/webm",
+    webm: "video/mp4",
     webp: "image/webp",
     woff: "font/woff",
     woff2: "font/woff2",
@@ -68,9 +68,15 @@ export const FILE_EXTENSION_HEADERS = {
     xml: "application/xml ",
     xul: "application/vnd.mozilla.xul+xml",
     zip: "application/zip",
-    "3gp": "video/3gpp",
-    "3g2": "video/3gpp2",
+    "3gp": "video/mp4",
+    "3g2": "video/mp4",
     "7z": "application/x-7z-compressed",
     mp4: "video/mp4",
+    mov: "video/mp4",
+    mkv:"video/mp4",
+    wmv: "video/mp4",
+    ogg: "video/mp4",
+    m4v:"video/mp4",
+    flv:"video/mp4"
   };
 

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

@@ -1,20 +1,22 @@
 import { Injectable } from "@angular/core";
-import { Camera, CameraOptions, PictureSourceType } from "@ionic-native/camera/ngx";
+import { Camera, CameraOptions, MediaType, PictureSourceType } from "@ionic-native/camera/ngx";
 import { Chooser } from "@ionic-native/chooser/ngx";
 import { FilePath } from "@ionic-native/file-path/ngx";
 import { File } from "@ionic-native/file/ngx";
 import { ActionSheetController, Platform, ToastController } from "@ionic/angular";
 import { TranslateService } from "@ngx-translate/core";
 import { FILE_EXTENSION_HEADERS } from "../../constants";
 import { localStorageConstants } from "../../constants/localStorageConstants";
+import { LoaderService } from "../loader/loader.service";
+
 @Injectable({
   providedIn: 'root'
 })
 export class AttachmentService {
   mediaType: string;
   texts: any;
-  payload : any;
-  actionSheetOpen : boolean = false;
+  payload: any;
+  actionSheetOpen: boolean = false;
   constructor(
     private camera: Camera,
     private file: File,
@@ -24,7 +26,8 @@ export class AttachmentService {
     private filePath: FilePath,
     private chooser: Chooser,
     // private filePickerIOS: IOSFilePicker,
-    private translate: TranslateService
+    private translate: TranslateService,
+    private loader: LoaderService
   ) {
     this.translate
       .get([
@@ -35,7 +38,8 @@ export class AttachmentService {
         "CANCEL",
         "FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE",
         "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED",
-        "FRMELEMNTS_MSG_ERROR_FILE_SIZE_LIMIT"
+        "FRMELEMNTS_MSG_ERROR_FILE_SIZE_LIMIT",
+        "FRMELEMNTS_LBL_FILE_SIZE_EXCEEDED"
       ])
       .subscribe((data) => {
         this.texts = data;
@@ -79,36 +83,99 @@ export class AttachmentService {
     return actionSheet.onDidDismiss();
   }
 
-  takePicture(sourceType: PictureSourceType) {
-    let options: CameraOptions = {
-      quality: 10,
+  takePicture(sourceType: PictureSourceType, mediaType: MediaType = this.camera.MediaType.ALLMEDIA) {
+    var options: CameraOptions = {
+      quality: 20,
       sourceType: sourceType,
       saveToPhotoAlbum: false,
       correctOrientation: true,
+      mediaType: mediaType,
+      destinationType: this.camera.DestinationType.FILE_URI,
     };
 
     this.camera
       .getPicture(options)
       .then((imagePath) => {
         if (this.platform.is("android") && sourceType === this.camera.PictureSourceType.PHOTOLIBRARY) {
-          this.filePath
-            .resolveNativePath(imagePath)
-            .then((filePath) => {
-              this.copyFile(filePath);
+          let newFilePath = imagePath;
+          if (!newFilePath.includes("file://")) {
+            newFilePath = "file://" + imagePath
+          }
+            this.checkForFileSizeRestriction(newFilePath).then(isValidFile => {
+              if (isValidFile) {
+                this.filePath
+                  .resolveNativePath(newFilePath)
+                  .then((filePath) => {
+                    this.copyFile(filePath);
+                  })
+                  .catch(error => { })
+              }
             })
         } else {
-          this.copyFile(imagePath);
+          this.checkForFileSizeRestriction(imagePath).then(isValidFile => {
+            if (isValidFile) {
+              this.copyFile(imagePath);
+            }
+          })
         }
       })
       .catch((err) => {
         console.log(err);
-        if(err !== "No Image Selected") {
+        if (err !== "No Image Selected") {
           this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
         }
       });
   }
 
-  copyFileToLocalDir(namePath, currentName, newFileName) {
+  writeFileToPrivateFolder(filePath) {
+    this.checkForFileSizeRestriction(filePath).then(isValidFile => {
+      if (isValidFile) {
+        let path = filePath.substr(0, filePath.lastIndexOf("/") + 1);
+        let currentName = filePath.split("/").pop();
+        this.loader.startLoader();
+        this.file.readAsArrayBuffer(path, currentName).then(success => {
+          const pathToWrite = this.directoryPath();
+          const newFileName = this.createFileName(currentName)
+          this.file.writeFile(pathToWrite, newFileName, success).then(fileWrite => {
+            const data = {
+              name: newFileName,
+              type: this.mimeType(newFileName),
+              isUploaded: false,
+              url: "",
+            };
+            this.loader.stopLoader();
+            this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
+            this.actionSheetOpen ? this.actionSheetController.dismiss(data) : this.payload.push(data);
+          }).catch(error => {
+            this.loader.stopLoader();
+            this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+          })
+        }).catch(error => {
+          this.loader.stopLoader();
+          this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+        })
+      }
+    }).catch(error => { })
+  }
+
+  checkForFileSizeRestriction(filePath): Promise<Boolean> {
+    return new Promise((resolve, reject) => {
+      this.file.resolveLocalFilesystemUrl(filePath).then(success => {
+        success.getMetadata((metadata) => {
+          if (metadata.size > localStorageConstants.FILE_LIMIT) {
+            this.presentToast(this.texts["FRMELEMNTS_LBL_FILE_SIZE_EXCEEDED"],'danger', 5000);
+            reject(false)
+          } else  {
+            resolve(true)
+          }
+        })
+      }).catch(error => {
+        reject(false)
+      })
+    })
+  }
+
+  copyFileToLocalDir(namePath, currentName, newFileName, completeFilePath) {
     this.file.copyFile(namePath, currentName, this.directoryPath(), newFileName).then(
       (success) => {
         const data = {
@@ -119,19 +186,20 @@ export class AttachmentService {
         };
 
         this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
-        this.actionSheetOpen? this.actionSheetController.dismiss(data) : this.payload.push(data);
+        this.actionSheetOpen ? this.actionSheetController.dismiss(data) : this.payload.push(data);
       },
       (error) => {
-        this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+        this.writeFileToPrivateFolder(completeFilePath);
+        // this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
       }
     );
   }
 
-  async presentToast(text, color = "danger") {
+  async presentToast(text, color = "danger", duration = 3000) {
     const toast = await this.toastController.create({
       message: text,
       position: "top",
-      duration: 3000,
+      duration: duration,
       color: color,
     });
     toast.present();
@@ -140,11 +208,11 @@ export class AttachmentService {
   async openFile() {
     try {
       const file = await this.chooser.getFile('application/pdf');
-      let sizeOftheFile:number = file.data.length
-      if(sizeOftheFile > localStorageConstants.FILE_LIMIT){
+      let sizeOftheFile: number = file.data.length
+      if (sizeOftheFile > localStorageConstants.FILE_LIMIT) {
         this.actionSheetController.dismiss();
         this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_FILE_SIZE_LIMIT"]);
-      }else{
+      } else {
         const pathToWrite = this.directoryPath();
         const newFileName = this.createFileName(file.name)
         const writtenFile = await this.file.writeFile(pathToWrite, newFileName, file.data.buffer)
@@ -156,10 +224,10 @@ export class AttachmentService {
             url: "",
           };
           this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
-          this.actionSheetOpen? this.actionSheetController.dismiss(data) : this.payload.push(data);
+          this.actionSheetOpen ? this.actionSheetController.dismiss(data) : this.payload.push(data);
         }
       }
-     
+
     } catch (error) {
       this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
     }
@@ -185,7 +253,7 @@ export class AttachmentService {
     let correctPath = filePath.substr(0, filePath.lastIndexOf("/") + 1);
     let currentName = filePath.split("/").pop();
     currentName = currentName.split("?")[0];
-    this.copyFileToLocalDir(correctPath, currentName, this.createFileName(currentName));
+    this.copyFileToLocalDir(correctPath, currentName, this.createFileName(currentName), filePath);
   }
 
   createFileName(name) {
@@ -213,20 +281,20 @@ export class AttachmentService {
     return this.file.removeFile(this.directoryPath(), fileName);
   }
 
-  async openAttachmentSource(type,payload) {
-    let data:any ='';
+  async openAttachmentSource(type, payload) {
+    let data: any = '';
     this.actionSheetOpen = false;
     this.payload = payload;
-    switch(type){
+    switch (type) {
       case 'openCamera':
-       this.takePicture(this.camera.PictureSourceType.CAMERA);
-      break;
+        this.takePicture(this.camera.PictureSourceType.CAMERA);
+        break;
       case 'openGallery':
-       this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
-      break;
+        this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
+        break;
       case 'openFiles':
         this.openFile();
-      break;
+        break;
     }
   }
 }

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

@@ -52,7 +52,7 @@ export class ProjectService {
     })
   }
   async getTemplateBySoluntionId(id) {
-    let payload = await this.utils.getProfileInfo();
+    let payload = await this.utils.getProfileData();
     const config = {
       url: urlConstants.API_URLS.TEMPLATE_DETAILS + id,
       payload: payload,

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

@@ -742,6 +742,11 @@ return data;
         value: "image",
         type: 'image/jpeg'
       },
+      {
+        name: "FRMELEMNTS_LBL_VIDEOS",
+        value: "video",
+        type: "video/mp4"
+      },
       {
         name: "FRMELEMNTS_LBL_FILES",
         value: "file",
@@ -752,6 +757,7 @@ return data;
         value: "link",
         type: "link"
       },
+
     ];
     return tabs;
   }