X-Git-Url: https://harishankar.org/repos/?p=habeas.git;a=blobdiff_plain;f=src%2Fhabeas%2FUtility.java;h=8602583be2c111cf3a72cb3b5406c62782929847;hp=8795204463730b08014ff741371333ca28b931c8;hb=703ad2090595c7cf19f92a58b95ce197c60bf5ea;hpb=020bf95644b2f26d9c81d66d2a752e55bcd3ad5b

diff --git a/src/habeas/Utility.java b/src/habeas/Utility.java
index 8795204..8602583 100644
--- a/src/habeas/Utility.java
+++ b/src/habeas/Utility.java
@@ -30,7 +30,23 @@ public class Utility {
     
             "SELECT ReferenceNumber, Description, SentDate, RPADReference, "
             + "ClientName FROM legalnotices INNER JOIN clients ON ClientId=clients.id"
-            + " WHERE NoticeSent=1 AND NoticeDelivered=0;"
+            + " WHERE NoticeSent=1 AND NoticeDelivered=0;",
+            
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClientName FROM legalnotices"
+            + " INNER JOIN clients ON ClientId=clients.id"
+            + " WHERE DraftCreated=1 AND DraftApproved=0;",
+            
+            "SELECT ReferenceNumber, Description, EntrustmentDate, "
+            + "ClarificationRemarks, ClientName FROM legalnotices INNER JOIN clients ON"
+            + " ClientId=clients.id WHERE ClarificationPending=1;",
+            
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClarificationRemarks"
+            + ", ClientName from legalnotices INNER JOIN clients ON ClientId=clients.id "
+            + "WHERE DraftCreated=0;",
+
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClientName FROM"
+            + " legalnotices INNER JOIN clients ON ClientId=clients.id WHERE "
+            + " DraftApproved=1 AND NoticeSent=0;"
     } ;
 
     private static final String[] REPORTS_FILTERED = { "SELECT ReferenceNumber, Description"
@@ -40,7 +56,23 @@ public class Utility {
     
             "SELECT ReferenceNumber, Description, SentDate, RPADReference, "
             + "ClientName FROM legalnotices INNER JOIN clients ON ClientId=clients.id"
-            + " WHERE NoticeSent=1 AND NoticeDelivered=0 AND ClientId=?;"
+            + " WHERE NoticeSent=1 AND NoticeDelivered=0 AND ClientId=?;",
+            
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClientName FROM legalnotices"
+            + " INNER JOIN clients ON ClientId=clients.id"
+            + " WHERE DraftCreated=1 AND DraftApproved=0 AND ClientId=?;",
+
+            "SELECT ReferenceNumber, Description, EntrustmentDate, "
+            + "ClarificationRemarks, ClientName FROM legalnotices INNER JOIN clients ON"
+            + " ClientId=clients.id WHERE ClarificationPending=1 AND ClientId=?;",
+
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClarificationRemarks"
+            + ", ClientName from legalnotices INNER JOIN clients ON ClientId=clients.id "
+            + "WHERE DraftCreated=0 AND ClientId=?;",            
+
+            "SELECT ReferenceNumber, Description, EntrustmentDate, ClientName FROM"
+            + " legalnotices INNER JOIN clients ON ClientId=clients.id WHERE "
+            + " DraftApproved=1 AND NoticeSent=0 AND ClientId=?;"            
     } ;    
     
     static void saveStationerySettings (String left_header,