Skip to content

edit fix #128

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
noahpang1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

edit fix #128

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
61 changes: 47 additions & 14 deletions app/static/css/homepage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ tr:nth-child(even) {
}
/* for popup in my_cases */
.overlay {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(102, 36, 132, 0.8);
transition: opacity 500ms;
visibility: hidden;
opacity: 0;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(102, 36, 132, 0.8);
transition: opacity 500ms;
visibility: hidden;
opacity: 0;
z-index:100;
}

Expand All @@ -151,11 +151,11 @@ tr:nth-child(even) {

.wrapper {
z-index:100;
margin: 70px auto;
padding: 20px;
background: #e7e7e7;
border-radius: 5px;
width: 30%;
margin: 70px auto;
padding: 20px;
background: #e7e7e7;
border-radius: 5px;
width: 30%;
height: 100%;
position: relative;
transition: all 5s ease-in-out;
Expand Down Expand Up @@ -187,3 +187,36 @@ tr:nth-child(even) {
background-color: #e7e7e7;
padding: 20px 0;
}

/* for mycases edit button */
.wrapper2 {
z-index:101;
margin: 70px auto;
padding: 20px;
background: #e7e7e7;
border-radius: 5px;
width: 100%;
height: 100%;
position: relative;
transition: all 5s ease-in-out;
}
.wrapper2 h2 {
margin-top: 0;
}
.wrapper2 .close {
position: absolute;
top: 20px;
right: 30px;
transition: all 200ms;
font-size: 30px;
font-weight: bold;
text-decoration: none;
color: #662484;
}
.wrapper2 .close:hover {
color: yellow;
}
.wrapper2 .content {
height: 70%;
overflow-y: scroll;
}
23 changes: 11 additions & 12 deletions app/templates/my_cases.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
{% block addhead %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/cases.css') }}"/>
{% endblock %}

Expand Down Expand Up @@ -90,11 +90,11 @@ <h3>Case Number: {{ case.customer_id }}</h3>
<br>
<label>Not Enrolled Reason: </label>
<br>
{{ case.not_enrolled_reason }}
{{ case.not_enrolled_reason }}
</div>
</div>
</div>
</div>
</div>
{% endfor %}
</tbody>
</table>
Expand All @@ -109,14 +109,14 @@ <h5 class="modal-title" id="assignModalLabel">Edit Case</h5>
</button>
</div>
<div class="form-group">
<div class="wrapper">
<h5 id="editIdHeader"></h5>
<div class="wrapper2">
<h5 id="editIdHeader"></h5>
<label for="editFirstName">First Name:</label><span id="editFirstName"></span><br/>
<label for="editLastName">Last Name:</label> <span id="editLastName"></span><br/>
<label for="editNumChildren">No. of Children:</label><span id="editNumChildren"></span><br/>
<label for="editOutreachDate">Outreach Date:</label><span id="editOutreachDate"></span><br/>
<label for="editPacketReturnStatus">Packet Return Status:</label>
<select class="form-control" id="editPacketReturnStatus"></select>
<select class="form-control" id="editPacketReturnStatus"></select>
<div class="edit-group-user">
<label for="editDecision">Decision:</label>
<select class="form-control" id="editDecision"></select>
Expand All @@ -138,11 +138,11 @@ <h5 id="editIdHeader"></h5>
<i class="fas fa-calendar-alt"></i>
</span>
</div>
</div>
</div>
<input type="hidden" id="editCaseId" name="case_id" value="">
<label for="editNotEnrolledReason">Not Enrolled Reason</label>
<br>
<input id="editNotEnrolledReason" value=""/>
<input id="editNotEnrolledReason" value=""/>
</div>
<div class="modal-footer">
<div id="errorBox" class="alert alert-danger" style="display: none;"></div>
Expand Down Expand Up @@ -244,7 +244,7 @@ <h5 id="editIdHeader"></h5>
});
});

$('#casesTable').on('click', '.edit-button', function() {
$('#casesTable').on('click', '.edit-button', function() {
var case_id = this.getAttribute('data-case-id');
$('.edit-group-user').show();
// Populate the modal with case details
Expand All @@ -259,7 +259,7 @@ <h5 id="editIdHeader"></h5>

var days_since_outreach = calculateDaysSinceOutreach($('#outreachDate_' + case_id).text());
console.log(packageReturnStatus, packageReturnStatus !== "RETURNED", days_since_outreach, days_since_outreach > 15);

if (packageReturnStatus !== "RETURNED" && days_since_outreach > 15) {
$('.edit-group-user').hide();
$("#editPacketReturnStatus option[value='" + "RETURNED" + "']").hide();
Expand All @@ -278,7 +278,7 @@ <h5 id="editIdHeader"></h5>

$('#editModal').modal('show');
});

$('#editSubmit').on('click', function() {
// Get all input values
var caseId = $('#editCaseId').val();
Expand Down Expand Up @@ -370,4 +370,3 @@ <h5 id="editIdHeader"></h5>
});
</script>
{% endblock %}