Skip to content
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

REF:BUILD: Fixed several frontend elements #110

Merged
merged 4 commits into from
May 14, 2024
Merged

REF:BUILD: Fixed several frontend elements #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05596c9
REF:BUILD: Fixed several frontend elements
Alejolonber25 May 13, 2024
af2c00d
Merge branch 'develop' into fix-frontend
Mendo6472 May 13, 2024
3fb1d31
REF:BUILD: Pass create hiring tests
Mendo6472 May 13, 2024
db0130c
REF:BUILD: Pass hiring request tests
Mendo6472 May 13, 2024
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
41 changes: 20 additions & 21 deletions hiring_module/hiring_app/templates/auth/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
{% load static %}
<div style="display: flex; justify-content: center; align-items: center; height: 100vh; overflow: hidden;">
<div style="display: flex; flex-direction: column; align-items: center; margin-top: 20px; padding: 30px; background-color: rgba(255, 255, 255, 0.918); border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); max-width: 350px; min-width: 30vw;">
<img src="{% static 'images/auth/logo_icesi.webp' %}" alt="logo" style="margin-bottom: 20px; height: 70px;">
<h1 style="font-size: 20px; font-weight: bold; line-height: 1.2; margin-bottom: 20px; color: #333;">Sign in to your account</h1>
<form method="post" style="display: flex; flex-direction: column; width: 100%;" action="#">
{% csrf_token %}
{{ form.non_field_errors }}
<div style="display: flex; justify-content: center; align-items: center; height: 100vh; overflow: hidden;">
<div style="display: flex; flex-direction: column; align-items: center; margin-top: 20px; padding: 35px; background-color: rgba(255, 255, 255, 0.918); border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); max-width: 350px; min-width: 30vw;">
<img src="{% static 'images/auth/logo_icesi.webp' %}" alt="logo" style="margin-bottom: 20px; height: 70px;">
<form method="post" style="display: flex; flex-direction: column; width: 100%;" action="#">
{% csrf_token %}
{{ form.non_field_errors }}

<label for="email" style="margin-bottom: 10px; font-size: 16px; font-weight: bold; color: #333;">Your ID</label>
{{ form.id }}
<label for="password" style="margin-top: 15px; margin-bottom: 10px; font-size: 16px; font-weight: bold; color: #333;">Password</label>
{{ form.password }}
<label for="email" style="margin-bottom: 10px; font-size: 16px; font-weight: bold; color: #333;">Usuario</label>
<input type="number" name="id" style="padding: 10px; margin-bottom: 15px; border: 1px solid #ccc; border-radius: 5px; font-size: 14px;" placeholder="" min="0" step="1" required="" id="id_id">
<label for="password" style="margin-top: 15px; margin-bottom: 10px; font-size: 16px; font-weight: bold; color: #333;">Contraseña</label>
<input type="password" name="password" style="padding: 10px; margin-bottom: 15px; border: 1px solid #ccc; border-radius: 5px; font-size: 14px;" placeholder="" required="" id="id_password">

<button type="submit" style="padding: 12px; margin-top: 20px; border: none; border-radius: 8px; background-color: #2A8FD0; color: #fff; font-size: 16px; cursor: pointer; transition: background-color 0.3s ease-in-out;">Sign in</button>
<div>
{% if messages %}
{% for message in messages %}
<p id="warningMessage" style="color: #dc2626; font-weight: 600; margin-top: 20px; text-align: center;">Credenciales incorrectas. Inténtelo de nuevo.</p>
{% endfor %}
{% endif %}
</div>
</form>
</div>
<button type="submit" style="padding: 12px; margin-top: 20px; border: none; border-radius: 8px; background-color: #2A8FD0; color: #fff; font-size: 16px; cursor: pointer; transition: background-color 0.3s ease-in-out;">Iniciar Sesión</button>
<div>
{% if messages %}
{% for message in messages %}
<p id="warningMessage" style="color: #dc2626; font-weight: 600; margin-top: 20px; text-align: center;">Credenciales incorrectas. Inténtelo de nuevo.</p>
{% endfor %}
{% endif %}
</div>
</form>
</div>
</div>
8 changes: 4 additions & 4 deletions hiring_module/hiring_app/templates/components/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
<h5 class="modal-title" id="exampleModalLabel">¿Estás seguro?</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">Select "Logout" below if you are ready to end your current session.</div>
<div class="modal-body">Seleccione "Cerrar Sesión" a continuación si está listo para finalizar su sesión actual.</div>
<div class="modal-footer">
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancel</button>
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancelar</button>

<form action="{% url 'logout' %}" method="post">
{% csrf_token %}
<button id="logoutButton2" class="btn btn-primary">Logout</button>
<button id="logoutButton2" class="btn btn-primary">Cerrar Sesión</button>
</form>
</div>
</div>
Expand Down
31 changes: 0 additions & 31 deletions hiring_module/hiring_app/templates/control_board/base_external_user.html
View file
Open in desktop

This file was deleted.

54 changes: 32 additions & 22 deletions hiring_module/hiring_app/templates/control_board/external_user_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,40 @@
{% extends 'control_board/base_external_user.html' %}
{% extends 'base.html' %}
{% load static %}
{% block title %}
Panel de control de usuario externo
Panel de control de usuario externo
{% endblock %}
{% block aditionalMetadata %}
{% endblock %}

{% block control_board %}
<main id="main" class="expanded">
<div class="container text-center">
<div style="padding-top: 25px;">
<button id="create_monitoring_contract" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
<a href="/hiring_app/request_creation/monitoring/">Crear contrato de monitoria</a>
</button>
</div>
<div style="padding-top: 25px;">
<button id="create_cex_contract" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
<a href="/hiring_app/request_creation/cex/">Crear contrato CEX</a>
</button>
</div>
<div style="padding-top: 25px;">
<button id="create_pos_contract" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
<a href="/hiring_app/request_creation/pos/">Crear contrato de prestacion de servicios</a>
</button>
</div>
{% block content %}

<div class="container-fluid">

<!-- Page Heading -->
<div class="container mb-4">
<h1 class="h3 text-gray-800">Bienvenido al panel de control de Usuario Externo</h1>
<h5>Radique los siguientes tipos de solicitudes de contratos</h5>
</div>

<!-- Content center -->
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-4 col-md-6 col-sm-12 mb-4">
<a id="create_monitoring_contract" href="/hiring_app/request_creation/monitoring/" class="btn btn-primary btn-block text-white" id="">
Crear contrato de monitoría
</a>
</div>
<div class="col-lg-4 col-md-6 col-sm-12 mb-4">
<a id="create_cex_contract" href="/hiring_app/request_creation/cex/" class="btn btn-primary btn-block text-white">
Crear contrato CEX
</a>
</div>
<div class="col-lg-4 col-md-6 col-sm-12 mb-4">
<a id="create_pos_contract" href="/hiring_app/request_creation/pos/" class="btn btn-primary btn-block text-white">
Crear contrato de Honorarios
</a>
</div>
</div>
</main>
</div>

{% endblock %}
{% endblock %}
20 changes: 17 additions & 3 deletions hiring_module/hiring_app/templates/control_board/table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ <h6 class="m-0 font-weight-bold text-primary">Listado de solicitudes de contrata
<thead>
<tr>
<th>ID</th>
<th>Contrato</th>
<th>Solicitante</th>
{% if not actualgroup == 'leader' %}
<th>Lider encargado</th>
Expand All @@ -36,8 +37,9 @@ <h6 class="m-0 font-weight-bold text-primary">Listado de solicitudes de contrata

{% for request in requests %}
<tr>
<td id="{{ request.id }}_id" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.id }}</td>
<td id="{{ request.id }}_name" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.created_by.first_name }} {{ request.created_by.last_name }}</td>
<td id="{{ request.id }}_id" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.id|truncatechars:25 }}</td>
<td>{{ request.request_type }}</td>
<td id="{{ request.id }}_name" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.created_by.first_name|truncatechars:10 }} {{ request.created_by.last_name|truncatechars:8 }}</td>
{% if not actualgroup == 'leader' %}
<td id="{{ request.id }}_leader" style="cursor: pointer;">
<p style="display: none;">{{ request.leader_assigned_to.first_name }}</p>
Expand All @@ -48,7 +50,19 @@ <h6 class="m-0 font-weight-bold text-primary">Listado de solicitudes de contrata
<p style="display: none;">{{ request.manager_assigned_to.first_name }}</p>
{% include 'request_hiring/components/assign_manager.html' with managers=managers contract_request=request form_id_prefix='change_manager_form_' %}</td>
{% endif %}
<td id="{{ request.id }}_state" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.state }}</td>
<td id="{{ request.id }}_state" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">
{% if request.state == 'pending' %}
Pendiente
{% elif request.state == 'review' %}
En Revisión
{% elif request.state == 'incomplete' %}
Incompleto
{% elif request.state == 'filed' %}
Completado
{% elif request.state == 'cancelled' %}
Cancelado
{% endif %}
</td>
<td id="{{ request.id }}_date" style="cursor: pointer;" onclick="redirectToInfoPage('{{ request.id }}')">{{ request.start_date|date:"d-m-Y" }}</td>
</tr>
{% endfor %}
Expand Down
39 changes: 21 additions & 18 deletions hiring_module/hiring_app/templates/request_creation/cex_request_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_hiree_full_name"
style="display: block; font-weight: 600"
>Hiree full name:</label
>Nombre Completo:</label
>
<input
type="text"
Expand All @@ -57,7 +57,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<!-- Hiree ID -->
<div style="margin-bottom: 2rem">
<label for="id_hiree_id" style="display: block; font-weight: 600"
>Hiree ID:</label
>Documento de Identificación:</label
>
<input
type="number"
Expand All @@ -84,7 +84,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_hiree_cellphone"
style="display: block; font-weight: 600"
>Hiree cellphone:</label
>Teléfono Celular:</label
>
<input
type="text"
Expand Down Expand Up @@ -112,7 +112,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_hiree_email"
style="display: block; font-weight: 600"
>Hiree email:</label
>Correo Electrónico:</label
>
<input
type="email"
Expand Down Expand Up @@ -197,7 +197,7 @@ <h6 class="m-0 font-weight-bold text-primary">
class="card-header py-3 d-flex flex-row align-items-center justify-content-between"
>
<h6 class="m-0 font-weight-bold text-primary">
Información del financiera
Información financiera
</h6>
</div>
<!-- Card Body -->
Expand Down Expand Up @@ -233,7 +233,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_banking_entity"
style="display: block; font-weight: 600"
>Banking entity:</label
>Entidad Bancaria:</label
>
<input
type="text"
Expand Down Expand Up @@ -262,7 +262,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_bank_account_type"
style="display: block; font-weight: 600"
>Bank account type:</label
>Tipo de Cuenta Bancaria:</label
>
<select
name="bank_account_type"
Expand All @@ -281,10 +281,13 @@ <h6 class="m-0 font-weight-bold text-primary">
box-shadow 0.15s ease-in-out;
"
>
<option value="" disabled selected>Select</option>
{% for choice in form.bank_account_type.field.choices %}
<option value="{{ choice.0 }}">{{ choice.1 }}</option>
{% endfor %}
<option value="" disabled selected>Seleccionar</option>

<option value="">---------</option>

<option value="checking">Débito</option>

<option value="savings">Ahorros</option>
</select>
</div>
<br />
Expand All @@ -294,7 +297,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_bank_account_number"
style="display: block; font-weight: 600"
>Bank account number:</label
>Número de Cuenta Bancaria:</label
>
<input
type="text"
Expand Down Expand Up @@ -322,7 +325,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_pension_fund"
style="display: block; font-weight: 600"
>Pension fund:</label
>Fondo de Pensiones:</label
>
<input
type="text"
Expand Down Expand Up @@ -366,7 +369,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_solicitant_faculty"
style="display: block; font-weight: 600"
>Solicitant faculty:</label
>Unidad Solicitante:</label
>
<input
type="text"
Expand All @@ -393,7 +396,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_request_motive"
style="display: block; font-weight: 600"
>Request motive:</label
>Motivo de Solicitud:</label
>
<textarea
id="id_request_motive"
Expand All @@ -419,7 +422,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_contract_value"
style="display: block; font-weight: 600"
>Contract value:</label
>Valor del Contrato:</label
>
<input
type="number"
Expand All @@ -446,7 +449,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<label
for="id_charge_account"
style="display: block; font-weight: 600"
>Charge account:</label
>Cuenta de Cargo:</label
>
<textarea
id="id_charge_account"
Expand All @@ -471,7 +474,7 @@ <h6 class="m-0 font-weight-bold text-primary">
<!-- Rut -->
<div style="margin-bottom: 2rem">
<label for="id_rut" style="display: block; font-weight: 600"
>Rut:</label
>RUT:</label
>
<input
type="file"
Expand Down
Loading
Loading