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

Jump to bottom

[OSIS-9160] Dissertation Migration BS5 #151

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[OSIS-9160] Dissertation Migration BS5 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb0700
[OSIS-9160] Dissertation Migration BS5
leboiss Jun 11, 2024
1ab8741
[OSIS-9160] Mig BS5 - Add datatableBS5.min file
leboiss Sep 5, 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
54 changes: 27 additions & 27 deletions templates/dissertation/adviser_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{% load i18n %}
<table class="table table-striped table-hover">
<tr>
<th>{% trans 'Manager' context 'dissertation' %}</th>
<th><a class="btn btn-primary pull-right trigger_modal" data-url="{% url 'faculty_adviser_add' %}?offer_proposition={{offer_propositions|join:','}}">
<span class="fa fa-plus"></span>
</a>
</th>
</tr>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj }}</td>
<td>
<a class="btn btn-default pull-right trigger_modal" data-url="{% url 'faculty_adviser_delete' obj.pk %}?offer_proposition={{offer_propositions|join:','}}">
<span class="fa fa-minus" ></span>
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<script>
$(document).ready(function(){
bind_trigger_modal();
});
</script>
{% load i18n %}
<table class="table table-striped table-hover">
<tr>
<th>{% trans 'Manager' context 'dissertation' %}</th>
<th><a class="btn btn-primary float-end trigger_modal" data-url="{% url 'faculty_adviser_add' %}?offer_proposition={{offer_propositions|join:','}}">
<i class="fa fa-plus"></i>
</a>
</th>
</tr>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj }}</td>
<td>
<a class="btn btn-default float-end trigger_modal" data-url="{% url 'faculty_adviser_delete' obj.pk %}?offer_proposition={{offer_propositions|join:','}}">
<i class="fa fa-minus" ></i>
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<script>
$(document).ready(function(){
bind_trigger_modal();
});
</script>
6 changes: 3 additions & 3 deletions templates/dissertation/facultyadviser_add_inner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% load static %}
{% load bootstrap3 i18n %}
{% load django_bootstrap5 i18n %}
<div class="modal-body" id="form-modal-body">
<form method="post" action='{{ request.get_full_path }}' class="post-form" id="form-modal">
{% csrf_token %}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" id="bt_close_add_manager_modal"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{% trans 'Confirm manager add' %}</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}" id="bt_close_add_manager_modal"></button>
</div>
<div class="modal-body">
<div id="pnl_faculty_adviser_off">
Expand All @@ -18,7 +18,7 @@ <h4 class="modal-title">{% trans 'Confirm manager add' %}</h4>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<input type="submit" id='add_faculty_adviser'class="btn btn-primary" onclick="$('#form-modal').submit();" value="{% trans 'Save' %}"/>
</div>
{{ form.media }}
6 changes: 3 additions & 3 deletions templates/dissertation/facultyadviser_confirm_delete_inner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% load static %}
{% load bootstrap3 i18n %}
{% load django_bootstrap5 i18n %}
<form method="post" action='{{ request.get_full_path }}' class="post-form" id="form-modal">
{% csrf_token %}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" id="bt_close_remove_manager_modal"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{% trans 'Confirm delete for :' %}{{ adviser }}</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}" id="bt_close_remove_manager_modal"></button>
</div>
<div class="modal-body">
<div id="pnl_faculty_adviser_off">
Expand All @@ -30,7 +30,7 @@ <h4 class="modal-title">{% trans 'Confirm delete for :' %}{{ adviser }}</h4>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<input type="submit" class="btn btn-primary" value="{% trans 'Remove' %}"/>
</div>
</form>
121 changes: 60 additions & 61 deletions templates/dissertation/offerproposition_filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,63 @@
{% extends "layout.html" %}
{% load static %}
{% load bootstrap3 i18n %}
{% extends "bootstrap5/layout.html" %}
{% load static %}
{% load django_bootstrap5 i18n %}
{% block content %}
<div class="page-header">
<h2>{% trans 'Dissertation Manager' %} - <label>{% for acronym in managed_entities_acronym %}{{ acronym }}
{% if not forloop.last %} - {% endif %}{% endfor %}</label></h2>
</div>
<div class="panel panel-default">
<div class="panel-body">
<br>
<div class="row">
<form method="get">
<div class="col-md-3">
{% bootstrap_field filter.form.education_group__educationgroupyear__acronym %}
</div>
<div class="col-md-4">
{% bootstrap_field filter.form.education_group__facultyadviser__adviser %}
</div>
<div class="col-md-1">
<br>
<button type="submit" id="bt_submit_pgm_manager_search" class="btn btn-primary" role="button">
<span class="fa fa-search" aria-hidden="true"></span>
</button>
</div>
</form>
</div>
<div class="row">
<div class="col-md-5">
<table class="table table-striped table-hover" id="tb_pgms">
<tr>
<div class="page-header">
<h2>{% trans 'Dissertation Manager' %} - <label>{% for acronym in managed_entities_acronym %}{{ acronym }}
{% if not forloop.last %} - {% endif %}{% endfor %}</label></h2>
</div>
<div class="card">
<div class="card-body">
<br>
<div class="row">
<form method="get">
<div class="col-lg-3">
{% bootstrap_field filter.form.education_group__educationgroupyear__acronym %}
</div>
<div class="col-lg-4">
{% bootstrap_field filter.form.education_group__facultyadviser__adviser %}
</div>
<div class="col-lg-1">
<br>
<button type="submit" id="bt_submit_pgm_manager_search" class="btn btn-primary" role="button">
<i class="fa fa-search" aria-hidden="true"></i>
</button>
</div>
</form>
</div>
<div class="row">
<div class="col-lg-5">
<table class="table table-striped table-hover" id="tb_pgms">
<tr>
<th> {% trans 'Filter by education group'%}</th>
</tr>
<form action="{% url 'adviser_list' %}" id='form_offer_prop' method="get">
{% for obj in object_list %}
<tr>
<td><input type="checkbox" name="offer_proposition" value="{{ obj.pk }}"
onclick="load_faculty_advisers()"> {{ obj.last_acronym }}</td>
</tr>
{% endfor %}
</form>
</table>
</div>
<div class="col-md-7" id="tb_faculty_adviser">
</tr>
<form action="{% url 'adviser_list' %}" id='form_offer_prop' method="get">
{% for obj in object_list %}
<tr>
<td><input type="checkbox" name="offer_proposition" value="{{ obj.pk }}"
onclick="load_faculty_advisers()"> {{ obj.last_acronym }}</td>
</tr>
{% endfor %}
</form>
</table>
</div>
<div class="col-lg-7" id="tb_faculty_adviser">
</div>
</div>
</div>
</div>

</div>
</div>
</div>
</div>

{% endblock %}
{% block script %}
<script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script>
<script>
$(document).ready(function () {
load_faculty_advisers();
});
function load_faculty_advisers() {
let form = $("#form_offer_prop");
$("#tb_faculty_adviser").load(form.attr('action'), form.serialize());
}
</script>
{% endblock %}
{% endblock %}
{% block script %}
<script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.min.js' %}"></script>
<script>
$(document).ready(function () {
load_faculty_advisers();
});
function load_faculty_advisers() {
let form = $("#form_offer_prop");
$("#tb_faculty_adviser").load(form.attr('action'), form.serialize());
}
</script>
{% endblock %}
14 changes: 7 additions & 7 deletions templates/dissertationdocumentfile_confirm_delete_inner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load static %}
{% load bootstrap3 i18n %}
{% extends "bootstrap5/layout.html" %}
{% load django_bootstrap5 i18n %}

{% comment "License" %}
* OSIS stands for Open Student Information System. It's an application
Expand All @@ -25,23 +25,23 @@
* see http://www.gnu.org/licenses/.
{% endcomment %}

<div class="page-header col-md-offset-3">
<div class="page-header offset-lg-3">
<h2>{% trans 'Delete file' %}</h2>
</div>
<div class="modal-body" id="form-modal-body">
<form method="POST" id="form-modal" class="post-form" action="{{ request.get_full_path }}">
{% csrf_token %}

<div class="row">
<div class="col-md-8 col-md-offset-1">
<div class="col-lg-8 offset-lg-1">
<span>{% trans 'Are you sure you want to delete this document?' %} </span>
</div>
</div>
</form>
{{ form.media }}
</div>

<div class="modal-footer" style="text-align:right">
<button type="button" class="btn btn-default" data-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<div class="modal-footer text-end">
<button type="button" class="btn btn-default" data-bs-dismiss="modal" id="bt_cancel_remove_manager_modal">{% trans 'Cancel' %}</button>
<button type="submit" class="save btn btn-primary" onclick="$('#form-modal').submit();">{% trans 'Delete' %}</button>
</div>
</div>
50 changes: 25 additions & 25 deletions templates/dissertations.html
View file
Open in desktop
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 Expand Up @@ -27,9 +27,9 @@
{% endcomment %}

{% block breadcrumb %}
<li><a href="{% url 'studies' %}" id="lnk_studies">{% trans "Students' path" %}</a></li>
<li id="lnk_cohorts_management"><a href="{% url 'cohorts_management' %}">{% trans "Cohorts management" %}</a></li>
<li class="active">{% trans 'Dissertations' %}</li>
<li class="breadcrumb-item"><a href="{% url 'studies' %}" id="lnk_studies">{% trans "Students' path" %}</a></li>
<li class="breadcrumb-item" id="lnk_cohorts_management"><a href="{% url 'cohorts_management' %}">{% trans "Cohorts management" %}</a></li>
<li class="breadcrumb-item active">{% trans 'Dissertations' %}</li>
{% endblock %}
{% block content %}
<div class="page-header">
Expand All @@ -41,7 +41,7 @@ <h2>{% trans 'Dissertations' %}</h2>
<h2>{% trans 'Action needed' %}</h2>
<p>
{% trans 'You have' %}
<span style="font-weight: bold">{{ count_advisers_pro_request }}</span>
<span class="font-bold">{{ count_advisers_pro_request }}</span>
{% trans 'Dissertations waiting validation' %}
</p>
<p>
Expand All @@ -51,20 +51,20 @@ <h2>{% trans 'Action needed' %}</h2>
</p>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-body">
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-md-1"><i class="far fa-lightbulb" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="far fa-lightbulb dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'my_dissertation_propositions' %}" id="lnk_my_dissertation_propositions" >
{% trans 'Dissertation subjects' %}
</a>
</h4>
<p>{% trans 'Dissertation subjects submitted by myself and others teachers' %}</p>
</div>
<div class="col-md-1"><i class="fa fa-cogs" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="fa fa-cogs dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'informations' %}" id="lnk_informations" >
{% trans 'My informations' %}
Expand All @@ -75,8 +75,8 @@ <h4 class="media-heading">
</div>
<br>
<div class="row">
<div class="col-md-1"><i class="far fa-edit" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="far fa-edit dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'dissertations_list' %}" id="lnk_dissertations" >
{% trans 'Dissertations' %}
Expand All @@ -86,20 +86,20 @@ <h4 class="media-heading">
</div>
</div>
{% elif adviser.type == 'MGR' %}
<div class="panel panel-default">
<div class="panel-body">
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-md-1"><i class="far fa-lightbulb" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="far fa-lightbulb dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'manager_proposition_dissertations' %}" id="lnk_manager_proposition_dissertations" >
{% trans 'Dissertation subjects' %}
</a>
</h4>
<p>{% trans 'Dissertation subjects submitted by teachers' %}</p>
</div>
<div class="col-md-1"><i class="fa fa-users" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="fa fa-users dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'manager_informations' %}" id="lnk_manager_informations" >
{% trans 'Teachers' %}
Expand All @@ -110,17 +110,17 @@ <h4 class="media-heading">
</div>
<br>
<div class="row">
<div class="col-md-1"><i class="far fa-edit" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="far fa-edit dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'manager_dissertations_list' %}" id="lnk_manager_dissertations" >
{% trans 'Dissertations' %}
</a>
</h4>
<p>{% trans 'List of the dissertation subjects' %}</p>
</div>
<div class="col-md-1"><i class="fa fa-cog" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="fa fa-cog dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'manager_offer_parameters' %}" id="lnk_manager_offer_parameters" >
{% trans 'Settings' context 'dissertation' %}
Expand All @@ -131,8 +131,8 @@ <h4 class="media-heading">
</div>
<br>
<div class="row">
<div class="col-md-1"><i class="fa fa-graduation-cap" style="font-size: 400%; color: #6699FF;"></i></div>
<div class="col-md-5">
<div class="col-lg-1"><i class="fa fa-graduation-cap dashboard-icon"></i></div>
<div class="col-lg-5">
<h4 class="media-heading">
<a href="{% url 'manager_students_list' %}" id="lnk_manager_students_list" >
{% trans 'For students' %}
Expand Down
Loading