Skip to content

Commit 03cef91

Browse files
committed
saving and displaying work - piority handler does not, gitignore update
1 parent b205e2a commit 03cef91

File tree

3 files changed

+38
-21
lines changed

3 files changed

+38
-21
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ build/
3535
.vscode/
3636

3737
### Mac OS ###
38-
.DS_Store
38+
.DS_Store
39+
/SAVE_DATA/events.csv

src/main/java/com/example/localcalendarjavafx/Event.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public class Event {
77
private int endTime; // End time in minutes
88
private int priority;
99

10-
// Updated constructor to match the parameters
1110
public Event(String title, String date, int startTime, int endTime, int priority) {
1211
this.title = title;
1312
this.date = date;
@@ -36,8 +35,22 @@ public int getPriority() {
3635
return priority;
3736
}
3837

38+
// Method to get start time in HHMM format
39+
public String getStartHHMM() {
40+
int hours = startTime / 60;
41+
int minutes = startTime % 60;
42+
return String.format("%02d%02d", hours, minutes);
43+
}
44+
45+
// Method to get end time in HHMM format
46+
public String getEndHHMM() {
47+
int hours = endTime / 60;
48+
int minutes = endTime % 60;
49+
return String.format("%02d%02d", hours, minutes);
50+
}
51+
3952
@Override
4053
public String toString() {
41-
return String.format("%s on %s from %d to %d (Priority: %d)", title, date, startTime, endTime, priority);
54+
return String.format("%s on %s from %s to %s (Priority: %d)", title, date, getStartHHMM(), getEndHHMM(), priority);
4255
}
4356
}
Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
package com.example.localcalendarjavafx;
22

3-
import java.util.List;
4-
53
public class PriorityCollisionHandler {
64

7-
public static void checkForCollisions(List<Event> events) {
8-
for (int i = 0; i < events.size(); i++) {
9-
Event event1 = events.get(i);
10-
for (int j = i + 1; j < events.size(); j++) {
11-
Event event2 = events.get(j);
12-
// Check for time collisions
13-
if (event1.getDate().equals(event2.getDate())) {
14-
if (isOverlapping(event1, event2)) {
15-
System.out.println("Collision detected between: " + event1.getTitle() + " and " + event2.getTitle());
16-
}
17-
}
18-
}
19-
}
5+
/**
6+
* Checks if two events collide based on their start and end times.
7+
*
8+
* @param event1 The first event to check.
9+
* @param event2 The second event to check.
10+
* @return true if the events collide, false otherwise.
11+
*/
12+
public static boolean checkCollision(Event event1, Event event2) {
13+
// Check if the events collide based on their start and end times
14+
return (event1.getStartTime() < event2.getEndTime() && event1.getEndTime() > event2.getStartTime());
2015
}
2116

22-
private static boolean isOverlapping(Event event1, Event event2) {
23-
// Check if event1 overlaps with event2
24-
return (event1.getStartHHMM() < event2.getEndHHMM() && event1.getEndHHMM() > event2.getStartHHMM());
17+
/**
18+
* Prints the details of an event.
19+
*
20+
* @param event The event whose details are to be printed.
21+
*/
22+
public static void printEventDetails(Event event) {
23+
System.out.println("Event: " + event.getTitle());
24+
System.out.println("Date: " + event.getDate());
25+
System.out.println("Start Time: " + event.getStartHHMM());
26+
System.out.println("End Time: " + event.getEndHHMM());
27+
System.out.println("Priority: " + event.getPriority());
2528
}
2629
}

0 commit comments

Comments
 (0)