From 22eaf711f29b39bc23677faa35f4dfe86fd2681f Mon Sep 17 00:00:00 2001
From: "bojana.marojevikj" <bojana.marojevikj@finki.ukim.mk>
Date: Thu, 27 Feb 2025 14:53:52 +0100
Subject: [PATCH 1/3] ui improvements
---
.../adminBookedConsultations.html | 2 +-
.../professorBookedConsultations.html | 2 +-
.../studentBookedConsultations.html | 2 +-
src/main/resources/templates/index.html | 36 +++++++++++++++++--
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html b/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
index c6b123f..d9efbbd 100644
--- a/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
@@ -3,7 +3,7 @@
xmlns:sec="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8">
- <title>Booked Consultations</title>
+ <title>FINKI Consultations</title>
</head>
<body>
<div layout:fragment="content">
diff --git a/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html b/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
index 75f9b7d..84b8f7e 100644
--- a/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
@@ -3,7 +3,7 @@
xmlns:sec="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8">
- <title>Booked Consultations</title>
+ <title>FINKI Consultations</title>
</head>
<body>
<div layout:fragment="content">
diff --git a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
index 2119c7e..ff2eff4 100644
--- a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
@@ -3,7 +3,7 @@
xmlns:sec="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8">
- <title>Booked Consultations</title>
+ <title>FINKI Consultations</title>
</head>
<body>
<div layout:fragment="content">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 3e1d415..5424e2f 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -5,6 +5,36 @@
<head>
<meta charset="UTF-8" content="no-cache">
<title>FINKI - Consultations</title>
+ <style>
+ .card-style {
+ transition: transform 0.3s ease, box-shadow 0.3s ease;
+ border-radius: 10px;
+ background: rgba(231, 231, 231, 0.53);
+ }
+
+ .card-style:hover {
+ transform: translateY(-10px) scale(1.05);
+ box-shadow: 0 10px 20px rgba(0, 0, 0, 0.15),
+ 0 6px 6px rgba(0, 0, 0, 0.10);
+ }
+
+ .edit-link {
+ transition: text-shadow 0.3s ease;
+ }
+
+ .edit-link:hover {
+ text-shadow: 1px 1px 1px #E68A00;
+ }
+
+ .consultation-link {
+ transition: text-shadow 0.3s ease;
+ }
+
+ .consultation-link:hover {
+ text-shadow: 1px 1px 1px #0056b3;
+ }
+
+ </style>
</head>
<body>
<div class="mt-4" layout:fragment="content">
@@ -39,20 +69,20 @@
<a th:id="${professor.getId()}"
th:href="${isAuthenticated ? '/consultations/professor/' + professor.getId() :
'/display/' + professor.getId()}"
- class="text-decoration-none mt-4">
+ class="text-decoration-none mt-4 consultation-link">
Консултации
</a>
<div sec:authorize="hasRole('ROLE_ADMIN')">
<a th:id="'edit-' + ${professor.getId()}"
th:href="@{/manage-consultations/{id}(id=${professor.getId()})}"
- class="text-decoration-none" style="color: #FFB300;">Промени</a>
+ class="text-decoration-none edit-link" style="color: #FFB300;">Промени</a>
</div>
<div sec:authorize="hasRole('ROLE_PROFESSOR')">
<th:block th:if="${professor.getId()} == ${username}">
<a th:id="'edit-' + ${professor.getId()}"
th:href="@{/manage-consultations/{id}(id=${professor.getId()})}"
- class="text-decoration-none" style="color: #FFB300;">Промени</a>
+ class="text-decoration-none edit-link" style="color: #FFB300;">Промени</a>
</th:block>
</div>
</div>
--
GitLab
From c3903abd02d09fc78bbb3f4e90d952663678592f Mon Sep 17 00:00:00 2001
From: "bojana.marojevikj" <bojana.marojevikj@finki.ukim.mk>
Date: Thu, 27 Feb 2025 15:16:06 +0100
Subject: [PATCH 2/3] display cancelled consultations info
---
src/main/resources/templates/bookedConsultations.html | 5 ++++-
.../studentBookedConsultations.html | 10 +++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/bookedConsultations.html b/src/main/resources/templates/bookedConsultations.html
index 660e425..3ad5427 100644
--- a/src/main/resources/templates/bookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations.html
@@ -62,7 +62,10 @@
</th:block>
<td class="col-1" th:text="${attendance.consultation.type}"></td>
<td class="col-1" th:text="${attendance.consultation.professor.name}"></td>
- <td class="col-2" th:utext="${attendance.consultation.studentInstructions}"></td>
+ <td class="col-2">
+ <span th:if="${attendance.consultation.isActive() == false}">Консултациите се <strong>откажани</strong>.</span>
+ <span th:unless="${attendance.consultation.isActive() == false}" th:utext="${attendance.consultation.studentInstructions}"></span>
+ </td>
<td class="col-3" th:utext="${attendance.comment}"></td>
</tr>
</tbody>
diff --git a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
index ff2eff4..eff4a59 100644
--- a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
@@ -72,25 +72,29 @@
<td class="col-2" th:text="${attendance.consultation.professor.name}"></td>
<td class="col-2" th:utext="${attendance.comment}"></td>
<td class="col-3" >
- <div th:unless="${attendance.consultation.isEnded()}">
+ <span th:if="${attendance.consultation.isActive() == false}">Консултациите се <strong>откажани</strong>.</span>
+ <div th:unless="${attendance.consultation.isEnded() || attendance.consultation.isActive() == false}">
<form action="/consultations/addComment" method="post" class="align-items-center">
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<input type="hidden" name="attendanceId" th:value="${attendance.id}"/>
<input type="hidden" name="professorId" value=""/>
<input type="hidden" name="consultationId" value=""/>
- <textarea name="newComment" class="form-control mt-2 me-2" placeholder="Р”РѕРґР°С РєРѕРјРµРЅС‚Р°СЂ..."
+ <textarea name="newComment" class="form-control mt-2 me-2"
+ placeholder="Р”РѕРґР°С РєРѕРјРµРЅС‚Р°СЂ..."
maxlength="1000" rows="2"></textarea>
<button type="submit" class="btn btn-primary mt-2 btn-sm">Р”РѕРґР°С РєРѕРјРµРЅС‚Р°СЂ</button>
</form>
+ </div>
+ <div th:unless="${attendance.consultation.isEnded()}">
<form action="/studentAttendances/cancel" method="post" class="mt-1">
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<input type="hidden" name="attendanceId" th:value="${attendance.id}"/>
<button type="submit" class="btn btn-danger btn-sm">Откажи присуство</button>
</form>
</div>
- <div th:if="${attendance.consultation.isEnded()}">
+ <div th:if="${attendance.consultation.isEnded() and attendance.consultation.isActive()}">
<div th:if="${attendance.reportAbsentProfessor}">
<p>Професорот беше отсутен: <span th:text="${attendance.absentProfessorComment}"></span></p>
</div>
--
GitLab
From 08a731b03d3233c956c4aca2ba53794c8b82d8c9 Mon Sep 17 00:00:00 2001
From: "bojana.marojevikj" <bojana.marojevikj@finki.ukim.mk>
Date: Thu, 27 Feb 2025 15:30:47 +0100
Subject: [PATCH 3/3] ui improvements
---
.../adminBookedConsultations.html | 12 +++++++++++-
.../professorBookedConsultations.html | 12 +++++++++++-
.../studentBookedConsultations.html | 12 +++++++++++-
.../manageConsultations/consultationDetails.html | 10 ++++++++++
.../manageConsultations/manageConsultations.html | 9 +++++++++
5 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html b/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
index d9efbbd..84331dd 100644
--- a/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/adminBookedConsultations.html
@@ -4,6 +4,16 @@
<head>
<meta charset="UTF-8">
<title>FINKI Consultations</title>
+ <style>
+ .table tr {
+ transition: transform 0.3s, box-shadow 0.3s;
+ }
+
+ .table tr:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ }
+ </style>
</head>
<body>
<div layout:fragment="content">
@@ -56,7 +66,7 @@
</div>
</form>
- <div class="mt-4">
+ <div class="mt-4 table-responsive">
<table class="table table-striped">
<thead>
<tr>
diff --git a/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html b/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
index 84b8f7e..57dd053 100644
--- a/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/professorBookedConsultations.html
@@ -4,6 +4,16 @@
<head>
<meta charset="UTF-8">
<title>FINKI Consultations</title>
+ <style>
+ .table tr {
+ transition: transform 0.3s, box-shadow 0.3s;
+ }
+
+ .table tr:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ }
+ </style>
</head>
<body>
<div layout:fragment="content">
@@ -49,7 +59,7 @@
<h6><i class="fas fa-info-circle text-info ms-2" title="Info"></i> Moжете РґР° РїСЂРёСавите отсуство РЅР° студент откако терминот Р·Р° консултации СњРµ РїРѕРјРёРЅРµ.</h6>
- <div class="mt-4">
+ <div class="mt-4 table-responsive">
<table class="table table-striped">
<thead>
<tr>
diff --git a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
index eff4a59..377a1fa 100644
--- a/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
+++ b/src/main/resources/templates/bookedConsultations/studentBookedConsultations.html
@@ -4,6 +4,16 @@
<head>
<meta charset="UTF-8">
<title>FINKI Consultations</title>
+ <style>
+ .table tr {
+ transition: transform 0.3s, box-shadow 0.3s;
+ }
+
+ .table tr:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ }
+ </style>
</head>
<body>
<div layout:fragment="content">
@@ -44,7 +54,7 @@
<h6><i class="fas fa-info-circle text-info ms-2" title="Info"></i> Moжете РґР° РїСЂРёСавите отсуство РЅР° професор откако терминот Р·Р° консултации СњРµ РїРѕРјРёРЅРµ.</h6>
- <div class="mt-4">
+ <div class="mt-4 table-responsive">
<table class="table table-striped">
<thead>
<tr>
diff --git a/src/main/resources/templates/manageConsultations/consultationDetails.html b/src/main/resources/templates/manageConsultations/consultationDetails.html
index 1b12589..6c8d3d1 100644
--- a/src/main/resources/templates/manageConsultations/consultationDetails.html
+++ b/src/main/resources/templates/manageConsultations/consultationDetails.html
@@ -9,6 +9,16 @@
window.history.back();
}
</script>
+ <style>
+ .table tr {
+ transition: transform 0.3s, box-shadow 0.3s;
+ }
+
+ .table tr:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ }
+ </style>
</head>
<body>
<div layout:fragment="content">
diff --git a/src/main/resources/templates/manageConsultations/manageConsultations.html b/src/main/resources/templates/manageConsultations/manageConsultations.html
index 883326c..3484509 100644
--- a/src/main/resources/templates/manageConsultations/manageConsultations.html
+++ b/src/main/resources/templates/manageConsultations/manageConsultations.html
@@ -82,6 +82,15 @@
.fas:hover {
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
}
+
+ .table tr {
+ transition: transform 0.3s, box-shadow 0.3s;
+ }
+
+ .table tr:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ }
</style>
--
GitLab