From c6fff4c78e053d40ff92af2a0763ad924bef6b62 Mon Sep 17 00:00:00 2001 From: Haider Ali Date: Sat, 18 Jul 2020 15:17:48 +0530 Subject: [PATCH 1/3] Descriptive message when no speaker/session --- .../ui-table/cell/cell-sessions-dashboard.hbs | 18 +++++++++++------- .../components/ui-table/cell/cell-sessions.hbs | 18 +++++++++++------- .../ui-table/cell/cell-speakers-dashboard.hbs | 18 +++++++++++------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs b/app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs index 02d33fd10a0..954f54fb5d7 100644 --- a/app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs +++ b/app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs @@ -1,7 +1,11 @@ -
-
{{t 'Submitted'}}: {{this.record.sessions}}
-
{{t 'Accepted'}}: {{this.record.sessionsAccepted}}
-
{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}
-
{{t 'Pending'}}: {{this.record.sessionsPending}}
-
{{t 'Rejected'}}: {{this.record.sessionsRejected}}
-
+{{#if this.record.sessions}} +
+
{{t 'Submitted'}}: {{this.record.sessions}}
+
{{t 'Accepted'}}: {{this.record.sessionsAccepted}}
+
{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}
+
{{t 'Pending'}}: {{this.record.sessionsPending}}
+
{{t 'Rejected'}}: {{this.record.sessionsRejected}}
+
+{{else}} + {{t 'No Session Information Added Yet'}} +{{/if}} diff --git a/app/templates/components/ui-table/cell/cell-sessions.hbs b/app/templates/components/ui-table/cell/cell-sessions.hbs index 02d33fd10a0..954f54fb5d7 100644 --- a/app/templates/components/ui-table/cell/cell-sessions.hbs +++ b/app/templates/components/ui-table/cell/cell-sessions.hbs @@ -1,7 +1,11 @@ -
-
{{t 'Submitted'}}: {{this.record.sessions}}
-
{{t 'Accepted'}}: {{this.record.sessionsAccepted}}
-
{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}
-
{{t 'Pending'}}: {{this.record.sessionsPending}}
-
{{t 'Rejected'}}: {{this.record.sessionsRejected}}
-
+{{#if this.record.sessions}} +
+
{{t 'Submitted'}}: {{this.record.sessions}}
+
{{t 'Accepted'}}: {{this.record.sessionsAccepted}}
+
{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}
+
{{t 'Pending'}}: {{this.record.sessionsPending}}
+
{{t 'Rejected'}}: {{this.record.sessionsRejected}}
+
+{{else}} + {{t 'No Session Information Added Yet'}} +{{/if}} diff --git a/app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs b/app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs index 120481b58b1..739e3d1a87f 100644 --- a/app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs +++ b/app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs @@ -1,7 +1,11 @@ -
-
{{t 'Total'}}: {{this.record.speakers}}
-
{{t 'Accepted'}}: {{this.record.speakersAccepted}}
-
{{t 'Confirmed'}}: {{this.record.speakersConfirmed}}
-
{{t 'Pending'}}: {{this.record.speakersPending}}
-
{{t 'Rejected'}}: {{this.record.speakersRejected}}
-
+{{#if this.record.speakers}} +
+
{{t 'Total'}}: {{this.record.speakers}}
+
{{t 'Accepted'}}: {{this.record.speakersAccepted}}
+
{{t 'Confirmed'}}: {{this.record.speakersConfirmed}}
+
{{t 'Pending'}}: {{this.record.speakersPending}}
+
{{t 'Rejected'}}: {{this.record.speakersRejected}}
+
+{{else}} + {{t 'No Speaker Added Yet'}} +{{/if}} From bf2a576aef8d6b159f2edc6f3af34728ba4f99b8 Mon Sep 17 00:00:00 2001 From: Haider Ali Date: Mon, 20 Jul 2020 15:11:19 +0530 Subject: [PATCH 2/3] fix tests --- .../components/ui-table/cell/cell-sessions-dashboard-test.js | 2 +- .../integration/components/ui-table/cell/cell-sessions-test.js | 2 +- .../components/ui-table/cell/cell-speakers-dashboard-test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js b/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js index 6aedc462950..c057a985ce1 100644 --- a/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js +++ b/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js @@ -8,6 +8,6 @@ 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')); + assert.ok(this.element.innerHTML.trim().includes('')); }); }); diff --git a/tests/integration/components/ui-table/cell/cell-sessions-test.js b/tests/integration/components/ui-table/cell/cell-sessions-test.js index 3f45eccb0fa..3e693418b6e 100644 --- a/tests/integration/components/ui-table/cell/cell-sessions-test.js +++ b/tests/integration/components/ui-table/cell/cell-sessions-test.js @@ -8,6 +8,6 @@ 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')); + assert.ok(this.element.innerHTML.trim().includes('')); }); }); diff --git a/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js b/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js index e26e2007f78..1f4bd329b6c 100644 --- a/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js +++ b/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js @@ -8,6 +8,6 @@ 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')); + assert.ok(this.element.innerHTML.trim().includes('')); }); }); From efb4c0865322729b155da68b330d5e63ab79d235 Mon Sep 17 00:00:00 2001 From: Haider Ali Date: Mon, 20 Jul 2020 18:07:41 +0530 Subject: [PATCH 3/3] Add conditions in test --- .../ui-table/cell/cell-sessions-dashboard-test.js | 8 +++++++- .../components/ui-table/cell/cell-sessions-test.js | 8 +++++++- .../ui-table/cell/cell-speakers-dashboard-test.js | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js b/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js index c057a985ce1..617034f4749 100644 --- a/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js +++ b/tests/integration/components/ui-table/cell/cell-sessions-dashboard-test.js @@ -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('')); + 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')); + } }); }); diff --git a/tests/integration/components/ui-table/cell/cell-sessions-test.js b/tests/integration/components/ui-table/cell/cell-sessions-test.js index 3e693418b6e..ca4f12e3252 100644 --- a/tests/integration/components/ui-table/cell/cell-sessions-test.js +++ b/tests/integration/components/ui-table/cell/cell-sessions-test.js @@ -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('')); + 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')); + } }); }); diff --git a/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js b/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js index 1f4bd329b6c..3c1a387124f 100644 --- a/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js +++ b/tests/integration/components/ui-table/cell/cell-speakers-dashboard-test.js @@ -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('')); + 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')); + } }); });