CIT/Vmeda.Online
4
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

Merge pull request #1744 from crazyserver/MOBILE-2855

Browse Source 
MOBILE-2855 workshop: Show received grades on closed phase
This commit is contained in:
Juan Leyva 2019-02-04 13:38:48 +01:00 committed by GitHub
commit b962a9ab39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
View File

@ -1,7 +1,7 @@
<core-loading [hideUntil]="loaded">
<div *ngIf="!summary">
<ion-list-header text-wrap>
<ion-avatar core-user-avatar [user]="profile" item-start></ion-avatar>
<ion-avatar core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile && profile.id" item-start></ion-avatar>
<h2>{{submission.title}}</h2>
<p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
<p *ngIf="showGrade(submission.submissiongrade)" [class.addon-has-overriden-grade]="showGrade(submission.submissiongradeover)">

2
src/addon/mod/workshop/pages/assessment/assessment.html
View File

@ -36,7 +36,7 @@
</ion-badge>
</ion-item>
<addon-mod-workshop-assessment-strategy *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access && profile" [workshop]="workshop" [access]="access" [assessmentId]="assessmentId" [userId]="profile.id" [strategy]="strategy"></addon-mod-workshop-assessment-strategy>
<addon-mod-workshop-assessment-strategy *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access" [workshop]="workshop" [access]="access" [assessmentId]="assessmentId" [userId]="profile && profile.id" [strategy]="strategy"></addon-mod-workshop-assessment-strategy>
<form ion-list [formGroup]="evaluateForm" *ngIf="evaluating">
<ion-item text-wrap>

4
src/addon/mod/workshop/pages/assessment/assessment.ts
View File

@ -164,8 +164,8 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
if (this.evaluating || this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED) {
// Get all info of the assessment.
return this.workshopHelper.getReviewerAssessmentById(this.workshopId, this.assessmentId, this.profile.id)
.then((assessment) => {
return this.workshopHelper.getReviewerAssessmentById(this.workshopId, this.assessmentId,
this.profile && this.profile.id).then((assessment) => {
let defaultGrade, promise;
this.assessment = this.workshopHelper.realGradeValue(this.workshop, assessment);

5
src/addon/mod/workshop/pages/submission/submission.ts
View File

@ -202,7 +202,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
this.workshop.phase < AddonModWorkshopProvider.PHASE_CLOSED && this.access.canoverridegrades;
this.ownAssessment = false;
if (this.access.canviewallassessments) {
if (this.access.canviewallassessments || this.currentUserId == this.userId) {
// Get new data, different that came from stateParams.
promises.push(this.workshopProvider.getSubmissionAssessments(this.workshopId, this.submissionId)
.then((subAssessments) => {
@ -291,7 +291,8 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
this.feedbackForm.controls['text'].setValue(this.evaluate.text);
});
}));
} else if (this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED && submissionData.gradeoverby) {
} else if (this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED && submissionData.gradeoverby &&
this.evaluate && this.evaluate.text) {
promises.push(this.userProvider.getProfile(submissionData.gradeoverby, this.courseId, true).then((profile) => {
this.evaluateByProfile = profile;
}));