Skip to content

ROCK-8575: Revert Medication Manager to Person-only reads #230

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
jwakefield-secc wants to merge 1 commit into
base: master
Choose a base branch
from
+129 −143
Open

ROCK-8575: Revert Medication Manager to Person-only reads #230

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
30 changes: 26 additions & 4 deletions Plugins/org.secc.Reporting/org_secc/Reporting/NextGen/MedicationDispense.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
<Content>
<asp:HiddenField runat="server" ID="hfManageMedsPersonId" />
<asp:HiddenField runat="server" ID="hfManageMedsMatrixGuid" />
<asp:HiddenField runat="server" ID="hfManageMedsSource" />
<div class="row">
<div class="col-md-12">
<asp:Literal runat="server" ID="ltManageMedsSourceBadge" />
<Rock:Grid runat="server" ID="gMedications" ShowActionRow="false" DataKeyNames="Id" AllowPaging="false"
OnRowDataBound="gMedications_RowDataBound">
<Columns>
Expand All @@ -64,7 +62,6 @@
<Rock:BoolField DataField="Active" HeaderText="Active" />
<Rock:LinkButtonField ID="btnToggleActive" HeaderText="Toggle" CssClass="btn btn-default btn-sm" Text="<i class='fa fa-toggle-on'></i>" OnClick="ToggleActive_Click" />
<Rock:EditField HeaderText="Edit" ID="btnEditMed" OnClick="btnEditMed_Click" />
<Rock:DeleteField HeaderText="Remove" ID="btnDeleteMed" OnClick="btnDeleteMed_Click" />
</Columns>
</Rock:Grid>
<asp:LinkButton runat="server" ID="btnAddMedication" CssClass="btn btn-primary margin-t-sm"
Expand Down Expand Up @@ -146,7 +143,7 @@
</button>
<asp:LinkButton runat="server" ID="btnDispenseSelected" OnClick="btnDispenseSelected_Click" Style="display:none" />
</div>
<Rock:Grid runat="server" ID="gGrid" TooltipField="History" DataKeyNames="Key" AllowSorting="true" OnRowSelected="gGrid_RowSelected">
<Rock:Grid runat="server" ID="gGrid" TooltipField="History" DataKeyNames="Key" AllowSorting="true" OnRowSelected="gGrid_RowSelected" OnRowDataBound="gGrid_RowDataBound">
<Columns>
<Rock:SelectField />
<asp:BoundField DataField="Person" HeaderText="Person" SortExpression="Person" />
Expand Down Expand Up @@ -242,6 +239,31 @@
pointer-events: none !important;
}

/* Inactive-but-dispensed-today rows: preserve same-day audit trail visibility while
making it visually obvious the med has since been deactivated. Combined with
.row-distributed (which is also applied since these rows have Distributed=true)
this grays the row and disables actions. */
.row-inactive-distributed {
background-color: #fafafa !important;
color: #888 !important;
}
.row-inactive-distributed td {
font-style: italic;
}
.inactive-badge {
display: inline-block;
margin-left: 6px;
padding: 2px 8px;
font-size: 11px;
font-weight: 600;
font-style: normal;
background: #e0e0e0;
color: #666;
border-radius: 3px;
text-transform: uppercase;
letter-spacing: 0.3px;
}

/* Custom distribution history tooltip */
.med-tooltip {
position: absolute;
Expand Down
Loading