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.

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

Phani, Bindu | BAH-3117 | Ability to add, display and update Notes section in OT Scheduling #647

Merged
merged 18 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Update CSS and date
  • Loading branch information
Phanindra-tw committed Jul 12, 2023
commit 14f086135510392002b0b21ef943f25a16252edd
2 changes: 1 addition & 1 deletion ui/app/ot/controller/otCalendarController.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ angular.module('bahmni.ot')
$scope.emptyNoteError = true;
return;
}
if($scope.isDayView){
if ($scope.isDayView) {
await surgicalAppointmentService.saveNoteForADay($scope.viewDate, $scope.otNotesField);
}
$state.go("otScheduling", {viewDate: $scope.viewDate}, {reload: true});
Expand Down
30 changes: 18 additions & 12 deletions ui/app/ot/views/otCalendar.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
<div on-Scroll class="calendar" ng-switch="providerToggle">
<!-- Please dont remove or alter the below class name -->
<div class="calendar-location">
<p ng-switch-default bindonce="locations" class="heading-cell" ng-repeat="location in locations">
{{location.name}}
</p>
<p ng-switch-when="true" bindonce="surgeons" class="heading-cell" ng-repeat="surgeon in surgeons">
{{surgeon.person.display}}
</p>
<div class="calendar-location"><div class="heading-ot-block">
<p class="heading-ot">{{viewDate | bahmniDateTimeWithFormat: 'ddd'}}</p>
<p class="heading-ot heading-ot-date">{{viewDate | bahmniDateTimeWithFormat: 'DD'}}</p>
</div>
<div class="notesTab" ng-click="showNotesPopup(viewDate)" style="border: .5px solid lightgrey" ng-if="(!noteForTheDay)">
</div>
<div class="notesTab notes-text" ng-if="noteForTheDay" ng-click="showNotesPopupEdit(viewDate, 0, noteForTheDay)"
title="{{noteForTheDay}}">
{{noteForTheDay}}
<div class="notesTab" ng-click="showNotesPopup(viewDate)" style="border: .5px solid lightgrey" ng-if="(!noteForTheDay)"></div>
<div class="notesTab notes-text" ng-if="noteForTheDay" ng-click="showNotesPopupEdit(viewDate, 0, noteForTheDay)"
title="{{noteForTheDay}}">
{{noteForTheDay}}
</div>
<hr/>
<div style="display: flex;">
<p ng-switch-default bindonce="locations" class="heading-cell" ng-repeat="location in locations">
{{location.name}}
</p>
<p ng-switch-when="true" bindonce="surgeons" class="heading-cell" ng-repeat="surgeon in surgeons">
{{surgeon.person.display}}
</p>
</div>
</div>

<div class="table-block">
<!-- Please dont remove or alter the below class name -->
<div class="calendar-time-container">
Expand Down
3 changes: 2 additions & 1 deletion ui/app/ot/views/otWeeklyCalendar.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<div on-Scroll class="calendar">
<div class="calendar-location">
<div class="weekly-heading-cell" ng-repeat="index in [0, 1, 2, 3, 4, 5, 6]">
<p class="heading-ot-date">{{weekStartDate | addDays: index | bahmniDateTimeWithFormat: 'Do MMM, ddd'}}</p>
<p class="heading-ot">{{weekStartDate | addDays: index | bahmniDateTimeWithFormat: 'ddd'}}</p>
<p class="heading-ot heading-ot-date">{{weekStartDate | addDays: index | bahmniDateTimeWithFormat: 'DD'}}</p>
<div class="note" ng-if="(!getNotesForDay(weekStartDate, index))" ng-style="styleForBlock(index)" ng-click="showNotesPopup(weekStartDate, index)"></div>
<div ng-if="getNotesForDay(weekStartDate, index)" class="notes-text" ng-click="showNotesPopupEdit(weekStartDate, index, notesForWeek[index])" title="{{getNotesForDay(weekStartDate, index)}}">
{{getNotesForDay(weekStartDate, index)}}
Expand Down
42 changes: 31 additions & 11 deletions ui/app/styles/ot/_otCalendar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,57 @@
.calendar-location {
padding-left: 80px;
overflow: hidden;
display: flex;
background: #fff;
width: 94%;
float: left;
position: absolute;
z-index: 20;
.heading-cell {
width: 300px;
box-sizing: border-box;
text-align: center;
float: left;
padding: 10px 0;
padding-bottom: 10px;
font-family: OpenSansSemiBold;
}
}
.day-heading{
position: absolute;
top: 55px;
}
.error{
color: #da1e28;
padding-top: 5px;
}
.heading-ot-date{
font-size: 24px;
}
.heading-ot{
padding-bottom: 10px;
}
.heading-ot-block{
padding: 10px 0;
display: inline-block;
position: absolute;
left: 24px;
}
.notesTab{
top: 40px;
left: 80px;
width: calc(99% - 90px);
width: calc(100% - 24px);
height: 30px;
position: absolute;
color: #161616;
border-radius: 4px;
overflow: scroll;
}
.notes-text{
background-color: #EDF5FF;
padding: 5px;
height: 16px;
padding: 8px;
height: auto;
border: 1px solid #0043CE;
border-left: 4px solid #0043CE;
}
.calendar-time-container {
clear: left;
position: absolute;
top: 75px;
top: 100px;
background: #fff;
z-index: 19;

Expand All @@ -73,7 +88,7 @@
left: 80px;
overflow: auto;
padding-bottom: 5px;
top: 75px;
top: 100px;
width: calc(100% - 90px);
right: 0;
}
Expand Down Expand Up @@ -325,3 +340,8 @@
position: absolute;
z-index: 20;
}
hr{
border: 0;
border-bottom: 1px solid #ddd;
margin-top: 15px;
}
12 changes: 7 additions & 5 deletions ui/app/styles/ot/_otWeeklyCalendar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@
height: 30px;
}
.heading-ot-date{
font-family: OpenSansSemiBold;
padding-bottom: 5px;
font-size: 24px;
}
.heading-ot{
padding-bottom: 10px;
}
.notes-text{
background-color: #EDF5FF;
padding: 5px;
height: 16px;
padding: 8px;
height: auto;
border: 1px solid #0043CE;
border-left: 3px solid #0043CE;
color: #161616;
border-radius: 4px;
text-align: left;
overflow: scroll;
}
Expand Down