Skip to content

Administrator #1114

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

Open
Bointeka wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Administrator #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
885998b
Added Administrator to dashboard in ./nav-bar/index.hbs. Added admini…
Bointeka Nov 15, 2021
9cb8584
Copied relevant base code from ./templates/submissions
Bointeka Nov 15, 2021
77dcacf
Copied relevant base code from ./controllers/submissions
Bointeka Nov 15, 2021
aeae6cf
Copied relevant base code from ./routers/submissions
Bointeka Nov 16, 2021
6b79544
Created cell components that populates table with correct name and email
Bointeka Nov 16, 2021
b94918a
Added name and email columns to the table.
Bointeka Nov 16, 2021
4542b22
To enable sorting through elastic search rather than Ember models tab…
Bointeka Nov 23, 2021
b0a2d38
Added another method of updating query
Bointeka Nov 24, 2021
ebf1477
Split the Award/Funder cell into two distinct cells
Bointeka Dec 4, 2021
30f1271
Fixed naming error
Bointeka Dec 4, 2021
354c414
Removed unneeded comments. Added admin check in nav-bar/index.js
Bointeka Dec 4, 2021
ebe1295
Removed filtering and sorting from non-working cells. Split up Funder…
Bointeka Dec 4, 2021
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
3 changes: 3 additions & 0 deletions app/components/nav-bar/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<ul class="navbar-nav" style="width:100%">
<li class="nav-item"><LinkTo @route="dashboard" class="nav-link pl-0 ml-0">Dashboard</LinkTo></li>
{{#if this.hasAUser}}
{{#if this.currentUser.isAdmin}}
<li class="nav-item"><LinkTo @route="administrator" class="nav-link" data-test-navbar-administrator-link>Administrator</LinkTo></li>
{{/if}}
<li class="nav-item"><LinkTo @route="grants" class="nav-link" data-test-navbar-grants-link>Grants</LinkTo></li>
<li class="nav-item"><LinkTo @route="submissions" class="nav-link" data-test-navbar-submissions-link>Submissions</LinkTo></li>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/submissions-award-cell/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#each @record.grants as |grant index|}}
{{if index ',<br>'}}
<LinkTo @route="grants.detail" @model={{grant.id}}>{{grant.awardNumber}}</LinkTo> ({{grant.primaryFunder.name}})
<LinkTo @route="grants.detail" @model={{grant.id}}>{{grant.awardNumber}}</LinkTo>
{{else}}
Not Available
{{/each}}
7 changes: 7 additions & 0 deletions app/components/submissions-email-cell/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{{#if (get @record 'submitter.email')}}
{{get @record 'submitter.email' }}
{{else if (get @record @column.propertyName)}}
{{get @record @column.propertyName}}
{{else}}
{{''}}
{{/if}}
3 changes: 3 additions & 0 deletions app/components/submissions-email-cell/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Component from '@glimmer/component';

export default class SubmissionsEmailCell extends Component {}
6 changes: 6 additions & 0 deletions app/components/submissions-funder-cell/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{{#each @record.grants as |grant index|}}
{{if index ',<br>'}}
{{grant.primaryFunder.name}}
{{else}}
Not Available
{{/each}}
3 changes: 3 additions & 0 deletions app/components/submissions-funder-cell/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Component from '@glimmer/component';

export default class SubmissionsAwardCell extends Component {}
9 changes: 9 additions & 0 deletions app/components/submissions-name-cell/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{{#if (get @record 'submitter.displayName')}}
{{get @record 'submitter.displayName' }}
{{else if (get @record 'submitter.firstName')}}
{{concat (get @record 'submitter.firstName' get @record 'submitter.lastName')}}
{{else if (get @record @column.propertyName)}}
{{get @record @column.propertyName}}
{{else}}
{{''}}
{{/if}}
3 changes: 3 additions & 0 deletions app/components/submissions-name-cell/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Component from '@glimmer/component';

export default class SubmissionsNameCell extends Component {}
Loading