From 8dc72a76ce0fa7a487b48b8ba25c540fd7bc87cd Mon Sep 17 00:00:00 2001
From: Konstantin Protzen <code@kondev.de>
Date: Wed, 22 Nov 2023 21:27:32 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20non-year-specific=20loadin?=
 =?UTF-8?q?g=20of=20subjects?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 homework/add/index.php                            | 4 ++--
 homework/edit/{edit-class.js => edit-homework.js} | 0
 homework/edit/index.php                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename homework/edit/{edit-class.js => edit-homework.js} (100%)

diff --git a/homework/add/index.php b/homework/add/index.php
index 7c7b043..e7aecaa 100644
--- a/homework/add/index.php
+++ b/homework/add/index.php
@@ -20,8 +20,8 @@
 
 // Get all subjects
 $subjectlist = array();
-if ($stmt = $con->prepare("SELECT name, color, id, last_used, average FROM " . $config["db"]["tables"]["subjects"] . " WHERE user_id = ?")) {
-    $stmt->bind_param("s", $_SESSION["user_id"]);
+if ($stmt = $con->prepare("SELECT name, color, id, last_used, average FROM " . $config["db"]["tables"]["subjects"] . " WHERE user_id = ? AND year = ?")) {
+    $stmt->bind_param("ss", $_SESSION["user_id"], $_SESSION["setting_years"]);
     $stmt->execute();
     $stmt->bind_result($subject_name, $subject_color, $subject_id, $subject_last_used, $subject_grade_average);
     while ($stmt->fetch()) {
diff --git a/homework/edit/edit-class.js b/homework/edit/edit-homework.js
similarity index 100%
rename from homework/edit/edit-class.js
rename to homework/edit/edit-homework.js
diff --git a/homework/edit/index.php b/homework/edit/index.php
index 81c8463..c43655d 100644
--- a/homework/edit/index.php
+++ b/homework/edit/index.php
@@ -165,7 +165,7 @@
     <script src="https://assets.noten-app.de/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="https://assets.noten-app.de/js/themes/themes.js"></script>
     <script src="./type-switch.js"></script>
-    <script src="./edit-subject.js"></script>
+    <script src="./edit-homework.js"></script>
     <?php if ($config["tracking"]["matomo"]["on"]) echo ($config["tracking"]["matomo"]["code"]); ?>
 </body>