EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3787 assign: Always show submission status

main
Pau Ferrer Ocaña 2022-01-07 16:49:04 +01:00
parent 9b93a0450c
commit 59e1a4fcf5
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/addons/mod/assign/classes/submissions-source.ts
View File

@ -211,14 +211,9 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
submission.gradingstatus, submission.gradingstatus,
); );
// Show submission status if not submitted for grading. submission.statusTranslated = Translate.instant(
if (submission.statusColor != 'success' || !submission.gradingstatus) { 'addon.mod_assign.submissionstatus_' + submission.status,
submission.statusTranslated = Translate.instant( );
'addon.mod_assign.submissionstatus_' + submission.status,
);
} else {
submission.statusTranslated = '';
}
if (notSynced) { if (notSynced) {
submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced'; submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';

2
src/addons/mod/assign/components/index/index.ts
View File

@ -302,7 +302,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
} }
} }
this.needsGradingAvailable = (submissionStatus.gradingsummary?.submissionsneedgradingcount || 0) > 0; this.needsGradingAvailable = this.summary.submissionsneedgradingcount > 0;
} }
/** /**

18
src/addons/mod/assign/pages/submission-list/submission-list.html
View File

@ -63,14 +63,16 @@
{{ 'addon.mod_assign.defaultteam' | translate }} {{ 'addon.mod_assign.defaultteam' | translate }}
</span> </span>
</p> </p>
<ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor" <p *ngIf="submission.statusTranslated">
*ngIf="submission.statusTranslated"> <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor">
{{ submission.statusTranslated }} {{ submission.statusTranslated }}
</ion-badge> </ion-badge>
<ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor" </p>
*ngIf="submission.gradingStatusTranslationId"> <p *ngIf="submission.gradingStatusTranslationId">
{{ submission.gradingStatusTranslationId | translate }} <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor">
</ion-badge> {{ submission.gradingStatusTranslationId | translate }}
</ion-badge>
</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ng-container> </ng-container>