Compare commits
3 Commits
main
...
affichage_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1da9d4ca5f | ||
|
|
e81c29a586 | ||
|
|
d28bf85556 |
@@ -1,12 +1,11 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from .models import Contrat, Departement, Employe,Affectation,Formation
|
from .models import Contrat, Departement, Employe,Affectation,Formation
|
||||||
|
|
||||||
class EmployeForm(forms.ModelForm):
|
class EmployeForm(forms.ModelForm):
|
||||||
"""Formulaire pour modifier les informations de profil d'un employé"""
|
"""Formulaire pour modifier les informations de profil d'un employé"""
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Employe
|
model = Employe
|
||||||
fields = (
|
fields = (
|
||||||
'departement',
|
|
||||||
'fonction',
|
|
||||||
'adresse',
|
'adresse',
|
||||||
'telephone',
|
'telephone',
|
||||||
'CV',
|
'CV',
|
||||||
@@ -15,17 +14,6 @@ class EmployeForm(forms.ModelForm):
|
|||||||
'photo',
|
'photo',
|
||||||
'casier_judiciaire'
|
'casier_judiciaire'
|
||||||
)
|
)
|
||||||
widgets = {
|
|
||||||
'departement': forms.Select(attrs={'class': 'form-select'}),
|
|
||||||
'fonction': forms.Select(attrs={'class': 'form-select'}),
|
|
||||||
'adresse': forms.TextInput(attrs={'class': 'form-control'}),
|
|
||||||
'telephone': forms.TextInput(attrs={'class': 'form-control'}),
|
|
||||||
'CV': forms.FileInput(attrs={'class': 'form-control'}),
|
|
||||||
'diplome': forms.FileInput(attrs={'class': 'form-control'}),
|
|
||||||
'rib': forms.FileInput(attrs={'class': 'form-control'}),
|
|
||||||
'photo': forms.FileInput(attrs={'class': 'form-control'}),
|
|
||||||
'casier_judiciaire': forms.FileInput(attrs={'class': 'form-control'}),
|
|
||||||
}
|
|
||||||
|
|
||||||
class AffectationForm(forms.ModelForm):
|
class AffectationForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ 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)
|
||||||
@@ -28,8 +29,6 @@ fetch(url_liste_employe)
|
|||||||
|
|
||||||
tableau_liste_employe.on("rowClick", function (row, rowData) {
|
tableau_liste_employe.on("rowClick", function (row, rowData) {
|
||||||
const data = rowData.getData();
|
const data = rowData.getData();
|
||||||
console.log('Employé cliqué:', data);
|
|
||||||
|
|
||||||
document.getElementById('detail-id').value = data.id;
|
document.getElementById('detail-id').value = data.id;
|
||||||
document.getElementById('detail-matricule').value = data.matricule;
|
document.getElementById('detail-matricule').value = data.matricule;
|
||||||
document.getElementById('detail-employe').value = data.employe;
|
document.getElementById('detail-employe').value = data.employe;
|
||||||
@@ -212,41 +211,23 @@ $("enregistrerDetail").addEventListener("click", function() {
|
|||||||
const fonction = document.getElementById('detail-fonction').value;
|
const fonction = document.getElementById('detail-fonction').value;
|
||||||
const dateEmbauche = document.getElementById('detail-dateEmbauche').value;
|
const dateEmbauche = document.getElementById('detail-dateEmbauche').value;
|
||||||
const matricule = document.getElementById('detail-matricule').value;
|
const matricule = document.getElementById('detail-matricule').value;
|
||||||
const departement = document.getElementById('detail-departement').value;
|
|
||||||
|
|
||||||
console.log('=== ENREGISTREMENT DÉTAILS ===');
|
|
||||||
console.log('ID:', id_);
|
|
||||||
console.log('Fonction:', fonction);
|
|
||||||
console.log('Date embauche:', dateEmbauche);
|
|
||||||
console.log('Matricule:', matricule);
|
|
||||||
console.log('Département (valeur brute):', departement);
|
|
||||||
console.log('Département (type):', typeof departement);
|
|
||||||
console.log('Département est vide:', !departement);
|
|
||||||
|
|
||||||
const url_enregistrer_detail = $("modalDetailEmployeBody").dataset.url;
|
const url_enregistrer_detail = $("modalDetailEmployeBody").dataset.url;
|
||||||
|
|
||||||
const payload = {
|
|
||||||
"id": id_,
|
|
||||||
"fonction": fonction,
|
|
||||||
"date_embauche": dateEmbauche,
|
|
||||||
"matricule": matricule,
|
|
||||||
"departement": departement
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log('Payload JSON:', payload);
|
|
||||||
console.log('Payload stringifié:', JSON.stringify(payload));
|
|
||||||
|
|
||||||
fetch(url_enregistrer_detail, {
|
fetch(url_enregistrer_detail, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
"X-CSRFToken": document.querySelector('[name=csrfmiddlewaretoken]').value
|
"X-CSRFToken": document.querySelector('[name=csrfmiddlewaretoken]').value
|
||||||
},
|
},
|
||||||
body: JSON.stringify(payload)
|
body: JSON.stringify({
|
||||||
|
"id": id_,
|
||||||
|
"fonction": fonction,
|
||||||
|
"date_embauche": dateEmbauche,
|
||||||
|
"matricule": matricule
|
||||||
|
})
|
||||||
})
|
})
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
console.log('Réponse du serveur:', data);
|
|
||||||
alert(data.message);
|
alert(data.message);
|
||||||
location.reload();
|
location.reload();
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
</h5>
|
</h5>
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body" id="modalDetailEmployeBody" data-url="{% url 'gestion_employe:enregistrer-detail-employe' %}" data-url-departements="{% url 'gestion_employe:liste-departements' %}">
|
<div class="modal-body" id="modalDetailEmployeBody" data-url="{% url 'gestion_employe:enregistrer-detail-employe' %}">
|
||||||
<div class="row g-3">
|
<div class="row g-3">
|
||||||
<input type="hidden" id="detail-id">
|
<input type="hidden" id="detail-id">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
@@ -23,12 +23,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Département :</label>
|
<label>Département :</label>
|
||||||
<select class="form-select" id="detail-departement">
|
<input type="text" class="form-control" id="detail-departement">
|
||||||
<option value="">-- Sélectionner --</option>
|
|
||||||
{% for dept in departements %}
|
|
||||||
<option value="{{ dept.id }}">{{ dept.nom }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Sexe :</label>
|
<label>Sexe :</label>
|
||||||
|
|||||||
@@ -83,10 +83,5 @@ urlpatterns = [
|
|||||||
"liste-contrat-expirants",
|
"liste-contrat-expirants",
|
||||||
views.liste_contrat_expirants,
|
views.liste_contrat_expirants,
|
||||||
name='liste-contrat-expirants'
|
name='liste-contrat-expirants'
|
||||||
),
|
|
||||||
path(
|
|
||||||
"liste-departements/",
|
|
||||||
views.liste_departements,
|
|
||||||
name='liste-departements'
|
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
@@ -13,13 +13,16 @@ from django.http import JsonResponse
|
|||||||
from django.forms.models import model_to_dict
|
from django.forms.models import model_to_dict
|
||||||
from django.db.models import Sum
|
from django.db.models import Sum
|
||||||
|
|
||||||
from .models import Employe, Contrat, Affectation, Formation, Departement
|
from .models import Employe, Contrat, Affectation, Formation
|
||||||
from .forms import AffectationForm, ContratForm, FormationForm
|
from .forms import AffectationForm, ContratForm, FormationForm
|
||||||
from fonction_utilitaire import fonctions_utilitaire
|
from fonction_utilitaire import fonctions_utilitaire
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def index(request):
|
def index(request):
|
||||||
"""Vue d'index"""
|
"""Vue d'index"""
|
||||||
|
if not request.user.groups.filter(name="ressource_humaine").exists():
|
||||||
|
return redirect('gestion_employe:mon-profil')
|
||||||
|
|
||||||
employes = Employe.objects.all().order_by('-user__date_joined')
|
employes = Employe.objects.all().order_by('-user__date_joined')
|
||||||
nombre_employes = Employe.objects.count()
|
nombre_employes = Employe.objects.count()
|
||||||
nombre_cps = Contrat.objects.filter(type_contrat='contrat_prestation').count()
|
nombre_cps = Contrat.objects.filter(type_contrat='contrat_prestation').count()
|
||||||
@@ -38,8 +41,7 @@ def index(request):
|
|||||||
'nombre_stage': nombre_stage,
|
'nombre_stage': nombre_stage,
|
||||||
'nombre_expirants': nombre_expirants,
|
'nombre_expirants': nombre_expirants,
|
||||||
'affectation_form': AffectationForm(),
|
'affectation_form': AffectationForm(),
|
||||||
'contrat_form': ContratForm(),
|
'contrat_form': ContratForm()
|
||||||
'departements': Departement.objects.all()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@@ -95,7 +97,7 @@ def affecter_employe_projet(request):
|
|||||||
elif total_affectation + temps_nouveau > 100:
|
elif total_affectation + temps_nouveau > 100:
|
||||||
messages.warning(
|
messages.warning(
|
||||||
request,
|
request,
|
||||||
f"Les pourcentages d'affectation de l'employé {employe.first_name} {employe.last_name} dépasse 100% sur les différents projets ({total_affectation + temps_nouveau}%)."
|
f"Les pourcentages d'affectation de l'employé {employe.user.first_name} {employe.user.last_name} dépasse 100% sur les différents projets ({total_affectation + temps_nouveau}%)."
|
||||||
)
|
)
|
||||||
return redirect('gestion_employe:index')
|
return redirect('gestion_employe:index')
|
||||||
|
|
||||||
@@ -301,30 +303,10 @@ def enregistrer_detail_employe(request):
|
|||||||
except Employe.DoesNotExist:
|
except Employe.DoesNotExist:
|
||||||
return JsonResponse({"error": "Employé non trouvé."}, status=404)
|
return JsonResponse({"error": "Employé non trouvé."}, status=404)
|
||||||
|
|
||||||
employe.fonction = data.get('fonction')
|
employe.fonction = data['fonction']
|
||||||
employe.date_embauche = data.get('date_embauche')
|
employe.date_embauche = data['date_embauche']
|
||||||
employe.matricule = data.get('matricule')
|
employe.matricule = data['matricule']
|
||||||
|
|
||||||
# Traiter le département
|
|
||||||
dept_value = data.get('departement')
|
|
||||||
print(f"[DEBUG] Département brut: {dept_value!r}")
|
|
||||||
print(f"[DEBUG] Type département: {type(dept_value).__name__}")
|
|
||||||
print(f"[DEBUG] Est vide: {not dept_value}")
|
|
||||||
|
|
||||||
if dept_value and str(dept_value).strip():
|
|
||||||
try:
|
|
||||||
dept_id = int(dept_value)
|
|
||||||
departement = Departement.objects.get(id=dept_id)
|
|
||||||
employe.departement = departement
|
|
||||||
except Departement.DoesNotExist:
|
|
||||||
employe.departement = None
|
|
||||||
except (ValueError, TypeError) as e:
|
|
||||||
employe.departement = None
|
|
||||||
else:
|
|
||||||
employe.departement = None
|
|
||||||
|
|
||||||
employe.save()
|
employe.save()
|
||||||
|
|
||||||
return JsonResponse({"message": "Détails de l'employé mis à jour avec succès."})
|
return JsonResponse({"message": "Détails de l'employé mis à jour avec succès."})
|
||||||
else:
|
else:
|
||||||
return JsonResponse({"message": "Méthode non autorisée."}, status=405)
|
return JsonResponse({"message": "Méthode non autorisée."}, status=405)
|
||||||
@@ -386,7 +368,7 @@ def liste_employe(request):
|
|||||||
"affectations": affectations,
|
"affectations": affectations,
|
||||||
"projet": projets,
|
"projet": projets,
|
||||||
"contrats": contrats,
|
"contrats": contrats,
|
||||||
"departement": employe.departement.id if employe.departement else "",
|
"departement": employe.departement.nom if employe.departement else "",
|
||||||
"fonction": employe.fonction,
|
"fonction": employe.fonction,
|
||||||
"date_embauche": employe.date_embauche,
|
"date_embauche": employe.date_embauche,
|
||||||
"adresse": employe.adresse,
|
"adresse": employe.adresse,
|
||||||
@@ -458,15 +440,3 @@ def supprimer_formation(request, id_formation):
|
|||||||
formation.delete()
|
formation.delete()
|
||||||
messages.success(request, "Formation supprimée ")
|
messages.success(request, "Formation supprimée ")
|
||||||
return redirect("mes_formations")
|
return redirect("mes_formations")
|
||||||
|
|
||||||
def liste_departements(request):
|
|
||||||
"""Vue pour retourner la liste de tous les départements en JSON"""
|
|
||||||
departements = Departement.objects.all()
|
|
||||||
data = [
|
|
||||||
{
|
|
||||||
"id": dept.id,
|
|
||||||
"nom": dept.nom
|
|
||||||
}
|
|
||||||
for dept in departements
|
|
||||||
]
|
|
||||||
return JsonResponse(data, safe=False)
|
|
||||||
|
|||||||
@@ -15,6 +15,11 @@ const tableau_liste_activite = new Tabulator("#tableau-liste-activite", {
|
|||||||
})
|
})
|
||||||
tableau_liste_activite.on("rowClick", function (row, rowData) {
|
tableau_liste_activite.on("rowClick", function (row, rowData) {
|
||||||
const data = rowData.getData();
|
const data = rowData.getData();
|
||||||
|
console.log('=== ACTIVITÉ SÉLECTIONNÉE ===');
|
||||||
|
console.log('ID:', data.id);
|
||||||
|
console.log('Budget prévu:', data.budget_prevu);
|
||||||
|
console.log('Budget dépensé:', data.budget_depense);
|
||||||
|
|
||||||
$("idDetailActivite").value = data.id;
|
$("idDetailActivite").value = data.id;
|
||||||
$("titreDetailActivite").value = data.titre;
|
$("titreDetailActivite").value = data.titre;
|
||||||
$("descriptionDetailActivite").value = data.description;
|
$("descriptionDetailActivite").value = data.description;
|
||||||
@@ -22,14 +27,79 @@ tableau_liste_activite.on("rowClick", function (row, rowData) {
|
|||||||
$("date_finDetailActivite").value = data.date_fin;
|
$("date_finDetailActivite").value = data.date_fin;
|
||||||
$("statutDetailActivite").value = data.statut;
|
$("statutDetailActivite").value = data.statut;
|
||||||
$("budget_prevuDetailActivite").value = data.budget_prevu;
|
$("budget_prevuDetailActivite").value = data.budget_prevu;
|
||||||
|
$("budget_depenseDetailActivite").value = data.budget_depense || 0;
|
||||||
|
|
||||||
|
// Vérifier si l'activité est annulée
|
||||||
|
const isAnnulee = data.statut && data.statut.toLowerCase().includes('annul');
|
||||||
|
console.log('Activité annulée?', isAnnulee);
|
||||||
|
|
||||||
|
// Masquer/Afficher les boutons d'action selon le statut
|
||||||
|
const btnAnnuler = $("btnAnnulerActivite");
|
||||||
|
const btnMiseAJour = $("btnMiseAJourDepense");
|
||||||
|
const btnAjouterLivrable = $("btnOuvrirAjouterLivrable");
|
||||||
|
|
||||||
|
if (isAnnulee) {
|
||||||
|
// Activité annulée : masquer les boutons
|
||||||
|
if (btnAnnuler) btnAnnuler.style.display = "none";
|
||||||
|
if (btnMiseAJour) btnMiseAJour.style.display = "none";
|
||||||
|
if (btnAjouterLivrable) btnAjouterLivrable.style.display = "none";
|
||||||
|
console.log('✓ Boutons masqués - activité annulée');
|
||||||
|
} else {
|
||||||
|
// Activité active : afficher les boutons
|
||||||
|
if (btnAnnuler) btnAnnuler.style.display = "block";
|
||||||
|
if (btnMiseAJour) btnMiseAJour.style.display = "block";
|
||||||
|
if (btnAjouterLivrable) btnAjouterLivrable.style.display = "block";
|
||||||
|
console.log('✓ Boutons affichés - activité active');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vérifier si les budgets sont différents
|
||||||
|
const budgetPrevu = parseFloat(data.budget_prevu) || 0;
|
||||||
|
const budgetDepense = parseFloat(data.budget_depense) || 0;
|
||||||
|
const isDifferent = budgetDepense !== budgetPrevu;
|
||||||
|
|
||||||
|
console.log('Budget prévu:', budgetPrevu);
|
||||||
|
console.log('Budget dépensé:', budgetDepense);
|
||||||
|
console.log('Sont-ils différents?', isDifferent);
|
||||||
|
|
||||||
|
// Masquer/Afficher le conteneur du motif
|
||||||
|
const motifContainer = $("motif_container");
|
||||||
|
if (motifContainer) {
|
||||||
|
if (isDifferent) {
|
||||||
|
motifContainer.style.display = "block";
|
||||||
|
$("motif_changement_budgetDetailActivite").value = data.motif_changement_budget || "";
|
||||||
|
console.log('✓ Motif AFFICHÉ - budgets différents');
|
||||||
|
} else {
|
||||||
|
motifContainer.style.display = "none";
|
||||||
|
$("motif_changement_budgetDetailActivite").value = "";
|
||||||
|
console.log('✓ Motif MASQUÉ - budgets identiques');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.error('❌ Élément motif_container introuvable!');
|
||||||
|
}
|
||||||
|
|
||||||
$("besoin_ressources_materiellesDetailActivite").value = data.besoin_ressource_materielle;
|
$("besoin_ressources_materiellesDetailActivite").value = data.besoin_ressource_materielle;
|
||||||
const modal = new bootstrap.Modal($("modalDetailActivite"));
|
const modal = new bootstrap.Modal($("modalDetailActivite"));
|
||||||
modal.show();
|
modal.show();
|
||||||
|
|
||||||
fetch(`liste-des-livrables/${data.id}/`)
|
const url_livrables = `/gestion-projet/activite/liste-des-livrables/${data.id}/`;
|
||||||
.then(response => response.json())
|
console.log('URL des livrables:', url_livrables);
|
||||||
|
|
||||||
|
fetch(url_livrables)
|
||||||
|
.then(response => {
|
||||||
|
console.log('Réponse status:', response.status);
|
||||||
|
return response.json();
|
||||||
|
})
|
||||||
.then(livrables => {
|
.then(livrables => {
|
||||||
|
console.log('Livrables reçus:', livrables);
|
||||||
|
console.log('Nombre de livrables:', livrables.length);
|
||||||
tableau_liste_livrable.setData(livrables);
|
tableau_liste_livrable.setData(livrables);
|
||||||
|
$("nombreLivrables").textContent = livrables.length;
|
||||||
|
console.log('Tableau mis à jour avec', livrables.length, 'livrables');
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error(' Erreur lors du chargement des livrables:', error);
|
||||||
|
tableau_liste_livrable.setData([]);
|
||||||
|
$("nombreLivrables").textContent = 0;
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -40,6 +110,7 @@ const tableau_liste_livrable = new Tabulator("#listeLivrables", {
|
|||||||
],
|
],
|
||||||
placeholder: "Aucun livrable trouvé",
|
placeholder: "Aucun livrable trouvé",
|
||||||
})
|
})
|
||||||
|
console.log('✓ Tableau des livrables initialisé');
|
||||||
|
|
||||||
$("btnMiseAJourDepense").addEventListener("click", function() {
|
$("btnMiseAJourDepense").addEventListener("click", function() {
|
||||||
const modal = new bootstrap.Modal($("modalDepenseActivite"));
|
const modal = new bootstrap.Modal($("modalDepenseActivite"));
|
||||||
@@ -57,3 +128,4 @@ $("btnAnnulerActivite").addEventListener("click", function(event) {
|
|||||||
$("id_activite_annulation").value = $("idDetailActivite").value;
|
$("id_activite_annulation").value = $("idDetailActivite").value;
|
||||||
bootstrap.Modal.getOrCreateInstance($("modalDetailActivite")).hide();
|
bootstrap.Modal.getOrCreateInstance($("modalDetailActivite")).hide();
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,58 +1,111 @@
|
|||||||
<div class="modal fade" id="modalDetailActivite" tabindex="-1">
|
<div class="modal fade" id="modalDetailActivite" tabindex="-1"
|
||||||
<div class="modal-dialog">
|
aria-labelledby="modalDetailActiviteLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog modal-lg modal-dialog-centered">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header bg-orange-dark">
|
<div class="modal-header bg-orange-dark text-black">
|
||||||
<h5 class="modal-title">Détails de l'activité</h5>
|
<h5 class="modal-title" id="modalDetailActiviteLabel">
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
<i class="bi bi-clipboard-check me-2"></i>
|
||||||
|
Détails de l'activité
|
||||||
|
</h5>
|
||||||
|
<button type="button"class="btn-close btn-close-white" data-bs-dismiss="modal"
|
||||||
|
aria-label="Fermer">
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body" data-url-livrables="{% url 'gestion_projet:liste-livrables-activite' activite_id=0 %}">
|
||||||
|
<input type="hidden" id="idDetailActivite">
|
||||||
<div class="row g-3">
|
<div class="row g-3">
|
||||||
<div class="">
|
<div class="col-12">
|
||||||
<input type="hidden" id="idDetailActivite">
|
<label for="titreDetailActivite" class="form-label fw-bold">
|
||||||
<div class="form-group mb-2">
|
Titre :
|
||||||
<label>Titre :</label>
|
</label>
|
||||||
<input type="text" class="form-control" id="titreDetailActivite">
|
<input type="text"class="form-control" id="titreDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<label for="descriptionDetailActivite" class="form-label fw-bold">
|
||||||
|
Description :
|
||||||
|
</label>
|
||||||
|
<textarea class="form-control"id="descriptionDetailActivite" rows="3" readonly></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label for="date_debutDetailActivite"class="form-label fw-bold">
|
||||||
|
Date de début :
|
||||||
|
</label>
|
||||||
|
<input type="date"class="form-control"id="date_debutDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label for="date_finDetailActivite"class="form-label fw-bold">
|
||||||
|
Date de fin :
|
||||||
|
</label>
|
||||||
|
<input type="date"class="form-control"id="date_finDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label for="statutDetailActivite" class="form-label fw-bold">
|
||||||
|
Statut :
|
||||||
|
</label>
|
||||||
|
<input type="text"class="form-control"id="statutDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label for="budget_prevuDetailActivite"class="form-label fw-bold">
|
||||||
|
Budget prévu :
|
||||||
|
</label>
|
||||||
|
<input type="number"class="form-control" id="budget_prevuDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label for="budget_depenseDetailActivite"class="form-label fw-bold">
|
||||||
|
Montant dépensé (GNF) :
|
||||||
|
</label>
|
||||||
|
<input type="number"class="form-control" id="budget_depenseDetailActivite"readonly>
|
||||||
|
</div>
|
||||||
|
<div class="col-12" id="motif_container">
|
||||||
|
<label for="motif_changement_budgetDetailActivite"class="form-label fw-bold">
|
||||||
|
Motif de différence :
|
||||||
|
</label>
|
||||||
|
<textarea class="form-control"id="motif_changement_budgetDetailActivite"rows="2"readonly></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<label for="besoin_ressources_materiellesDetailActivite"class="form-label fw-bold">
|
||||||
|
Besoin de ressources matérielles :
|
||||||
|
</label>
|
||||||
|
<textarea class="form-control"id="besoin_ressources_materiellesDetailActivite"rows="3"readonly></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 mt-4">
|
||||||
|
|
||||||
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
||||||
|
<h5 class="mb-0 fw-bold">
|
||||||
|
<i class="bi bi-box-seam me-2"></i>
|
||||||
|
Liste des livrables
|
||||||
|
</h5>
|
||||||
|
<span class="badge bg-primary" id="nombreLivrables">
|
||||||
|
0
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Description :</label>
|
|
||||||
<textarea class="form-control" id="descriptionDetailActivite"></textarea>
|
|
||||||
</div>
|
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Date de début :</label>
|
|
||||||
<input type="date" class="form-control" id="date_debutDetailActivite">
|
|
||||||
</div>
|
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Date de fin :</label>
|
|
||||||
<input type="date" class="form-control" id="date_finDetailActivite">
|
|
||||||
</div>
|
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Statut:</label>
|
|
||||||
<input type="text" class="form-control" id="statutDetailActivite">
|
|
||||||
</div>
|
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Budget prévu :</label>
|
|
||||||
<input type="number" class="form-control" id="budget_prevuDetailActivite">
|
|
||||||
</div>
|
|
||||||
<div class="form-group mb-2">
|
|
||||||
<label>Besoin de ressources matérielles:</label>
|
|
||||||
<textarea class="form-control" id="besoin_ressources_materiellesDetailActivite"></textarea>
|
|
||||||
</div>
|
|
||||||
<p><strong>Liste des livrables :</strong></p>
|
|
||||||
<div id="listeLivrables"></div>
|
<div id="listeLivrables"></div>
|
||||||
<button class="btn btn-danger d-block mx-auto" id="btnAnnulerActivite">
|
</div>
|
||||||
|
|
||||||
|
<div class="col-12 mt-3 text-center">
|
||||||
|
<button type="button"class="btn btn-danger"id="btnAnnulerActivite">
|
||||||
|
<i class="bi bi-x-circle me-2"></i>
|
||||||
Annuler cette activité
|
Annuler cette activité
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-success" id="btnMiseAJourDepense">
|
<button type="button"class="btn btn-success"id="btnMiseAJourDepense">
|
||||||
<i class="bi bi-plus-circle"></i> Mise à jour du budget
|
<i class="bi bi-cash-stack me-2"></i>
|
||||||
|
Mise à jour du budget
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalAjouterLivrable">
|
<button type="button"class="btn btn-primary"id="btnOuvrirAjouterLivrable"data-bs-toggle="modal"
|
||||||
<i class="bi bi-plus-circle"></i> Ajouter un livrable
|
data-bs-target="#modalAjouterLivrable">
|
||||||
|
<i class="bi bi-plus-circle me-2"></i>
|
||||||
|
Ajouter un livrable
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn btn-secondary"data-bs-dismiss="modal">
|
||||||
|
Fermer
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -381,15 +381,32 @@ def liste_activites_projet(request):
|
|||||||
@login_required
|
@login_required
|
||||||
def liste_livrables_activite(request, activite_id):
|
def liste_livrables_activite(request, activite_id):
|
||||||
"""Vue pour retourner la liste des livrables attendus d'une activité spécifique"""
|
"""Vue pour retourner la liste des livrables attendus d'une activité spécifique"""
|
||||||
livrables = LivrablesLivres.objects.filter(activite__id=activite_id)
|
try:
|
||||||
data = []
|
livrables = LivrablesLivres.objects.filter(activite__id=activite_id)
|
||||||
for livrable in livrables:
|
data = []
|
||||||
print(livrable.fichier.url)
|
|
||||||
data.append({
|
for livrable in livrables:
|
||||||
"titre": livrable.nom,
|
lien = ""
|
||||||
"lien": livrable.fichier.url if livrable.fichier else "",
|
if livrable.fichier:
|
||||||
})
|
try:
|
||||||
return JsonResponse(data, safe=False)
|
lien = livrable.fichier.url
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[DEBUG] Erreur accès URL fichier {livrable.nom}: {e}")
|
||||||
|
lien = ""
|
||||||
|
|
||||||
|
data.append({
|
||||||
|
"titre": livrable.nom,
|
||||||
|
"lien": lien,
|
||||||
|
})
|
||||||
|
|
||||||
|
print(f"[DEBUG] ✓ Livrables activité {activite_id}: {len(data)} trouvés")
|
||||||
|
return JsonResponse(data, safe=False)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[DEBUG] Erreur liste_livrables_activite: {e}")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
return JsonResponse({"error": f"Erreur serveur: {str(e)}"}, status=500)
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def mises_a_jour_depense_activite(request):
|
def mises_a_jour_depense_activite(request):
|
||||||
|
|||||||
@@ -12,12 +12,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
|||||||
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
||||||
modal.show();
|
modal.show();
|
||||||
fetch (`/gestion-salle/revervation/details/${event.guid}`)
|
fetch (`/gestion-salle/revervation/details/${event.guid}`)
|
||||||
.then(response => {
|
.then(response => response.json())
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Erreur HTTP ${response.status}`);
|
|
||||||
}
|
|
||||||
return response.json();
|
|
||||||
})
|
|
||||||
.then(data => {
|
.then(data => {
|
||||||
currentReservationId = data.id_reservation;
|
currentReservationId = data.id_reservation;
|
||||||
$("id_reservation_detail").value = data.id_reservation;
|
$("id_reservation_detail").value = data.id_reservation;
|
||||||
@@ -26,7 +21,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
|||||||
$("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_evenement;
|
||||||
$("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;
|
||||||
@@ -39,7 +34,6 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
|||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
.catch(error => console.error("Impossible de charger les détails de la réservation :", error));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -186,6 +180,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
|
|||||||
$("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_debut").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;
|
||||||
|
|||||||
@@ -55,5 +55,5 @@
|
|||||||
{% block 'js' %}
|
{% block 'js' %}
|
||||||
<script src="https://cdn.jsdelivr.net/npm/lemonadejs/dist/lemonade.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/lemonadejs/dist/lemonade.min.js"></script>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@calendarjs/ce/dist/index.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/@calendarjs/ce/dist/index.min.js"></script>
|
||||||
<script src="{% static 'gestion_salle/js/index.js' %}?v=3"></script>
|
<script src="{% static 'gestion_salle/js/index.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -25,10 +25,10 @@
|
|||||||
<label>Date de debut :</label>
|
<label>Date de debut :</label>
|
||||||
<input type='date' class="form-control" id="date_debut" readonly >
|
<input type='date' class="form-control" id="date_debut" readonly >
|
||||||
</div>
|
</div>
|
||||||
{% comment %} <div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Date de fin :</label>
|
<label>Date de fin :</label>
|
||||||
<input type='date' class="form-control" id="date_fin" readonly >
|
<input type='date' class="form-control" id="date_fin" readonly >
|
||||||
</div> {% endcomment %}
|
</div>
|
||||||
<div class="form-group mb-2">
|
<div class="form-group mb-2">
|
||||||
<label>Heure de début :</label>
|
<label>Heure de début :</label>
|
||||||
<input type='time' class="form-control" id="heure_debut" readonly>
|
<input type='time' class="form-control" id="heure_debut" readonly>
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
|
|||||||
'employe': f"{employe.first_name} {employe.last_name}",
|
'employe': f"{employe.first_name} {employe.last_name}",
|
||||||
'salle': reservation.salle,
|
'salle': reservation.salle,
|
||||||
'statut': dict(Reservation.STATUT).get(reservation.statut),
|
'statut': dict(Reservation.STATUT).get(reservation.statut),
|
||||||
'date_debut': reservation.date_debut.strftime('%Y-%m-%d'),
|
'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'),
|
||||||
'heure_debut': reservation.heure_debut.strftime('%H:%M'),
|
'heure_debut': reservation.heure_debut.strftime('%H:%M'),
|
||||||
'heure_fin': reservation.heure_fin.strftime('%H:%M'),
|
'heure_fin': reservation.heure_fin.strftime('%H:%M'),
|
||||||
'motif_reservation': reservation.motif_reservation,
|
'motif_reservation': reservation.motif_reservation,
|
||||||
|
|||||||
Reference in New Issue
Block a user