From 08371d580f30524ec4f9f62c96be3e1337300e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 10 Sep 2018 09:47:56 +0200
Subject: [PATCH] MOBILE-2567 grades: Fix rowspan problem

---
 .../components/course/core-grades-course.html | 22 ++++++++++---------
 src/core/grades/providers/helper.ts           |  2 --
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/grades/components/course/core-grades-course.html b/src/core/grades/components/course/core-grades-course.html
index fcfe59d9b..637e22a35 100644
--- a/src/core/grades/components/course/core-grades-course.html
+++ b/src/core/grades/components/course/core-grades-course.html
@@ -10,23 +10,25 @@
             <table cellspacing="0" cellpadding="0" class="core-grades-table">
                 <thead>
                     <tr>
-                        <th *ngFor="let column of gradesTable.columns" id="{{column.name}}" [class.hidden-phone]="column.hiddenPhone" [attr.colspan]="column.colspan">
+                        <th *ngFor="let column of gradesTable.columns" id="{{column.name}}" [class.hidden-phone]="column.hiddenPhone" [attr.colspan]="column.colspan" text-start>
                             {{ 'core.grades.' + column.name | translate }}
                         </th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr *ngFor="let row of gradesTable.rows" (click)="row.itemtype != 'category' && gotoGrade(row.id)" [class]="row.rowclass">
-                        <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
-                        </td>
-                        <th class="core-grades-table-gradeitem" [class.column-itemname]="row.itemtype == 'category'" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id">
-                            <core-icon *ngIf="row.icon" name="{{row.icon}}" item-start></core-icon>
-                            <img *ngIf="row.image" [src]="row.image" item-start/>
-                            <span [innerHTML]="row.gradeitem"></span>
-                        </th>
-                        <ng-container *ngFor="let column of gradesTable.columns">
-                            <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined" [class]="'core-grades-table-' + column.name" [innerHTML]="row[column.name]" [class.hidden-phone]="column.hiddenPhone">
+                        <ng-container *ngIf="row.itemtype">
+                            <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
                             </td>
+                            <th class="core-grades-table-gradeitem" [class.column-itemname]="row.itemtype == 'category'" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id" text-start>
+                                <core-icon *ngIf="row.icon" name="{{row.icon}}" item-start></core-icon>
+                                <img *ngIf="row.image" [src]="row.image" item-start/>
+                                <span [innerHTML]="row.gradeitem"></span>
+                            </th>
+                            <ng-container *ngFor="let column of gradesTable.columns">
+                                <td *ngIf="column.name != 'gradeitem' && row[column.name] != undefined" [class]="'core-grades-table-' + column.name" [innerHTML]="row[column.name]" [class.hidden-phone]="column.hiddenPhone" text-start>
+                                </td>
+                            </ng-container>
                         </ng-container>
                     </tr>
                 </tbody>
diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index dd176b35e..7f2e5f4be 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -156,8 +156,6 @@ export class CoreGradesHelperProvider {
             };
         formatted.rows = table.tabledata.map((row: any) => {
             return this.formatGradeRowForTable(row);
-        }).filter((row: any) => {
-            return typeof row.gradeitem !== 'undefined';
         });
 
         // Get a row with some info.