From 29a36e8a618d68d38466584af74428b0333b592d Mon Sep 17 00:00:00 2001 From: ErolHaagenrud Date: Mon, 15 Dec 2025 15:48:46 +0100 Subject: [PATCH] =?UTF-8?q?F=C3=B8r=20direktekobling=20til=20Google=20Kale?= =?UTF-8?q?nder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kbs/kbsintranett/CalendarEvent.java | 16 +++++++++++----- hele_prosjektet.txt | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/kbs/kbsintranett/CalendarEvent.java b/app/src/main/java/com/kbs/kbsintranett/CalendarEvent.java index bb331ea..4638d60 100644 --- a/app/src/main/java/com/kbs/kbsintranett/CalendarEvent.java +++ b/app/src/main/java/com/kbs/kbsintranett/CalendarEvent.java @@ -5,23 +5,25 @@ import com.google.gson.annotations.SerializedName; public class CalendarEvent { @SerializedName("title") private String title; - @SerializedName("start_date") // Juster denne nøkkelen til hva APIet faktisk returnerer (f.eks "start") private String rawDate; - @SerializedName("end_date") // Juster nøkkel (f.eks "end") private String rawEndDate; @SerializedName("description") private String description; - @SerializedName("location") private String location; + // --- NYTT FELT: Varsling (minutter før start) --- + // Nå henter denne verdien direkte fra "reminder_minutes" i JSON-responsen fra PHP + @SerializedName("reminder_minutes") + private int reminderMinutes = 15; // Default 15 min + // --- UI-hjelpefelter (settes manuelt i appen etter parsing) --- - private String day; // F.eks "12" + private String day; // F.eks "12" private String month; // F.eks "DES" - private String time; // F.eks "10:00 - 11:30" + private String time; // F.eks "10:00 - 11:30" // Konstruktør for Retrofit (Gson) public CalendarEvent(String title, String rawDate, String rawEndDate, String description, String location) { @@ -55,4 +57,8 @@ public class CalendarEvent { public String getTime() { return time; } public void setTime(String time) { this.time = time; } + + // --- NYE METODER FOR VARSLING --- + public int getReminderMinutes() { return reminderMinutes; } + public void setReminderMinutes(int minutes) { this.reminderMinutes = minutes; } } \ No newline at end of file diff --git a/hele_prosjektet.txt b/hele_prosjektet.txt index 9018bbd..7c5359e 100644 --- a/hele_prosjektet.txt +++ b/hele_prosjektet.txt @@ -467,23 +467,25 @@ import com.google.gson.annotations.SerializedName; public class CalendarEvent { @SerializedName("title") private String title; - @SerializedName("start_date") // Juster denne nøkkelen til hva APIet faktisk returnerer (f.eks "start") private String rawDate; - @SerializedName("end_date") // Juster nøkkel (f.eks "end") private String rawEndDate; @SerializedName("description") private String description; - @SerializedName("location") private String location; + // --- NYTT FELT: Varsling (minutter før start) --- + // Nå henter denne verdien direkte fra "reminder_minutes" i JSON-responsen fra PHP + @SerializedName("reminder_minutes") + private int reminderMinutes = 15; // Default 15 min + // --- UI-hjelpefelter (settes manuelt i appen etter parsing) --- - private String day; // F.eks "12" + private String day; // F.eks "12" private String month; // F.eks "DES" - private String time; // F.eks "10:00 - 11:30" + private String time; // F.eks "10:00 - 11:30" // Konstruktør for Retrofit (Gson) public CalendarEvent(String title, String rawDate, String rawEndDate, String description, String location) { @@ -517,6 +519,10 @@ public class CalendarEvent { public String getTime() { return time; } public void setTime(String time) { this.time = time; } + + // --- NYE METODER FOR VARSLING --- + public int getReminderMinutes() { return reminderMinutes; } + public void setReminderMinutes(int minutes) { this.reminderMinutes = minutes; } } ============================================================