Reporting Functionality - fixed generic reports

[habeas.git] / src / habeas / MainFrame.java

diff --git a/src/habeas/MainFrame.java b/src/habeas/MainFrame.java
index ec3ce33..3ff0418 100644 (file)
--- a/src/habeas/MainFrame.java
+++ b/src/habeas/MainFrame.java
@@ -6,10 +6,7 @@
 package habeas;
 
 import java.util.ArrayList;
-import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.filechooser.FileNameExtensionFilter;
 
 /**
  *
@@ -43,6 +40,7 @@ public class MainFrame extends javax.swing.JFrame {
         menuGenerateRaisedBills = new javax.swing.JMenuItem();
         menuNoticesReports = new javax.swing.JMenu();
         menuAwaitingPayment = new javax.swing.JMenuItem();
+        menuNoticesSentNotYetDelivered = new javax.swing.JMenuItem();
         menuSettings = new javax.swing.JMenu();
         menuDatabaseSettings = new javax.swing.JMenuItem();
         menuStationery = new javax.swing.JMenuItem();
@@ -108,6 +106,15 @@ public class MainFrame extends javax.swing.JFrame {
         });
         menuNoticesReports.add(menuAwaitingPayment);
 
+        menuNoticesSentNotYetDelivered.setMnemonic('s');
+        menuNoticesSentNotYetDelivered.setText("Notices sent not yet delivered...");
+        menuNoticesSentNotYetDelivered.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                menuNoticesSentNotYetDeliveredActionPerformed(evt);
+            }
+        });
+        menuNoticesReports.add(menuNoticesSentNotYetDelivered);
+
         menuLawyerNotices.add(menuNoticesReports);
 
         jMenuBar1.add(menuLawyerNotices);
@@ -192,16 +199,32 @@ public class MainFrame extends javax.swing.JFrame {
         // TODO add your handling code here:
         NoticesReportViewDialog frm = new NoticesReportViewDialog(this, false);
         String [] cols = {"Reference Number", "Description", "Bill Date", "Bill Amount", "Client"};
-        ArrayList<Object> data = Utility.getPendingPaymentBills (-1);
+        int rep = 0;
+        ArrayList<Object> data = Utility.getReportData(rep, -1);
         if (data == null) {
             JOptionPane.showMessageDialog(this, ERROR_DISPLAYING_REPORT);
             return;
         }
-        frm.setupReportTable(REPORT_TITLE_BILLS_AWAITING_PAYMENT, cols, data);
+        frm.setupReportTable(rep, REPORT_TITLE_BILLS_AWAITING_PAYMENT, cols, data);
         frm.setVisible(true);
     }//GEN-LAST:event_menuAwaitingPaymentActionPerformed
-    private static final String ERROR_DISPLAYING_REPORT = "Error displaying report";
-    private static final String REPORT_TITLE_BILLS_AWAITING_PAYMENT = "Bills Awaiting Payment";
+
+    private void menuNoticesSentNotYetDeliveredActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_menuNoticesSentNotYetDeliveredActionPerformed
+        // TODO add your handling code here:
+        NoticesReportViewDialog frm = new NoticesReportViewDialog(this, false);
+        String[] cols = {"Reference Number", "Description", "Sent Date", "RPAD Reference", "Client"};
+        int rep = 1;
+        ArrayList<Object> data = Utility.getReportData (rep, -1);
+        if (data == null) {
+            JOptionPane.showMessageDialog(this, ERROR_DISPLAYING_REPORT);
+            return;
+        }
+        frm.setupReportTable(rep, REPORT_TITLE_NOTICES_SENT_NOT_DELIVERED, cols, data);
+        frm.setVisible (true);
+    }//GEN-LAST:event_menuNoticesSentNotYetDeliveredActionPerformed
+    public static final String REPORT_TITLE_NOTICES_SENT_NOT_DELIVERED = "Notices Sent Not Yet Delivered";
+    public static final String ERROR_DISPLAYING_REPORT = "Error displaying report";
+    public static final String REPORT_TITLE_BILLS_AWAITING_PAYMENT = "Bills Awaiting Payment";
 
     /**
      * @param args the command line arguments
@@ -250,6 +273,7 @@ public class MainFrame extends javax.swing.JFrame {
     private javax.swing.JMenuItem menuManageNotices;
     private javax.swing.JMenu menuMaster;
     private javax.swing.JMenu menuNoticesReports;
+    private javax.swing.JMenuItem menuNoticesSentNotYetDelivered;
     private javax.swing.JMenu menuSettings;
     private javax.swing.JMenuItem menuStationery;
     // End of variables declaration//GEN-END:variables