Premiere implementation de sso

SIRH/settings.py

@@ -24,9 +24,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 SECRET_KEY = config('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = config('DEBUG', default=False, cast=bool)
+DEBUG = config('DEBUG', default=True, cast=bool)
 
 ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',') 
+CSRF_TRUSTED_ORIGINS = config("CSRF_TRUSTED_ORIGINS", default=[]).split(",")
 
 # Application definition
 
@@ -77,22 +78,14 @@ WSGI_APPLICATION = 'SIRH.wsgi.application'
 # https://docs.djangoproject.com/en/5.2/ref/settings/#databases
 
 
-if config('ENVIRONMENT') == 'local':
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        }
-    }
-else:
 DATABASES = {
         'default': {
         'ENGINE': 'django.db.backends.mysql',
-            'NAME': config('DATABASE_NAME'),
+        'NAME': config("DB_NAME"),
-            'USER': config('DATABASE_USER'),
+        'USER': config("DB_USER"),
-            'PASSWORD': config('DATABASE_PASSWORD'),
+        'PASSWORD': config("DB_PASSWORD"),
-            'HOST': config('DATABASE_HOST'),
+        'HOST': config("DB_HOST"),
-            'PORT': config('DATABASE_PORT'),
+        'PORT': config("DB_PORT", cast=int),
     }
 }
 
@@ -151,10 +144,10 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 # LOGIN_URL = '/client/'
 LOGIN_URL = 'simple-sso-login'
 
-SSO_PRIVATE_KEY = 'wV3nf1YXeZpepf8iJAdWcfJOS4BVXYlIKsKES2RheuJLu5ycgm0ZK3zgdw9ODjdo' # Designe la clé privée
+SSO_PRIVATE_KEY = 'D2brFY3LnNDLQBBnvYPXAn185Wi9EpPvnHsUosjEZ9vZMyEtXqkcVfFWkVbN0xpG'
-SSO_PUBLIC_KEY = 'E8vV810D8HSmhUwl6abuZALhO5fmUdjjd3wAVCFZyyDX7SsSeAf9XwVyKZ5brilt' # Designe la clé publique
+SSO_PUBLIC_KEY = 'm9JDP3uGPmGG9ULqPw2BY3ryBNMTGRsuukgIOhk7lIN9lT0wlr2zhoRZiNZ28UCM'
-SSO_SERVER  = 'http://localhost:8000/server/'
+SSO_SERVER  = 'http://test-authentification.cerfig.org:89/server/'
-SSO_LOGOUT_URL = 'http://localhost:8000/deconnexion'
+#SSO_LOGOUT_URL = 'http://test-authentification.cerfig.org:89/deconnexion'
 
 # Configuration de l'email
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
@@ -162,6 +155,6 @@ EMAIL_HOST = 'ssl0.ovh.net'
 EMAIL_PORT = 465
 EMAIL_USE_SSL = True
 EMAIL_USE_TLS = False
-EMAIL_HOST_USER = 'support.it@cerfig.org'
+EMAIL_HOST_USER = config("EMAIL_HOST_USER")
-EMAIL_HOST_PASSWORD = 'Cerfig2025'
+EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER

SIRH/templates/SIRH/parts/menu_application.html

@@ -1,8 +1,8 @@
 <div class="col-1 bg-danger border d-flex flex-column vh-100 pt-5 sticky-top">
-    <a href="http://localhost:8002/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <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://localhost:8001/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <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>

SIRH/templates/SIRH/parts/menu_principal.html

@@ -42,7 +42,7 @@
         <i class="bi bi-calendar-check"></i> Réservation
     </a>
     {% comment %} {% url 'deconnexion' %} {% endcomment %}
-    <a href="" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
+    <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
     </a>
 </div>

staticfiles/gestion_conge/js/index.js

@@ -3,7 +3,7 @@ const $ = (element) => document.getElementById(element);
 const url_liste_conge_attente = $("liste-demande-conges").dataset.url
 
 const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
-    layout : "fitColumns",
+    // layout : "fitColumns",
     columns: [
         {"title": "Nom et Prénom", "field": "prenom_nom"},
         {"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",
         }},
         {"title": "Type de congé", "field": "type"},
-        {"title": "Date de la demande", "field": "date_demande"},
+        {"title": "Date de la demande", "field": "date_demande", responsive: 1},
         {"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{ 
             allowEmpty : true , 
         }},
@@ -24,7 +24,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
         }},
     ],
     pagination: true,
-    paginationSize: 5
+    paginationSize: 5,
 })
 
 const bouton_demande_conges = $("bouton-demande-conge");

staticfiles/gestion_employe/js/index.js

@@ -12,6 +12,7 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
     // ajaxURL: url_liste_employe,
     pagination: true,
     paginationSize: 10,
+    responsiveLayout : "hide"
 })
 
 fetch(url_liste_employe)

staticfiles/gestion_employe/js/mon_profil.js

@@ -16,27 +16,31 @@ const tableau_certificat = new Tabulator("#tableau-certificat", {
     ],
     ajaxURL: url_certificat,
 })
-
 const enregistrerProfil = $("enregistrerProfil");
+
 enregistrerProfil.addEventListener("click", (e) => {
+
     const url = $("information-personnelles").dataset.url;
     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, {
-        method: 'POST',
+        method: "POST",
         headers: {
-            'Content-Type': 'application/json',
+            "X-CSRFToken": csrftoken
-            'X-CSRFToken': csrftoken
         },
-        body: JSON.stringify({ 
+        body: formData
-            "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(data => alert(data.message))
-})
+    .catch(error => console.error("Erreur:", error));
+});

staticfiles/gestion_projet/js/enregistrement_bailleur.js

@@ -1,4 +1,5 @@
 const btnEnregistrerBailleur = document.getElementById('btnEnregistrerBailleur');
+let table;
 
 btnEnregistrerBailleur.addEventListener('click', function() {
     const form = document.getElementById('formBailleur');
@@ -21,3 +22,30 @@ 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);
+            }
+        }
+    });
+
+});
+

staticfiles/gestion_salle/js/index.js

@@ -15,7 +15,6 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
         .then(response => response.json())
         .then(data => {
             currentReservationId = data.id_reservation;
-            console.log(data);
             $("id_reservation_detail").value = data.id_reservation;
             $("id_reservation_refus").value = data.id_reservation;
             $("id_reservation_zoom").value = data.id_reservation;
@@ -30,11 +29,10 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
             $("besoin_ordinateur").checked=data.besoin_ordinateur;
             $("lien_zoom").value=data.lien_zoom;
 
-            if(data.statut !== "annulee"){
+            if (data.besoin_zoom === false){
-                $("motif_refus_container").className = "d-none";
+                $("lien_zoom_container").className = "d-none";
-            }else{
-                $("motif_refus").value=data.motif_refus;
             }
+
         })
     }
 });
@@ -80,6 +78,11 @@ $("bouton-annuler").addEventListener("click", (e) => {
     const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
     const url_annuler = $("formulaire-details").dataset.urlannuler;
 
+    console.log("URL d'annulation :");
+    console.log($("formulaire-details"))
+
+    e.preventDefault();
+
     fetch(
         url_annuler,
         {
@@ -130,6 +133,9 @@ if($("refuserReservation")){
         const url = e.currentTarget.dataset.lienrefus; 
         const idRes = $("id_reservation_detail").value;
 
+        console.log(idRes);
+        e.preventDefault();
+
         fetch(url, {
             method: "POST",
             headers: {
@@ -161,16 +167,11 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
 tableau_reservation_attente.on("rowClick", (row, rowData) => {
     const data = rowData.getData();
 
-    console.log(data);
-
     if(data.besoin_zoom === false){
         $("lien_zoom_container").className = 'd-none';
     }
 
-    if(data.statut !== "refusee"){
+    const id_user = $("current-user-id").dataset.userid;
-        $("motif_refus_container").className = 'd-none';
-    }
-
     $("id_reservation_detail").value = data.id;
     $("id_reservation_refus").value = data.id;
     $("id_reservation_zoom").value = data.id;
@@ -178,14 +179,18 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
     $("employe").value=data.employe;
     $("salle").value=data.salle;
     $("statut-reservation").innerHTML=data.statut;
-    $("date_evenement").value=data.date_debut;
+    $("date_debut").value = data.date_debut;
+    $("date_fin").value = data.date_fin;
     $("heure_debut").value=data.heure_debut;
     $("heure_fin").value=data.heure_fin;
     $("motif_reservation").value=data.motif_reservation;
     $("besoin_zoom").checked=data.besoin_zoom;
     $("besoin_ordinateur").checked=data.besoin_ordi;
     $("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"));
     bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();