Compare commits
5 Commits
643205a4bb
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| f9ca539670 | |||
| 7b4778252f | |||
| 2c086187e7 | |||
| 5aff49600e | |||
| 8c6e59e15a |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -24,10 +24,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent
|
|||||||
SECRET_KEY = config('SECRET_KEY')
|
SECRET_KEY = config('SECRET_KEY')
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = config('DEBUG', default=True, cast=bool)
|
DEBUG = config('DEBUG', default=False, cast=bool)
|
||||||
|
|
||||||
ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',')
|
ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',')
|
||||||
CSRF_TRUSTED_ORIGINS = config("CSRF_TRUSTED_ORIGINS", default=[]).split(",")
|
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
@@ -41,9 +40,12 @@ INSTALLED_APPS = [
|
|||||||
'gestion_employe',
|
'gestion_employe',
|
||||||
'gestion_conge',
|
'gestion_conge',
|
||||||
'gestion_projet',
|
'gestion_projet',
|
||||||
'gestion_salle'
|
'gestion_salle',
|
||||||
|
'simple_sso.sso_server'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
LOGIN_URL = 'login'
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
@@ -78,16 +80,24 @@ WSGI_APPLICATION = 'SIRH.wsgi.application'
|
|||||||
# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
|
# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
|
||||||
|
|
||||||
|
|
||||||
DATABASES = {
|
if config('ENVIRONMENT') == 'local':
|
||||||
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.mysql',
|
'ENGINE': 'django.db.backends.sqlite3',
|
||||||
'NAME': config("DB_NAME"),
|
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
|
||||||
'USER': config("DB_USER"),
|
}
|
||||||
'PASSWORD': config("DB_PASSWORD"),
|
}
|
||||||
'HOST': config("DB_HOST"),
|
else:
|
||||||
'PORT': config("DB_PORT", cast=int),
|
DATABASES = {
|
||||||
|
'default': {
|
||||||
|
'ENGINE': 'django.db.backends.mysql',
|
||||||
|
'NAME': config('DATABASE_NAME'),
|
||||||
|
'USER': config('DATABASE_USER'),
|
||||||
|
'PASSWORD': config('DATABASE_PASSWORD'),
|
||||||
|
'HOST': config('DATABASE_HOST'),
|
||||||
|
'PORT': config('DATABASE_PORT'),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
# Password validation
|
# Password validation
|
||||||
# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
|
# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
|
||||||
@@ -140,21 +150,12 @@ MEDIA_ROOT = BASE_DIR / "media"
|
|||||||
|
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
# Connexion sso
|
|
||||||
# LOGIN_URL = '/client/'
|
|
||||||
LOGIN_URL = 'simple-sso-login'
|
|
||||||
|
|
||||||
SSO_PRIVATE_KEY = 'D2brFY3LnNDLQBBnvYPXAn185Wi9EpPvnHsUosjEZ9vZMyEtXqkcVfFWkVbN0xpG'
|
|
||||||
SSO_PUBLIC_KEY = 'm9JDP3uGPmGG9ULqPw2BY3ryBNMTGRsuukgIOhk7lIN9lT0wlr2zhoRZiNZ28UCM'
|
|
||||||
SSO_SERVER = 'http://test-authentification.cerfig.org:89/server/'
|
|
||||||
#SSO_LOGOUT_URL = 'http://test-authentification.cerfig.org:89/deconnexion'
|
|
||||||
|
|
||||||
# Configuration de l'email
|
# Configuration de l'email
|
||||||
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||||
EMAIL_HOST = 'ssl0.ovh.net'
|
EMAIL_HOST = 'ssl0.ovh.net'
|
||||||
EMAIL_PORT = 465
|
EMAIL_PORT = 465
|
||||||
EMAIL_USE_SSL = True
|
EMAIL_USE_SSL = True
|
||||||
EMAIL_USE_TLS = False
|
EMAIL_USE_TLS = False
|
||||||
EMAIL_HOST_USER = config("EMAIL_HOST_USER")
|
EMAIL_HOST_USER = 'support.it@cerfig.org'
|
||||||
EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
|
EMAIL_HOST_PASSWORD = 'Cerfig2025'
|
||||||
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
|
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
|
||||||
|
|||||||
33
SIRH/sso.py
33
SIRH/sso.py
@@ -1,33 +0,0 @@
|
|||||||
# SGL/sso.py
|
|
||||||
from gestion_employe.models import Employe, Departement
|
|
||||||
from simple_sso.sso_client.client import Client
|
|
||||||
from django.contrib.auth import get_user_model
|
|
||||||
from django.contrib.auth.models import Group
|
|
||||||
|
|
||||||
User = get_user_model()
|
|
||||||
|
|
||||||
class SIRHClient(Client):
|
|
||||||
def build_user(self, user_data):
|
|
||||||
"""Crée le User et son Profile avec les infos reçues du serveur."""
|
|
||||||
user_data_copy = user_data.copy()
|
|
||||||
user_data.pop("departement")
|
|
||||||
user_data.pop("chef_departement")
|
|
||||||
user_data.pop("groups")
|
|
||||||
|
|
||||||
user = super().build_user(user_data)
|
|
||||||
departement = Departement.objects.get_or_create(
|
|
||||||
nom=user_data_copy.get("departement", ""))[0]
|
|
||||||
|
|
||||||
Employe.objects.update_or_create(
|
|
||||||
user = user,
|
|
||||||
defaults = {
|
|
||||||
"departement": departement,
|
|
||||||
"chef": user_data_copy.get("chef_departement", ""),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
for group_name in user_data_copy.get("groups", []):
|
|
||||||
group, _ = Group.objects.get_or_create(name=group_name)
|
|
||||||
user.groups.add(group)
|
|
||||||
|
|
||||||
return user
|
|
||||||
@@ -15,9 +15,8 @@
|
|||||||
<body>
|
<body>
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="row flex-nowrap">
|
<div class="row flex-nowrap">
|
||||||
{% include 'parts/menu_application.html' %}
|
|
||||||
{% include 'parts/menu_principal.html' %}
|
{% include 'parts/menu_principal.html' %}
|
||||||
<div class="col p-4">
|
<div class="col-9 p-4">
|
||||||
{% block 'contenu' %} {% endblock %}
|
{% block 'contenu' %} {% endblock %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -24,16 +24,15 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<input type="hidden" name="next" value="{{ next }}">
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="mail">Votre adresse email :</label>
|
<label for="mail">Votre adresse email :</label>
|
||||||
<input type="text" name="mail" class="form-control" placeholder="Entrez votre e-mail" required>
|
<input type="text" name="mail" class="form-control" placeholder="Entrez votre e-mail" required>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="mot_de_passe">Mot de passe</label>
|
<label for="mot_de_passe">Mot de passe</label>
|
||||||
<input type="password" name="mot_de_passe" class="form-control" placeholder="Entrez votre mot de passe" required>
|
<input type="password" name="mot_de_passe" class="form-control" placeholder="Entrez votre mot de passe" required>
|
||||||
<i class="bi bi-eye toggle-password" onclick="togglePassword()"
|
<i class="bi bi-eye toggle-password" onclick="togglePassword()"
|
||||||
style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
|
style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
|
||||||
</div>
|
</div>
|
||||||
<button type="submit" class="btn btn-primary w-100">Se connecter</button>
|
<button type="submit" class="btn btn-primary w-100">Se connecter</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
<div class="col-1 bg-danger border d-flex flex-column vh-100 pt-5 sticky-top">
|
|
||||||
<a href="http://test-sirh.cerfig.org:89/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
|
||||||
<i class="bi bi-people-fill fs-1 d-block"></i>SIRH
|
|
||||||
</a>
|
|
||||||
<a href="http://test-sgl.cerfig.org:89/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
|
||||||
<i class="bi bi-building-gear fs-1 d-block"></i> SGL
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
@@ -13,36 +13,35 @@
|
|||||||
<i class="bi bi-person-circle text-white" style="font-size:60px;"></i>
|
<i class="bi bi-person-circle text-white" style="font-size:60px;"></i>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="text-white mt-2 fw-bold fs-5">
|
<div class="text-white mt-2 fw-bold fs-5">
|
||||||
{{ user.first_name }} {{ user.last_name }}
|
{{ user.username }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-person-circle"></i> Mon profil
|
<i class="bi bi-person-circle"></i> Mon profil
|
||||||
</a>
|
</a>
|
||||||
{% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
|
{% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
|
||||||
<a href="{% url 'gestion_employe:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_employe:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-speedometer2"></i> Tableau de bord
|
<i class="bi bi-speedometer2"></i> Tableau de bord
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
|
{% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
|
||||||
<a href="{% url 'gestion_projet:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_projet:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-folder"></i> Gestion des Projets
|
<i class="bi bi-folder"></i> Gestion des Projets
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{% url 'gestion_conges:conge' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_conges:conge' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-airplane"></i> Gestion des congés
|
<i class="bi bi-airplane"></i> Gestion des congés
|
||||||
</a>
|
</a>
|
||||||
{% if user|is_chef_projet %}
|
{% if user|is_chef_projet %}
|
||||||
<a href="{% url 'gestion_projet:activites-projet' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_projet:activites-projet' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-list-task"></i> Suivi des Activités
|
<i class="bi bi-list-task"></i> Suivi des Activités
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{% url 'gestion_salle:reservation-salle' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
<a href="{% url 'gestion_salle:reservation-salle' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<i class="bi bi-calendar-check"></i> Réservation
|
<i class="bi bi-calendar-check"></i> Réservation
|
||||||
</a>
|
</a>
|
||||||
{% comment %} {% url 'deconnexion' %} {% endcomment %}
|
<a href="{% url 'deconnexion' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
|
||||||
<a href="http://test-authentification.cerfig.org:89/deconnexion" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
|
|
||||||
<i class="bi bi-box-arrow-right"></i> Déconnexion
|
<i class="bi bi-box-arrow-right"></i> Déconnexion
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
43
SIRH/urls.py
43
SIRH/urls.py
@@ -16,29 +16,32 @@ Including another URLconf
|
|||||||
"""
|
"""
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
# from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
# from simple_sso.sso_server.server import Server
|
||||||
|
|
||||||
from .sso import SIRHClient
|
from . import views
|
||||||
|
|
||||||
client_sirh = SIRHClient(
|
# server_sso = Server()
|
||||||
settings.SSO_SERVER,
|
|
||||||
settings.SSO_PUBLIC_KEY,
|
|
||||||
settings.SSO_PRIVATE_KEY
|
|
||||||
)
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
# path('login/',
|
|
||||||
# views.login_view,
|
|
||||||
# name='login'
|
|
||||||
# ),
|
|
||||||
# path(
|
|
||||||
# 'deconnexion/',
|
|
||||||
# views.deconnexion_view,
|
|
||||||
# name='deconnexion'
|
|
||||||
# ),
|
|
||||||
path(
|
path(
|
||||||
'',
|
'',
|
||||||
|
views.login_view,
|
||||||
|
name='index'
|
||||||
|
),
|
||||||
|
|
||||||
|
path('login/',
|
||||||
|
views.login_view,
|
||||||
|
name='login'
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
'deconnexion/',
|
||||||
|
views.deconnexion_view,
|
||||||
|
name='deconnexion'
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
'gestion-employe/',
|
||||||
include("gestion_employe.urls")
|
include("gestion_employe.urls")
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
@@ -57,6 +60,8 @@ urlpatterns = [
|
|||||||
'admin/',
|
'admin/',
|
||||||
admin.site.urls
|
admin.site.urls
|
||||||
),
|
),
|
||||||
path("client/", include(client_sirh.get_urls())),
|
# path(
|
||||||
]
|
# 'sso',
|
||||||
# + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
# include(server_sso.get_urls())
|
||||||
|
# )
|
||||||
|
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
from django.contrib.auth import authenticate, login, logout
|
||||||
|
from django.shortcuts import render, redirect
|
||||||
|
from django.contrib import messages
|
||||||
|
|
||||||
|
def login_view(request):
|
||||||
|
"""
|
||||||
|
Gère la connexion des utilisateurs avec redirection selon le rôle et
|
||||||
|
vérification de l'acceptation de la politique d'utilisation.
|
||||||
|
"""
|
||||||
|
if request.method == 'POST':
|
||||||
|
email = request.POST.get('mail')
|
||||||
|
password = request.POST.get('mot_de_passe')
|
||||||
|
|
||||||
|
if not (email and password):
|
||||||
|
messages.error(request, "Veuillez remplir tous les champs.")
|
||||||
|
return render(request, 'login.html')
|
||||||
|
|
||||||
|
user = authenticate(request, username=email, password=password)
|
||||||
|
|
||||||
|
if user is None:
|
||||||
|
messages.error(request, "Nom d’utilisateur ou mot de passe incorrect.")
|
||||||
|
return render(request, 'login.html')
|
||||||
|
|
||||||
|
if not user.is_active:
|
||||||
|
messages.error(request, "Compte inactif. Contactez l'administrateur.")
|
||||||
|
return render(request, 'login.html')
|
||||||
|
|
||||||
|
login(request, user)
|
||||||
|
|
||||||
|
return redirect("gestion_conges:conge")
|
||||||
|
|
||||||
|
return render(request, 'login.html')
|
||||||
|
|
||||||
|
def deconnexion_view(request):
|
||||||
|
"""Gère la déconnexion de l'utilisateur."""
|
||||||
|
logout(request)
|
||||||
|
return redirect('login')
|
||||||
Binary file not shown.
@@ -7,7 +7,10 @@ QUOTA_CONGE_ANNUEL = 30
|
|||||||
NOMBRE_PAGINATION = 8
|
NOMBRE_PAGINATION = 8
|
||||||
DEBUT_RAPPEL = 60
|
DEBUT_RAPPEL = 60
|
||||||
DUREE_FIN_CONTRAT = 90
|
DUREE_FIN_CONTRAT = 90
|
||||||
# EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))
|
try:
|
||||||
|
EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
def solde_conge(employe):
|
def solde_conge(employe):
|
||||||
"""Fonction de calcul du solde de congé restant l'employé"""
|
"""Fonction de calcul du solde de congé restant l'employé"""
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,30 +0,0 @@
|
|||||||
# Generated by Django 5.2.13 on 2026-06-16 11:06
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
initial = True
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('gestion_employe', '0001_initial'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Conge',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('date_debut', models.DateField(verbose_name='Date de Début')),
|
|
||||||
('date_fin', models.DateField(verbose_name='Date de Fin')),
|
|
||||||
('type', models.CharField(choices=[('conge_annuel', 'Conge Annuel')], max_length=100, verbose_name='Type de Congé')),
|
|
||||||
('date_demande', models.DateField(auto_now_add=True, verbose_name='Date de Demande')),
|
|
||||||
('validation_hierarchique', models.BooleanField(default=None, null=True)),
|
|
||||||
('validation_direction', models.BooleanField(default=None, null=True)),
|
|
||||||
('motif_refus', models.TextField(blank=True, null=True)),
|
|
||||||
('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='employe', to='gestion_employe.employe')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -3,7 +3,7 @@ const $ = (element) => document.getElementById(element);
|
|||||||
const url_liste_conge_attente = $("liste-demande-conges").dataset.url
|
const url_liste_conge_attente = $("liste-demande-conges").dataset.url
|
||||||
|
|
||||||
const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
||||||
// layout : "fitColumns",
|
layout : "fitColumns",
|
||||||
columns: [
|
columns: [
|
||||||
{"title": "Nom et Prénom", "field": "prenom_nom"},
|
{"title": "Nom et Prénom", "field": "prenom_nom"},
|
||||||
{"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
|
{"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
|
||||||
@@ -15,7 +15,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
|||||||
outputFormat:"dd/MM/yy",
|
outputFormat:"dd/MM/yy",
|
||||||
}},
|
}},
|
||||||
{"title": "Type de congé", "field": "type"},
|
{"title": "Type de congé", "field": "type"},
|
||||||
{"title": "Date de la demande", "field": "date_demande", responsive: 1},
|
{"title": "Date de la demande", "field": "date_demande"},
|
||||||
{"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{
|
{"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{
|
||||||
allowEmpty : true ,
|
allowEmpty : true ,
|
||||||
}},
|
}},
|
||||||
@@ -24,7 +24,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
|||||||
}},
|
}},
|
||||||
],
|
],
|
||||||
pagination: true,
|
pagination: true,
|
||||||
paginationSize: 5,
|
paginationSize: 5
|
||||||
})
|
})
|
||||||
|
|
||||||
const bouton_demande_conges = $("bouton-demande-conge");
|
const bouton_demande_conges = $("bouton-demande-conge");
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}success{% endif %}">{{message}}</div>
|
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}success{% endif %}">{{message}}</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="row d-flex justify-content-center mb-4">
|
<div class="row d-flex justify-content-center mb-4">
|
||||||
<div class="col text-white bg-danger d-flex flex-column justify-content-center align-items-center border rounded p-4">
|
<div class="col text-white bg-danger d-flex flex-column justify-content-center align-items-center border rounded p-4">
|
||||||
<div class="card-header fw-bold">
|
<div class="card-header fw-bold">
|
||||||
@@ -33,17 +32,11 @@
|
|||||||
<h5 class="fw-bold">{{ nombre_conges_valide }}</h5>
|
<h5 class="fw-bold">{{ nombre_conges_valide }}</h5>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="d-flex justify-content-between my-4">
|
||||||
|
|
||||||
<div class="row mb-3">
|
|
||||||
<div class="col d-flex justify-content-between align-items-center">
|
|
||||||
<h3><i class="bi bi-list-ul"></i> Liste des demandes de congé</h3>
|
<h3><i class="bi bi-list-ul"></i> Liste des demandes de congé</h3>
|
||||||
<button class='btn btn-primary' id="bouton-demande-conge">Demande de congé</button>
|
<button class='btn btn-primary' id="bouton-demande-conge">Demande de congé</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="table-responsive">
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<div id="liste-demande-conges" data-url="{% url 'gestion_conges:liste-des-conges' %}"></div>
|
<div id="liste-demande-conges" data-url="{% url 'gestion_conges:liste-des-conges' %}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,88 +0,0 @@
|
|||||||
# Generated by Django 5.2.13 on 2026-06-16 11:06
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
initial = True
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('gestion_projet', '0001_initial'),
|
|
||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Departement',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('nom', models.CharField(max_length=100)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Employe',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('matricule', models.CharField(blank=True, max_length=10, null=True, unique=True)),
|
|
||||||
('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('assistant_technique_recherche', 'Assistant technique de recherche'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)),
|
|
||||||
('date_embauche', models.DateField(blank=True, null=True)),
|
|
||||||
('adresse', models.CharField(blank=True, max_length=100, null=True)),
|
|
||||||
('telephone', models.CharField(blank=True, max_length=15, null=True)),
|
|
||||||
('sexe', models.CharField(blank=True, choices=[('m', 'Masculin'), ('f', 'Féminin')], max_length=1, null=True)),
|
|
||||||
('date_naissance', models.DateField(blank=True, null=True)),
|
|
||||||
('CV', models.FileField(blank=True, null=True, upload_to='cv/')),
|
|
||||||
('diplome', models.FileField(blank=True, null=True, upload_to='diplomes/')),
|
|
||||||
('rib', models.FileField(blank=True, null=True, upload_to='rib/')),
|
|
||||||
('photo', models.ImageField(blank=True, null=True, upload_to='photos/')),
|
|
||||||
('casier_judiciaire', models.FileField(blank=True, null=True, upload_to='casier/')),
|
|
||||||
('chef', models.BooleanField(default=False, verbose_name='Cet utilisateur est-il chef de ce département ?')),
|
|
||||||
('departement', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='gestion_employe.departement')),
|
|
||||||
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Contrat',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('numero_contrat', models.CharField(max_length=100, unique=True)),
|
|
||||||
('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage'), ('convention_bourse_entretien', "Convention de bourse d'entretien")], max_length=50)),
|
|
||||||
('date_debut', models.DateField()),
|
|
||||||
('date_fin', models.DateField(blank=True, null=True)),
|
|
||||||
('salaire_mensuel', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
|
|
||||||
('statut', models.CharField(choices=[('actif', 'Actif'), ('termine', 'Terminé'), ('suspendu', 'Suspendu'), ('rupture_contrat', 'Rupture de Contrat')], max_length=50)),
|
|
||||||
('fichier_contrat', models.FileField(blank=True, null=True, upload_to='contrats/')),
|
|
||||||
('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_employe.employe')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Formation',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('titre', models.CharField(max_length=255, verbose_name='Nom du certificat')),
|
|
||||||
('organisme', models.CharField(max_length=255, verbose_name="Nom de l'organisme")),
|
|
||||||
('description', models.TextField(blank=True, null=True, verbose_name='Description de la formation')),
|
|
||||||
('date_obtention', models.DateField(blank=True, null=True, verbose_name="Date d'obtention")),
|
|
||||||
('date_fin', models.DateField(blank=True, null=True, verbose_name='Date de fin de validité')),
|
|
||||||
('certificat', models.FileField(blank=True, null=True, upload_to='documents/formations/', verbose_name='Certificat (PDF/Image)')),
|
|
||||||
('employe', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='employe_formation', to='gestion_employe.employe')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Affectation',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('date_affectation', models.DateField()),
|
|
||||||
('date_fin_daffectation', models.DateField(blank=True, null=True)),
|
|
||||||
('role', models.CharField(choices=[('chef_projet', 'Chef de projet'), ('doctorant', 'Doctorant'), ('mastorant', 'Mastorant'), ('consultant', 'Consultant'), ('stagiaire', 'Stagiaire'), ('laborantin', 'Laborantin'), ('medecin', 'Médecin'), ('autre', 'Autre')], default='Membre', max_length=20)),
|
|
||||||
('pourcentage_temps_affectation', models.DecimalField(decimal_places=2, max_digits=5)),
|
|
||||||
('projet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_projet.projet')),
|
|
||||||
('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_employe.employe')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'unique_together': {('projet', 'employe')},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -12,7 +12,6 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
|
|||||||
// ajaxURL: url_liste_employe,
|
// ajaxURL: url_liste_employe,
|
||||||
pagination: true,
|
pagination: true,
|
||||||
paginationSize: 10,
|
paginationSize: 10,
|
||||||
responsiveLayout : "hide"
|
|
||||||
})
|
})
|
||||||
|
|
||||||
fetch(url_liste_employe)
|
fetch(url_liste_employe)
|
||||||
|
|||||||
@@ -18,29 +18,34 @@ const tableau_certificat = new Tabulator("#tableau-certificat", {
|
|||||||
})
|
})
|
||||||
const enregistrerProfil = $("enregistrerProfil");
|
const enregistrerProfil = $("enregistrerProfil");
|
||||||
|
|
||||||
enregistrerProfil.addEventListener("click", (e) => {
|
// enregistrerProfil.addEventListener("click", (e) => {
|
||||||
|
|
||||||
const url = $("information-personnelles").dataset.url;
|
// const url = $("information-personnelles").dataset.url;
|
||||||
const csrftoken = document.querySelector("[name='csrfmiddlewaretoken']").value;
|
// const csrftoken = document.querySelector("[name='csrfmiddlewaretoken']").value;
|
||||||
|
|
||||||
const formData = new FormData();
|
// const formData = new FormData();
|
||||||
|
|
||||||
formData.append("nom", $("nom").value);
|
// formData.append("nom", $("nom").value);
|
||||||
formData.append("prenom", $("prenom").value);
|
// formData.append("prenom", $("prenom").value);
|
||||||
formData.append("email", $("email").value);
|
// formData.append("email", $("email").value);
|
||||||
formData.append("telephone", $("telephone").value);
|
// formData.append("telephone", $("telephone").value);
|
||||||
formData.append("adresse", $("adresse").value);
|
// formData.append("adresse", $("adresse").value);
|
||||||
formData.append("sexe", $("sexe").value);
|
// formData.append("sexe", $("sexe").value);
|
||||||
formData.append("date_naissance", $("date_naissance").value);
|
// formData.append("date_naissance", $("date_naissance").value);
|
||||||
|
|
||||||
fetch(url, {
|
|
||||||
method: "POST",
|
// console.log("---------------------------------------------")
|
||||||
headers: {
|
// console.log("Données du formulaire:", url);
|
||||||
"X-CSRFToken": csrftoken
|
// console.log("Données du formulaire:", formData);
|
||||||
},
|
|
||||||
body: formData
|
// fetch(url, {
|
||||||
})
|
// method: "POST",
|
||||||
.then(response => response.json())
|
// headers: {
|
||||||
.then(data => alert(data.message))
|
// "X-CSRFToken": csrftoken
|
||||||
.catch(error => console.error("Erreur:", error));
|
// },
|
||||||
});
|
// body: formData
|
||||||
|
// })
|
||||||
|
// .then(response => response.json())
|
||||||
|
// .then(data => alert(data.message))
|
||||||
|
// .catch(error => console.error("Erreur:", error));
|
||||||
|
// });
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
</h2>
|
</h2>
|
||||||
<div id="collapseProfil" class="accordion-collapse" aria-labelledby="headingContrats" data-bs-parent="#accordionInformationEmploye">
|
<div id="collapseProfil" class="accordion-collapse" aria-labelledby="headingContrats" data-bs-parent="#accordionInformationEmploye">
|
||||||
<div class="accordion-body">
|
<div class="accordion-body">
|
||||||
<div class="row" id="information-personnelles" data-url="{% url 'gestion_employe:modifier-employe' %}">
|
<form class="row" action = "{% url 'gestion_employe:modifier-employe' %}" method = "POST" enctype = "multipart/form-data" id="information-personnelles" data-url="{% url 'gestion_employe:modifier-employe' %}">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
@@ -50,19 +50,19 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Matricule :</label>
|
<label>Matricule :</label>
|
||||||
<input type="text" class="form-control" id="matricule" value="{{ employe.matricule|default:'' }}" readonly>
|
<input type="text" class="form-control" id="matricule" name = 'matricule' value="{{ employe.matricule|default:'' }}" readonly>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Nom :</label>
|
<label>Nom :</label>
|
||||||
<input type="text" class="form-control" id="nom" value="{{ employe.user.last_name }}">
|
<input type="text" class="form-control" id="nom" name = 'nom' value="{{ employe.user.last_name }}">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Prénom :</label>
|
<label>Prénom :</label>
|
||||||
<input type="text" class="form-control" id="prenom" value="{{ employe.user.first_name }}">
|
<input type="text" class="form-control" id="prenom" name = 'prenom' value="{{ employe.user.first_name }}">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Sexe :</label>
|
<label>Sexe :</label>
|
||||||
<select id='sexe' class="form-select">
|
<select id='sexe' name = 'sexe' class="form-select">
|
||||||
<option value='h' {% if employe.sexe == 'h' %}selected{% endif %}>Homme</option>
|
<option value='h' {% if employe.sexe == 'h' %}selected{% endif %}>Homme</option>
|
||||||
<option value='f' {% if employe.sexe == 'f' %}selected{% endif %}>Femme</option>
|
<option value='f' {% if employe.sexe == 'f' %}selected{% endif %}>Femme</option>
|
||||||
</select>
|
</select>
|
||||||
@@ -72,27 +72,27 @@
|
|||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Date de naissance :</label>
|
<label>Date de naissance :</label>
|
||||||
<input type="date" class="form-control" id="date_naissance" value="{{ employe.date_naissance|date:'Y-m-d' }}">
|
<input type="date" class="form-control" id="date_naissance" name = 'date_naissance' value="{{ employe.date_naissance|date:'Y-m-d' }}">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Département :</label>
|
<label>Département :</label>
|
||||||
<input type="text" class="form-control" id="departement" value="{{ employe.departement.nom|default:'' }}" readonly>
|
<input type="text" class="form-control" id="departement" name = 'departement' value="{{ employe.departement.nom|default:'' }}" readonly>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Email :</label>
|
<label>Email :</label>
|
||||||
<input type="email" class="form-control" id="email" value="{{ employe.user.email|default:'' }}">
|
<input type="email" class="form-control" id="email" name = 'email' value="{{ employe.user.email|default:'' }}">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Téléphone :</label>
|
<label>Téléphone :</label>
|
||||||
<input type="text" class="form-control" id="telephone" value="{{ employe.telephone|default:'' }}">
|
<input type="text" class="form-control" id="telephone" name = 'telephone' value="{{ employe.telephone|default:'' }}">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Adresse :</label>
|
<label>Adresse :</label>
|
||||||
<input type="text" class="form-control" id="adresse" value="{{ employe.adresse|default:'' }}">
|
<input type="text" class="form-control" id="adresse" name = 'adresse' value="{{ employe.adresse|default:'' }}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<button type="submit" class="btn btn-success d-block m-auto" id="enregistrerProfil">Enregistrer</button>
|
||||||
<button type="submit" class="btn btn-success d-block m-auto" id="enregistrerProfil">Enregistrer</button>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Binary file not shown.
@@ -191,25 +191,26 @@ def modifier_employer(request):
|
|||||||
except Employe.DoesNotExist:
|
except Employe.DoesNotExist:
|
||||||
return JsonResponse({"message": "Employé non trouvé."})
|
return JsonResponse({"message": "Employé non trouvé."})
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
data = json.loads(request.body)
|
|
||||||
user = User.objects.get(username=request.user)
|
user = User.objects.get(username=request.user)
|
||||||
user.last_name = data['nom']
|
user.last_name = request.POST['nom']
|
||||||
user.first_name = data['prenom']
|
user.first_name = request.POST['prenom']
|
||||||
user.email = data['email']
|
user.email = request.POST['email']
|
||||||
employe.telephone = data['telephone']
|
employe.telephone = request.POST['telephone']
|
||||||
employe.adresse = data['adresse']
|
employe.adresse = request.POST['adresse']
|
||||||
employe.sexe = data['sexe']
|
employe.sexe = request.POST['sexe']
|
||||||
if request.FILES.get("photo"):
|
if request.FILES.get("photo"):
|
||||||
employe.photo = request.FILES["photo"]
|
employe.photo = request.FILES["photo"]
|
||||||
if data['date_naissance']:
|
if request.POST['date_naissance']:
|
||||||
difference = relativedelta(timezone.now().date(), datetime.strptime(data['date_naissance'], "%Y-%m-%d").date())
|
difference = relativedelta(timezone.now().date(), datetime.strptime(request.POST['date_naissance'], "%Y-%m-%d").date())
|
||||||
if difference.years >= 18:
|
if difference.years >= 18:
|
||||||
employe.date_naissance = data['date_naissance']
|
employe.date_naissance = request.POST['date_naissance']
|
||||||
else:
|
else:
|
||||||
return JsonResponse({"message": "Veuillez entrez une date de naissance correcte."})
|
messages.error(request, "Veuillez entrez une date de naissance correcte.")
|
||||||
employe.save()
|
employe.save()
|
||||||
user.save()
|
user.save()
|
||||||
return JsonResponse({"message": "Profil mis à jour avec succès."})
|
messages.success(request, "Profil mis à jour avec succès.")
|
||||||
|
return redirect("gestion_employe:mon-profil")
|
||||||
|
|
||||||
|
|
||||||
def enregistrement_document(request):
|
def enregistrement_document(request):
|
||||||
"""Vue pour permettre à un utilisateur de télécharger et enregistrer des documents liés à son profil"""
|
"""Vue pour permettre à un utilisateur de télécharger et enregistrer des documents liés à son profil"""
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,107 +0,0 @@
|
|||||||
# Generated by Django 5.2.13 on 2026-06-16 11:06
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
initial = True
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='ActiviteProjet',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('titre', models.CharField(max_length=200, verbose_name="Titre de l'activité")),
|
|
||||||
('description', models.TextField(blank=True, null=True, verbose_name="Description de l'activité")),
|
|
||||||
('date_debut', models.DateField(verbose_name='Date de début')),
|
|
||||||
('date_fin', models.DateField(verbose_name='Date de fin')),
|
|
||||||
('annuler', models.BooleanField(default=False, verbose_name="Annuler l'activité")),
|
|
||||||
('motif_annulation', models.TextField(blank=True, null=True, verbose_name="Motif d'annulation")),
|
|
||||||
('motif_changement_budget', models.TextField(blank=True, null=True, verbose_name='Motif de changement de budget')),
|
|
||||||
('budget_prevu', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='Budget prévu')),
|
|
||||||
('budget_depense', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='Budget dépensé')),
|
|
||||||
('besoin_ressource_materielle', models.TextField(verbose_name='Besoin de ressources matérielles')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Bailleur',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('nom_organisme', models.CharField(max_length=200, unique=True)),
|
|
||||||
('contact', models.CharField(blank=True, max_length=100, null=True)),
|
|
||||||
('email', models.EmailField(blank=True, max_length=254, null=True)),
|
|
||||||
('pays', models.CharField(blank=True, max_length=100, null=True)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='DomaineDeRecherche',
|
|
||||||
fields=[
|
|
||||||
('nom', models.CharField(choices=[('sciences_sociales', 'Sciences sociales'), ('naturelles', 'Naturelles'), ('humaines', 'Humaines'), ('veterinaires', 'Vétérinaires')], max_length=100, primary_key=True, serialize=False, verbose_name='Domaine de recherche')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'verbose_name': 'Domaine de recherche',
|
|
||||||
'verbose_name_plural': 'Domaines de recherche',
|
|
||||||
},
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='LivrablesLivres',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('nom', models.CharField(max_length=255, verbose_name='Nom du livrable')),
|
|
||||||
('fichier', models.FileField(blank=True, null=True, upload_to='fichier_livrables/')),
|
|
||||||
('activite', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_projet.activiteprojet')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Projet',
|
|
||||||
fields=[
|
|
||||||
('id_projet', models.CharField(blank=True, max_length=100, primary_key=True, serialize=False, unique=True, verbose_name='ID du projet')),
|
|
||||||
('nom_projet', models.CharField(max_length=200, verbose_name='Nom du projet')),
|
|
||||||
('date_debut', models.DateField(verbose_name='Date de début')),
|
|
||||||
('date_fin', models.DateField(verbose_name='Date de fin')),
|
|
||||||
('numero_convention', models.CharField(max_length=100, verbose_name='Numéro de convention')),
|
|
||||||
('description', models.TextField(verbose_name='Description')),
|
|
||||||
('type_projet', models.CharField(choices=[('laboratoire', 'Laboratoire'), ('épidémiologie', 'Épidémiologie'), ('sciences sociales', 'Sciences sociales'), ('cliniques', 'Cliniques'), ('autre', 'Autre')], default='épidémiologie', max_length=100, verbose_name='Type de projet')),
|
|
||||||
('budget', models.DecimalField(decimal_places=2, max_digits=12, verbose_name='Budget')),
|
|
||||||
('budget_RH', models.DecimalField(decimal_places=2, max_digits=12, verbose_name='Budget RH')),
|
|
||||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
|
||||||
('bailleur', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='gestion_projet.bailleur', verbose_name='Bailleur de fonds')),
|
|
||||||
('domaine_recherche', models.ManyToManyField(to='gestion_projet.domainederecherche')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='DocumentProjet',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('date_ajout', models.DateTimeField(auto_now_add=True, verbose_name="Date d'ajout")),
|
|
||||||
('nom_document', models.CharField(choices=[('protocole', 'Protocole d’étude'), ('ethique', "Approbation du comité d'éthique"), ('autorisation', 'Autorisation (DNLP)'), ('rapport_technique', 'Rapport technique'), ('rapport_financier', 'Rapport financier'), ('rapport_avancement', "Rapport d'avancement"), ('convention', 'Convention'), ('rapport_final', 'Rapport final'), ('autre', 'Autre')], max_length=100, verbose_name='Type de document')),
|
|
||||||
('description', models.TextField(blank=True, verbose_name='Description')),
|
|
||||||
('numero', models.CharField(blank=True, max_length=100, null=True, verbose_name='Numéro du document')),
|
|
||||||
('date_validite', models.DateField(blank=True, null=True, verbose_name='Date de validité')),
|
|
||||||
('fichier', models.FileField(upload_to='documents_projets/', verbose_name='Fichier à télécharger')),
|
|
||||||
('projet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='gestion_projet.projet', verbose_name='Projet')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='activiteprojet',
|
|
||||||
name='projet',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_projet.projet', verbose_name='Projet'),
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='FinancementProjet',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('pourcentage', models.DecimalField(decimal_places=2, max_digits=5)),
|
|
||||||
('bailleur', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_projet.bailleur')),
|
|
||||||
('projet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_projet.projet')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'unique_together': {('projet', 'bailleur')},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
]
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,34 +0,0 @@
|
|||||||
# Generated by Django 5.2.13 on 2026-06-16 11:06
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
initial = True
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('gestion_employe', '0001_initial'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Reservation',
|
|
||||||
fields=[
|
|
||||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('salle', models.CharField(choices=[('formation', 'Salle de formation'), ('reunion', 'Salle de réunion'), ('lien_zoom', 'Lien Zoom')], max_length=100)),
|
|
||||||
('date_demande', models.DateTimeField(auto_now_add=True)),
|
|
||||||
('date_debut', models.DateField()),
|
|
||||||
('date_fin', models.DateField(blank=True, null=True)),
|
|
||||||
('heure_debut', models.TimeField()),
|
|
||||||
('heure_fin', models.TimeField()),
|
|
||||||
('besoin_zoom', models.BooleanField(default=False, verbose_name="Besoin d'un lien Zoom ?")),
|
|
||||||
('besoin_ordi', models.BooleanField(default=False, verbose_name="Besoin d'un ordinateur ?")),
|
|
||||||
('lien_zoom', models.URLField(blank=True, null=True, verbose_name='Lien Zoom')),
|
|
||||||
('motif_reservation', models.TextField()),
|
|
||||||
('statut', models.CharField(choices=[('en_attente', 'En attente'), ('validee', 'Validée'), ('refusee', 'Refusée'), ('annulee', 'Annulée')], default='en_attente', max_length=25)),
|
|
||||||
('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_employe.employe')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -10,7 +10,6 @@ numpy==2.2.6
|
|||||||
pandas==2.3.3
|
pandas==2.3.3
|
||||||
pillow==12.2.0
|
pillow==12.2.0
|
||||||
python-dateutil==2.9.0.post0
|
python-dateutil==2.9.0.post0
|
||||||
python-decouple==3.8
|
|
||||||
pytz==2026.1.post1
|
pytz==2026.1.post1
|
||||||
requests==2.33.1
|
requests==2.33.1
|
||||||
six==1.17.0
|
six==1.17.0
|
||||||
@@ -18,5 +17,5 @@ sqlparse==0.5.5
|
|||||||
typing_extensions==4.15.0
|
typing_extensions==4.15.0
|
||||||
tzdata==2026.2
|
tzdata==2026.2
|
||||||
urllib3==2.6.3
|
urllib3==2.6.3
|
||||||
webservices==0.7
|
python-decouple
|
||||||
webservices.naudit==0.7.2
|
gunicorn
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const $ = (element) => document.getElementById(element);
|
|||||||
const url_liste_conge_attente = $("liste-demande-conges").dataset.url
|
const url_liste_conge_attente = $("liste-demande-conges").dataset.url
|
||||||
|
|
||||||
const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
||||||
// layout : "fitColumns",
|
layout : "fitColumns",
|
||||||
columns: [
|
columns: [
|
||||||
{"title": "Nom et Prénom", "field": "prenom_nom"},
|
{"title": "Nom et Prénom", "field": "prenom_nom"},
|
||||||
{"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
|
{"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
|
||||||
@@ -15,7 +15,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
|||||||
outputFormat:"dd/MM/yy",
|
outputFormat:"dd/MM/yy",
|
||||||
}},
|
}},
|
||||||
{"title": "Type de congé", "field": "type"},
|
{"title": "Type de congé", "field": "type"},
|
||||||
{"title": "Date de la demande", "field": "date_demande", responsive: 1},
|
{"title": "Date de la demande", "field": "date_demande"},
|
||||||
{"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{
|
{"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{
|
||||||
allowEmpty : true ,
|
allowEmpty : true ,
|
||||||
}},
|
}},
|
||||||
@@ -24,7 +24,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
|
|||||||
}},
|
}},
|
||||||
],
|
],
|
||||||
pagination: true,
|
pagination: true,
|
||||||
paginationSize: 5,
|
paginationSize: 5
|
||||||
})
|
})
|
||||||
|
|
||||||
const bouton_demande_conges = $("bouton-demande-conge");
|
const bouton_demande_conges = $("bouton-demande-conge");
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
|
|||||||
// ajaxURL: url_liste_employe,
|
// ajaxURL: url_liste_employe,
|
||||||
pagination: true,
|
pagination: true,
|
||||||
paginationSize: 10,
|
paginationSize: 10,
|
||||||
responsiveLayout : "hide"
|
|
||||||
})
|
})
|
||||||
|
|
||||||
fetch(url_liste_employe)
|
fetch(url_liste_employe)
|
||||||
|
|||||||
@@ -16,31 +16,27 @@ const tableau_certificat = new Tabulator("#tableau-certificat", {
|
|||||||
],
|
],
|
||||||
ajaxURL: url_certificat,
|
ajaxURL: url_certificat,
|
||||||
})
|
})
|
||||||
|
|
||||||
const enregistrerProfil = $("enregistrerProfil");
|
const enregistrerProfil = $("enregistrerProfil");
|
||||||
|
|
||||||
enregistrerProfil.addEventListener("click", (e) => {
|
enregistrerProfil.addEventListener("click", (e) => {
|
||||||
|
|
||||||
const url = $("information-personnelles").dataset.url;
|
const url = $("information-personnelles").dataset.url;
|
||||||
const csrftoken = document.querySelector("[name='csrfmiddlewaretoken']").value;
|
const csrftoken = document.querySelector("[name='csrfmiddlewaretoken']").value;
|
||||||
|
|
||||||
const formData = new FormData();
|
|
||||||
|
|
||||||
formData.append("nom", $("nom").value);
|
|
||||||
formData.append("prenom", $("prenom").value);
|
|
||||||
formData.append("email", $("email").value);
|
|
||||||
formData.append("telephone", $("telephone").value);
|
|
||||||
formData.append("adresse", $("adresse").value);
|
|
||||||
formData.append("sexe", $("sexe").value);
|
|
||||||
formData.append("date_naissance", $("date_naissance").value);
|
|
||||||
|
|
||||||
fetch(url, {
|
fetch(url, {
|
||||||
method: "POST",
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
"X-CSRFToken": csrftoken
|
'Content-Type': 'application/json',
|
||||||
|
'X-CSRFToken': csrftoken
|
||||||
},
|
},
|
||||||
body: formData
|
body: JSON.stringify({
|
||||||
|
"nom": $("nom").value,
|
||||||
|
"prenom": $("prenom").value,
|
||||||
|
"email": $("email").value,
|
||||||
|
"telephone": $("telephone").value,
|
||||||
|
"adresse": $("adresse").value,
|
||||||
|
"sexe": $("sexe").value,
|
||||||
|
"date_naissance": $("date_naissance").value,
|
||||||
|
})
|
||||||
})
|
})
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => alert(data.message))
|
.then(data => alert(data.message))
|
||||||
.catch(error => console.error("Erreur:", error));
|
})
|
||||||
});
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
const btnEnregistrerBailleur = document.getElementById('btnEnregistrerBailleur');
|
const btnEnregistrerBailleur = document.getElementById('btnEnregistrerBailleur');
|
||||||
let table;
|
|
||||||
|
|
||||||
btnEnregistrerBailleur.addEventListener('click', function() {
|
btnEnregistrerBailleur.addEventListener('click', function() {
|
||||||
const form = document.getElementById('formBailleur');
|
const form = document.getElementById('formBailleur');
|
||||||
@@ -22,30 +21,3 @@ btnEnregistrerBailleur.addEventListener('click', function() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", function () {
|
|
||||||
|
|
||||||
table = new Tabulator("#table-bailleurs", {
|
|
||||||
ajaxURL: "/gestion-projet/bailleurs/",
|
|
||||||
layout: "fitColumns",
|
|
||||||
pagination: "local",
|
|
||||||
paginationSize: 5,
|
|
||||||
|
|
||||||
columns: [
|
|
||||||
{title: "#", formatter: "rownum", width: 60},
|
|
||||||
{title: "Organisme", field: "nom_organisme"},
|
|
||||||
{title: "Contact", field: "contact"},
|
|
||||||
{title: "Email", field: "email"},
|
|
||||||
{title: "Pays", field: "pays"},
|
|
||||||
],
|
|
||||||
rowDblClick: function(e, row) {
|
|
||||||
const data = row.getData();
|
|
||||||
|
|
||||||
if (confirm(`Voulez-vous vraiment supprimer ${data.nom_organisme} ?`)) {
|
|
||||||
supprimerBailleur(data.id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
|||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
currentReservationId = data.id_reservation;
|
currentReservationId = data.id_reservation;
|
||||||
|
console.log(data);
|
||||||
$("id_reservation_detail").value = data.id_reservation;
|
$("id_reservation_detail").value = data.id_reservation;
|
||||||
$("id_reservation_refus").value = data.id_reservation;
|
$("id_reservation_refus").value = data.id_reservation;
|
||||||
$("id_reservation_zoom").value = data.id_reservation;
|
$("id_reservation_zoom").value = data.id_reservation;
|
||||||
@@ -29,10 +30,11 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
|||||||
$("besoin_ordinateur").checked=data.besoin_ordinateur;
|
$("besoin_ordinateur").checked=data.besoin_ordinateur;
|
||||||
$("lien_zoom").value=data.lien_zoom;
|
$("lien_zoom").value=data.lien_zoom;
|
||||||
|
|
||||||
if (data.besoin_zoom === false){
|
if(data.statut !== "annulee"){
|
||||||
$("lien_zoom_container").className = "d-none";
|
$("motif_refus_container").className = "d-none";
|
||||||
|
}else{
|
||||||
|
$("motif_refus").value=data.motif_refus;
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -78,11 +80,6 @@ $("bouton-annuler").addEventListener("click", (e) => {
|
|||||||
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
|
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
|
||||||
const url_annuler = $("formulaire-details").dataset.urlannuler;
|
const url_annuler = $("formulaire-details").dataset.urlannuler;
|
||||||
|
|
||||||
console.log("URL d'annulation :");
|
|
||||||
console.log($("formulaire-details"))
|
|
||||||
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
fetch(
|
fetch(
|
||||||
url_annuler,
|
url_annuler,
|
||||||
{
|
{
|
||||||
@@ -133,9 +130,6 @@ if($("refuserReservation")){
|
|||||||
const url = e.currentTarget.dataset.lienrefus;
|
const url = e.currentTarget.dataset.lienrefus;
|
||||||
const idRes = $("id_reservation_detail").value;
|
const idRes = $("id_reservation_detail").value;
|
||||||
|
|
||||||
console.log(idRes);
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
fetch(url, {
|
fetch(url, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -167,11 +161,16 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
|
|||||||
tableau_reservation_attente.on("rowClick", (row, rowData) => {
|
tableau_reservation_attente.on("rowClick", (row, rowData) => {
|
||||||
const data = rowData.getData();
|
const data = rowData.getData();
|
||||||
|
|
||||||
|
console.log(data);
|
||||||
|
|
||||||
if(data.besoin_zoom === false){
|
if(data.besoin_zoom === false){
|
||||||
$("lien_zoom_container").className = 'd-none';
|
$("lien_zoom_container").className = 'd-none';
|
||||||
}
|
}
|
||||||
|
|
||||||
const id_user = $("current-user-id").dataset.userid;
|
if(data.statut !== "refusee"){
|
||||||
|
$("motif_refus_container").className = 'd-none';
|
||||||
|
}
|
||||||
|
|
||||||
$("id_reservation_detail").value = data.id;
|
$("id_reservation_detail").value = data.id;
|
||||||
$("id_reservation_refus").value = data.id;
|
$("id_reservation_refus").value = data.id;
|
||||||
$("id_reservation_zoom").value = data.id;
|
$("id_reservation_zoom").value = data.id;
|
||||||
@@ -179,18 +178,14 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
|
|||||||
$("employe").value=data.employe;
|
$("employe").value=data.employe;
|
||||||
$("salle").value=data.salle;
|
$("salle").value=data.salle;
|
||||||
$("statut-reservation").innerHTML=data.statut;
|
$("statut-reservation").innerHTML=data.statut;
|
||||||
$("date_debut").value = data.date_debut;
|
$("date_evenement").value=data.date_debut;
|
||||||
$("date_fin").value = data.date_fin;
|
|
||||||
$("heure_debut").value=data.heure_debut;
|
$("heure_debut").value=data.heure_debut;
|
||||||
$("heure_fin").value=data.heure_fin;
|
$("heure_fin").value=data.heure_fin;
|
||||||
$("motif_reservation").value=data.motif_reservation;
|
$("motif_reservation").value=data.motif_reservation;
|
||||||
$("besoin_zoom").checked=data.besoin_zoom;
|
$("besoin_zoom").checked=data.besoin_zoom;
|
||||||
$("besoin_ordinateur").checked=data.besoin_ordi;
|
$("besoin_ordinateur").checked=data.besoin_ordi;
|
||||||
$("lien_zoom").value=data.lien_zoom;
|
$("lien_zoom").value=data.lien_zoom;
|
||||||
|
$("motif_refus").value=data.motif_refus;
|
||||||
if (id_user != data.employe_id){
|
|
||||||
$("bouton-annuler").className = "d-none";
|
|
||||||
}
|
|
||||||
|
|
||||||
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
||||||
bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
|
bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
|
||||||
|
|||||||
Reference in New Issue
Block a user