diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html index c9cb04c87..685a98db0 100644 --- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html +++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html @@ -72,7 +72,7 @@ -

{{ 'addon.mod_feedback.completed_feedbacks' | translate }}

diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts index bfa04b763..3f3f94027 100644 --- a/src/addons/mod/feedback/components/index/index.ts +++ b/src/addons/mod/feedback/components/index/index.ts @@ -400,15 +400,15 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity } /** - * Open respondents page. + * Open attempts page. */ - openRespondents(): void { + openAttempts(): void { if (!this.access!.canviewreports || this.completedCount <= 0) { return; } CoreNavigator.navigateToSitePath( - AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${this.courseId}/${this.module.id}/respondents`, + AddonModFeedbackModuleHandlerService.PAGE_NAME + `/${this.courseId}/${this.module.id}/attempts`, { params: { group: this.group, diff --git a/src/addons/mod/feedback/feedback-lazy.module.ts b/src/addons/mod/feedback/feedback-lazy.module.ts index 15bf99ecd..b055ceedd 100644 --- a/src/addons/mod/feedback/feedback-lazy.module.ts +++ b/src/addons/mod/feedback/feedback-lazy.module.ts @@ -17,7 +17,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CoreSharedModule } from '@/core/shared.module'; import { AddonModFeedbackComponentsModule } from './components/components.module'; import { AddonModFeedbackIndexPage } from './pages/index/index'; -import { AddonModFeedbackRespondentsPage } from './pages/respondents/respondents'; +import { AddonModFeedbackAttemptsPage } from './pages/attempts/attempts'; import { conditionalRoutes } from '@/app/app-routing.module'; import { CoreScreen } from '@services/screen'; @@ -40,11 +40,11 @@ const commonRoutes: Routes = [ const mobileRoutes: Routes = [ ...commonRoutes, { - path: ':courseId/:cmId/respondents', - component: AddonModFeedbackRespondentsPage, + path: ':courseId/:cmId/attempts', + component: AddonModFeedbackAttemptsPage, }, { - path: ':courseId/:cmId/respondents/attempt/:attemptId', + path: ':courseId/:cmId/attempts/:attemptId', loadChildren: () => import('./pages/attempt/attempt.module').then(m => m.AddonModFeedbackAttemptPageModule), }, ]; @@ -52,11 +52,11 @@ const mobileRoutes: Routes = [ const tabletRoutes: Routes = [ ...commonRoutes, { - path: ':courseId/:cmId/respondents', - component: AddonModFeedbackRespondentsPage, + path: ':courseId/:cmId/attempts', + component: AddonModFeedbackAttemptsPage, children: [ { - path: 'attempt/:attemptId', + path: ':attemptId', loadChildren: () => import('./pages/attempt/attempt.module').then(m => m.AddonModFeedbackAttemptPageModule), }, ], @@ -76,7 +76,7 @@ const routes: Routes = [ ], declarations: [ AddonModFeedbackIndexPage, - AddonModFeedbackRespondentsPage, + AddonModFeedbackAttemptsPage, ], }) export class AddonModFeedbackLazyModule {} diff --git a/src/addons/mod/feedback/pages/respondents/respondents.html b/src/addons/mod/feedback/pages/attempts/attempts.html similarity index 74% rename from src/addons/mod/feedback/pages/respondents/respondents.html rename to src/addons/mod/feedback/pages/attempts/attempts.html index 51c2184d0..795bde959 100644 --- a/src/addons/mod/feedback/pages/respondents/respondents.html +++ b/src/addons/mod/feedback/pages/attempts/attempts.html @@ -29,14 +29,15 @@
- + -

{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: responses.responses.total } }}

+

{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: attempts.identifiable.total } }} +

- +

{{ attempt.fullname }}

@@ -45,36 +46,36 @@
- {{ 'core.loadmore' | translate }} - +
- + -

{{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: responses.anonResponses.total } }}

+

{{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: attempts.anonymous.total } }}

- +

{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}}

- {{ 'core.loadmore' | translate }} - + diff --git a/src/addons/mod/feedback/pages/respondents/respondents.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts similarity index 73% rename from src/addons/mod/feedback/pages/respondents/respondents.ts rename to src/addons/mod/feedback/pages/attempts/attempts.ts index 73a95a75f..dc5915976 100644 --- a/src/addons/mod/feedback/pages/respondents/respondents.ts +++ b/src/addons/mod/feedback/pages/attempts/attempts.ts @@ -30,13 +30,13 @@ import { import { AddonModFeedbackHelper, AddonModFeedbackResponsesAnalysis } from '../../services/feedback-helper'; /** - * Page that displays feedback respondents. + * Page that displays feedback attempts. */ @Component({ - selector: 'page-addon-mod-feedback-respondents', - templateUrl: 'respondents.html', + selector: 'page-addon-mod-feedback-attempts', + templateUrl: 'attempts.html', }) -export class AddonModFeedbackRespondentsPage implements AfterViewInit { +export class AddonModFeedbackAttemptsPage implements AfterViewInit { @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent; @@ -45,7 +45,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit { protected page = 0; protected feedback?: AddonModFeedbackWSFeedback; - responses: AddonModFeedbackResponsesManager; + attempts: AddonModFeedbackAttemptsManager; selectedGroup!: number; groupInfo?: CoreGroupInfo; loaded = false; @@ -54,7 +54,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit { constructor( route: ActivatedRoute, ) { - this.responses = new AddonModFeedbackResponsesManager( + this.attempts = new AddonModFeedbackAttemptsManager( route.component, ); } @@ -77,7 +77,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit { await this.fetchData(); - this.responses.start(this.splitView); + this.attempts.start(this.splitView); } /** @@ -88,7 +88,7 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit { */ async fetchData(refresh: boolean = false): Promise { this.page = 0; - this.responses.resetItems(); + this.attempts.resetItems(); try { this.feedback = await AddonModFeedback.getFeedback(this.courseId, this.cmId); @@ -121,17 +121,17 @@ export class AddonModFeedbackRespondentsPage implements AfterViewInit { } else { this.selectedGroup = groupId; this.page = 0; - this.responses.resetItems(); + this.attempts.resetItems(); } try { - const responses = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback!.id, { + const attempts = await AddonModFeedbackHelper.getResponsesAnalysis(this.feedback!.id, { groupId: this.selectedGroup, page: this.page, cmId: this.cmId, }); - this.responses.setResponses(responses); + this.attempts.setAttempts(attempts); } finally { this.loadingMore = false; this.loaded = true; @@ -183,16 +183,16 @@ type EntryItem = AddonModFeedbackWSAttempt | AddonModFeedbackWSAnonAttempt; /** * Entries manager. */ -class AddonModFeedbackResponsesManager extends CorePageItemsListManager { +class AddonModFeedbackAttemptsManager extends CorePageItemsListManager { - responses: AddonModFeedbackResponses = { - attempts: [], + identifiable: AddonModFeedbackIdentifiableAttempts = { + items: [], total: 0, canLoadMore: false, }; - anonResponses: AddonModFeedbackAnonResponses = { - attempts: [], + anonymous: AddonModFeedbackAnonymousAttempts = { + items: [], total: 0, canLoadMore: false, }; @@ -202,25 +202,25 @@ class AddonModFeedbackResponsesManager extends CorePageItemsListManager this.responses.attempts).concat(this.anonResponses.attempts)); + this.setItems(( this.identifiable.items).concat(this.anonymous.items)); } /** @@ -228,29 +228,29 @@ class AddonModFeedbackResponsesManager extends CorePageItemsListManager