Skip to content

Commit 7a1b49c

Browse files
committed
MOBILE-3213 workshop: Disable refreshers when inform
1 parent bed497d commit 7a1b49c

File tree

6 files changed

+7
-25
lines changed

6 files changed

+7
-25
lines changed

src/addon/mod/workshop/components/index/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
154154
promises.push(this.workshopProvider.invalidateReviewerAssesmentsData(this.workshop.id));
155155
}
156156
promises.push(this.workshopProvider.invalidateGradesData(this.workshop.id));
157+
promises.push(this.workshopProvider.invalidateWorkshopWSData(this.workshop.id));
157158
}
158159

159160
return Promise.all(promises);

src/addon/mod/workshop/pages/assessment/assessment.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ion-navbar>
1010
</ion-header>
1111
<ion-content>
12-
<ion-refresher [enabled]="loaded" (ionRefresh)="refreshAssessment($event)">
12+
<ion-refresher [enabled]="loaded" (ionRefresh)="refreshAssessment($event)" *ngIf="!evaluating">
1313
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
1414
</ion-refresher>
1515
<core-loading [hideUntil]="loaded">

src/addon/mod/workshop/pages/edit-submission/edit-submission.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
</ion-navbar>
1010
</ion-header>
1111
<ion-content>
12-
<ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)">
13-
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
14-
</ion-refresher>
1512
<core-loading [hideUntil]="loaded">
1613
<form ion-list [formGroup]="editForm" *ngIf="workshop">
1714
<ion-item text-wrap>

src/addon/mod/workshop/pages/edit-submission/edit-submission.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -274,26 +274,6 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
274274
return false;
275275
}
276276

277-
/**
278-
* Pull to refresh.
279-
*
280-
* @param refresher Refresher.
281-
*/
282-
refreshSubmission(refresher: any): void {
283-
if (this.loaded) {
284-
const promises = [];
285-
286-
promises.push(this.workshopProvider.invalidateSubmissionData(this.workshopId, this.submission.id));
287-
promises.push(this.workshopProvider.invalidateSubmissionsData(this.workshopId));
288-
289-
Promise.all(promises).finally(() => {
290-
return this.fetchSubmissionData();
291-
}).finally(() => {
292-
refresher.complete();
293-
});
294-
}
295-
}
296-
297277
/**
298278
* Save the submission.
299279
*/

src/addon/mod/workshop/pages/submission/submission.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ion-navbar>
1313
</ion-header>
1414
<ion-content>
15-
<ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)">
15+
<ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)" *ngIf="!((assessmentId && access.assessingallowed) || canAddFeedback)">
1616
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
1717
</ion-refresher>
1818
<core-loading [hideUntil]="loaded">

src/addon/mod/workshop/pages/submission/submission.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
373373
promises.push(this.workshopProvider.invalidateAssessmentData(this.workshopId, this.assessmentId));
374374
}
375375

376+
if (this.assessmentUserId) {
377+
promises.push(this.workshopProvider.invalidateReviewerAssesmentsData(this.workshopId, this.assessmentId));
378+
}
379+
376380
return Promise.all(promises).finally(() => {
377381
this.eventsProvider.trigger(AddonModWorkshopProvider.ASSESSMENT_INVALIDATED, this.siteId);
378382

0 commit comments

Comments
 (0)