Skip to content
Snippets Groups Projects
Commit 67002b8a authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

changed ExperimentList to fit with a new interface with Oracle

parent f012fd45
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,7 @@ class ExperimentList extends JFrame ...@@ -152,7 +152,7 @@ class ExperimentList extends JFrame
// parse experiment data // parse experiment data
String[] experiment = new String[getColumnCount()+1]; String[] experiment = new String[getColumnCount()+1];
experiment[Column.NAME.ordinal()] = cells[0].substring(j); experiment[Column.NAME.ordinal()] = cells[0].substring(j);
experiment[Column.DESCRIPTION.ordinal()] = cells[1]; experiment[Column.DESCRIPTION.ordinal()] = cells[1].replace("$",",");
experiment[Column.START_DATE.ordinal()] = cells[3]; experiment[Column.START_DATE.ordinal()] = cells[3];
experiment[Column.END_DATE.ordinal()] = cells[4]; experiment[Column.END_DATE.ordinal()] = cells[4];
experiment[Column.MANAGER.ordinal()] = parseUsers(cells[5]); experiment[Column.MANAGER.ordinal()] = parseUsers(cells[5]);
...@@ -245,36 +245,45 @@ class ExperimentList extends JFrame ...@@ -245,36 +245,45 @@ class ExperimentList extends JFrame
submitDatesBtn.addActionListener(new ActionListener() { submitDatesBtn.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) public void actionPerformed(ActionEvent e)
{ {
entryLabel.setVisible(true);
submitDatesBtn.setVisible(true);
importExperimentBtn.setVisible(true);
importAndStartExperimentBtn.setVisible(true);
stopExperimentBtn.setVisible(true);
startExperimentBtn.setVisible(true);
DateLabelFormatter df = new DateLabelFormatter();
final Date startSelectedDate = (Date) startDatePicker.getModel().getValue();
String start;
String end;
try { try {
entryLabel.setVisible(true); start = df.valueToString(startSelectedDate);
submitDatesBtn.setVisible(true);
importExperimentBtn.setVisible(true);
importAndStartExperimentBtn.setVisible(true);
stopExperimentBtn.setVisible(true);
startExperimentBtn.setVisible(true);
DateLabelFormatter df = new DateLabelFormatter();
final Date startSelectedDate = (Date) startDatePicker.getModel().getValue();
String start = df.valueToString(startSelectedDate);
Date endSelectedDate = (Date) endDatePicker.getModel().getValue(); Date endSelectedDate = (Date) endDatePicker.getModel().getValue();
String end = df.valueToString(endSelectedDate); end = df.valueToString(endSelectedDate);
String list = oconnection.getExperiments(sector, start, end); } catch (ParseException e1) {
if (table == null) {
tableModel = new ExperimentTableModel();
tableModel.setTable(list);
table = new JTable(tableModel);
scrollPane = new JScrollPane( table );
topPanel.add( scrollPane, BorderLayout.CENTER );
table.setRowSelectionAllowed( true );
pack();
setVisible(true);
table.setVisible(true);
} else {
tableModel.setTable(list);
tableModel.fireTableStructureChanged();
}
} catch (SQLException | ParseException e1) {
JOptionPane.showMessageDialog(null, e1.getMessage()); JOptionPane.showMessageDialog(null, e1.getMessage());
return;
}
String list;
try {
list = oconnection.getExperiments(sector, start, end);
}catch (Exception e1) {
JOptionPane.showMessageDialog(null, e1.getMessage());
return;
}
if (table == null) {
tableModel = new ExperimentTableModel();
tableModel.setTable(list);
table = new JTable(tableModel);
scrollPane = new JScrollPane( table );
topPanel.add( scrollPane, BorderLayout.CENTER );
table.setRowSelectionAllowed( true );
pack();
setVisible(true);
table.setVisible(true);
} else {
tableModel.setTable(list);
tableModel.fireTableStructureChanged();
} }
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment