Sb 28716

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

@@ -277,4 +277,4 @@
       "style": "scss"
     }
   }
-}
+}

config.xml

@@ -176,4 +176,4 @@
         <variable name="PLAY_SERVICES_VERSION" value="15.0.1" />
     </plugin>
     <plugin name="uk.co.workingedge.phonegap.plugin.istablet" spec="^1.2.0" />
-</widget>
+</widget>

package.json

@@ -355,4 +355,4 @@
       "<rootDir>/src/app/animations/*.ts"
     ]
   }
-}
+}

src/app/app-routing.module.ts

@@ -142,4 +142,4 @@ const routes: Routes = [
     HasNotSelectedFrameworkGuard,
     IsGuestUserGuard],
 })
-export class AppRoutingModule { }
+export class AppRoutingModule { }

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>

src/app/manage-learn/project/project-operation/project-operation.page.ts

@@ -13,7 +13,7 @@ import { Location } from '@angular/common';
 import { DbService } from '../../core/services/db.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UnnatiDataService } from '../../core/services/unnati-data.service';
-import { LoaderService, NetworkService, statusType, ToastService } from '../../core';
+import { LoaderService, NetworkService, ProjectService, statusType, ToastService } from '../../core';
 import { RouterLinks } from '@app/app/app.constant';
 import { SyncService } from '../../core/services/sync.service';
 import cloneDeep from 'lodash/cloneDeep';
@@ -64,6 +64,7 @@ export class ProjectOperationPage  {
     private syncServ: SyncService,
     private networkService: NetworkService,
     private toast: ToastService,
+    private projectServ: ProjectService,
   ) {
     this.routerparam.params.subscribe(data => {
       this.projectId = data.id;
@@ -341,10 +342,12 @@ export class ProjectOperationPage  {
   }
 
   newProjectCreate() {
-    this.template.isNew = true;
-    this.template.downloaded = true;
+    // this.template.isNew = true;
+    // this.template.downloaded = true;
 
-    this.update(true);
+    // this.update(true);
+
+    this.projectServ.createNewProject(this.template, false)
   }
   ionViewWillLeave() {
     if(this.viewProjectAlert ){

src/app/manage-learn/shared/components/task-card/task-card.component.html

@@ -2,9 +2,10 @@
   <ion-card (click)="onCardClick(task)" class="sb-dt-card task-card" *ngIf="!task?.isDeleted">
     <ion-row>
       <ion-col size="1">
-        <ion-icon *ngIf="task?.status == statuses['completed']" name="checkmark-circle" class="check-icon"
+        <ion-icon *ngIf="task?.status == statuses['completed'].value" name="checkmark-circle" class="check-icon"
           color="success"></ion-icon>
       </ion-col>
+
       <ion-col size="11">
         <div class="display-flex-space-btn">
           <div style="flex:1">{{task?.name}}</div>

src/app/manage-learn/shared/components/task-card/task-card.component.ts

@@ -59,6 +59,7 @@ export class TaskCardComponent implements OnInit {
           observationId: submissionDetails.observationId,
           entityId: submissionDetails.entityId,
           entityName: submissionDetails.entityName,
+          disableObserveAgain: task?.status == this.statuses['completed'].value,
         },
       });
     } else {

src/assets/styles/fonts.scss

@@ -76,4 +76,3 @@
     text-align: center;
   }
 
-

src/services/active-page/active-page-service.ts

@@ -50,4 +50,4 @@ export class ActivePageService {
     return pageId;
   }
 
-}
+}

src/services/crash-analytics/crash-analytics-error-logger.ts

@@ -43,4 +43,4 @@ export class CrashAnalyticsErrorLogger extends ErrorHandler {
         super.handleError(error);
     }
 
-}
+}

tslint.json

@@ -137,4 +137,4 @@
       ]
     }
   }
-}
+}