Merge pull request #435 from sunbird-cb/cbrelease-4.0.1

Cbrelease 4.0.1
sunbird-cb · May 27, 2022 · cfb88f2 · cfb88f2
2 parents 67882fb + 9da5f39
commit cfb88f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...rc/lib/routes/app-toc/components/app-toc-content-card/app-toc-content-card.component.html b/...rc/lib/routes/app-toc/components/app-toc-content-card/app-toc-content-card.component.html
@@ -33,6 +33,9 @@
               <!-- </span> -->
             </div>
           </div>
+          <button *ngIf="content?.artifactUrl && isAllowed" type="button" mat-icon-button [matMenuTriggerFor]="buttonMenu">
+            <mat-icon>more_vertical</mat-icon>
+          </button>
           <ng-container *ngIf="content?.identifier && content?.completionPercentage">
             <ng-container *ngIf="content?.completionStatus == 2">
               <circle-progress class="flex items-center progress" [percent]="100" [radius]="12" [outerStrokeWidth]="3"
@@ -64,9 +67,7 @@
               </ws-widget-content-progress> -->
             </ng-container>
           </ng-container>
-          <button *ngIf="content?.artifactUrl && isAllowed" type="button" mat-icon-button [matMenuTriggerFor]="buttonMenu">
-            <mat-icon>more_vertical</mat-icon>
-          </button>
+
           <!-- <div *ngIf="hasContentStructure" class="child-meta-container">
             <div class="child-structure"> -->
           <!-- <mat-icon class="structure-icon">import_contacts</mat-icon> -->
@@ -233,6 +234,10 @@
           <mat-icon class="mr-1 custom-icon rotate-90">call_to_action</mat-icon>
           <span>Course</span>
         </div> -->
+        <button *ngIf="content?.artifactUrl && !isXSmall && isAllowed" type="button" mat-icon-button class=""
+          [matMenuTriggerFor]="buttonMenu">
+          <mat-icon>more_vertical</mat-icon>
+        </button>
         <ng-container *ngIf="content?.identifier && content?.completionPercentage">
           <ng-container *ngIf="content?.completionStatus == 2">
             <circle-progress class="flex items-center progress" [percent]="100" [radius]="12" [outerStrokeWidth]="3"
@@ -263,10 +268,6 @@
             </ws-widget-content-progress> -->
           </ng-container>
         </ng-container>
-        <button *ngIf="content?.artifactUrl && !isXSmall && isAllowed" type="button" mat-icon-button class="text-right"
-          [matMenuTriggerFor]="buttonMenu">
-          <mat-icon>more_vertical</mat-icon>
-        </button>
       </div>
 
       <!-- <button *ngIf="content?.artifactUrl" type="button" mat-icon-button [matMenuTriggerFor]="buttonMenu">

diff --git a/...pp/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts b/...pp/src/lib/routes/app-toc/components/app-toc-single-page/app-toc-single-page.component.ts
@@ -606,6 +606,7 @@ export class AppTocSinglePageComponent implements OnInit, OnChanges, OnDestroy {
     ratingSummaryPr.avgRating = parseFloat((meanRating / this.ratingSummary.total_number_of_ratings).toFixed(1))
     if (this.content) {
       this.content.averageRating = ratingSummaryPr.avgRating
+      this.content.totalRating = ratingSummaryPr.total_number_of_ratings
     }
     // ratingSummaryPr.avgRating = 5
     return ratingSummaryPr