Merge pull request #3335 from wschaeferB/3340-RemoveLastAccessedCol

3340 last accessed column removed, filter changed to created date
This commit is contained in:
Richard Cordovano 2017-12-18 14:37:37 -05:00 committed by GitHub
commit e9f08af317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 15 deletions

View File

@ -230,7 +230,7 @@ MultiUserCasesPanel.bnShowLog.text=&Show Auto Ingest Case Log
MultiUserCasesPanel.rbAllCases.text=Everything MultiUserCasesPanel.rbAllCases.text=Everything
MultiUserCasesPanel.bnRefresh.text=&Refresh MultiUserCasesPanel.bnRefresh.text=&Refresh
MultiUserCasesPanel.bnOpen.text=&Open MultiUserCasesPanel.bnOpen.text=&Open
MultiUserCasesPanel.rbGroupLabel.text=Show cases accessed in the last 10: MultiUserCasesPanel.rbGroupLabel.text=Show cases created in the last 10:
MultiUserCasesPanel.rbMonths.text=Months MultiUserCasesPanel.rbMonths.text=Months
CueBannerPanel.newCaseLabel.text=New Case CueBannerPanel.newCaseLabel.text=New Case
CueBannerPanel.openCaseButton.text= CueBannerPanel.openCaseButton.text=

View File

@ -75,7 +75,6 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
*/ */
private static final String CASE_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.CaseHeaderText"); private static final String CASE_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.CaseHeaderText");
private static final String CREATEDTIME_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.CreatedTimeHeaderText"); private static final String CREATEDTIME_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.CreatedTimeHeaderText");
private static final String COMPLETEDTIME_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.LastAccessedTimeHeaderText");
private static final String STATUS_ICON_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.StatusIconHeaderText"); private static final String STATUS_ICON_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.StatusIconHeaderText");
private static final String OUTPUT_FOLDER_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.OutputFolderHeaderText"); private static final String OUTPUT_FOLDER_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.OutputFolderHeaderText");
private static final String METADATA_FILE_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.MetadataFileHeaderText"); private static final String METADATA_FILE_HEADER = NbBundle.getMessage(MultiUserCasesPanel.class, "ReviewModeCasePanel.MetadataFileHeaderText");
@ -89,7 +88,7 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
OUTPUTFOLDER, OUTPUTFOLDER,
METADATA_FILE METADATA_FILE
} }
private final String[] columnNames = {CASE_HEADER, CREATEDTIME_HEADER, COMPLETEDTIME_HEADER, STATUS_ICON_HEADER, OUTPUT_FOLDER_HEADER, METADATA_FILE_HEADER}; private final String[] columnNames = {CASE_HEADER, CREATEDTIME_HEADER, STATUS_ICON_HEADER, OUTPUT_FOLDER_HEADER, METADATA_FILE_HEADER};
private DefaultTableModel caseTableModel; private DefaultTableModel caseTableModel;
private JDialog parentDialog; private JDialog parentDialog;
private LoadTableWorker tableWorker; private LoadTableWorker tableWorker;
@ -111,7 +110,7 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
@Override @Override
public Class<?> getColumnClass(int col) { public Class<?> getColumnClass(int col) {
if (this.getColumnName(col).equals(CREATEDTIME_HEADER) || this.getColumnName(col).equals(COMPLETEDTIME_HEADER)) { if (this.getColumnName(col).equals(CREATEDTIME_HEADER)) {
return Date.class; return Date.class;
} else { } else {
return super.getColumnClass(col); return super.getColumnClass(col);
@ -139,13 +138,6 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
theColumn.setPreferredWidth(TIME_COL_PREFERRED_WIDTH); theColumn.setPreferredWidth(TIME_COL_PREFERRED_WIDTH);
theColumn.setWidth(TIME_COL_PREFERRED_WIDTH); theColumn.setWidth(TIME_COL_PREFERRED_WIDTH);
theColumn = casesTable.getColumn(COMPLETEDTIME_HEADER);
theColumn.setCellRenderer(new LongDateCellRenderer());
theColumn.setMinWidth(TIME_COL_MIN_WIDTH);
theColumn.setMaxWidth(TIME_COL_MAX_WIDTH);
theColumn.setPreferredWidth(TIME_COL_PREFERRED_WIDTH);
theColumn.setWidth(TIME_COL_PREFERRED_WIDTH);
theColumn = casesTable.getColumn(STATUS_ICON_HEADER); theColumn = casesTable.getColumn(STATUS_ICON_HEADER);
theColumn.setCellRenderer(new StatusIconCellRenderer()); theColumn.setCellRenderer(new StatusIconCellRenderer());
theColumn.setMinWidth(STATUS_COL_MIN_WIDTH); theColumn.setMinWidth(STATUS_COL_MIN_WIDTH);
@ -156,7 +148,7 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
casesTable.removeColumn(casesTable.getColumn(OUTPUT_FOLDER_HEADER)); casesTable.removeColumn(casesTable.getColumn(OUTPUT_FOLDER_HEADER));
casesTable.removeColumn(casesTable.getColumn(METADATA_FILE_HEADER)); casesTable.removeColumn(casesTable.getColumn(METADATA_FILE_HEADER));
casesTable.setRowSorter(new RowSorter<>(caseTableModel)); casesTable.setRowSorter(new RowSorter<>(caseTableModel));
casesTable.getRowSorter().toggleSortOrder(casesTable.getColumn(COMPLETEDTIME_HEADER).getModelIndex()); casesTable.getRowSorter().toggleSortOrder(casesTable.getColumn(CREATEDTIME_HEADER).getModelIndex());
/* /*
* Listen for row selection changes and set button state for the current * Listen for row selection changes and set button state for the current
* selection. * selection.
@ -181,7 +173,7 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
//set the table to display text informing the user that the list is being retreived and disable case selection //set the table to display text informing the user that the list is being retreived and disable case selection
caseTableModel.setRowCount(0); caseTableModel.setRowCount(0);
casesTable.setRowSelectionAllowed(false); casesTable.setRowSelectionAllowed(false);
caseTableModel.addRow(new Object[]{CASES_POPULATING_MESSAGE, null, null, null, "", ""}); caseTableModel.addRow(new Object[]{CASES_POPULATING_MESSAGE, null, null, "", ""});
tableWorker = new LoadTableWorker(); tableWorker = new LoadTableWorker();
tableWorker.execute(); tableWorker.execute();
} }
@ -632,11 +624,10 @@ final class MultiUserCasesPanel extends javax.swing.JPanel {
caseTableModel.setRowCount(0); caseTableModel.setRowCount(0);
long now = new Date().getTime(); long now = new Date().getTime();
for (MultiUserCase autoIngestCase : cases) { for (MultiUserCase autoIngestCase : cases) {
if (autoIngestCase.getLastAccessedDate() != null && passesTimeFilter(now, autoIngestCase.getLastAccessedDate().getTime())) { if (autoIngestCase.getCreationDate() != null && passesTimeFilter(now, autoIngestCase.getCreationDate().getTime())) {
caseTableModel.addRow(new Object[]{ caseTableModel.addRow(new Object[]{
autoIngestCase.getCaseDisplayName(), autoIngestCase.getCaseDisplayName(),
autoIngestCase.getCreationDate(), autoIngestCase.getCreationDate(),
autoIngestCase.getLastAccessedDate(),
(MultiUserCaseManager.CaseStatus.OK != autoIngestCase.getStatus()) ? StatusIconCellRenderer.Status.WARNING : StatusIconCellRenderer.Status.OK, (MultiUserCaseManager.CaseStatus.OK != autoIngestCase.getStatus()) ? StatusIconCellRenderer.Status.WARNING : StatusIconCellRenderer.Status.OK,
autoIngestCase.getCaseDirectoryPath().toString(), autoIngestCase.getCaseDirectoryPath().toString(),
autoIngestCase.getMetadataFileName()}); autoIngestCase.getMetadataFileName()});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 43 KiB