pridani sloupce trvaní udalosti
parent
4ddacd74fe
commit
5196c432db
|
|
@ -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
|
||||
|
|
@ -33,7 +33,7 @@ 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,19 +65,32 @@ 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<Map> iteratorMap = Client.maps.listIterator();
|
||||
ListIterator<MapObject> 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()};
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue