pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #771 from dod-ccpo/ppoc-label

Browse Source 
PPoC in members table
This commit is contained in:
leigh-mil 2019-04-17 14:54:00 -04:00 committed by GitHub
commit 1609883d8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atst/routes/portfolios/index.py
View File

@ -63,11 +63,20 @@ def serialize_member_form_data(member):
}
def get_members_data(portfolio):
members = [serialize_member_form_data(member) for member in portfolio.members]
for member in members:
if member["user_id"] == portfolio.owner.id:
ppoc = member
members.remove(member)
members.insert(0, ppoc)
return members
def render_admin_page(portfolio, form=None):
pagination_opts = Paginator.get_pagination_opts(http_request)
audit_events = AuditLog.get_portfolio_events(portfolio, pagination_opts)
members_data = [serialize_member_form_data(member) for member in portfolio.members]
members_data = get_members_data(portfolio)
portfolio_form = PortfolioForm(data={"name": portfolio.name})
member_perms_form = member_forms.MembersPermissionsForm(
data={"members_permissions": members_data}

4
styles/components/_portfolio_layout.scss
View File

@ -272,6 +272,7 @@
.members-table-ppoc {
select::-ms-expand {
display: none;
color: $color-gray;
}
select {
@ -288,11 +289,12 @@
word-break: normal;
padding-right: 3rem;
padding-left: 1.2rem;
color: $color-gray;
}
select:hover {
box-shadow: none;
color: $color-base;
color: $color-gray;
}
}

19
templates/fragments/admin/members_edit.html
View File

@ -3,17 +3,20 @@
{% for subform in member_perms_form.members_permissions %}
{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, subform.user_id.data) %}
{% set ppoc = subform.user_id.data == portfolio.owner.id %}
{% set archive_button_class = 'button-danger-outline' %}
<tr {% if ppoc %}class="members-table-ppoc"{% endif %}>
<td class='name'>{{ subform.member.data }}
{% if subform.user_id.data == user.id %}
<span class='you'>(<span class='green'>you</span>)</span>
{% set archive_button_class = 'usa-button-disabled' %}
{% elif ppoc %}
{% set archive_button_class = 'usa-button-disabled' %}
{% else %}
{% set archive_button_class = 'button-danger-outline' %}
{% endif %}
<div>
{% if ppoc %}
{% set archive_button_class = 'usa-button-disabled' %}
<span class='you'>PPoC</span>
{% endif %}
{% if subform.user_id.data == user.id %}
{% set archive_button_class = 'usa-button-disabled' %}
<span class='you'>(<span class='green'>you</span>)</span>
{% endif %}
</div>
</td>
<td>{{ OptionsInput(subform.perms_app_mgmt, label=False, disabled=ppoc) }}</td>

20
templates/fragments/admin/members_view.html
View File

@ -1,18 +1,24 @@
{% for subform in member_perms_form.members_permissions %}
{% set ppoc = subform.user_id.data == portfolio.owner.id %}
{% set heading_perms = [subform.perms_app_mgmt, subform.perms_funding, subform.perms_reporting, subform.perms_portfolio_mgmt] %}
<tr>
<td class='name'>{{ subform.member.data }}
{% if subform.member.data == user.full_name %}
<span class='you'>(<span class='green'>you</span>)</span>
{% endif %}
<div>
{% if ppoc %}
<span class='you'>PPoC</span>
{% endif %}
{% if subform.user_id.data == user.id %}
<span class='you'>(<span class='green'>you</span>)</span>
{% endif %}
</div>
</td>
{% set heading_perms = [subform.perms_app_mgmt, subform.perms_funding, subform.perms_reporting, subform.perms_portfolio_mgmt] %}
{% for access in heading_perms %}
{% if dict(access.choices).get(access.data) == 'Edit Access' %}
<td class='green'>Edit Access</td>
{% if dict(access.choices).get(access.data) == ('portfolios.members.permissions.edit_access' | translate) %}
<td class='green'>{{ 'portfolios.members.permissions.edit_access' | translate }}</td>
{% else %}
<td>View Only</td>
<td>{{ 'portfolios.members.permissions.view_only' | translate }}</td>
{% endif %}
{% endfor %}