Skip to content

Commit

Permalink
Merge pull request #5290 from jp524/modify-case-contacts-form
Browse files Browse the repository at this point in the history
Remove “+ Highlight” button from New Case Contact form
  • Loading branch information
schoork authored Oct 22, 2023
2 parents ac74697 + 1ea0ba7 commit 48a78b6
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 61 deletions.
18 changes: 0 additions & 18 deletions app/assets/stylesheets/pages/case_contacts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,3 @@ legend {
.cc-italic {
font-style: italic;
}

.notes-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 0.5em;

h2 {
margin-bottom: 0;
}
}

.highlight-button {
background: none;
border: none;
color: var(--blue);
font-size: 1.1em;
}
6 changes: 0 additions & 6 deletions app/javascript/src/case_contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ async function fireSwalFollowupAlert () {
})
}

function displayHighlightModal (event) {
event.preventDefault()
$('#caseContactHighlight').modal('show')
}

$(() => { // JQuery's callback for the DOM loading
const milesDriven = $('#case_contact_miles_driven')
const durationHoursElement = $('#case-contact-duration-hours-display')
Expand Down Expand Up @@ -170,7 +165,6 @@ $(() => { // JQuery's callback for the DOM loading

$('[data-toggle="tooltip"]').tooltip()
$('.followup-button').on('click', displayFollowupAlert)
$('#open-highlight-modal').on('click', displayHighlightModal)

if (/\/case_contacts\/*.*\?.*success=true/.test(window.location.href)) {
$('#thank_you').modal()
Expand Down
38 changes: 1 addition & 37 deletions app/views/case_contacts/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,7 @@ readonly: true %>
</div>

<div class="card-style-1 pl-25 mb-10">
<div class="notes-header pr-25">
<h2 class="mb-3"><%= form.label :notes, "5. Enter Notes" %></h2>

<button id="open-highlight-modal" class="mb-3 btn-sm main-btn secondary-btn-outline btn-hover" data-bs-toggle="modal" data-target="#visibleColumns">+ Highlight</button>

</div>
<h2 class="mb-3"><%= form.label :notes, "5. Enter Notes" %></h2>
<div class="cc-italic mb-3">
Please refer to individuals by their roles instead of by their names. Ex: My supervisor joined me for a call with the social worker to discuss my youth.
</div>
Expand All @@ -257,34 +252,3 @@ readonly: true %>
</div>
<%= render 'confirm_note_content_dialog', form: form %>
<% end %>

<div class="warning-modal">
<div class="modal fade" id="caseContactHighlight" tabindex="-1" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content card-style">
<div class="modal-header px-0 border-0">
<h5 class="text-bold">Highlight</h5>
<button
class="border-0 bg-transparent h1"
data-bs-dismiss="modal">
<i class="lni lni-cross-circle"></i>
</button>
</div>
<div class="modal-body px-0">
<div class="mb-30">
<h6 class="mb-20">
Coming Soon.
</h6>
</div>
<div class="action d-flex flex-wrap justify-content-end">
<button
data-bs-dismiss="modal"
class="main-btn danger-btn-outline btn-hover m-1"><i class="lni lni-ban mr-10"></i>
Close
</button>
</div>
</div>
</div>
</div>
</div>
</div>

0 comments on commit 48a78b6

Please sign in to comment.