Issue #SB-28144 : fix

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Sunbird for Education
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

angular.json

@@ -274,7 +274,7 @@
       "styleext": "scss"
     },
     "@schematics/angular:component": {
-      "styleext": "scss"
+      "style": "scss"
     }
   }
 }

package.json

@@ -24,13 +24,13 @@
   "dependencies": {
     "@angular-builders/custom-webpack": "^8.4.1",
     "@angular-builders/dev-server": "^7.3.1",
-    "@angular/animations": "^9.1.13",
-    "@angular/common": "^9.1.13",
-    "@angular/core": "^9.1.13",
-    "@angular/forms": "^9.1.13",
-    "@angular/platform-browser": "^9.1.13",
-    "@angular/platform-browser-dynamic": "^9.1.13",
-    "@angular/router": "^9.1.13",
+    "@angular/animations": "^11.2.14",
+    "@angular/common": "^11.2.14",
+    "@angular/core": "^11.2.14",
+    "@angular/forms": "^11.2.14",
+    "@angular/platform-browser": "^11.2.14",
+    "@angular/platform-browser-dynamic": "^11.2.14",
+    "@angular/router": "^11.2.14",
     "@ionic-native/android-permissions": "^5.30.0",
     "@ionic-native/app-version": "^5.15.1",
     "@ionic-native/camera": "^5.30.0",
@@ -164,7 +164,7 @@
     "sb-notification": "0.0.2",
     "sb-svg2pdf": "0.0.10",
     "sb-tag-manager": "^3.9.19",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "uk.co.workingedge.phonegap.plugin.istablet": "^1.2.0",
     "uuid": "^3.4.0",
     "video.js": "7.4.1",
@@ -183,12 +183,12 @@
     "ionic_enable_lint": false
   },
   "devDependencies": {
-    "@angular-devkit/architect": "^0.901.15",
-    "@angular-devkit/build-angular": "~0.901.15",
-    "@angular/cli": "~9.1.15",
-    "@angular/compiler": "~9.1.13",
-    "@angular/compiler-cli": "~9.1.13",
-    "@angular/language-service": "~9.1.13",
+    "@angular-devkit/architect": "^0.1102.18",
+    "@angular-devkit/build-angular": "~0.1102.18",
+    "@angular/cli": "~11.2.18",
+    "@angular/compiler": "~11.2.14",
+    "@angular/compiler-cli": "~11.2.14",
+    "@angular/language-service": "~11.2.14",
     "@angularclass/hmr": "^2.1.3",
     "@babel/core": "^7.5.5",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
@@ -212,8 +212,8 @@
     "sonarqube-scanner": "^2.5.0",
     "tiny-glob": "^0.2.9",
     "ts-node": "^8.4.1",
-    "tslint": "~5.16.0",
-    "typescript": "~3.8.3"
+    "tslint": "~6.1.0",
+    "typescript": "~4.0.8"
   },
   "description": "An Ionic project",
   "cordova": {

scripts/deleteUnUsableIosIcon.js

@@ -69,6 +69,7 @@ function deleteUnUsableIosIcon(ionicIconFilePath) {
                 'newspaper.svg',
                 'attach.svg',
                 'image.svg',
+                'images.svg',
                 'map.svg',
                 'book.svg',
                 'checkmark-circle.svg',
@@ -132,7 +133,7 @@ function deleteUnUsableIosIcon(ionicIconFilePath) {
                 "sync-circle.svg",
                 "arrow-up-circle-outline.svg",
                 "arrow-down-circle-outline.svg",
-                "caret-forward-circle.svg"
+                "caret-forward-circle.svg",
             ].includes(file))) {
                 fs.unlinkSync(ionicIconFilePath + '/' + file);
             }

src/app.scss

@@ -2163,7 +2163,19 @@ app-user-home{
   }
 }
 
-app-metadata-details{
+app-add-file {
+  .icon-style{
+    border-radius: 50%;
+    padding: 10px;
+    background-image: linear-gradient( #dce7f3 50%, #adc3dd 100% );
+    box-shadow: 1px 3px 4px #666666;
+  }
+  .btn-space-btwn{
+    display: flex;
+    justify-content: space-between;
+  }
+}
+app-metadata-details,app-add-file {
   .progress-bar-style{
     height: 10px;
     border-radius: 16px;
@@ -2307,4 +2319,11 @@ app-metadata-details{
         text-transform: none;
     }
 }
-}
+.attachment-delete-alert{
+  background-color: red;
+  ion-button{
+    color:#adc3dd;
+    --color:green;
+  }
+}
+}

src/app/app-routing.module.ts

@@ -132,7 +132,7 @@ const routes: Routes = [
 
 @NgModule({
   imports: [
-    RouterModule.forRoot(routes)
+    RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })
   ],
   exports: [RouterModule],
   providers: [

src/app/app.constant.ts

@@ -597,6 +597,8 @@ export class RouterLinks {
     public static readonly PROJECT_OPERATION_PAGE = `/${RouterLinks.PROJECT}/${RouterLinks.PROJECT_OPERATION}`;
     public static readonly CREATE_PROJECT_PAGE = `/${RouterLinks.PROJECT}/${RouterLinks.CREATE_PROJECT}`;
     public static readonly ATTACHMENTS_LIST = `/${RouterLinks.PROJECT}/${RouterLinks.ATTACHMENTS}`;
+    public static readonly ADD_FILE='add-file';
+    public static readonly ATTACHMENTS_LISTING = 'attachment-listing';
 
 
     public static readonly SOLUTIONS = 'solutions';

src/app/collection-detail-etb/collection-detail-etb.page.ts

@@ -383,7 +383,7 @@ export class CollectionDetailEtbPage implements OnInit {
       this.subscribeSdkEvent();
     });
     this.ionContent.ionScroll.subscribe((event) => {
-      this.scrollPosition = event.scrollTop;
+      this.scrollPosition = event['scrollTop'];
     });
 
     this.events.subscribe(EventTopics.DEEPLINK_COLLECTION_PAGE_OPEN, (data) => {

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

@@ -68,5 +68,38 @@ export const actions = {
       action: "files",
       color: 'primary'
     }
+  ],
+
+  TASK_FILE_DESCRIPTION:{
+    label:'FRMELEMNTS_LBL_TASK_ATTACHMENTS_DESCRIPTION'
+  },
+  PROJECT_FILE_DESCRIPTION:{
+    label:'FRMELEMNTS_LBL_PROJECT_ATTACHMENTS_DESCRIPTION'
+  },
+  FILE_UPLOAD_OPTIONS:[
+    {
+      title: "CAMERA",
+      icon: "camera",
+      action: "openCamera",
+      color: 'primary'
+    },
+    {
+      title: "GALLERY",
+      icon: "images",
+      action: "openGallery",
+      color: 'primary'
+    },
+    {
+      title: "FILES",
+      icon: "document", 
+      action: "openFiles",
+      color: 'primary'
+    },
+    {
+      title: "LINKS",
+      icon: "link-outline", 
+      action: "openLink",
+      color: 'primary'
+    }
   ]
 }

src/app/manage-learn/core/guards/deactivate.guard.ts

@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+
+import {  ActivatedRouteSnapshot,CanDeactivate, RouterStateSnapshot } from '@angular/router';
+
+import { Observable } from 'rxjs';
+import { AddFilePage } from '../../project/add-file/add-file.page';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DeactivateGuard implements CanDeactivate<any> 
+{
+    component: Object;
+    route: ActivatedRouteSnapshot;
+
+   constructor(){
+   }
+
+   canDeactivate(component:AddFilePage,
+                route: ActivatedRouteSnapshot, 
+                state: RouterStateSnapshot,
+                nextState: RouterStateSnapshot) : Observable<any> | Promise<any> | any {
+        return !component.exitPage ? component.pageExitConfirm() : true;
+
+  }
+
+}

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

@@ -13,7 +13,8 @@ import { FILE_EXTENSION_HEADERS } from "../../constants";
 export class AttachmentService {
   mediaType: string;
   texts: any;
-
+  payload : any;
+  actionSheetOpen : boolean = false;
   constructor(
     private camera: Camera,
     private file: File,
@@ -41,6 +42,7 @@ export class AttachmentService {
   }
 
   async selectImage() {
+    this.actionSheetOpen = true
     const actionSheet = await this.actionSheetController.create({
       header: this.texts["FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE"],
       cssClass: 'sb-popover',
@@ -116,7 +118,7 @@ export class AttachmentService {
         };
 
         this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
-        this.actionSheetController.dismiss(data);
+        this.actionSheetOpen? this.actionSheetController.dismiss(data) : this.payload.push(data);
       },
       (error) => {
         this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
@@ -147,12 +149,11 @@ export class AttachmentService {
           isUploaded: false,
           url: "",
         };
-
         this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
-        this.actionSheetController.dismiss(data);
+        this.actionSheetOpen? this.actionSheetController.dismiss(data) : this.payload.push(data);
       }
     } catch (error) {
-       this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+      this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
     }
 
     // non working code for sdk30-android 11
@@ -203,4 +204,21 @@ export class AttachmentService {
   deleteFile(fileName) {
     return this.file.removeFile(this.directoryPath(), fileName);
   }
+
+  async openAttachmentSource(type,payload) {
+    let data:any ='';
+    this.actionSheetOpen = false;
+    this.payload = payload;
+    switch(type){
+      case 'openCamera':
+       this.takePicture(this.camera.PictureSourceType.CAMERA);
+      break;
+      case 'openGallery':
+       this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
+      break;
+      case 'openFiles':
+        this.openFile();
+      break;
+    }
+  }
 }

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

@@ -411,4 +411,21 @@ export class ProjectService {
       })
     })
   }
+
+  getLinks(links) {
+    let formattedLinks = links.replace(/[ ]/g, ',').split(',');
+    let linkArray = [];
+    formattedLinks.forEach(element => {
+      if(element){
+        let link = {
+          name: element,
+          type: 'link',
+          isUploaded: false,
+          url: "",
+        };
+        linkArray.push(link);
+      }
+    });
+    return linkArray.length ? linkArray : links;
+  }
 }

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

@@ -104,8 +104,8 @@ export class SyncService {
     if(showLoader){
       this.loader.startLoader()
     }
-    const project = { ...projectDetails};
-    const payload = this.removeKeys(project, ['isNew', 'isEdit']);
+    const project = { ...projectDetails };
+    const payload = this.removeKeys(project, ['isNew', 'isEdit', 'submissionDetails']);
     delete payload._id;
     const actualPayload = this.processPayload(payload);
     //Else in submitted status projects, the sync API will Fail while redirecting to sync page
@@ -182,6 +182,14 @@ export class SyncService {
 
   getAllAttachmentOfProject(project) {
     let attachments = [];
+    // project leve attachments
+    if (project.attachments && project.attachments.length) {
+      for (const attachment of project.attachments) {
+        !attachment['sourcePath'] ? attachments.push(attachment) : null;
+      }
+    }
+
+    // Task leve attachments
     for (const task of project.tasks) {
       if (task.attachments && task.attachments.length) {
         for (const attachment of task.attachments) {

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

@@ -737,4 +737,25 @@ return data;
     }
     return taskCount?.length;
   }
+
+  getTabs(){
+    let tabs = [
+      {
+        name: "FRMELEMNTS_LBL_IMAGES",
+        value: "images",
+        type: 'image/jpeg'
+      },
+      {
+        name: "FRMELEMNTS_LBL_FILES",
+        value: "files",
+        type: "application/pdf"
+      },
+      {
+        name: "FRMELEMNTS_LBL_LINKS",
+        value: "links",
+        type: "link"
+      },
+    ];
+    return tabs;
+  }
 }

src/app/manage-learn/observation/observation-submission/observation-submission.component.html

@@ -65,10 +65,10 @@
   <app-no-data *ngIf="!submissions?.length"></app-no-data>
 </ion-content>
 
-<ion-footer no-shadow *ngIf="!disableObserveAgain">
+<ion-footer no-shadow>
   <ion-toolbar position="bottom">
     <ion-row>
-      <ion-col>
+      <ion-col *ngIf="!disableObserveAgain">
         <ion-button ion-button full (click)="observeAgain()" class="footerButton w-100">
           {{ 'FRMELEMNTS_LBL_OBSERVE_AGAIN' | translate }}
         </ion-button>