Merge pull request #417 from sunbird-cb/mandatory-courses

Task #58265: start-again enhancement for course & program
sunbird-cb · May 24, 2022 · 16d2358 · 16d2358
2 parents c8c83ed + 1435c3f
commit 16d2358
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 12 deletions.
diff --git a/library/ws-widget/collection/src/lib/card-content/card-content.component.html b/library/ws-widget/collection/src/lib/card-content/card-content.component.html
@@ -1062,7 +1062,7 @@ <h2 class="mat-subheading-2 flex-1 min-w-0 margin-remove-bottom" i18n>Reason</h2
           </ul>
         </div>
         <!-- <div class="flex"> -->
-          <div>
+          <div *ngIf="widgetData?.content?.batch?.endDate">
             <p>Deadline - {{widgetData.content.batch?.endDate | date: "d MMM yyyy"}}</p>
           </div>
           <div class="tags" *ngIf="widgetData.content.keywords && widgetData.content.keywords.length > 0">

diff --git a/...y/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts b/...y/ws-widget/collection/src/lib/content-strip-multiple/content-strip-multiple.component.ts
@@ -601,7 +601,7 @@ export class ContentStripMultipleComponent extends WidgetBaseComponent
 
           // To sort in descending order of the enrolled date
           if (content && content.length) {
-            contentNew = content.sort((a: any, b: any) => {
+            contentNew = (content || []).sort((a: any, b: any) => {
               const dateA: any = new Date(a.enrolledDate || 0)
               const dateB: any = new Date(b.enrolledDate || 0)
               return dateB - dateA

diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.ts
@@ -211,7 +211,12 @@ export class AppTocBannerComponent implements OnInit, OnChanges, OnDestroy {
       this.getLearningUrls()
     }
     if (this.resumeData && this.content) {
-      const resumeDataV2 = this.getResumeDataFromList()
+      let resumeDataV2: any
+      if (this.content.completionPercentage === 100) {
+        resumeDataV2 = this.getResumeDataFromList('start')
+      } else {
+        resumeDataV2 = this.getResumeDataFromList()
+      }
       if (!resumeDataV2.mimeType) {
         resumeDataV2.mimeType = this.getMimeType(this.content, resumeDataV2.identifier)
       }
@@ -370,12 +375,19 @@ export class AppTocBannerComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
 
-  private getResumeDataFromList() {
-    const lastItem = this.resumeData && this.resumeData.pop()
+  private getResumeDataFromList(type?: string) {
+    if (!type) {
+      console.log('getResumeDataFromList: type', type)
+      const lastItem = this.resumeData && this.resumeData.pop()
+      return {
+        identifier: lastItem.contentId,
+        mimeType: lastItem.progressdetails && lastItem.progressdetails.mimeType,
+      }
+    }
+    const firstItem = this.resumeData && this.resumeData.length && this.resumeData[0]
     return {
-      identifier: lastItem.contentId,
-      mimeType: lastItem.progressdetails && lastItem.progressdetails.mimeType,
-
+      identifier: firstItem.contentId,
+      mimeType: firstItem.progressdetails && firstItem.progressdetails.mimeType,
     }
   }
   private modifySensibleContentRating() {

diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.html
@@ -114,8 +114,13 @@
                   [routerLink]="resumeData ? resumeDataLink?.url : firstResourceLink?.url"
                   [queryParams]="resumeData ? generateQuery('RESUME') : generateQuery('START')"
                   class="mat-button mat-button-base resumeButton custom-button width-1-1 text-white">
-                  <ng-container *ngIf="!forPreview || isInIFrame; else authView" i18n>
-                    {{resumeData? "Resume" : "Start"}}
+                  <ng-container *ngIf="content.completionPercentage < 100">
+                    <ng-container *ngIf="!forPreview || isInIFrame; else authView" i18n>
+                      {{resumeData? "Resume" : "Start"}}
+                    </ng-container>
+                  </ng-container>
+                  <ng-container *ngIf="content.completionPercentage === 100">
+                    {{resumeData? "Start again" : "Start"}}
                   </ng-container>
                 </a>
                 <a *ngIf="isPostAssessment && showTakeAssessment?.post_assessment" [routerLink]="firstResourceLink?.url"
@@ -172,8 +177,16 @@
                   [routerLink]="resumeData ? resumeDataLink?.url : firstResourceLink?.url"
                   [queryParams]="resumeData ? generateQuery('RESUME') : generateQuery('START')"
                   class="mat-button mat-button-base resumeButton custom-button width-1-1 text-white">
-                  <ng-container *ngIf="!forPreview || isInIFrame; else authView" i18n>
+                  <!-- <ng-container *ngIf="!forPreview || isInIFrame; else authView" i18n>
                     {{resumeData? "Resume" : "Start"}}
+                  </ng-container> -->
+                  <ng-container *ngIf="content.completionPercentage < 100">
+                    <ng-container *ngIf="!forPreview || isInIFrame; else authView" i18n>
+                      {{resumeData? "Resume" : "Start"}}
+                    </ng-container>
+                  </ng-container>
+                  <ng-container *ngIf="content.completionPercentage === 100">
+                    {{resumeData? "Start again" : "Start"}}
                   </ng-container>
                 </a>
                 <a *ngIf="isPostAssessment && showTakeAssessment?.post_assessment" [routerLink]="firstResourceLink?.url"

diff --git a/...app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.ts b/...app/src/lib/routes/mandatory-course/routes/mandatory-course/mandatory-course.component.ts
@@ -72,7 +72,7 @@ export class MandatoryCourseComponent implements OnInit, OnDestroy, OnChanges {
     // }
 
     // To sort in descending order of the enrolled date
-    contentNew = content.sort((a: any, b: any) => {
+    contentNew = (content || []).sort((a: any, b: any) => {
       const dateA: any = new Date(a.enrolledDate || 0)
       const dateB: any = new Date(b.enrolledDate || 0)
       return dateB - dateA