mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-23 20:03:11 +00:00
Merge branch 'new_user_page' into 'master'
New user page See merge request federez/re2o!95
This commit is contained in:
chirac
commit
1fe2601d78
2 changed files with 368 additions and 200 deletions
|
|
@ -237,6 +237,7 @@ install_base=$(dialog --clear \
|
||||||
$HEIGHT $WIDTH \
|
$HEIGHT $WIDTH \
|
||||||
2>&1 >/dev/tty)
|
2>&1 >/dev/tty)
|
||||||
|
|
||||||
|
echo "Installation des paquets de base"
|
||||||
apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fonts-recommended python3-djangorestframework python3-django-reversion python3-pip libsasl2-dev libldap2-dev libssl-dev python3-crypto
|
apt-get -y install python3-django python3-dateutil texlive-latex-base texlive-fonts-recommended python3-djangorestframework python3-django-reversion python3-pip libsasl2-dev libldap2-dev libssl-dev python3-crypto
|
||||||
pip3 install django-bootstrap3
|
pip3 install django-bootstrap3
|
||||||
pip3 install django-ldapdb
|
pip3 install django-ldapdb
|
||||||
|
|
|
||||||
|
|
@ -26,51 +26,78 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
{% load bootstrap3 %}
|
{% load bootstrap3 %}
|
||||||
{% load acl %}
|
{% load acl %}
|
||||||
{% block title %}Profil{% endblock %}
|
{% block title %}Profil{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h2>{{ users.class_name }} : {{ users.surname }} {{users.name}}</h2>
|
<h2>{{ users.surname }} {{users.name}}</h2>
|
||||||
<div>
|
<p>Vous êtes {% if users.end_adhesion != None %}<span class="label label-success">
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-info' users.id %}">
|
un {{ users.class_name | lower}}</span>{% else %}<span class="label label-danger">
|
||||||
|
non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
|
||||||
|
<span class="label label-success">active</span>{% else %}<span class="label label-danger">désactivée</span>{% endif %}.</p>
|
||||||
|
{% if user_solde %}
|
||||||
|
<p>Votre solde est de <span class="badge">{{ user.solde }}€</span>.
|
||||||
|
{% if allow_online_payment %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:recharge' %}">
|
||||||
|
<i class="fa fa-euro-sign"></i>
|
||||||
|
Recharger
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="panel-group" id="accordion">
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse1">
|
||||||
|
<h3 class="panel-title pull-left" >
|
||||||
|
<i class="fa fa-user"></i> Informations détaillées
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionuser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionuser">
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'users:edit-info' users.id %}">
|
||||||
<i class="fa fa-edit"></i>
|
<i class="fa fa-edit"></i>
|
||||||
Editer
|
Editer
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' users.id %}">
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'users:password' users.id %}">
|
||||||
<i class="fa fa-lock"></i>
|
<i class="fa fa-lock"></i>
|
||||||
Changer le mot de passe
|
Changer le mot de passe
|
||||||
</a>
|
</a>
|
||||||
|
</li>
|
||||||
{% can_change User state %}
|
{% can_change User state %}
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:state' users.id %}">
|
<li>
|
||||||
|
<a href="{% url 'users:state' users.id %}">
|
||||||
<i class="fa fa-id-badge"></i>
|
<i class="fa fa-id-badge"></i>
|
||||||
Changer le statut
|
Changer le statut
|
||||||
</a>
|
</a>
|
||||||
|
</li>
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
{% can_change User groups %}
|
{% can_change User groups %}
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:groups' users.id %}">
|
<li>
|
||||||
|
<a href="{% url 'users:groups' users.id %}">
|
||||||
<i class="fa fa-check"></i>
|
<i class="fa fa-check"></i>
|
||||||
Gérer les groupes
|
Gérer les groupes
|
||||||
</a>
|
</a>
|
||||||
|
</li>
|
||||||
{% acl_end %}
|
{% acl_end %}
|
||||||
<a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' users.id %}">
|
<li>
|
||||||
|
<a href="{% url 'users:history' 'user' users.id %}">
|
||||||
<i class="fa fa-history"></i>
|
<i class="fa fa-history"></i>
|
||||||
Historique
|
Historique
|
||||||
</a>
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
</div>
|
||||||
<br />
|
<div class="panel-collapse collapse in" id="collapse1">
|
||||||
</p>
|
<div class="panel-body">
|
||||||
|
<div class="table-responsive">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
{% if users.is_class_club %}
|
|
||||||
<th>Mailing</th>
|
|
||||||
{% if users.club.mailing %}
|
|
||||||
<td>{{ users.pseudo }}(-admin)</td>
|
|
||||||
{% else %}
|
|
||||||
<td>Mailing désactivée</td>
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
|
||||||
<th>Prénom</th>
|
<th>Prénom</th>
|
||||||
<td>{{ users.name }}</td>
|
<td>{{ users.name }}</td>
|
||||||
{% endif %}
|
|
||||||
<th>Nom</th>
|
<th>Nom</th>
|
||||||
<td>{{ users.surname }}</td>
|
<td>{{ users.surname }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -157,12 +184,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{% if users.is_class_club %}
|
{% if users.is_class_club %}
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' users.club.id %}">
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse2">
|
||||||
|
<h3 class="panel-title pull-left">
|
||||||
|
<i class="fa fa-users"></i> Gérer le club
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionclub" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionclub">
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'users:edit-club-admin-members' users.club.id %}">
|
||||||
<i class="fa fa-lock"></i>
|
<i class="fa fa-lock"></i>
|
||||||
Gérer admin et membres
|
Gérer admin et membres
|
||||||
</a>
|
</a>
|
||||||
<h3>Administrateurs du club</h3>
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="panel-collapse collapse" id="collapse2">
|
||||||
|
<div class="panel-body">
|
||||||
|
<h4>Administrateurs du club</h4>
|
||||||
|
<div class="table-responsive">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -179,7 +228,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
<h3>Membres</h3>
|
</div>
|
||||||
|
<h4>Membres</h4>
|
||||||
|
<div class="table-responsive">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -196,38 +247,154 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>Machines</h2>
|
<div class="panel panel-default">
|
||||||
{% can_create Machine users.id %}
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse3">
|
||||||
<h4><a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}"><i class="fa fa-desktop"></i> Ajouter une machine</a></h4>
|
<h3 class="panel-title pull-left">
|
||||||
{% acl_end %}
|
<i class="fa fa-desktop"></i>
|
||||||
|
Machines
|
||||||
|
<span class="badge">{{machines_list.count}}</span>
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionmachines" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionmachines">
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'machines:new-machine' users.id %}">
|
||||||
|
<i class="fa fa-desktop"></i>
|
||||||
|
Ajouter une machine
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="collapse3" class="panel-collapse collapse">
|
||||||
|
<div class="panel-body">
|
||||||
{% if machines_list %}
|
{% if machines_list %}
|
||||||
{% include "machines/aff_machines.html" with machines_list=machines_list %}
|
{% include "machines/aff_machines.html" with machines_list=machines_list %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Aucune machine</p>
|
<p>Aucune machine</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>Cotisations</h2>
|
</div>
|
||||||
<h4>{% can_create Facture %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"><i class="fa fa-euro-sign"></i> Ajouter une cotisation</a> {% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}"><i class="fa fa-euro-sign"></i> Modifier le solde</a>{% endif%}{% acl_else %}{% if user_solde %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new_facture_solde' user.id %}"><i class="fa fa-euro-sign"></i> Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}</h4>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse4">
|
||||||
|
<h3 class="panel-title pull-left">
|
||||||
|
<i class="fa fa-euro-sign"></i>
|
||||||
|
Cotisations
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionfacture" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionfacture">
|
||||||
|
{% can_create Facture %}
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'cotisations:new-facture' users.id %}">
|
||||||
|
<i class="fa fa-euro-sign"></i>
|
||||||
|
Ajouter une cotisation
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% if user_solde %}
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'cotisations:credit-solde' users.id %}">
|
||||||
|
<i class="fa fa-euro-sign"></i>
|
||||||
|
Modifier le solde
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif%}{% acl_else %}
|
||||||
|
{% if user_solde %}
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'cotisations:new_facture_solde' user.id %}">
|
||||||
|
<i class="fa fa-euro-sign"></i>
|
||||||
|
Ajouter une cotisation par solde</a>{% endif %}{% acl_end %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="collapse4" class="panel-collapse collapse">
|
||||||
|
<div class="panel-body">
|
||||||
{% if facture_list %}
|
{% if facture_list %}
|
||||||
{% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
|
{% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Aucune facture</p>
|
<p>Aucune facture</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>Bannissements</h2>
|
</div>
|
||||||
{% can_create Ban %}<h4><a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-ban' users.id %}"><i class="fa fa-ban"></i> Ajouter un bannissement</a></h4>{% acl_end %}
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse5">
|
||||||
|
<h3 class="panel-title pull-left">
|
||||||
|
<i class="fa fa-ban"></i>
|
||||||
|
Bannissements
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionban" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionban">
|
||||||
|
{% can_create Ban %}
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'users:add-ban' users.id %}">
|
||||||
|
<i class="fa fa-ban"></i>
|
||||||
|
Ajouter un bannissement
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% acl_end %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="collapse5" class="panel-collapse collapse">
|
||||||
|
<div class="panel-body">
|
||||||
{% if ban_list %}
|
{% if ban_list %}
|
||||||
{% include "users/aff_bans.html" with ban_list=ban_list %}
|
{% include "users/aff_bans.html" with ban_list=ban_list %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Aucun bannissement</p>
|
<p>Aucun bannissement</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>Accès à titre gracieux :</h2>
|
</div>
|
||||||
{% can_create Whitelist %}<h4><a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-whitelist' users.id %}"><i class="fa fa-check-circle"></i> Accorder un accès à titre gracieux</a></h4>{% acl_end %}
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse6">
|
||||||
|
<h3 class="panel-title pull-left">
|
||||||
|
<i class="fa fa-check-circle"></i>
|
||||||
|
Accès à titre gracieux
|
||||||
|
</h3>
|
||||||
|
<div class="dropdown pull-right">
|
||||||
|
<a class="btn btn-default btn-sm" id="editionwhitelist" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||||
|
<i class="fa fa-edit"></i> <span class="caret"></span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu" arialabelledby="editionwhitelist">
|
||||||
|
{% can_create Whitelist %}
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'users:add-whitelist' users.id %}">
|
||||||
|
<i class="fa fa-check-circle"></i>
|
||||||
|
Accorder un accès à titre gracieux
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% acl_end %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="collapse6" class="panel-collapse collapse">
|
||||||
|
<div class="panel-body">
|
||||||
{% if white_list %}
|
{% if white_list %}
|
||||||
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Aucun accès gracieux</p>
|
<p>Aucun accès gracieux</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<br />
|
</div>
|
||||||
<br />
|
</div>
|
||||||
<br />
|
</div>
|
||||||
|
</div>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue