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

BS-207 | Placement of previous alerts near Drugs #683

Merged
merged 16 commits into from
Sep 5, 2023
Merged

BS-207 | Placement of previous alerts near Drugs #683

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3df00f8
BS-207 | Patrick | add CDSS alert icons and tooltips for previous dru…
nyatindopatrick Aug 21, 2023
0246ffe
BS-207 | Patrick | Fix tooltip placement
nyatindopatrick Aug 21, 2023
38f184e
BS-207 | Patrick | add cdss alert details and link
nyatindopatrick Aug 21, 2023
fd086d9
BS-207 | Patrick | make CDSS alert icon a button
nyatindopatrick Aug 22, 2023
0089f42
BS-207 | Patrick | fix alert icon button size
nyatindopatrick Aug 24, 2023
277b74b
BS-207 | Patrick | Refactor previous alert filtering logic
nyatindopatrick Aug 25, 2023
c3cc606
BS-207 | Patrick | Refactor new drug order alert filtering logic
nyatindopatrick Aug 25, 2023
355dd04
BS-207 | Patrick | remove font size from global icon class
nyatindopatrick Aug 25, 2023
730ec60
BS-207 | Patrick | Allow multiple cdss alerts in one tooltip
nyatindopatrick Aug 25, 2023
91061a9
BS-207 | Patrick | move tooltip trigger to button
nyatindopatrick Aug 25, 2023
8aa29c5
BS-207 | Patrick | Fix tooltip padding
nyatindopatrick Aug 28, 2023
dc8080f
BS-207 | Patrick | Add directive for CDSS alerts
nyatindopatrick Sep 5, 2023
82f2346
BS-207 | Patrick | Add watchers for the alerts and treatment changes
nyatindopatrick Sep 5, 2023
a18f4a3
BS-207 | Patrick | Add translations for "Dismissed"
nyatindopatrick Sep 5, 2023
2448bb7
BS-207 | Patrick | Add unit tests
nyatindopatrick Sep 5, 2023
dd241b3
BS-207 | Patrick | remove translations for other languages
nyatindopatrick Sep 5, 2023
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
Prev Previous commit
Next Next commit
BS-207 | Patrick | add cdss alert details and link
  • Loading branch information
@nyatindopatrick
nyatindopatrick committed Aug 21, 2023
commit 38f184e29943b72b63095f9e0ffd64eedabc770d
8 changes: 8 additions & 0 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 @@ -40,6 +40,14 @@
<p>
{{getPreviousDrugAlert(drugOrder).summary}}
</p>
<p>
<span>
{{getPreviousDrugAlert(drugOrder).detail}}
</span>
<a href="{{getPreviousDrugAlert(drugOrder).source.url}}" target="_blank" ng-show="getPreviousDrugAlert(drugOrder).source.url">
<i class="fa fa-question-circle drug-link"></i>
</a>
</p>
</div>
<div class="dosage-frequency">
<span ng-show="drugOrder.getDoseAndUnits()">{{drugOrder.getDoseAndUnits()}} | </span>
Expand Down
58 changes: 31 additions & 27 deletions ui/app/styles/bahmni-components/_tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
.ipd-test-results {
max-width: 70px;
overflow: hidden;
white-space: nowrap;
display: inline-block;
text-overflow: ellipsis;
max-width: 70px;
overflow: hidden;
white-space: nowrap;
display: inline-block;
text-overflow: ellipsis;
cursor: pointer;
}

.tooltip {
position: absolute;
padding: 5px;
margin-left: 70px;
margin-top: -28px;
background: $clinicalInfoMessageBg;
border-radius: 5px;
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.2);
i {
color: $clinicalInfoMessageBg;
font-size: 20px;
position: absolute;
left: -10px;
top: 0px;
}
position: absolute;
padding: 5px;
margin-left: 70px;
margin-top: -28px;
background: $clinicalInfoMessageBg;
border-radius: 5px;
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.2);
i {
color: $clinicalInfoMessageBg;
font-size: 20px;
position: absolute;
left: -10px;
top: 0px;
}
}

.cdss-tooltip {
Expand All @@ -46,7 +46,7 @@
border-right: 5px solid transparent;
border-bottom: 5px solid #393939;
}

.cdss-tooltip__status {
display: flex;
align-items: center;
Expand All @@ -58,17 +58,21 @@
color: black;
}
.status-critical {
background-color: #FFD6D8;
border: 1px solid #FF0000;
background-color: #ffd6d8;
border: 1px solid #ff0000;
}

.status-warning {
background-color: #FEEAD6;
border: 1px solid #FFA500;
background-color: #feead6;
border: 1px solid #ffa500;
}

.status-info {
background-color: #D5F5FF;
border: 1px solid #00A3E0;
background-color: #d5f5ff;
border: 1px solid #00a3e0;
}
}

.drug-link {
position: relative !important;
}
}
16 changes: 2 additions & 14 deletions ui/app/styles/common/_bahmniGlobal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,19 +382,7 @@ u, .add-drug-btninput[value]:first-letter {
.cdss-alert-icon {
border: none !important;
background: none !important;
.critical {
&:hover {
color: #FF0000 !important;
}
}
.warning {
&:hover {
color: #FFA500 !important;
}
}
.info {
&:hover {
color: #00A3E0 !important;
}
i {
color: #8e8e8e;
}
}