Skip to content

Commit

Permalink
[OSIS-9285] Mig BS5 - module assistant
Browse files Browse the repository at this point in the history
  • Loading branch information
@leboiss
leboiss committed Sep 5, 2024
1 parent 575ac99 commit 0608ee8
Show file tree
Hide file tree
Showing 30 changed files with 906 additions and 908 deletions.
2 changes: 1 addition & 1 deletion templates/access_denied.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "bootstrap5/layout.html" %}
{% load static %}
{% load i18n %}

Expand Down
65 changes: 33 additions & 32 deletions templates/assistant_form_part1.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "bootstrap5/layout.html" %}
{% load static %}
{% load i18n %}
{% load l10n %}
Expand Down Expand Up @@ -27,78 +27,79 @@
* see http://www.gnu.org/licenses/.
{% endcomment %}
{% block breadcrumb %}
<li><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
<li class="active">{% trans 'Renewal application form' %}</li>
<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_assistant_mandates">{% trans 'My mandates' %}</a></li>
<li class="breadcrumb-item active">{% trans 'Renewal application form' %}
</li>
{% endblock %}
{% block content %}
<ul class="nav nav-tabs ">
<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
<li class="active"><a href="#">{% trans 'Administrative' %}</a></li>
<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
<li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
<li class="nav-item"><a href="#" class="nav-link active">{% trans 'Administrative' %}</a></li>
<li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
{% if mandate.assistant_type == "ASSISTANT" %}
<li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
<li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
{% endif %}
<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
</ul>
<div class="panel panel-default">
<div class="panel-body">
<div class="card border-top-0">
<div class="card-body">
{% if msg %}
<h5><p style="color:red">{{ msg }}</p></h5>
<h5><p class="text-danger">{{ msg }}</p></h5>
{% endif %}
<form id="pst-form-part1" method="POST" action="{% url 'form_part1_save' %}">
{% csrf_token %}
{{ form.non_field_errors }}
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Administrative information' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Administrative information' %}</h4>
</div>
</div>
<div class="form-group" style="padding-top: 15px;">
<div class="form-group pt-3">
<div class="controls" id="person">{{assistant.person}}</div>
</div>
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Contract' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Contract' %}</h4>
</div>
</div>
<div class="form-group" style="padding-top: 15px;">
<label style="padding-top: 5px" for="renewal_type">{% trans 'Renewal type' %}
<div class="form-group pt-3">
<label class="pt-2" for="renewal_type">{% trans 'Renewal type' %}
</label>
<div class="controls" id="renewal_type">
{% trans mandate.renewal_type %}
</div>
{% for structure in mandate.mandatestructure_set.all|dictsort:"id" %}
<label style="padding-top: 15px" for="structures">
<label class="pt-3" for="structures">
{% trans structure.structure.type|lower %}</label>
<div class="controls" id="structures">{{structure.structure.acronym}}</div>
{% endfor %}
<label style="padding-top: 15px" for="full_time_equivalent">
<label class="pt-3" for="full_time_equivalent">
{% trans 'Full-time equivalent' %}</label>
<div class="controls" id="full_time_equivalent">{{mandate.fulltime_equivalent}}</div>
<label style="padding-top: 15px" for="date_of_first_nomination">
<label class="pt-3" for="date_of_first_nomination">
{% trans 'Date of first nomination' %}</label>
<div class="controls" id="date_of_first_nomination">{{mandate.entry_date}}</div>
<label style="padding-top: 15px" for="field">{% trans 'Mandate type' %}</label>
<label class="pt-3" for="field">{% trans 'Mandate type' %}</label>
<div class="controls" id="field">
{% trans mandate.assistant_type %}
</div>
</div>
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Miscellaneous' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Miscellaneous' %}</h4>
</div>
</div>
<div class="form-group">
<label style="padding-top: 5px" for="function_outside_university">
<label class="pt-2" for="function_outside_university">
{% trans 'Current positions outside the University and % of time spent' %}
</label>
{{ form.external_functions }}
<span class="error">{{ form.errors.external_functions }}</span>
</div>
<div class="form-group">
<label style="padding-top: 5px" for="external_post">
<label class="pt-2" for="external_post">
{% trans 'Mandate requested externally (FNRS, FRIA, ...)' %}
</label>
{{ form.external_contract }}
Expand All @@ -114,7 +115,7 @@ <h4>{% trans 'Miscellaneous' %}</h4>
</div>
{% endif %}
<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_pstform_part1_save">
<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}
<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}
</button>
<input type="hidden" name="mandate_id" value="{{ mandate.id }}">
</form>
Expand Down
62 changes: 31 additions & 31 deletions templates/assistant_form_part3.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "layout.html" %}
{% extends "bootstrap5/layout.html" %}
{% load static %}
{% load i18n %}
{% load l10n %}
{% load bootstrap3 %}
{% load django_bootstrap5 %}

{% comment "License" %}
* OSIS stands for Open Student Information System. It's an application
Expand Down Expand Up @@ -31,33 +31,33 @@
<link rel="stylesheet" href="{% static 'css/jquery-ui.css' %}">
{% endblock %}
{% block breadcrumb %}
<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
<li class="active">{% trans 'Renewal application form' %}</li>
<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
{% endblock %}
{% block content %}
<ul class="nav nav-tabs ">
<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
<li class="active"><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
<li><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
</ul>
<div class="panel panel-default">
<div class="panel-body">
<li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
<li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link active">{% trans 'Ph.D.' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link">{% trans 'Research' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
</ul>
<div class="card">
<div class="card-body">
{% if msg %}
<h5><p style="color:red">{{ msg }}</p></h5>
<h5><p class="text-danger">{{ msg }}</p></h5>
{% endif %}
<form id="pst-form-part3" method="POST" enctype="multipart/form-data" action="{% url 'form_part3_save' %}">
{{ form.non_field_errors }}
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Ph.D.' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Ph.D.' %}</h4>
</div>
</div>
<div class="form-group">
Expand Down Expand Up @@ -108,29 +108,29 @@ <h4>{% trans 'Ph.D.' %}</h4>
{{ form.remark }}
<span class="error">{{ form.remark.errors }}</span>
</div>
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Report of the steering committee (mandatory from the second renewal application)' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Report of the steering committee (mandatory from the second renewal application)' %}</h4>
</div>
</div>
{% for file in files %}
<div class="row" style="padding-top: 15px;">
<div class="col-md-2" style="text-align: left">
<a class="btn btn-default btn-danger btn-sm" id="btn_delete_file" style="margin-right: 5px;"
<div class="row pt-3">
<div class="col-lg-2" style="text-align: left">
<a class="btn btn-danger btn-md me-2" id="btn_delete_file"
title="{% trans 'Delete file'%}"
onclick="location.href='{% url 'assistant_file_delete' file.id 'form_part3_edit' %}';">
<span class="fas fa-times" aria-hidden="true" id="spn_delete_file"></span>
<i class="fas fa-times" aria-hidden="true" id="spn_delete_file"></i>
{% trans 'Delete' %}</a>
</div>
<div class="col-md-10" id="hdn_filename" style="text-align: left">
<div class="col-lg-10 text-start" id="hdn_filename">
<a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">{{ file.document_file }}</a>
</div>
</div>
{% endfor %}
<div class="form-group" style="padding-top: 15px;">
<a class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_documents"
id="btn_add_file" style="margin-right: 5px;" title="{% trans 'Add file'%}">
<span class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></span>
<div class="form-group pt-3">
<a class="btn btn-default me-2" data-bs-toggle="modal" data-bs-target="#pnl_upload_documents"
id="btn_add_file" title="{% trans 'Add file'%}">
<i class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></i>
{% trans 'Attach a PDF file' %}</a>
</div>
<hr>
Expand All @@ -141,7 +141,7 @@ <h4>{% trans 'Report of the steering committee (mandatory from the second renewa
<div class="form-group">
<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}"
id="bt_pstform_part3_save">
<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
</div>
{{ form.media }}
</form>
Expand Down
56 changes: 28 additions & 28 deletions templates/assistant_form_part4.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "bootstrap5/layout.html" %}
{% load static %}
{% load i18n %}
{% load l10n %}
Expand Down Expand Up @@ -27,27 +27,27 @@
* see http://www.gnu.org/licenses/.
{% endcomment %}
{% block breadcrumb %}
<li><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
<li class="active">{% trans 'Renewal application form' %}</li>
<li class="breadcrumb-item"><a href="{% url 'assistant_mandates' %}" id="lnk_my_mandates">{% trans 'My mandates' %}</a></li>
<li class="breadcrumb-item active">{% trans 'Renewal application form' %}</li>
{% endblock %}
{% block content %}
<ul class="nav nav-tabs ">
<li><a href="{% url 'assistant_mandates' %}">{% trans 'My mandates' %}</a></li>
<li><a href="{% url 'form_part1_edit' %}">{% trans 'Administrative' %}</a></li>
<li><a href="{% url 'mandate_learning_units' %}">{% trans 'Learning units' %}</a></li>
<li><a href="{% url 'form_part3_edit' %}">{% trans 'Ph.D.' %}</a></li>
<li class="active"><a href="{% url 'form_part4_edit' %}">{% trans 'Research' %}</a></li>
<li><a href="{% url 'form_part5_edit' %}">{% trans 'Activities' %}</a></li>
<li><a href="{% url 'form_part6_edit' %}">{% trans 'Summary' %}</a></li>
<li class="nav-item"><a href="{% url 'assistant_mandates' %}" class="nav-link">{% trans 'My mandates' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part1_edit' %}" class="nav-link">{% trans 'Administrative' %}</a></li>
<li class="nav-item"><a href="{% url 'mandate_learning_units' %}" class="nav-link">{% trans 'Learning units' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part3_edit' %}" class="nav-link">{% trans 'Ph.D.' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part4_edit' %}" class="nav-link active">{% trans 'Research' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part5_edit' %}" class="nav-link">{% trans 'Activities' %}</a></li>
<li class="nav-item"><a href="{% url 'form_part6_edit' %}" class="nav-link">{% trans 'Summary' %}</a></li>
</ul>
<div class="panel panel-default">
<div class="panel-body">
<div class="card">
<div class="card-body">
<form id="pst-form-part4" method="POST" enctype="multipart/form-data" action="{% url 'form_part4_save' %}">
{% csrf_token %}
{{ form.non_field_errors }}
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'Research' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'Research' %}</h4>
</div>
</div>
<div class="form-group" style="padding-top: 10px">
Expand Down Expand Up @@ -80,37 +80,37 @@ <h4>{% trans 'Research' %}</h4>
{{ form.remark }}
<span class="error">{{ form.remark.errors }}</span>
</div>
<div class="panel-default">
<div class="panel-heading">
<h4>{% trans 'List of publications in PDF format (DIAL)' %}</h4>
<div class="card border-0">
<div class="card-heading border-bottom">
<h4 class="fs-5 my-2">{% trans 'List of publications in PDF format (DIAL)' %}</h4>
</div>
</div>
{% for file in files %}
<div class="row" style="padding-top: 15px;">
<div class="col-md-2" style="text-align: left">
<a class="btn btn-default btn-danger btn-sm" id="btn_delete_file" style="margin-right: 5px;"
<div class="row pt-3">
<div class="col-lg-2" style="text-align: left">
<a class="btn btn-danger btn-md me-2" id="btn_delete_file"
title="{% trans 'Delete'%}"
onclick="location.href='{% url 'assistant_file_delete' file.id 'form_part4_edit' %}';">
<span class="fas fa-times" aria-hidden="true" id="spn_delete_file"></span>
<i class="fas fa-times" aria-hidden="true" id="spn_delete_file"></i>
{% trans 'Delete file' %}</a>
</div>
<div class="col-md-10" id="hdn_filename" style="text-align: left">
<div class="col-lg-10 text-start" id="hdn_filename">
<a href="{% url 'assistant_file_download' document_file_id=file.id %}" class="no_spinner">{{ file.document_file }}</a>
</div>
</div>
{% endfor %}
<div class="row" style="padding-top: 15px; padding-left: 15px;">
<a class="btn btn-default" data-toggle="modal" data-target="#pnl_upload_documents"
id="btn_add_file" style="margin-right: 5px;" title="{% trans 'Add file'%}">
<span class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></span>
<div class="row px-3">
<a class="btn btn-default me-2" data-bs-toggle="modal" data-bs-target="#pnl_upload_documents"
id="btn_add_file" title="{% trans 'Add file'%}">
<i class="fas fa-arrow-circle-up" aria-hidden="true" id="spn_add_file"></i>
{% trans 'Attach a PDF file' %}</a>
</div>
<hr>
<input type="hidden" value="{{mandate.id | default_if_none:''}}" id="hdn_current_mandate_id"
name="mandate_id" title="mandate_id" >
<input type="hidden" value="{{ document_type }}" id="hdn_description" name="description" title="description">
<button type="submit" class="btn btn-primary" title="{% trans 'Save'%}" id="bt_pstform_part3_save">
<span class="far fa-save" aria-hidden="true"></span> {% trans 'Save'%}</button>
<i class="far fa-save" aria-hidden="true"></i> {% trans 'Save'%}</button>
</form>
</div>
</div>
Expand Down
Loading

0 comments on commit 0608ee8

Please sign in to comment.