From 5196c432db7058ff644349fc8956bb1149165359 Mon Sep 17 00:00:00 2001 From: Michal Date: Thu, 13 Feb 2025 18:23:01 +0100 Subject: [PATCH] =?UTF-8?q?pridani=20sloupce=20trvan=C3=AD=20udalosti?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jnet/client/gui/EventsPanel.java | 38 +++++++++++++++++++--------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/jnet/client/gui/EventsPanel.java b/src/jnet/client/gui/EventsPanel.java index 48b71e0..327d96e 100644 --- a/src/jnet/client/gui/EventsPanel.java +++ b/src/jnet/client/gui/EventsPanel.java @@ -20,7 +20,7 @@ public class EventsPanel extends JPanel { int limit = 50; - String column[] = {"Začátek", "Konec", "Stav", "Mapa", "Zařízení"}; + String column[] = {"Začátek", "Konec", "Délka", "Stav", "Mapa", "Zařízení"}; DefaultTableModel tableModel = new DefaultTableModel(column, 0) { @Override @@ -32,8 +32,8 @@ public class EventsPanel extends JPanel { Collections.sort(Client.events, new EventComparator()); Collections.reverse(Client.events); - - if (limit > Client.events.size()){ + + if (limit > Client.events.size()) { limit = Client.events.size(); } @@ -42,6 +42,7 @@ public class EventsPanel extends JPanel { Object[] d = { getDate(Client.events.get(i).getStart()), getDate(Client.events.get(i).getEnd()), + getDuration(Client.events.get(i).getStart(), Client.events.get(i).getEnd()), Client.events.get(i).getDescription(), info[0], info[1]}; @@ -64,16 +65,29 @@ public class EventsPanel extends JPanel { return ""; } + private String getDuration(long startTime, long endTime) { + if (endTime != 0) { + long difference = endTime - startTime; + + // převod na sekundy, minuty, hodiny + long seconds = difference / 1000; + long minutes = difference / (1000 * 60); + long hours = difference / (1000 * 60 * 60); + + SimpleDateFormat ft = new SimpleDateFormat("HH:mm:ss"); + return hours + "h " + minutes + "m " + seconds + "s"; + } + return ""; + } + private String[] getObjetInfo(int id) { - ListIterator iteratorMap = Client.maps.listIterator(); - ListIterator iteratorMapObject = Client.mapObject.listIterator(); - while (iteratorMap.hasNext()) { - Map map = iteratorMap.next(); - while (iteratorMapObject.hasNext()) { - MapObject obj = iteratorMapObject.next(); - if (obj.getId() == id) { - String[] data = {map.getName(), obj.getName()}; - return data; + for (MapObject mapObject : Client.mapObject) { + if (mapObject.getId() == id) { + for (Map map : Client.maps) { + if (map.getId() == mapObject.getMap()) { + String[] data = {map.getName(), mapObject.getName()}; + return data; + } } } }