Revert "REF:BUILD: Fixed UI elements"

ICESI-PI1-2024A-G1 · May 6, 2024 · 628cae7 · 628cae7
1 parent 28c1eaf
commit 628cae7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 28 deletions.
diff --git a/hiring_module/hiring_app/templates/request_creation/cex_request_form.html b/hiring_module/hiring_app/templates/request_creation/cex_request_form.html
@@ -156,6 +156,7 @@ <h1 style="font-size: 1.5rem; font-weight: 600; margin-bottom: 1rem;">Solicitude
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <p id="notificationMessage">Mensaje de notificación</p>
@@ -186,10 +187,6 @@ <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
             notificationModal.hide();
         }
 
-        notificationCloseBtn.addEventListener('click', function () {
-            hideNotification();
-        });
-
         form.addEventListener('submit', function (event) {
             event.preventDefault();
 

diff --git a/hiring_module/hiring_app/templates/request_creation/monitoring_request_form.html b/hiring_module/hiring_app/templates/request_creation/monitoring_request_form.html
@@ -146,6 +146,7 @@ <h1 style="font-size: 1.5rem; font-weight: 600; margin-bottom: 1rem;">Solicitude
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <p id="notificationMessage">Mensaje de notificación</p>
@@ -176,10 +177,6 @@ <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
             notificationModal.hide();
         }
 
-        notificationCloseBtn.addEventListener('click', function () {
-            hideNotification();
-        });
-
         form.addEventListener('submit', function (event) {
             event.preventDefault();
 

diff --git a/hiring_module/hiring_app/templates/request_creation/pos_request_form.html b/hiring_module/hiring_app/templates/request_creation/pos_request_form.html
@@ -272,6 +272,7 @@ <h4>Course schedules:</h4>
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <p id="notificationMessage">Mensaje de notificación</p>
@@ -302,10 +303,6 @@ <h5 class="modal-title" id="notificationTitle">Título de la notificación</h5>
             notificationModal.hide();
         }
 
-        notificationCloseBtn.addEventListener('click', function () {
-            hideNotification();
-        });
-
         form.addEventListener('submit', function (event) {
             event.preventDefault();
 

diff --git a/hiring_module/hiring_app/templates/request_hiring/components/change_state.html b/hiring_module/hiring_app/templates/request_hiring/components/change_state.html
@@ -12,6 +12,9 @@
     <form id="reasonForm" method="post" action="{% url 'hiring_app:change_state' idContract=contract_request.id %}">
         {% csrf_token %}
         <input type="hidden" id="state" name="state">
+        <div class="modal-header">
+            <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
 
         <div class="modal-body">
             <label id="reasonLabel" for="reason" style="margin-bottom: 10px; color: #4a5568; font-weight: bold; display: block;">Motivo:</label>

diff --git a/hiring_module/hiring_app/views/request_creation/cex_contract_request_view.py b/hiring_module/hiring_app/views/request_creation/cex_contract_request_view.py
@@ -35,11 +35,6 @@ def form_valid(self, form):
     def form_invalid(self, form):
         return self.render_to_response(self.get_context_data(form=form))
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['actualgroup'] = 'external'
-        return context
-
 def download_rut_file(request, idContract, *args, **kwargs):
     # Get the rut and send it as a file
     model_instance = get_object_or_404(CEXContractRequest, id=idContract)

diff --git a/hiring_module/hiring_app/views/request_creation/monitoring_contract_request_view.py b/hiring_module/hiring_app/views/request_creation/monitoring_contract_request_view.py
@@ -32,9 +32,4 @@ def form_valid(self, form):
         return super().form_valid(form)
 
     def form_invalid(self, form):
-        return self.render_to_response(self.get_context_data(form=form))
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['actualgroup'] = 'external'
-        return context
+        return self.render_to_response(self.get_context_data(form=form))
diff --git a/hiring_module/hiring_app/views/request_creation/pos_contract_request_view.py b/hiring_module/hiring_app/views/request_creation/pos_contract_request_view.py
@@ -47,11 +47,6 @@ def form_valid(self, form):
     def form_invalid(self, form):
         return self.render_to_response(self.get_context_data(form=form))
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['actualgroup'] = 'external'
-        return context
-
 
 
 def download_rut_file(request, idContract, *args, **kwargs):