optimizing imports, added some project functionality

shsu · Mar 1, 2014 · 6a290fb · 6a290fb
1 parent 30d336b
commit 6a290fb
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 176 deletions.
diff --git a/src/main/java/ca/bcit/infosys/comp4911/access/PayRateDao.java b/src/main/java/ca/bcit/infosys/comp4911/access/PayRateDao.java
@@ -1,5 +1,6 @@
 package ca.bcit.infosys.comp4911.access;
 
+import ca.bcit.infosys.comp4911.domain.PayLevel;
 import ca.bcit.infosys.comp4911.domain.PayRate;
 
 import javax.persistence.EntityManager;
@@ -39,15 +40,15 @@ public List<PayRate> getAllPayRates() {
     public List<PayRate> getAllPayRatesByLevel(final String payLevel) {
         TypedQuery<PayRate> query = em.createQuery("select p from PayRate p where p.payLevel = :payLevel ",
                 PayRate.class);
-        query.setParameter("payLevel", PayRate.PayLevel.valueOf(payLevel));
+        query.setParameter("payLevel", PayLevel.valueOf(payLevel));
         return query.getResultList();
     }
 
     public PayRate getPayRateByLevelAndYear(final String payLevel,
                                                final String year) {
         TypedQuery<PayRate> query = em.createQuery("select p from PayRate p where p.payLevelName = :payLevel" +
             " and p.year = :year", PayRate.class);
-        query.setParameter("payLevel", PayRate.PayLevel.valueOf(payLevel));
+        query.setParameter("payLevel", PayLevel.valueOf(payLevel));
         query.setParameter("year", year);
         return query.getSingleResult();
     }

diff --git a/src/main/java/ca/bcit/infosys/comp4911/access/TimesheetDao.java b/src/main/java/ca/bcit/infosys/comp4911/access/TimesheetDao.java
@@ -8,9 +8,6 @@
 import javax.persistence.TypedQuery;
 import java.util.List;
 
-/**
- * Created by Graeme on 2/8/14.
- */
 @Stateless
 public class TimesheetDao {
 
@@ -53,11 +50,11 @@ public List<Timesheet> getAllByUser(final int userId)
         return query.getResultList();
     }
 
-    public Timesheet getByDate(final int weekNumber, final int year, final int userID) {
+    public Timesheet getByDate(final int weekNumber, final int year, final int userId) {
         TypedQuery<Timesheet> query = em.createQuery("select t from Timesheet t" +
             " where t.weekNumber = :week and t.userID = :id and t.year = :year", Timesheet.class);
         query.setParameter("week", weekNumber);
-        query.setParameter("id", userID);
+        query.setParameter("id", userId);
         query.setParameter("year", year);
         return query.getSingleResult();
     }
@@ -70,4 +67,12 @@ public List<Timesheet> getRejected(final Integer userID) {
         query.setParameter("id", userID);
         return query.getResultList();
     }
+
+    public List<Timesheet> getAllTimesheetsToApprove(final int userID) {
+        TypedQuery<Timesheet> query = em.createQuery("select t from Timesheet t where t.isApproved = :approved" +
+                " and t.userID = (select u.id from User u where u.timesheetApproverUserID = :user_id)",
+                Timesheet.class);
+        query.setParameter("user_id", userID);
+        return query.getResultList();
+    }
 }
diff --git a/src/main/java/ca/bcit/infosys/comp4911/application/SampleData.java b/src/main/java/ca/bcit/infosys/comp4911/application/SampleData.java
@@ -7,29 +7,21 @@
 import ca.bcit.infosys.comp4911.access.UserDao;
 import ca.bcit.infosys.comp4911.access.WorkPackageAssignmentDao;
 import ca.bcit.infosys.comp4911.access.WorkPackageDao;
-import ca.bcit.infosys.comp4911.domain.PayRate.PayLevel;
+import ca.bcit.infosys.comp4911.domain.PayLevel;
 import ca.bcit.infosys.comp4911.domain.Project;
 import ca.bcit.infosys.comp4911.domain.ProjectAssignment;
-import ca.bcit.infosys.comp4911.domain.Timesheet;
-import ca.bcit.infosys.comp4911.domain.TimesheetRow;
 import ca.bcit.infosys.comp4911.domain.User;
 import ca.bcit.infosys.comp4911.domain.WorkPackage;
 import ca.bcit.infosys.comp4911.domain.WorkPackageAssignment;
-import org.hibernate.Session;
 import org.mindrot.jbcrypt.BCrypt;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.EJB;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
-import javax.transaction.Transactional;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 @Singleton
 @Startup
@@ -81,7 +73,7 @@ private void generateUsers() {
                     new Date(),
                     false,
                     "",
-                    40,0,0,0,0,0,0,PayLevel.P1
+                    40,0,0,0,0,0,0, PayLevel.P1
                     ));
         }
 
@@ -155,9 +147,9 @@ private void generateProjectAssignments()
             ));
         }
     }
-
+    /**
     private void generateTimesheets() {
-/**
+
         Timesheet timesheet;
 
         for(int j = 0; j < 2; j++)
@@ -176,7 +168,7 @@ private void generateTimesheets() {
         }
 
         }
-    */
-    }
 
+    }
+    */
 }
diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/Effort.java b/src/main/java/ca/bcit/infosys/comp4911/domain/Effort.java
@@ -1,19 +1,14 @@
 package ca.bcit.infosys.comp4911.domain;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
-
-import java.io.Serializable;
-
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
-import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.Version;
-
-import java.lang.Override;
-import ca.bcit.infosys.comp4911.domain.PayRate.PayLevel;
+import java.io.Serializable;
 
 @Entity
 public class Effort implements Serializable {

diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/PayLevel.java b/src/main/java/ca/bcit/infosys/comp4911/domain/PayLevel.java
@@ -1,84 +1,8 @@
 package ca.bcit.infosys.comp4911.domain;
 
-import javax.persistence.Entity;
-import java.io.Serializable;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Column;
-import javax.persistence.Version;
-import java.lang.Override;
-
-/** Propose to Delete this class, Unnecessary  */
-@Entity
-public class PayLevel implements Serializable {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", updatable = false, nullable = false)
-    private Integer id = null;
-
-    @Version
-    @Column(name = "version")
-    private int version = 0;
-
-    @Column
-    private String payLevelName;
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(final Integer id) {
-        this.id = id;
-    }
-
-    public int getVersion() {
-        return this.version;
-    }
-
-    public void setVersion(final int version) {
-        this.version = version;
-    }
-
-    public String getPayLevelName() {
-        return this.payLevelName;
-    }
-
-    public void setPayLevelName(final String payLevelName) {
-        this.payLevelName = payLevelName;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        if (id != null) {
-            return id.equals(((PayLevel) that).id);
-        }
-        return super.equals(that);
-    }
-
-    @Override
-    public int hashCode() {
-        if (id != null) {
-            return id.hashCode();
-        }
-        return super.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        String result = getClass().getSimpleName() + " ";
-        if (payLevelName != null && !payLevelName.trim().isEmpty())
-            result += "payLevelName: " + payLevelName;
-        return result;
-    }
-}
+/**
+ * Pay Level Values
+ */
+public enum PayLevel {
+    P1, P2, P3, P4, P5;
+}
diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/PayRate.java b/src/main/java/ca/bcit/infosys/comp4911/domain/PayRate.java
@@ -9,11 +9,6 @@
 import javax.persistence.Id;
 import javax.persistence.Version;
 import java.io.Serializable;
-
-import ca.bcit.infosys.comp4911.domain.PayLevel;
-
-import javax.persistence.ManyToOne;
-import java.lang.Override;
 import java.math.BigDecimal;
 
 @Entity
@@ -111,8 +106,4 @@ public String toString() {
         result += ", rate: " + rate;
         return result;
     }
-
-    public enum PayLevel {
-        P1, P2, P3, P4, P5;
-    }
 }
diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/Project.java b/src/main/java/ca/bcit/infosys/comp4911/domain/Project.java
@@ -2,26 +2,13 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.lang.Override;
-import java.util.Currency;
-
-import ca.bcit.infosys.comp4911.domain.WorkPackage;
-
-import java.util.Set;
-import java.util.HashSet;
-import javax.persistence.OneToMany;
-
-import ca.bcit.infosys.comp4911.domain.Effort;
-import org.codehaus.jackson.annotate.JsonIgnore;
 
 @Entity
 public class Project implements Serializable {

diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/ProjectAssignment.java b/src/main/java/ca/bcit/infosys/comp4911/domain/ProjectAssignment.java
@@ -5,7 +5,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.ManyToOne;
 import javax.persistence.Version;
 import java.io.Serializable;
 

diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/Timesheet.java b/src/main/java/ca/bcit/infosys/comp4911/domain/Timesheet.java
@@ -1,45 +1,34 @@
 package ca.bcit.infosys.comp4911.domain;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.Hibernate;
-
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
-import java.io.Serializable;
 import javax.persistence.FetchType;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
-import javax.persistence.Column;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
-import java.lang.Override;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import ca.bcit.infosys.comp4911.domain.User;
-
 @Entity
 public class Timesheet implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", updatable = false, nullable = false)
+    @Column(name = "TIMESHEET_ID", updatable = false, nullable = false)
     private Integer id = null;
 
     @Version
     @Column(name = "version")
     private int version = 0;
 
     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinTable(
-            name="TIMESHEET_TIMESHEETROW",
-            joinColumns = {@JoinColumn(name="TIMESHEET_ID")},
-            inverseJoinColumns = {@JoinColumn(name="TIMESHEETROW_ID")}
-    )
+    @JoinColumn(name="OWNER_ID", referencedColumnName="TIMESHEET_ID")
     private List<TimesheetRow> timesheetRows;
 
     @Column

diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/User.java b/src/main/java/ca/bcit/infosys/comp4911/domain/User.java
@@ -2,20 +2,14 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
 import java.io.Serializable;
 import java.util.Date;
-import java.lang.Override;
-
-import ca.bcit.infosys.comp4911.domain.PayRate.PayLevel;
 
 @Entity
 public class User implements Serializable

diff --git a/src/main/java/ca/bcit/infosys/comp4911/domain/UserPayRateHistory.java b/src/main/java/ca/bcit/infosys/comp4911/domain/UserPayRateHistory.java
@@ -6,8 +6,6 @@
 import javax.persistence.Id;
 import javax.persistence.Version;
 import java.util.Date;
-import java.lang.Override;
-import ca.bcit.infosys.comp4911.domain.PayRate.PayLevel;
 
 public class UserPayRateHistory {