Skip to content
Snippets Groups Projects
Commit 0f78d19b authored by Jessie Ragot's avatar Jessie Ragot
Browse files

Merge remote-tracking branch 'origin/main'

parents cc10b0c9 88eeeef4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 60 additions and 62 deletions
src/main/resources/application.properties
+ 1
− 1
View file @ 0f78d19b
......@@ -6,7 +6,7 @@ spring.datasource.password=jessie
#spring.datasource.password=mypass
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true
spring.thymeleaf.prefix=classpath:/templates/
......
src/main/resources/static/images/admin2.png 0 → 100644
+ 0
− 0
View file @ 0f78d19b
src/main/resources/static/images/admin2.png

675 KiB

src/main/resources/static/images/background1.png 0 → 100644
+ 0
− 0
View file @ 0f78d19b
src/main/resources/static/images/background1.png

156 KiB

src/main/resources/static/images/medecins.png 0 → 100644
+ 0
− 0
View file @ 0f78d19b
src/main/resources/static/images/medecins.png

31.8 KiB

src/main/resources/static/images/patient.png 0 → 100644
+ 0
− 0
View file @ 0f78d19b
src/main/resources/static/images/patient.png

45 KiB

src/main/resources/static/images/patient1.png 0 → 100644
+ 0
− 0
View file @ 0f78d19b
src/main/resources/static/images/patient1.png

757 KiB

src/main/resources/templates/admin-appointments.html
+ 7
− 7
View file @ 0f78d19b
......@@ -9,7 +9,7 @@
<body class="bg-gray-100 font-sans leading-normal tracking-normal flex flex-col min-h-screen">
<!-- Header -->
<header class="bg-white shadow-md">
<header class="bg-white shadow-md sticky top-0 z-50">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12">
<div class="flex justify-between items-center py-6">
<h1 class="text-2xl font-bold text-blue-900 tracking-wide">📅 Liste des rendez-vous</h1>
......@@ -19,15 +19,15 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-16">
<!-- Image légèrement plus haute -->
<div class="w-full max-w-xs mt-[-20px]">
<img src="/images/appointments.jpg" alt="Liste des rendez-vous" class="w-full rounded-lg shadow-lg">
<!-- Image -->
<div class="w-full max-w-sm mb-8 transform transition hover:scale-105">
<img src="/images/appointments.jpg" alt="Liste des rendez-vous" class="w-full rounded-lg shadow-lg opacity-90">
</div>
<!-- Contenu -->
<div class="mt-6 w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<div class="w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-16">
<h2 class="text-3xl font-bold text-blue-900">📅 Liste des rendez-vous</h2>
<p class="mt-4 text-lg text-gray-700">Consultez et gérez les rendez-vous médicaux facilement.</p>
......@@ -77,7 +77,7 @@
</main>
<!-- Footer en bas -->
<!-- Footer -->
<footer class="bg-white shadow-md mt-auto">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12 py-4 text-center">
<p class="text-sm text-gray-600">&copy; 2025 Gestion Dossiers Médicaux. Tous droits réservés.</p>
......
src/main/resources/templates/admin-dashboard.html
+ 2
− 2
View file @ 0f78d19b
......@@ -24,7 +24,7 @@
<!-- Image illustrant le tableau de bord admin -->
<div class="w-full max-w-md">
<img src="/images/admindashboard.png" alt="Tableau de bord admin" class="w-full rounded-lg shadow-lg">
<img src="/images/admin2.png" alt="Tableau de bord admin" class="w-full rounded-lg shadow-lg">
</div>
<!-- Conteneur du tableau de bord -->
......@@ -77,7 +77,7 @@
</main>
<!-- Footer toujours en bas -->
<!-- Footer -->
<footer class="bg-white shadow-md mt-auto">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12 py-4 text-center">
<p class="text-sm text-gray-600">&copy; 2025 Gestion Dossiers Médicaux. Tous droits réservés.</p>
......
src/main/resources/templates/create-appointment-admin.html
+ 17
− 18
View file @ 0f78d19b
......@@ -9,7 +9,7 @@
<body class="bg-gray-100 font-sans leading-normal tracking-normal flex flex-col min-h-screen">
<!-- Header -->
<header class="bg-white shadow-md">
<header class="bg-white shadow-md sticky top-0 z-50">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12">
<div class="flex justify-between items-center py-6">
<h1 class="text-2xl font-bold text-blue-900 tracking-wide">📅 Créer un rendez-vous</h1>
......@@ -19,23 +19,23 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-16">
<!-- Image centrée -->
<div class="w-full max-w-lg mt-[-10px]">
<img src="/images/createappointment.jpg" alt="Créer un rendez-vous" class="w-full rounded-lg shadow-lg">
<div class="w-full max-w-sm mb-8 transform transition hover:scale-105">
<img src="/images/createappointment.jpg" alt="Créer un rendez-vous" class="w-full rounded-lg shadow-lg opacity-90">
</div>
<!-- Formulaire -->
<div class="mt-6 w-full max-w-xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<div class="w-full max-w-xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-16">
<h2 class="text-3xl font-bold text-blue-900">📅 Nouveau rendez-vous</h2>
<p class="mt-2 text-lg text-gray-700">Planifiez un rendez-vous médical facilement.</p>
<form method="post" th:action="@{/admin/admin-appointments/create}" class="mt-6">
<!-- Sélecteur du Patient -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">👤 Patient :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">👤 Patient :</label>
<select class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="patientId" required>
<option value="">Sélectionner un patient</option>
<option th:each="patient : ${patients}" th:value="${patient.id}" th:text="${patient.firstName + ' ' + patient.lastName}"></option>
......@@ -43,8 +43,8 @@
</div>
<!-- Sélecteur du Médecin -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">👨‍⚕️ Médecin :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">👨‍⚕️ Médecin :</label>
<select class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="doctorId" required>
<option value="">Sélectionner un médecin</option>
<option th:each="doctor : ${doctors}" th:value="${doctor.id}" th:text="${doctor.firstName + ' ' + doctor.lastName}"></option>
......@@ -52,30 +52,29 @@
</div>
<!-- Date et Heure -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">📅 Date et heure :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">📅 Date et heure :</label>
<input type="datetime-local" class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="dateTime" required>
</div>
<!-- Motif -->
<div class="mb-6">
<label class="block text-left text-gray-800 font-semibold">📝 Motif :</label>
<div class="mb-6 text-left">
<label class="block text-gray-800 font-semibold">📝 Motif :</label>
<input type="text" class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="reason" required>
</div>
<!-- Boutons -->
<div class="flex justify-center space-x-4">
<button type="submit" class="px-6 py-3 bg-green-500 text-white font-semibold rounded-lg shadow-md hover:bg-green-600 transition flex items-center space-x-2">
<button type="submit" class="px-6 py-3 bg-green-500 text-white font-semibold rounded-lg shadow-md hover:bg-green-600 transition flex items-center">
<span>Créer le rendez-vous</span>
</button>
<a href="/admin/admin-appointments" th:href="@{/admin/admin-appointments}"
class="px-6 py-3 bg-gray-500 text-white font-semibold rounded-lg shadow-md hover:bg-gray-600 transition flex items-center space-x-2">
class="px-6 py-3 bg-gray-500 text-white font-semibold rounded-lg shadow-md hover:bg-gray-600 transition flex items-center">
<span>Annuler</span>
</a>
</div>
</form>
</div>
</main>
<!-- Footer en bas -->
......
src/main/resources/templates/create-appointment-doctor.html
+ 13
− 13
View file @ 0f78d19b
......@@ -9,7 +9,7 @@
<body class="bg-gray-100 font-sans leading-normal tracking-normal flex flex-col min-h-screen">
<!-- Header (identique à "Liste des rendez-vous") -->
<header class="bg-white shadow-md">
<header class="bg-white shadow-md sticky top-0 z-50">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12">
<div class="flex justify-between items-center py-6">
<h1 class="text-2xl font-bold text-blue-900 tracking-wide"> 📅 Créer un rendez-vous</h1>
......@@ -21,23 +21,23 @@
</header>
<!-- Conteneur principal -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-16">
<!-- Image centrée -->
<div class="w-full max-w-lg mt-[-10px]">
<img src="/images/createappointment.jpg" alt="Création de rendez-vous" class="w-full rounded-lg shadow-lg">
<div class="w-full max-w-sm mb-8 transform transition hover:scale-105">
<img src="/images/createappointment.jpg" alt="Création de rendez-vous" class="w-full rounded-lg shadow-lg opacity-90">
</div>
<!-- Formulaire (réduit en largeur) -->
<div class="mt-6 w-full max-w-xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<div class="w-full max-w-xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-16">
<h2 class="text-3xl font-bold text-blue-900">📅 Nouveau Rendez-vous</h2>
<p class="mt-2 text-lg text-gray-700">Planifiez un rendez-vous médical facilement.</p>
<form method="post" th:action="@{/doctors/appointments/create}" class="mt-6">
<!-- Sélecteur du Patient -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">👤 Patient :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">👤 Patient :</label>
<select class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="patientId" required>
<option value="">Sélectionner un patient</option>
<option th:each="patient : ${patients}" th:value="${patient.id}" th:text="${patient.firstName + ' ' + patient.lastName}"></option>
......@@ -45,22 +45,22 @@
</div>
<!-- Médecin -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">👨‍⚕️ Médecin :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">👨‍⚕️ Médecin :</label>
<input type="hidden" name="doctorId" th:value="${doctor.id}">
<input type="text" class="w-full px-4 py-2 border rounded-lg shadow-sm bg-gray-100"
th:value="'Dr. ' + ${doctor.firstName} + ' ' + ${doctor.lastName}" readonly>
</div>
<!-- Date et Heure -->
<div class="mb-4">
<label class="block text-left text-gray-800 font-semibold">📅 Date et heure :</label>
<div class="mb-4 text-left">
<label class="block text-gray-800 font-semibold">📅 Date et heure :</label>
<input type="datetime-local" class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="dateTime" required>
</div>
<!-- Motif -->
<div class="mb-6">
<label class="block text-left text-gray-800 font-semibold">📝 Motif :</label>
<div class="mb-6 text-left">
<label class="block text-gray-800 font-semibold">📝 Motif :</label>
<input type="text" class="w-full px-4 py-2 border rounded-lg shadow-sm focus:ring focus:ring-blue-300" name="reason" required>
</div>
......
src/main/resources/templates/doctor-appointments.html
+ 7
− 8
View file @ 0f78d19b
......@@ -9,7 +9,7 @@
<body class="bg-gray-100 font-sans leading-normal tracking-normal flex flex-col min-h-screen">
<!-- Header -->
<header class="bg-white shadow-md">
<header class="bg-white shadow-md sticky top-0 z-50">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12">
<div class="flex justify-between items-center py-6">
<h1 class="text-2xl font-bold text-blue-900 tracking-wide">📅 Liste des rendez-vous</h1>
......@@ -19,15 +19,15 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-16">
<!-- Image légèrement plus haute -->
<div class="w-full max-w-xs mt-[-20px]"> <!-- Taille réduite + position légèrement remontée -->
<img src="/images/appointments.jpg" alt="Liste des rendez-vous" class="w-full rounded-lg shadow-lg">
<!-- Image -->
<div class="w-full max-w-sm mb-8 transform transition hover:scale-105">
<img src="/images/appointments.jpg" alt="Liste des rendez-vous" class="w-full rounded-lg shadow-lg opacity-90">
</div>
<!-- Contenu -->
<div class="mt-6 w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<div class="w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-16">
<h2 class="text-3xl font-bold text-blue-900">📅 Liste des rendez-vous</h2>
<p class="mt-4 text-lg text-gray-700">Consultez et gérez vos rendez-vous médicaux facilement.</p>
......@@ -71,10 +71,9 @@
<a href="/doctors/dashboard" class="px-6 py-3 bg-gray-500 text-white rounded-lg shadow-md hover:bg-gray-600 transition">🔙 Retour au tableau de bord</a>
</div>
</div>
</main>
<!-- Footer en bas -->
<!-- Footer -->
<footer class="bg-white shadow-md mt-auto">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12 py-4 text-center">
<p class="text-sm text-gray-600">&copy; 2025 Gestion Dossiers Médicaux. Tous droits réservés.</p>
......
src/main/resources/templates/doctor-dashboard.html
+ 9
− 9
View file @ 0f78d19b
......@@ -19,18 +19,19 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 mt-6 mb-6">
<!-- Image au centre -->
<div class="w-full max-w-lg">
<img src="/images/doctorsdashboard.jpg" alt="Médecin au travail" class="w-full rounded-lg shadow-lg">
<!-- Image -->
<div class="w-full max-w-md mb-6">
<img src="/images/doctorsdashboard.jpg" alt="Tableau de bord médecin" class="w-full rounded-lg shadow-lg">
</div>
<!-- Contenu sous l'image -->
<div class="mt-8 max-w-3xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<h2 class="text-4xl font-bold text-blue-900">👨‍⚕️ Bienvenue sur votre tableau de bord</h2>
<!-- Conteneur du tableau de bord -->
<div class="w-full max-w-4xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-10">
<h2 class="text-3xl font-bold text-blue-900">👨‍⚕️ Bienvenue sur votre tableau de bord</h2>
<p class="mt-4 text-lg text-gray-700">📁 Consultez vos dossiers médicaux et gérez vos patients efficacement.</p>
<!-- Menu des options pour les médecins -->
<div class="mt-8 grid grid-cols-1 md:grid-cols-3 gap-6">
<a href="/doctors/patients" class="p-6 bg-white shadow-md rounded-lg hover:shadow-lg transition border border-blue-300">
<h3 class="text-xl font-semibold text-blue-800">👨‍⚕️ Mes Patients</h3>
......@@ -51,13 +52,12 @@
<h3 class="text-xl font-semibold text-blue-800">💰 Mes Factures</h3>
<p class="mt-2 text-gray-600">Consulter et gérer vos factures de consultations.</p>
</a>
</div>
</div>
</main>
<!-- Footer toujours en bas -->
<!-- Footer -->
<footer class="bg-white shadow-md mt-auto">
<div class="max-w-7xl mx-auto px-6 sm:px-8 lg:px-12 py-4 text-center">
<p class="text-sm text-gray-600">&copy; 2025 Gestion Dossiers Médicaux. Tous droits réservés.</p>
......
src/main/resources/templates/patient-dashboard.html
+ 1
− 1
View file @ 0f78d19b
......@@ -24,7 +24,7 @@
<!-- Image au centre -->
<div class="w-full max-w-lg">
<img src="/images/patientdashboard.png" alt="Tableau de bord patient" class="w-full rounded-lg shadow-lg">
<img src="/images/patient1.png" alt="Tableau de bord patient" class="w-full rounded-lg shadow-lg">
</div>
<!-- Contenu sous l'image -->
......
src/main/resources/templates/view-medical-file-admin.html
+ 2
− 2
View file @ 0f78d19b
......@@ -20,10 +20,10 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-12">
<!-- Contenu -->
<div class="mt-6 w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
<div class="w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300 mb-12">
<div th:if="${medicalFile}">
<h2 class="text-3xl font-bold text-blue-900">📁 Dossier médical</h2>
......
src/main/resources/templates/view-medical-file-doctor.html
+ 1
− 1
View file @ 0f78d19b
......@@ -20,7 +20,7 @@
</header>
<!-- Main Section -->
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12">
<main class="flex-grow flex flex-col justify-center items-center text-center px-6 sm:px-8 lg:px-12 py-12 mb-12">
<!-- Contenu -->
<div class="mt-6 w-full max-w-5xl bg-white bg-opacity-90 backdrop-blur-lg shadow-lg rounded-xl p-8 border border-blue-300">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment