Merge pull request #96 from ICESI-PI1-2024A-G1/develop

V 1.0.1
ICESI-PI1-2024A-G1 · May 6, 2024 · 0bbd309 · 0bbd309
2 parents 9ed92b9 + 3488c92
commit 0bbd309
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/hiring_module/hiring_app/templates/components/LeftSideMenu.html b/hiring_module/hiring_app/templates/components/LeftSideMenu.html
@@ -1,5 +1,4 @@
 {% load static %}
-{% if actualgroup != "external" %}
 <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
 
     <!-- Sidebar - Brand -->
@@ -29,10 +28,12 @@
         </a>
         {% endif %}
 
+        {% if actualgroup != "external" %}
         <a class="nav-link" href="{% url 'hiring_app:statistics' %}">
             <i class="fas fa-fw fa-file-contract"></i>
             <span>Estadisticas</span>
         </a>
+        {% endif %}
     </li>
 
     <!-- Divider -->
@@ -44,5 +45,4 @@
     </div>
 
 
-</ul>
-{% endif %}
+</ul>
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
@@ -177,6 +177,10 @@ <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
@@ -303,6 +303,10 @@ <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,9 +12,6 @@
     <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
@@ -34,6 +34,13 @@ 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

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,4 +32,9 @@ 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))
+        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
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,6 +47,10 @@ 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):