Prise en charge de la photo de profil
This commit is contained in:
@@ -26,15 +26,9 @@
|
||||
<div class="form-group col-5 me-2">
|
||||
<label>Selectionner une salle :</label>
|
||||
<select class = "form-select" id="liste-salle">
|
||||
<<<<<<< HEAD
|
||||
<option value='Salle de formation'>Salle de formation</option>
|
||||
<option value='Salle de réunion'>Salle de réunion</option>
|
||||
<option value='Lien Zoom'>Lien Zoom</option>
|
||||
=======
|
||||
<option value='formation'>Salle de formation</option>
|
||||
<option value='reunion'>Salle de réunion</option>
|
||||
<option value='lien_zoom'>Lien Zoom</option>
|
||||
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
<!-- Modal d'affichage des détails d'une reservation -->
|
||||
<<<<<<< HEAD
|
||||
{% load tags_personnaliser %}
|
||||
=======
|
||||
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
||||
<div class="modal fade" id="modalDetailReservation" tabindex="-1" aria-labelledby="modalDetailReservationLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
@@ -25,11 +22,7 @@
|
||||
<input class="form-control" id="salle" readonly>
|
||||
</div>
|
||||
<div class="form-group mb-2">
|
||||
<<<<<<< HEAD
|
||||
<label>Date de debut :</label>
|
||||
=======
|
||||
<label>Date de l'évènement :</label>
|
||||
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
||||
<input type='date' class="form-control" id="date_evenement" readonly >
|
||||
</div>
|
||||
<div class="form-group mb-2">
|
||||
@@ -53,7 +46,6 @@
|
||||
<input type="url" class="form-control" id="lien_zoom" readonly >
|
||||
</div>
|
||||
<div class="form-check mb-2">
|
||||
<<<<<<< HEAD
|
||||
<label class="form-check-label">Besoin d'un ordinateur</label>
|
||||
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
|
||||
</div>
|
||||
@@ -67,33 +59,9 @@
|
||||
{% endif %}
|
||||
<span id="current-user-id" data-user-id="{{ request.user.id }}"></span>
|
||||
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
|
||||
=======
|
||||
<label label="form-check-label">Besoin d'un ordinateur</label>
|
||||
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
|
||||
</div>
|
||||
<div class="form-group mb-2" id='motif_refus_container'>
|
||||
<label>Motif de refus de la reservation :</label>
|
||||
<textarea class="form-control" id="motif_refus" readonly></textarea>
|
||||
</div>
|
||||
<div class='d-flex justify-content-around mt-2'>
|
||||
{% if appartient_au_departement_informatique %}
|
||||
<button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button>
|
||||
{% endif %}
|
||||
{% if appartient_direction and reservation.statut == "en_attente" %}
|
||||
<button class="btn btn-danger" id="refuserReservation" data-lienrefus="{% url 'gestion_salle:refuser-reservation' %}">Refuser</button>
|
||||
{% endif %}
|
||||
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
|
||||
{% if appartient_direction %}
|
||||
<button class="btn btn-success" id="bouton-valider">Valider</button>
|
||||
{% endif %}
|
||||
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
</div>
|
||||
=======
|
||||
</div>
|
||||
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
||||
|
||||
Reference in New Issue
Block a user