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

Jump to bottom

BAH-4049 | Fix. Auto Select Feature for Print Medication Feature #991

Merged
merged 2 commits into from
Aug 7, 2024
Merged

BAH-4049 | Fix. Auto Select Feature for Print Medication Feature #991

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
938f0a5
Parvathy | BAH-4049 | Fix. Auto Select Feature for Print Medication F…
parvathy00 Jul 29, 2024
691a2fa
Parvathy | BAH-4049 | Fix. Print View When Clicking on Cdss Alert Icon
parvathy00 Aug 6, 2024
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
17 changes: 13 additions & 4 deletions ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="tabs">
<div class="tab" ng-repeat="drugOrderGroup in consultation.drugOrderGroups" ng-class="{'selected-tab': drugOrderGroup.selected }">
<input class="tab-radio" id="{{'drug-orders-tab-' + $index}}" name="tab-group-1" type="radio" ng-checked="drugOrderGroup.selected" ng-class="{}" tabindex="-1">
<label class="tab-label" for="{{'drug-orders-tab-' + $index}}">
<label class="tab-label" for="{{'drug-orders-tab-' + $index}}" ng-click="selectAllDrugs(drugOrderGroup, $index)" ng-init="selectAllDrugs(consultation.drugOrderGroups[0], 0)">
<span>{{drugOrderGroup.label | bahmniDate}}</span>
<i class="fa fa-star current-visit-icon" title="Current visit" ng-if="drugOrderGroup.isCurrentVisit"></i>
</label>
Expand All @@ -21,10 +21,19 @@
<p ng-if="!drugOrderGroup.drugOrders.length" class="placeholder-text">{{ ::'MEDICATION_NO_RECENT_TREATMENT' | translate }}</p>
<ul class="table-mimic">
<form id="prescribedDrugs" name="prescribedDrugs" ng-submit="printSelectedDrugs()">
<li id="ordered-drug-orders" ng-repeat="drugOrder in drugOrderGroup.drugOrders" ng-class="{'active-drug' : drugOrder.isActive(), 'highlight' : drugOrder.isBeingEdited, 'scheduled-drug': drugOrder.isScheduled()}">
<li id="ordered-drug-orders" bm-pop-over autoclose="true" ng-repeat="drugOrder in drugOrderGroup.drugOrders" ng-class="{'active-drug' : drugOrder.isActive(), 'highlight' : drugOrder.isBeingEdited, 'scheduled-drug': drugOrder.isScheduled()}">
<div class="drug-details" ng-class="{'strike-through': drugOrder.isDiscontinuedOrStopped()}">
<div class="drug-dosage">
<strong class="drug-name">{{drugOrder.getDisplayName()}}</strong>
<div class="drug-dosage relative">
<strong class="drug-name popover-trigger">
<button type="button" ng-if="drugOrder.alerts && drugOrder.alerts.length > 0 && !hasActiveAlerts(drugOrder.alerts)" class="cdss-alert-icon" bm-pop-over-trigger>
<i class="fa cdss-icon-medication fa-exclamation-circle">
</i>
</button>
{{drugOrder.getDisplayName()}}
</strong>
<div class="tooltip cdss-tooltip" bm-pop-over-target>
<cdss-popover alerts="drugOrder.alerts"></cdss-popover>
</div>
<div class="dosage-frequency">
<span ng-show="drugOrder.getDoseAndUnits()">{{drugOrder.getDoseAndUnits()}}</span>
<span ng-show="drugOrder.getFrequency() && drugOrder.getFrequency().length"> | {{drugOrder.getFrequency()}}</span>
Expand Down
Loading