Skip to content
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

fix: Descriptive message when no speaker/session #4582

Merged
merged 5 commits into from
Jul 20, 2020
Merged

fix: Descriptive message when no speaker/session #4582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6fff4c
Descriptive message when no speaker/session
Haider8 Jul 18, 2020
fe7d46b
Merge branch 'development' of https://github.com/fossasia/open-event-…
Haider8 Jul 20, 2020
bf2a576
fix tests
Haider8 Jul 20, 2020
efb4c08
Add conditions in test
Haider8 Jul 20, 2020
cfe5d23
Merge branch 'development' of https://github.com/fossasia/open-event-…
Haider8 Jul 20, 2020
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
18 changes: 11 additions & 7 deletions app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div class="ui list">
<div class="item">{{t 'Submitted'}}: {{this.record.sessions}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.sessionsAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.sessionsPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.sessionsRejected}}</div>
</div>
{{#if this.record.sessions}}
<div class="ui list">
<div class="item">{{t 'Submitted'}}: {{this.record.sessions}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.sessionsAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.sessionsPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.sessionsRejected}}</div>
</div>
{{else}}
{{t 'No Session Information Added Yet'}}
{{/if}}
18 changes: 11 additions & 7 deletions app/templates/components/ui-table/cell/cell-sessions.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div class="ui list">
<div class="item">{{t 'Submitted'}}: {{this.record.sessions}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.sessionsAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.sessionsPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.sessionsRejected}}</div>
</div>
{{#if this.record.sessions}}
<div class="ui list">
<div class="item">{{t 'Submitted'}}: {{this.record.sessions}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.sessionsAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.sessionsPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.sessionsRejected}}</div>
</div>
{{else}}
{{t 'No Session Information Added Yet'}}
{{/if}}
18 changes: 11 additions & 7 deletions app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div class="ui list">
<div class="item">{{t 'Total'}}: {{this.record.speakers}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.speakersAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.speakersConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.speakersPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.speakersRejected}}</div>
</div>
{{#if this.record.speakers}}
<div class="ui list">
<div class="item">{{t 'Total'}}: {{this.record.speakers}}</div>
<div class="item">{{t 'Accepted'}}: {{this.record.speakersAccepted}}</div>
<div class="item">{{t 'Confirmed'}}: {{this.record.speakersConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.speakersPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.speakersRejected}}</div>
</div>
{{else}}
{{t 'No Speaker Added Yet'}}
{{/if}}
8 changes: 7 additions & 1 deletion tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ module('Integration | Component | ui table/cell/cell sessions dashboard', functi

test('it renders', async function(assert) {
await render(hbs `{{ui-table/cell/cell-sessions-dashboard}}`);
assert.ok(this.element.innerHTML.trim().includes('Submitted'));
if (this.element.innerHTML.trim().includes('Submitted')) {
assert.notOk(this.element.innerHTML.trim().includes('No Session Information Added Yet'));
assert.ok(this.element.innerHTML.trim().includes('Submitted'));
} else {
assert.notOk(this.element.innerHTML.trim().includes('Submitted'));
assert.ok(this.element.innerHTML.trim().includes('No Session Information Added Yet'));
}
});
});
8 changes: 7 additions & 1 deletion tests/integration/components/ui-table/cell/cell-sessions-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ module('Integration | Component | ui table/cell/cell sessions', function(hooks)

test('it renders', async function(assert) {
await render(hbs `{{ui-table/cell/cell-sessions}}`);
assert.ok(this.element.innerHTML.trim().includes('Submitted'));
if (this.element.innerHTML.trim().includes('Submitted')) {
assert.notOk(this.element.innerHTML.trim().includes('No Session Information Added Yet'));
assert.ok(this.element.innerHTML.trim().includes('Submitted'));
} else {
assert.notOk(this.element.innerHTML.trim().includes('Submitted'));
assert.ok(this.element.innerHTML.trim().includes('No Session Information Added Yet'));
}
});
});
8 changes: 7 additions & 1 deletion tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ module('Integration | Component | ui table/cell/cell speakers dashboard', functi

test('it renders', async function(assert) {
await render(hbs `{{ui-table/cell/cell-speakers-dashboard}}`);
assert.ok(this.element.innerHTML.trim().includes('Accepted'));
if (this.element.innerHTML.trim().includes('Accepted')) {
assert.notOk(this.element.innerHTML.trim().includes('No Speaker Added Yet'));
assert.ok(this.element.innerHTML.trim().includes('Accepted'));
} else {
assert.notOk(this.element.innerHTML.trim().includes('Accepted'));
assert.ok(this.element.innerHTML.trim().includes('No Speaker Added Yet'));
}
});
});