Skip to content

Improve School Vocab by Session Type Visualization loading #9297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaelchadwick wants to merge 1 commit into from
Closed

Improve School Vocab by Session Type Visualization loading #9297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 3 additions & 39 deletions packages/frontend/app/components/school/session-type-visualize-vocabularies.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,6 @@
import { LinkTo } from '@ember/routing';
import t from 'ember-intl/helpers/t';
import { hash } from '@ember/helper';
import { pageTitle } from 'ember-page-title';
import VisualizeSessionTypeVocabulariesGraph from './visualize-session-type-vocabularies-graph';
<template>
{{pageTitle
(t "general.schools")
" | "
@model.school.title
" | "
(t "general.visualizations")
" | "
(t "general.sessionTypes")
" | "
@model.title
" | "
(t "general.vocabularies")
}}
<section
class="school-session-type-visualize-vocabularies data-visualization"
data-test-school-session-type-visualize-vocabularies
...attributes
>
<div class="backtolink" data-test-back-to-school>
<LinkTo
@route="school"
@model={{@model.school}}
@query={{hash schoolSessionTypeDetails=true}}
>
{{t "general.backToSchool"}}
</LinkTo>
</div>
<h2 data-test-primary-title>{{t "general.vocabulariesBySessionType"}}</h2>
<h3 data-test-secondary-title>
{{@model.title}}
</h3>
<div class="visualizations">
<VisualizeSessionTypeVocabulariesGraph @sessionType={{@model}} @showDataTable={{true}} />
</div>
</section>
<div class="visualizations">
<VisualizeSessionTypeVocabulariesGraph @sessionType={{@model}} @showDataTable={{true}} />
</div>
</template>
6 changes: 6 additions & 0 deletions packages/frontend/app/controllers/session-type-visualize-vocabularies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Controller from '@ember/controller';
import { tracked } from '@glimmer/tracking';

export default class SessionTypeVisualizeVocabulariesController extends Controller {
@tracked dataLoaded = false;
}
11 changes: 11 additions & 0 deletions packages/frontend/app/routes/session-type-visualize-vocabularies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { service } from '@ember/service';
import { action } from '@ember/object';
import Route from '@ember/routing/route';

export default class SessionTypeVisualizeVocabulariesRoute extends Route {
Expand All @@ -8,6 +9,11 @@ export default class SessionTypeVisualizeVocabulariesRoute extends Route {

_dataLoadingPromise = null;

setupController(controller, model) {
super.setupController(controller, model);
controller.set('dataLoaded', this._dataLoadingPromise);
}

beforeModel(transition) {
this.currentUser.requireNonLearner(transition);
}
Expand All @@ -30,4 +36,9 @@ export default class SessionTypeVisualizeVocabulariesRoute extends Route {

return await this._dataLoadingPromise;
}

@action
loading() {
return true;
}
}
46 changes: 45 additions & 1 deletion packages/frontend/app/templates/session-type-visualize-vocabularies.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,46 @@
import { LinkTo } from '@ember/routing';
import t from 'ember-intl/helpers/t';
import { hash } from '@ember/helper';
import { pageTitle } from 'ember-page-title';
import LoadingSpinner from 'ilios-common/components/loading-spinner';
import SessionTypeVisualizeVocabularies from 'frontend/components/school/session-type-visualize-vocabularies';
<template><SessionTypeVisualizeVocabularies @model={{@model}} /></template>
<template>
{{pageTitle
(t "general.schools")
" | "
@model.school.title
" | "
(t "general.visualizations")
" | "
(t "general.sessionTypes")
" | "
@model.title
" | "
(t "general.vocabularies")
}}
<section
class="school-session-type-visualize-vocabularies data-visualization"
data-test-school-session-type-visualize-vocabularies
...attributes
>
<div class="backtolink" data-test-back-to-school>
<LinkTo
@route="school"
@model={{@model.school}}
@query={{hash schoolSessionTypeDetails=true}}
>
{{t "general.backToSchool"}}
</LinkTo>
</div>
<h2 data-test-primary-title>{{t "general.vocabulariesBySessionType"}}</h2>
<h3 data-test-secondary-title>
{{@model.title}}
</h3>

{{#if @controller.dataLoaded}}
<SessionTypeVisualizeVocabularies @model={{@model}} />
{{else}}
<LoadingSpinner />
{{/if}}
</section>
</template>
Loading