Skip to content

Commit

Permalink
Merge branch 'develop' into models_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jazwu committed Mar 8, 2024
2 parents c1f2f96 + 431ebed commit e402916
Show file tree
Hide file tree
Showing 6 changed files with 356 additions and 35 deletions.
34 changes: 23 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,26 @@ after_script:
- coverage report

deploy:
provider: elasticbeanstalk
access_key_id: $ACCESS_KEY_ID
secret_access_key: $SECRET_ACCESS_KEY
region: $REGION
app: health-score
env: health-env4
bucket_name: $BUCKET_NAME
on:
repo: gcivil-nyu-org/INT2-Monday-Spring2024-Team-1
branch: master
skip_cleanup: 'true'
- provider: elasticbeanstalk
access_key_id: $ACCESS_KEY_ID
secret_access_key: $SECRET_ACCESS_KEY
region: $REGION
app: health-score
env: health-env4
bucket_name: $BUCKET_NAME
on:
repo: gcivil-nyu-org/INT2-Monday-Spring2024-Team-1
branch: master
skip_cleanup: 'true'

- provider: elasticbeanstalk
access_key_id: $ACCESS_KEY_ID
secret_access_key: $SECRET_ACCESS_KEY
region: $REGION
app: health-score-integration
env: Health-score-integration-env
bucket_name: $BUCKET_NAME
on:
repo: gcivil-nyu-org/INT2-Monday-Spring2024-Team-1
branch: develop
skip_cleanup: 'true'
45 changes: 24 additions & 21 deletions healthScore/templates/view_history.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
overflow-y: auto;
}

.appointmentName{
.appointmentName {
text-decoration: underline;
color: blue;
}
Expand Down Expand Up @@ -100,26 +100,29 @@
<a class="navbar-brand" href="#">Health Score</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link disabled" href="#">Home</a>
</li>
<li class="nav-item active">
<a class="nav-link disabled" href="#">View Health History <span
class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Health Score</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Community</a>
</li>
</ul>
</div>
</nav>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link disabled" href="#">Home</a>
</li>
<li class="nav-item active">
<a class="nav-link disabled" href="#">View Health History <span
class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Your Requests</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Health Score</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Community</a>
</li>
</ul>
</div>
</nav>

<h2 class="text-center">Your Health History</h2>

Expand Down
293 changes: 293 additions & 0 deletions healthScore/templates/view_requests.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<title>View Health History</title>
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<style>
.sidebar {
height: 100%;
width: 0;
position: fixed;
z-index: 1;
top: 0;
left: 0;
background-color: #111;
overflow-x: hidden;
transition: 0.5s;
padding-top: 60px;
}

.sidebar a {
padding: 10px 15px;
text-decoration: none;
font-size: 25px;
color: #818181;
display: block;
transition: 0.3s;
}

.sidebar a:hover {
color: #f1f1f1;
}

.navbar-custom {
background-color: #e3f2fd;
}

.navbar-brand {
position: relative;
background: url();
width: 170px;
left: 15px;
background-size: contain;
}

.sidebar .closebtn {
position: absolute;
top: 0;
right: 25px;
font-size: 36px;
margin-left: 50px;
}

.propertiesNoDisplay {
visibility: hidden;
display: none;
}

.addPropertiesValues {
padding: 0.75rem;
vertical-align: top;
border: 1px solid #dee2e6 !important;
}

.modalHeight {
max-height: 25rem;
overflow-y: auto;
}

.appointmentName {
text-decoration: underline;
color: blue;
}

@media screen and (max-height: 450px) {
.sidebar {
padding-top: 15px;
}

.sidebar a {
font-size: 18px;
}
}
</style>
</head>

<body>

<div id="mySidebar" class="sidebar">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">×</a>
<a href="#">Home</a>
<a href="#">Health History</a>
<a href="#">Raising a Request</a>
</div>

<div class="container my-5">
<nav class="navbar navbar-light navbar-custom">
<a class="navbar-brand" href="#">Health Score</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link disabled" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">View Health History</a>
</li>
<li class="nav-item active">
<a class="nav-link disabled" href="#">Your Requests
<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Health Score</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Community</a>
</li>
</ul>
</div>
</nav>

<h2 class="text-center">Your Requests</h2>

<!-- Filter Section -->
<div class="row">
<div class="col-lg-12">
<h4>Filter Your Requests</h4>
<form method="GET" action="{% url 'view_requests' %}" class="form-row align-items-center">
<div class="col-2">
<label for="appointment_name" class="sr-only">Reason for Visit:</label>
<input type="text" class="form-control mb-2" id="appointment_name" name="appointment_name"
placeholder="Reason for Visit" value="{{ request.GET.appointment_name }}">
</div>
<div class="col-2">
<label for="healthcare_worker" class="sr-only">User Name:</label>
<input type="text" class="form-control mb-2" id="healthcare_worker" name="healthcare_worker"
placeholder="Healthcare Worker" value="{{ request.GET.healthcare_worker }}">
</div>
<div class="col-auto">
<label for="healthcare_facility" class="sr-only">Healthcare Facility:</label>
<input type="text" class="form-control mb-2" id="healthcare_facility" name="healthcare_facility"
placeholder="Healthcare Facility" value="{{ request.GET.healthcare_facility }}">
</div>
<div class="col-auto">
<label for="date" class="sr-only">Date:</label>
<input type="date" class="form-control mb-2" id="date" name="date" value="{{ request.GET.date }}">
</div>
<div class="col-auto">
<label for="record_status" class="sr-only">Request Status:</label>
<select class="form-control mb-2" id="record_status" name="record_status"
aria-label="Request Status">
<option value="">Request Status</option>
<option value="approved">Approved</option>
<option value="rejected">Rejected</option>
<option value="pending">Pending</option>
</select>
</div>
<div class="col-auto">
<button type="submit" class="btn btn-secondary mb-2">Filter</button>
</div>
<div class="col-auto">
<a href="{% url 'view_requests' %}" class="btn btn-outline-secondary mb-2">Clear</a>
</div>
</form>

</div>
</div>

<!-- Data Display Section -->
<div class="row">
<div class="col-lg-12">
<table class="table table-striped my-4">
<thead class="thead-dark">
<tr>
<th scope="col">Reason for Visit</th>
<th scope="col">Visit Details</th>
<th scope="col">Healthcare Worker</th>
<th scope="col">Healthcare Facility</th>
<th scope="col">Address</th>
<th scope="col">Created Date</th>
<th scope="col">Updated Date</th>
<th scope="col">Status</th>
</tr>
</thead>
<tbody>
{% for request, details in zipped_details %}
<tr>
<td class="appointmentName"
onclick="getProperties(`{{ forloop.counter }}|{{ request.appointment_properties }}|{{ request.appointment_name }}`)"
data-toggle="modal" data-target="#myModal">{{ request.appointment_name }}</td>
<td>{{ request.appointment_type }}</td>
<td>{{ request.doctor_name }}</td>
<td>{{ request.hospital_name }}</td>
<td>{{ request.hospital_address }}</td>
<td>{{ request.createdAt }}</td>
<td>{{ request.updatedAt }}</td>
<td class="{% if request.record_status == 'approved' %}text-success
{% elif request.record_status == 'rejected' %}text-danger
{% else %}text-dark{% endif %}">
{{ request.record_status|capfirst }}
</td>
</tr>
{% endfor %}

</tbody>
</table>
</div>
</div>
</div>


<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.2/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>

<script>
function openNav() {
document.getElementById("mySidebar").style.width = "250px";
}

function closeNav() {
document.getElementById("mySidebar").style.width = "0";
}


function formattedDate(date) {
var dateObject = new Date(date);
var month = dateObject.getMonth() + 1;
var day = dateObject.getDate();
var year = dateObject.getFullYear();

if (month < 10) {
month = '0' + month;
}
if (day < 10) {
day = '0' + day;
}

var formattedDate = month + '/' + day + '/' + year;
return formattedDate
}


function capitalizeLetter(key) {
return key.charAt(0).toUpperCase() + key.slice(1);
}

function getProperties(appointment) {
appointment_details = appointment.split("|")
if (appointment_details[1]) {
appointment_name = appointment_details[2]

appointment_properties = JSON.parse(appointment_details[1])

document.getElementById('modal-title').innerHTML = appointment_name

var props = `<table class="table table-striped my-4 addPropertiesKeys">
<thead class="thead-dark">`
for (var [key, value] of Object.entries(appointment_properties)) {
if (key == 'date') {
value = formattedDate(value)
}
props += `
<tr>
<th class="addPropertiesKeys">${capitalizeLetter(key)}</th>
<td class="addPropertiesValues">${value}</td>
</tr>
`
}

props += ` </thead>
</table>`

document.getElementById('modal-body').innerHTML = props
} else {
document.getElementById('modal-body').innerHTML = `<div class='alert alert-danger' role='alert'>
No Properties!
</div>`
}
}

</script>


</body>
</html>
1 change: 1 addition & 0 deletions healthScore/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
path("viewReports", views.view_report, name="view_reports"),
path("login", views.login_view, name="login"),
path("logout/", auth_views.LogoutView.as_view(), name="logout"),
path("viewRequests", views.view_health_history_requests, name="view_requests"),
]

0 comments on commit e402916

Please sign in to comment.