Avans/AgendaModule
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completed filter

Browse Source 
Fixed filter bugs and added filtering on time
This commit is contained in:
xrgman
2015-03-02 12:17:36 +01:00
parent 58dd8b21be
commit 4a9a1c869f
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PanelTable.java
+29 -3
View File
@@ -24,7 +24,7 @@ import javax.swing.table.AbstractTableModel;
/** /**
* Constructs a JTable in a ScrolPane. * Constructs a JTable in a ScrolPane.
* @author Wesley * @author Wesley
* @version 1.2 * @version 1.3
*/ */
public class PanelTable extends JPanel implements Panel{ public class PanelTable extends JPanel implements Panel{
@@ -52,6 +52,7 @@ public class PanelTable extends JPanel implements Panel{
table= new JTable(); table= new JTable();
table.setAutoCreateRowSorter(true); table.setAutoCreateRowSorter(true);
table.setAutoResizeMode(table.AUTO_RESIZE_ALL_COLUMNS); table.setAutoResizeMode(table.AUTO_RESIZE_ALL_COLUMNS);
table.getTableHeader().setReorderingAllowed(false);
table.addMouseListener(new MouseAdapter() { table.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) { if(e.getClickCount() > 1 ) cellClicked(e); else selectedCell = (JTable) e.getSource(); } public void mouseClicked(MouseEvent e) { if(e.getClickCount() > 1 ) cellClicked(e); else selectedCell = (JTable) e.getSource(); }
}); });
@@ -173,7 +174,7 @@ public class PanelTable extends JPanel implements Panel{
break; break;
case 1: case 1:
for(Event event : fullEvents) { for(Event event : fullEvents) {
if(event.equals(events.get(selectedCell.getSelectedRow()))) { if(event.getEventName().equals(events.get(selectedCell.getSelectedRow()).getEventName())) {
filteredList.add(event); filteredList.add(event);
} }
} }
@@ -185,7 +186,32 @@ public class PanelTable extends JPanel implements Panel{
} }
} }
break; break;
case 3:
int selectedCellStartTime = events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getHours()*100;
selectedCellStartTime += events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getMinutes();
int selectedCellEndTime = events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getHours()*100;
selectedCellEndTime += events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getMinutes();
for(Event event : fullEvents) {
int time = event.getStartDate().getTime().getHours()*100;
time += event.getStartDate().getTime().getMinutes();
if(time >= selectedCellStartTime && time <= selectedCellEndTime) {
filteredList.add(event);
}
}
break;
case 4:
selectedCellStartTime = events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getHours()*100;
selectedCellStartTime += events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getMinutes();
selectedCellEndTime = events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getHours()*100;
selectedCellEndTime += events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getMinutes();
for(Event event : fullEvents) {
int time = event.getEndDate().getTime().getHours()*100;
time += event.getEndDate().getTime().getMinutes();
if(time >= selectedCellStartTime && time <= selectedCellEndTime) {
filteredList.add(event);
}
}
break;
} }
update(filteredList,false); update(filteredList,false);
selectedCell = null; selectedCell = null;