From 587431c548fc43d4328b2f3ab6e328802583ba81 Mon Sep 17 00:00:00 2001 From: perds Date: Tue, 27 Sep 2016 11:32:38 -0400 Subject: [PATCH 01/57] formatted the code --- src/ca/sheridancollege/beans/Builder.java | 151 +++--- .../beans/ConstructionPersonnel.java | 128 +++-- src/ca/sheridancollege/beans/Deficiency.java | 197 ++++---- src/ca/sheridancollege/beans/Form.java | 105 ++--- src/ca/sheridancollege/beans/HomeOwner.java | 83 ++-- .../beans/MyUserDetailsService.java | 65 ++- src/ca/sheridancollege/beans/Unit.java | 7 +- src/ca/sheridancollege/beans/User.java | 128 +++-- src/ca/sheridancollege/beans/UserRole.java | 95 ++-- src/ca/sheridancollege/beans/WorkOrder.java | 67 ++- .../sheridancollege/config/hibernate.cfg.xml | 58 +-- .../config/security-context.xml | 89 ++-- .../sheridancollege/config/tiles-layout.xml | 88 ++-- .../controllers/HomeController.java | 436 +++++++++--------- src/ca/sheridancollege/dao/DAO.java | 32 +- 15 files changed, 799 insertions(+), 930 deletions(-) diff --git a/src/ca/sheridancollege/beans/Builder.java b/src/ca/sheridancollege/beans/Builder.java index e105514..a730dbd 100644 --- a/src/ca/sheridancollege/beans/Builder.java +++ b/src/ca/sheridancollege/beans/Builder.java @@ -1,91 +1,84 @@ package ca.sheridancollege.beans; -import java.io.Serializable; +import org.hibernate.annotations.NamedQuery; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; - -import org.hibernate.annotations.NamedQuery; +import java.io.Serializable; @Entity -@NamedQuery(name="Builder.byUserName", query="from Builder where users_username = :users_username") +@NamedQuery(name = "Builder.byUserName", query = "from Builder where users_username = :users_username") public class Builder implements Serializable { -//test - - - - private String builderEmail; - private String builderName; - @Id - private long builderRefNum; - private String builderCompany; - private String builderPhoneNumber; - - @OneToOne - @JoinColumn(name="users_username") - private User user; - - public Builder() { - - } - - public Builder(String builderName, long builderRefNum, - String builderCompany, String builderPhoneNumber, String builderEmail) { - this.builderName = builderName; - this.builderRefNum = builderRefNum; - this.builderCompany = builderCompany; - this.builderPhoneNumber = builderPhoneNumber; - this.builderEmail = builderEmail; - } - - public String getBuilderName() { - return builderName; - } - - public void setBuilderName(String builderName) { - this.builderName = builderName; - } - - public long getBuilderRefNum() { - return builderRefNum; - } - - public void setBuilderRefNum(long builderRefNum) { - this.builderRefNum = builderRefNum; - } - - public String getBuilderCompany() { - return builderCompany; - } - - public void setBuilderCompany(String builderCompany) { - this.builderCompany = builderCompany; - } - - public String getBuilderPhoneNumber() { - return builderPhoneNumber; - } - - public void setBuilderPhoneNumber(String builderPhoneNumber) { - this.builderPhoneNumber = builderPhoneNumber; - } - - public String getBuilderEmail() { - return builderEmail; - } - - public void setBuilderEmail(String builderEmail) { - this.builderEmail = builderEmail; - } - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - + + @Id + private long builderRefNum; + private String builderEmail; + private String builderName; + private String builderCompany; + private String builderPhoneNumber; + @OneToOne + @JoinColumn(name = "users_username") + private User user; + + public Builder() { + } + + public Builder(String builderName, long builderRefNum, String builderCompany, String builderPhoneNumber, String builderEmail) { + this.builderName = builderName; + this.builderRefNum = builderRefNum; + this.builderCompany = builderCompany; + this.builderPhoneNumber = builderPhoneNumber; + this.builderEmail = builderEmail; + } + + public String getBuilderName() { + return builderName; + } + + public void setBuilderName(String builderName) { + this.builderName = builderName; + } + + public long getBuilderRefNum() { + return builderRefNum; + } + + public void setBuilderRefNum(long builderRefNum) { + this.builderRefNum = builderRefNum; + } + + public String getBuilderCompany() { + return builderCompany; + } + + public void setBuilderCompany(String builderCompany) { + this.builderCompany = builderCompany; + } + + public String getBuilderPhoneNumber() { + return builderPhoneNumber; + } + + public void setBuilderPhoneNumber(String builderPhoneNumber) { + this.builderPhoneNumber = builderPhoneNumber; + } + + public String getBuilderEmail() { + return builderEmail; + } + + public void setBuilderEmail(String builderEmail) { + this.builderEmail = builderEmail; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } } diff --git a/src/ca/sheridancollege/beans/ConstructionPersonnel.java b/src/ca/sheridancollege/beans/ConstructionPersonnel.java index 2ab8e99..71706c9 100644 --- a/src/ca/sheridancollege/beans/ConstructionPersonnel.java +++ b/src/ca/sheridancollege/beans/ConstructionPersonnel.java @@ -1,76 +1,74 @@ package ca.sheridancollege.beans; -import java.io.Serializable; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import java.io.Serializable; @Entity public class ConstructionPersonnel implements Serializable { - @Id - @GeneratedValue - private int id; - private String name; - private String trade; - private long phoneNumber; - private String email; - - public ConstructionPersonnel() { - - } - - public ConstructionPersonnel(int id, String name, String trade, long phoneNumber, String email) { - this.id = id; - this.name = name; - this.trade = trade; - this.phoneNumber = phoneNumber; - this.email = email; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTrade() { - return trade; - } - - public void setTrade(String trade) { - this.trade = trade; - } - - public long getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(long phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public void getWorkOrder(int constructionPersonnelId) { - // needs logic - } + @Id + @GeneratedValue + private int id; + private String name; + private String trade; + private long phoneNumber; + private String email; + + public ConstructionPersonnel() { + } + + public ConstructionPersonnel(int id, String name, String trade, long phoneNumber, String email) { + this.id = id; + this.name = name; + this.trade = trade; + this.phoneNumber = phoneNumber; + this.email = email; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTrade() { + return trade; + } + + public void setTrade(String trade) { + this.trade = trade; + } + + public long getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(long phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public void getWorkOrder(int constructionPersonnelId) { + // TODO needs logic + } } diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java index d6ffeda..9d74966 100644 --- a/src/ca/sheridancollege/beans/Deficiency.java +++ b/src/ca/sheridancollege/beans/Deficiency.java @@ -1,112 +1,105 @@ package ca.sheridancollege.beans; +import javax.persistence.Column; +import javax.persistence.Embeddable; import java.io.Serializable; import java.util.Date; -import javax.persistence.*; - -import org.hibernate.annotations.Generated; -import org.hibernate.annotations.NamedQuery; - @Embeddable public class Deficiency implements Serializable { - /** - * - */ - private static final long serialVersionUID = 7277687991400754226L; -// @GeneratedValue - private int id; - private String location; - @Column(name = "description", nullable = false, length = 1000) - private String description; - private String constructionPersonnel; - private String category; - private String[] categories; - private Date deadline; - private Boolean status; - - public Deficiency() { - this(0, null, null, null); - } - - public Deficiency(int id, String location, String description, String constructionPersonnel) { - this(id, location, description, constructionPersonnel, null, null, false); - } - - public Deficiency(int id, String location, String description, String constructionPersonnel, String category, Date deadline, Boolean status) { - this.id = id; - this.location = location; - this.description = description; - this.constructionPersonnel = constructionPersonnel; - this.category = category; - this.deadline = deadline; - this.status = status; - setCategories(); - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public Date getDeadline() { - return deadline; - } - - public void setDeadline(Date deadline) { - this.deadline = deadline; - } - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } - - public int getId() { - return id; - } - - public String[] getCategories() { - return categories; - } - - public void setId(int id) { - this.id = id; - } - - public String getConstructionPersonnel() { - return constructionPersonnel; - } - - public void setConstructionPersonnel(String constructionPersonnel) { - this.constructionPersonnel = constructionPersonnel; - } - - public void setCategories() { - categories = new String[] {"Add Categories"}; - } + private static final long serialVersionUID = 7277687991400754226L; + private int id; + private String location; + @Column(name = "description", nullable = false, length = 1000) + private String description; + private String constructionPersonnel; + private String category; + private String[] categories; + private Date deadline; + private Boolean status; + + public Deficiency() { + this(0, null, null, null); + } + + public Deficiency(int id, String location, String description, String constructionPersonnel) { + this(id, location, description, constructionPersonnel, null, null, false); + } + + public Deficiency(int id, String location, String description, String constructionPersonnel, String category, Date deadline, Boolean status) { + this.id = id; + this.location = location; + this.description = description; + this.constructionPersonnel = constructionPersonnel; + this.category = category; + this.deadline = deadline; + this.status = status; + setCategories(); + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public Date getDeadline() { + return deadline; + } + + public void setDeadline(Date deadline) { + this.deadline = deadline; + } + + public Boolean getStatus() { + return status; + } + + public void setStatus(Boolean status) { + this.status = status; + } + + public int getId() { + return id; + } + + public String[] getCategories() { + return categories; + } + + public void setId(int id) { + this.id = id; + } + + public String getConstructionPersonnel() { + return constructionPersonnel; + } + + public void setConstructionPersonnel(String constructionPersonnel) { + this.constructionPersonnel = constructionPersonnel; + } + + public void setCategories() { + categories = new String[]{"Add Categories"}; + } } diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index 7f3b340..9eef453 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -2,91 +2,54 @@ import org.hibernate.annotations.NamedQuery; -import java.io.Serializable; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import java.io.Serializable; @Entity -@NamedQuery(name="Form.byHomeEnrollmentNumber", query="from Form where homeEnrollmentNumber = :homeEnrollmentNumber") +@NamedQuery(name = "Form.byHomeEnrollmentNumber", query = "from Form where homeEnrollmentNumber = :homeEnrollmentNumber") public class Form implements Serializable { - @Id - @GeneratedValue - private long id; - private long homeEnrollmentNumber; -// private Unit unit; -// private WorkOrder workOrder; -// private HomeOwner homeOwner; - private String formType; -// private Builder builder; - private String repName; - //private Blob repSig; - - public Form() { + @Id + @GeneratedValue + private long id; + private long homeEnrollmentNumber; + private String formType; + private String repName; + //private Blob repSig; - } + public Form() { - public Form(long homeEnrollmentNumber, String formType, String repName) { - this.homeEnrollmentNumber = homeEnrollmentNumber; - this.formType = formType; - this.repName = repName; - } + } - public long getId() { - return id; - } + public Form(long homeEnrollmentNumber, String formType, String repName) { + this.homeEnrollmentNumber = homeEnrollmentNumber; + this.formType = formType; + this.repName = repName; + } - public void setId(long id) { - this.id = id; - } -// -// public Unit getUnit() { -// return unit; -// } -// -// public void setUnit(Unit unit) { -// this.unit = unit; -// } + public long getId() { + return id; + } -// public WorkOrder getWorkOrder() { -// return workOrder; -// } -// -// public void setWorkOrder(WorkOrder workOrder) { -// this.workOrder = workOrder; -// } -// -// public HomeOwner getHomeOwner() { -// return homeOwner; -// } -// -// public void setHomeOwner(HomeOwner homeOwner) { -// this.homeOwner = homeOwner; -// } + public void setId(long id) { + this.id = id; + } - public String getFormType() { - return formType; - } + public String getFormType() { + return formType; + } - public void setFormType(String formType) { - this.formType = formType; - } -// -// public Builder getBuilder() { -// return builder; -// } -// -// public void setBuilder(Builder builder) { -// this.builder = builder; -// } + public void setFormType(String formType) { + this.formType = formType; + } - public String getRepName() { - return repName; - } + public String getRepName() { + return repName; + } - public void setRepName(String repName) { - this.repName = repName; - } + public void setRepName(String repName) { + this.repName = repName; + } } diff --git a/src/ca/sheridancollege/beans/HomeOwner.java b/src/ca/sheridancollege/beans/HomeOwner.java index fe2eda0..979ca0f 100644 --- a/src/ca/sheridancollege/beans/HomeOwner.java +++ b/src/ca/sheridancollege/beans/HomeOwner.java @@ -2,68 +2,55 @@ import org.hibernate.annotations.NamedQuery; -import java.io.Serializable; - -import javax.persistence.Embeddable; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; import javax.persistence.Id; +import java.io.Serializable; -//@Entity @Entity -@NamedQuery(name="HomeOwner.byHomeEnrollmentNumber", query="from HomeOwner where homeEnrollmentNumber = :homeEnrollmentNumber") +@NamedQuery(name = "HomeOwner.byHomeEnrollmentNumber", query = "from HomeOwner where homeEnrollmentNumber = :homeEnrollmentNumber") public class HomeOwner implements Serializable { - //@Id - //@GeneratedValue - //private float id; - private String name; - @Id - private String phoneNumber; - private long homeEnrollmentNumber; - - public HomeOwner() { - } + private String name; + @Id + private String phoneNumber; + private long homeEnrollmentNumber; - //test push - public HomeOwner(String name, String phoneNumber) { - this.name = name; - this.phoneNumber = phoneNumber; - } + public HomeOwner() { + } - public HomeOwner(String name, String phoneNumber, long homeEnrollmentNumber) { - this.name = name; - this.phoneNumber = phoneNumber; - this.homeEnrollmentNumber = homeEnrollmentNumber; - } + public HomeOwner(String name, String phoneNumber) { + this.name = name; + this.phoneNumber = phoneNumber; + } - public String getName() { - return name; - } + public HomeOwner(String name, String phoneNumber, long homeEnrollmentNumber) { + this.name = name; + this.phoneNumber = phoneNumber; + this.homeEnrollmentNumber = homeEnrollmentNumber; + } - public void setName(String name) { - this.name = name; - } + public String getName() { + return name; + } - public String getPhoneNumber() { - return phoneNumber; - } + public void setName(String name) { + this.name = name; + } - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } + public String getPhoneNumber() { + return phoneNumber; + } - public long getHomeEnrollmentNumber() { - return homeEnrollmentNumber; - } + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } - public void setHomeEnrollmentNumber(long homeEnrollmentNumber) { - this.homeEnrollmentNumber = homeEnrollmentNumber; - } + public long getHomeEnrollmentNumber() { + return homeEnrollmentNumber; + } - /* - public float getId() { - return id; - } */ + public void setHomeEnrollmentNumber(long homeEnrollmentNumber) { + this.homeEnrollmentNumber = homeEnrollmentNumber; + } } diff --git a/src/ca/sheridancollege/beans/MyUserDetailsService.java b/src/ca/sheridancollege/beans/MyUserDetailsService.java index 0df8fad..dfdbdf1 100644 --- a/src/ca/sheridancollege/beans/MyUserDetailsService.java +++ b/src/ca/sheridancollege/beans/MyUserDetailsService.java @@ -1,10 +1,6 @@ package ca.sheridancollege.beans; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import ca.sheridancollege.dao.DAO; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; @@ -12,36 +8,37 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import ca.sheridancollege.dao.DAO; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class MyUserDetailsService implements UserDetailsService { - private DAO dao = new DAO(); - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - - // Note: we have a User bean, but there is a Spring User class as well, - // and we are required to specify which is which below - ca.sheridancollege.beans.User user = dao.findByUserName(username); - List authorities = buildUserAuthority(user.getUserRole()); - return buildUserForAuthentication(user, authorities); - - } - - // Converts ca.sheridancollege.beans.Useruser to - // org.springframework.security.core.userdetails.User - private User buildUserForAuthentication(ca.sheridancollege.beans.User user, List authorities) { - return new User(user.getUsername(), user.getPassword(), user.isEnabled(), true, true, true, authorities); - } - - private List buildUserAuthority(Set userRoles) { - Set setAuths = new HashSet(); - // Build user's authorities - for (UserRole userRole : userRoles) { - setAuths.add(new SimpleGrantedAuthority(userRole.getRole())); - } - List Result = new ArrayList(setAuths); - return Result; - } + private DAO dao = new DAO(); + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + // Note: we have a User bean, but there is a Spring User class as well, + // and we are required to specify which is which below + ca.sheridancollege.beans.User user = dao.findByUserName(username); + List authorities = buildUserAuthority(user.getUserRole()); + return buildUserForAuthentication(user, authorities); + } + + // Converts ca.sheridancollege.beans.Useruser to + // org.springframework.security.core.userdetails.User + private User buildUserForAuthentication(ca.sheridancollege.beans.User user, List authorities) { + return new User(user.getUsername(), user.getPassword(), user.isEnabled(), true, true, true, authorities); + } + + private List buildUserAuthority(Set userRoles) { + Set setAuths = new HashSet(); + // Build user's authorities + for (UserRole userRole : userRoles) { + setAuths.add(new SimpleGrantedAuthority(userRole.getRole())); + } + List Result = new ArrayList(setAuths); + return Result; + } } diff --git a/src/ca/sheridancollege/beans/Unit.java b/src/ca/sheridancollege/beans/Unit.java index 4cd8672..623e96b 100644 --- a/src/ca/sheridancollege/beans/Unit.java +++ b/src/ca/sheridancollege/beans/Unit.java @@ -1,7 +1,6 @@ package ca.sheridancollege.beans; import org.apache.commons.lang.time.DateUtils; -import org.hibernate.annotations.NamedQueries; import org.hibernate.annotations.NamedQuery; import org.springframework.transaction.annotation.Transactional; @@ -23,16 +22,12 @@ public class Unit implements Serializable { private long homeEnrollmentNumber; private int lotNumber; private String address; - //@OneToOne(mappedBy="homeOwner") - //need to pass pk and fk relationship not the whole object for this annotation to work. - private String projectName; private Date posessionDate; private String municipality; private int level; private int unitNum; private String plan; - //@ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}) @ElementCollection(fetch = FetchType.EAGER) private List deficiencies; @@ -41,7 +36,7 @@ public Unit() { } public Unit(long homeEnrollmentNumber) { - + this.homeEnrollmentNumber = homeEnrollmentNumber; } public Unit(long homeEnrollmentNumber, int lotNumber, String address, String projectName, int level, String plan, int unitNum) { diff --git a/src/ca/sheridancollege/beans/User.java b/src/ca/sheridancollege/beans/User.java index 4bac2a0..ab5402b 100644 --- a/src/ca/sheridancollege/beans/User.java +++ b/src/ca/sheridancollege/beans/User.java @@ -1,80 +1,72 @@ package ca.sheridancollege.beans; +import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; - @Entity @Table(name = "users") public class User implements Serializable { - @Id - @Column(name = "username", unique = true, nullable = false, length = 45) - private String username; - @Column(name = "password", nullable = false, length = 60) - private String password; - @Column(name = "enabled", nullable = false) - private boolean enabled; - @OneToMany(fetch = FetchType.LAZY, mappedBy = "user") - private Set userRole = new HashSet(0); - - @OneToOne(mappedBy="user") - private Builder builder; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public Set getUserRole() { - return userRole; - } - - public void setUserRole(Set userRole) { - this.userRole = userRole; - } - - public User() { - } - - public User(String username, String password, boolean enabled, Set userRole) { - this.username = username; - this.password = password; - this.enabled = enabled; - this.userRole = userRole; - } - - public User(String username, String password, boolean enabled) { - this.username = username; - this.password = password; - this.enabled = enabled; - } + @Id + @Column(name = "username", unique = true, nullable = false, length = 45) + private String username; + @Column(name = "password", nullable = false, length = 60) + private String password; + @Column(name = "enabled", nullable = false) + private boolean enabled; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "user") + private Set userRole = new HashSet(0); + @OneToOne(mappedBy = "user") + private Builder builder; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public Set getUserRole() { + return userRole; + } + + public void setUserRole(Set userRole) { + this.userRole = userRole; + } + + public User() { + } + + public User(String username, String password, boolean enabled, Set userRole) { + this.username = username; + this.password = password; + this.enabled = enabled; + this.userRole = userRole; + } + + public User(String username, String password, boolean enabled) { + this.username = username; + this.password = password; + this.enabled = enabled; + } } diff --git a/src/ca/sheridancollege/beans/UserRole.java b/src/ca/sheridancollege/beans/UserRole.java index 4ed3739..1d29433 100644 --- a/src/ca/sheridancollege/beans/UserRole.java +++ b/src/ca/sheridancollege/beans/UserRole.java @@ -1,61 +1,52 @@ package ca.sheridancollege.beans; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - @Entity -@Table(name = "user_roles", uniqueConstraints = @UniqueConstraint(columnNames= { "role", "username" }) ) +@Table(name = "user_roles", uniqueConstraints = @UniqueConstraint(columnNames = {"role", "username"})) public class UserRole implements Serializable { - @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.IDENTITY) - @Column(name = "user_role_id", unique = true, nullable = false) - private Integer userRoleId; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "username", nullable = false) - private User user; - @Column(name = "role", nullable = false, length = 45) - private String role; - - public Integer getUserRoleId() { - return userRoleId; - } - - public void setUserRoleId(Integer userRoleId) { - this.userRoleId = userRoleId; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - - public UserRole() { - } - - public UserRole(User user, String role) { - this.user = user; - this.role = role; - } + @Id + @GeneratedValue(strategy = javax.persistence.GenerationType.IDENTITY) + @Column(name = "user_role_id", unique = true, nullable = false) + private Integer userRoleId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "username", nullable = false) + private User user; + @Column(name = "role", nullable = false, length = 45) + private String role; + + public Integer getUserRoleId() { + return userRoleId; + } + + public void setUserRoleId(Integer userRoleId) { + this.userRoleId = userRoleId; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public UserRole() { + } + + public UserRole(User user, String role) { + this.user = user; + this.role = role; + } } diff --git a/src/ca/sheridancollege/beans/WorkOrder.java b/src/ca/sheridancollege/beans/WorkOrder.java index 79713e2..290a75e 100644 --- a/src/ca/sheridancollege/beans/WorkOrder.java +++ b/src/ca/sheridancollege/beans/WorkOrder.java @@ -1,54 +1,53 @@ package ca.sheridancollege.beans; -import java.io.Serializable; -import java.util.ArrayList; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import java.io.Serializable; +import java.util.ArrayList; @Entity public class WorkOrder implements Serializable { - @Id - @GeneratedValue - private long id; - private ConstructionPersonnel personnel; - private ArrayList deficiencies; - // should this take a form or unit? + @Id + @GeneratedValue + private long id; + private ConstructionPersonnel personnel; + private ArrayList deficiencies; + // TODO should this take a form or unit? - public WorkOrder() { + public WorkOrder() { - } + } - public WorkOrder(long id, ConstructionPersonnel personnel, ArrayList deficiencies) { - this.id = id; - this.personnel = personnel; - this.deficiencies = deficiencies; - } + public WorkOrder(long id, ConstructionPersonnel personnel, ArrayList deficiencies) { + this.id = id; + this.personnel = personnel; + this.deficiencies = deficiencies; + } - public long getId() { - return id; - } + public long getId() { + return id; + } - public void setId(long id) { - this.id = id; - } + public void setId(long id) { + this.id = id; + } - public ConstructionPersonnel getPersonnel() { - return personnel; - } + public ConstructionPersonnel getPersonnel() { + return personnel; + } - public void setPersonnel(ConstructionPersonnel personnel) { - this.personnel = personnel; - } + public void setPersonnel(ConstructionPersonnel personnel) { + this.personnel = personnel; + } - public ArrayList getDeficiencies() { - return deficiencies; - } + public ArrayList getDeficiencies() { + return deficiencies; + } - public void setDeficiencies(ArrayList deficiencies) { - this.deficiencies = deficiencies; - } + public void setDeficiencies(ArrayList deficiencies) { + this.deficiencies = deficiencies; + } } diff --git a/src/ca/sheridancollege/config/hibernate.cfg.xml b/src/ca/sheridancollege/config/hibernate.cfg.xml index 1bccaf3..64ceeec 100644 --- a/src/ca/sheridancollege/config/hibernate.cfg.xml +++ b/src/ca/sheridancollege/config/hibernate.cfg.xml @@ -1,33 +1,33 @@ - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 - - - org.hibernate.dialect.MySQLDialect - - - true - - - update - - - - - - - - - - - - - + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/hibernatedb + root + 1234 + + + org.hibernate.dialect.MySQLDialect + + + true + + + update + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index 7ffd42f..5894c59 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -1,51 +1,50 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 7047624..4ed76ce 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -1,51 +1,49 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index e4d888a..0f5b118 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -1,113 +1,101 @@ package ca.sheridancollege.controllers; -import java.util.Date; -import java.util.List; - -import javax.persistence.Embedded; - import ca.sheridancollege.beans.*; +import ca.sheridancollege.dao.DAO; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.authentication.dao.SystemWideSaltSource; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; -import ca.sheridancollege.dao.DAO; +import java.util.Date; +import java.util.List; @Controller public class HomeController { - //public static String builderUserName = "Testnow"; - - private DAO dao = new DAO(); - private long num = 0; - @RequestMapping("/") - public String home(Model model) { - - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - - if (!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUserName = authentication.getName(); - - model.addAttribute("user", currentUserName); - - return "home"; - } - - return "loginForm"; - } - - @RequestMapping("/saveOrUpdateDeficiency") - public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, @ModelAttribute long homeEnrollmentNumber) { - - dao.saveOrUpdate(deficiency); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); - - return "displayDeficiencies"; - } - - @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") - public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - - Deficiency deficiency = new Deficiency(); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); - model.addAttribute("deficiency", deficiency); - - return "addDeficiency"; - } - - @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") - public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { - - dao.deleteDeficiency(id, homeEnrollmentNumber); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); - - return "displayUnitDeficiencies"; - } - - @RequestMapping("/displayUnits") - public String displayUnits(Model model) { - - List unitList = dao.getAllUnits(); - - model.addAttribute("unitList", unitList); - - return "displayUnits"; - } - - - @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") - public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); - - return "displayUnitDeficiencies"; - } - - @RequestMapping("/saveDeficiency") - public String saveDeficiency( - Model model, + private DAO dao = new DAO(); + private long num = 0; + + @RequestMapping("/") + public String home(Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (!(authentication instanceof AnonymousAuthenticationToken)) { + String currentUserName = authentication.getName(); + + model.addAttribute("user", currentUserName); + + return "home"; + } + return "loginForm"; + } + + @RequestMapping("/saveOrUpdateDeficiency") + public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, @ModelAttribute long homeEnrollmentNumber) { + + dao.saveOrUpdate(deficiency); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return "displayDeficiencies"; + } + + @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") + public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + + Deficiency deficiency = new Deficiency(); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + model.addAttribute("deficiency", deficiency); + + return "addDeficiency"; + } + + @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") + public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + + dao.deleteDeficiency(id, homeEnrollmentNumber); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return "displayUnitDeficiencies"; + } + + @RequestMapping("/displayUnits") + public String displayUnits(Model model) { + + List unitList = dao.getAllUnits(); + + model.addAttribute("unitList", unitList); + + return "displayUnits"; + } + + + @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") + public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return "displayUnitDeficiencies"; + } + + @RequestMapping("/saveDeficiency") + public String saveDeficiency( + Model model, @RequestParam int id, @RequestParam String location, @RequestParam String description, @@ -119,137 +107,135 @@ public String saveDeficiency( ) { Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel); - List unit = dao.getUnit(homeEnrollmentNumber); - System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); - unit.get(0).addDeficiency(deficiency); - - dao.saveOrUpdateUnit(unit.get(0)); - - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); - - return "displayUnitDeficiencies"; - } - - @RequestMapping("/displayUnitInfo") - public String displayUnitInfo(Model model) { - dao.addTestData(); - model.addAttribute("unit", new Unit()); - model.addAttribute("builder", new Builder()); - model.addAttribute("form", new Form()); - //dao.getUnit(homeEnrollmentNumber); - return "displayUnitInfo"; - } - - //@RequestMapping("/displayUnitData") - @RequestMapping(value="/displayUnitData", method=RequestMethod.POST) - public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { - - String builderUserName = this.getUserName(); - - Listreturns = dao.getUnit(homeEnrollmentNumber); - Unit match = returns.get(0); - //System.out.println("testing " + match.getAddress()); - model.addAttribute("unit", match); - num = match.getHomeEnrollmentNumber(); - - ListreturnsBuilder = dao.getBuilder(builderUserName); - Builder matchBuilder = returnsBuilder.get(0); - model.addAttribute("builder",matchBuilder); - - List
form = dao.getForm(homeEnrollmentNumber); - if (form.size() > 0) { - model.addAttribute("form", form.get(0)); - } else { - model.addAttribute("form", new Form()); - } - - return "displayUnitInfo"; - } - - @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) - public String saveUnit( - Model model, - @RequestParam long homeEnrollmentNumber, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, - @RequestParam int lotNumber, - @RequestParam String address, - @RequestParam String projectName, - @RequestParam String municipality, - @RequestParam int level, - @RequestParam int unitNum, - @RequestParam String plan, - @RequestParam String repName - ) { - - Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan); - - dao.saveOrUpdateUnit(unit); - String builderUserName = this.getUserName(); - - Listreturns = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", returns.get(0)); - - ListreturnsBuilder = dao.getBuilder(builderUserName); - model.addAttribute("builder", returnsBuilder.get(0)); - - Form form = new Form(homeEnrollmentNumber, "PDI", repName); - - dao.createForm(form); - model.addAttribute("form", form); - - return "displayUnitInfo"; - } - - @RequestMapping("/addSignOff") - public String addSignOff(Model model) { - return "addSignOff"; - } - - @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(Model model) { - - return "loginForm"; - } - - @RequestMapping("/createAccount") - public String createAccount(Model model) { - - - - return "createAccount"; - } - - @RequestMapping("/register") - public String register(Model model, @RequestParam String username, @RequestParam String password) { - - String encryptedPassword = new BCryptPasswordEncoder().encode(password); - User user = new User(username, encryptedPassword, true); - - UserRole userRole = new UserRole(user, "ROLE_USER"); - user.getUserRole().add(userRole); - - DAO dao = new DAO(); - dao.createUser(user); - - UserDetails userDetails = new MyUserDetailsService().loadUserByUsername(username); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(userDetails, - encryptedPassword, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(auth); - - model.addAttribute("accountCreated", true); - - return "home"; - - } - - public String getUserName() { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUserName = authentication.getName(); - return currentUserName; - } - return null; - } + List unit = dao.getUnit(homeEnrollmentNumber); + System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); + unit.get(0).addDeficiency(deficiency); + + dao.saveOrUpdateUnit(unit.get(0)); + + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return "displayUnitDeficiencies"; + } + + @RequestMapping("/displayUnitInfo") + public String displayUnitInfo(Model model) { + dao.addTestData(); + model.addAttribute("unit", new Unit()); + model.addAttribute("builder", new Builder()); + model.addAttribute("form", new Form()); + //dao.getUnit(homeEnrollmentNumber); + return "displayUnitInfo"; + } + + @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) + public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { + + String builderUserName = this.getUserName(); + + List returns = dao.getUnit(homeEnrollmentNumber); + Unit match = returns.get(0); + //System.out.println("testing " + match.getAddress()); + model.addAttribute("unit", match); + num = match.getHomeEnrollmentNumber(); + + List returnsBuilder = dao.getBuilder(builderUserName); + Builder matchBuilder = returnsBuilder.get(0); + model.addAttribute("builder", matchBuilder); + + List form = dao.getForm(homeEnrollmentNumber); + if (form.size() > 0) { + model.addAttribute("form", form.get(0)); + } else { + model.addAttribute("form", new Form()); + } + + return "displayUnitInfo"; + } + + @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) + public String saveUnit( + Model model, + @RequestParam long homeEnrollmentNumber, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, + @RequestParam int lotNumber, + @RequestParam String address, + @RequestParam String projectName, + @RequestParam String municipality, + @RequestParam int level, + @RequestParam int unitNum, + @RequestParam String plan, + @RequestParam String repName + ) { + + Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan); + + dao.saveOrUpdateUnit(unit); + String builderUserName = this.getUserName(); + + List returns = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", returns.get(0)); + + List returnsBuilder = dao.getBuilder(builderUserName); + model.addAttribute("builder", returnsBuilder.get(0)); + + Form form = new Form(homeEnrollmentNumber, "PDI", repName); + + dao.createForm(form); + model.addAttribute("form", form); + + return "displayUnitInfo"; + } + + @RequestMapping("/addSignOff") + public String addSignOff(Model model) { + return "addSignOff"; + } + + @RequestMapping(value = "/login", method = RequestMethod.GET) + public String login(Model model) { + + return "loginForm"; + } + + @RequestMapping("/createAccount") + public String createAccount(Model model) { + + + return "createAccount"; + } + + @RequestMapping("/register") + public String register(Model model, @RequestParam String username, @RequestParam String password) { + + String encryptedPassword = new BCryptPasswordEncoder().encode(password); + User user = new User(username, encryptedPassword, true); + + UserRole userRole = new UserRole(user, "ROLE_USER"); + user.getUserRole().add(userRole); + + DAO dao = new DAO(); + dao.createUser(user); + + UserDetails userDetails = new MyUserDetailsService().loadUserByUsername(username); + UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(userDetails, + encryptedPassword, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(auth); + + model.addAttribute("accountCreated", true); + + return "home"; + + } + + public String getUserName() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (!(authentication instanceof AnonymousAuthenticationToken)) { + String currentUserName = authentication.getName(); + return currentUserName; + } + return null; + } } diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index d6b2a39..6f565af 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -1,29 +1,21 @@ package ca.sheridancollege.dao; -import java.util.Date; -import java.util.List; - +import ca.sheridancollege.beans.*; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import ca.sheridancollege.beans.Builder; -import ca.sheridancollege.beans.Deficiency; -import ca.sheridancollege.beans.Form; -import ca.sheridancollege.beans.HomeOwner; -import ca.sheridancollege.beans.Unit; -import ca.sheridancollege.beans.User; +import java.util.Date; +import java.util.List; public class DAO { - SessionFactory sessionFactory = new Configuration().configure("ca/sheridancollege/config/hibernate.cfg.xml") - .buildSessionFactory(); + SessionFactory sessionFactory = new Configuration().configure("ca/sheridancollege/config/hibernate.cfg.xml").buildSessionFactory(); public User findByUserName(String username) { - List users = sessionFactory.openSession().createQuery("from User where username=:user") - .setParameter("user", username).list(); + List users = sessionFactory.openSession().createQuery("from User where username=:user").setParameter("user", username).list(); if (users.size() > 0) return users.get(0); else @@ -58,9 +50,7 @@ public List getUnit(long homeEnrollmentNumber) { session.beginTransaction(); Query query = session.getNamedQuery("Unit.byHomeEnrollmentNumber"); - query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); - List unitList = (List) query.list(); session.getTransaction().commit(); @@ -74,9 +64,7 @@ public List getBuilder(String builderUserName) { session.beginTransaction(); Query query = session.getNamedQuery("Builder.byUserName"); - query.setString("users_username", builderUserName); - List builderList = (List) query.list(); session.getTransaction().commit(); @@ -119,13 +107,9 @@ public void deleteDeficiency(int id, long homeEnrollmentNumber) { session.beginTransaction(); Query query = session.getNamedQuery("Unit.byHomeEnrollmentNumber"); - query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); - List unitList = (List) query.list(); - Unit unit = unitList.get(0); - List deficiencies = unit.getDeficiencies(); for (Deficiency deficiency : unit.getDeficiencies()) { @@ -133,11 +117,9 @@ public void deleteDeficiency(int id, long homeEnrollmentNumber) { deficiencies.remove(deficiency); } } - unit.setDeficiencies(deficiencies); session.saveOrUpdate(unit); - session.getTransaction().commit(); session.close(); } @@ -175,9 +157,7 @@ public List getHomeOwner(long homeEnrollmentNumber) { session.beginTransaction(); Query query = session.getNamedQuery("HomeOwner.byHomeEnrollmentNumber"); - query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); - List homeOwnerList = (List) query.list(); session.getTransaction().commit(); @@ -201,9 +181,7 @@ public List getForm(long homeEnrollmentNumber) { session.beginTransaction(); Query query = session.getNamedQuery("Form.byHomeEnrollmentNumber"); - query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); - List formList = (List) query.list(); session.getTransaction().commit(); From 9989bfd0d951475f2a25db818eb81a939f0e1415 Mon Sep 17 00:00:00 2001 From: perds Date: Wed, 28 Sep 2016 13:47:30 -0400 Subject: [PATCH 02/57] added category and status to deficiency --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 22 ++++++++++++++----- src/ca/sheridancollege/beans/Deficiency.java | 7 +++--- .../controllers/HomeController.java | 6 ++--- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index e733438..95799c9 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -27,7 +27,7 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> -Perds' Wiki +Add Deficiency: ${unit.homeEnrollmentNumber} @@ -41,7 +41,7 @@
- +
@@ -81,15 +81,25 @@ +
+ +
+ +
+
+ - + - - Back + + Back diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java index 9d74966..df4329a 100644 --- a/src/ca/sheridancollege/beans/Deficiency.java +++ b/src/ca/sheridancollege/beans/Deficiency.java @@ -20,11 +20,11 @@ public class Deficiency implements Serializable { private Boolean status; public Deficiency() { - this(0, null, null, null); + this(0, null, null, null, null, false); } - public Deficiency(int id, String location, String description, String constructionPersonnel) { - this(id, location, description, constructionPersonnel, null, null, false); + public Deficiency(int id, String location, String description, String constructionPersonnel, String category, boolean status) { + this(id, location, description, constructionPersonnel, category, null, status); } public Deficiency(int id, String location, String description, String constructionPersonnel, String category, Date deadline, Boolean status) { @@ -38,6 +38,7 @@ public Deficiency(int id, String location, String description, String constructi setCategories(); } + public String getLocation() { return location; } diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 0f5b118..64ce505 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -100,12 +100,12 @@ public String saveDeficiency( @RequestParam String location, @RequestParam String description, @RequestParam String constructionPersonnel, -// @RequestParam String category, + @RequestParam String category, // @RequestParam Date deadline, -// @RequestParam Boolean status, @RequestParam long homeEnrollmentNumber ) { - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel); + boolean status = false; + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, status); List unit = dao.getUnit(homeEnrollmentNumber); System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); From f583e8a8cc94200ad82176b9aba3c3ade17c511f Mon Sep 17 00:00:00 2001 From: perds Date: Wed, 28 Sep 2016 13:58:21 -0400 Subject: [PATCH 03/57] fixed column inaccuracy for add deficiency --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index 95799c9..fb3fada 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -46,7 +46,7 @@
- +
@@ -82,7 +82,7 @@
- +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + + + + + + Back + + + + + + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp new file mode 100644 index 0000000..4b67208 --- /dev/null +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -0,0 +1,52 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> + + + + + + + + + + + + + + + + + +
+
+ +
${unitDeficiency.id} + ${unitDeficiency.description}
+ + Delete + +
+
+ +
+ + + Add Deficiency + + + Back +
+ + + \ No newline at end of file diff --git a/src/ca/sheridancollege/beans/Unit.java b/src/ca/sheridancollege/beans/Unit.java index 623e96b..2ea8d13 100644 --- a/src/ca/sheridancollege/beans/Unit.java +++ b/src/ca/sheridancollege/beans/Unit.java @@ -1,6 +1,7 @@ package ca.sheridancollege.beans; import org.apache.commons.lang.time.DateUtils; +import org.hibernate.annotations.NamedQueries; import org.hibernate.annotations.NamedQuery; import org.springframework.transaction.annotation.Transactional; @@ -15,7 +16,10 @@ @Transactional @Entity -@NamedQuery(name = "Unit.byHomeEnrollmentNumber", query = "from Unit where homeEnrollmentNumber = :homeEnrollmentNumber") +@NamedQueries({ + @NamedQuery(name = "Unit.byHomeEnrollmentNumber", query = "from Unit where homeEnrollmentNumber = :homeEnrollmentNumber"), + @NamedQuery(name = "Unit.byProjectName", query = "from Unit where projectName = :projectName") +}) public class Unit implements Serializable { @Id diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index 5894c59..0201ea2 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -16,8 +16,10 @@ + + @@ -26,9 +28,12 @@ + + + diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 0f5b118..57bec0e 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -13,6 +13,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -61,6 +62,19 @@ public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber return "addDeficiency"; } + @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") + public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + + Deficiency deficiency = new Deficiency(); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + model.addAttribute("deficiency", deficiency); + + return "workOrderAddDeficiency"; + } + @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { @@ -93,6 +107,15 @@ public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmen return "displayUnitDeficiencies"; } + @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") + public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return "workOrderDisplayUnitDeficiencies"; + } + @RequestMapping("/saveDeficiency") public String saveDeficiency( Model model, @@ -119,6 +142,32 @@ public String saveDeficiency( return "displayUnitDeficiencies"; } + @RequestMapping("/workOrderSaveDeficiency") + public String workOrderSaveDeficiency( + Model model, + @RequestParam int id, + @RequestParam String location, + @RequestParam String description, + @RequestParam String constructionPersonnel, +// @RequestParam String category, +// @RequestParam Date deadline, +// @RequestParam Boolean status, + @RequestParam long homeEnrollmentNumber + ) { + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel); + + List unit = dao.getUnit(homeEnrollmentNumber); + System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); + unit.get(0).addDeficiency(deficiency); + + dao.saveOrUpdateUnit(unit.get(0)); + + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return "workOrderDisplayUnitDeficiencies"; + } + @RequestMapping("/displayUnitInfo") public String displayUnitInfo(Model model) { dao.addTestData(); @@ -229,6 +278,28 @@ public String register(Model model, @RequestParam String username, @RequestParam } + @RequestMapping("/displayBuildingProjects") + public String displayBuildingProjects(Model model) { + + List projectList = new ArrayList<>(); + + projectList.add("Blue Skys Project"); + + model.addAttribute("projectList", projectList); + + return "displayBuildingProjects"; + } + + @RequestMapping("/displayUnits/{project}") + public String displayUnits(Model model, @PathVariable String project) { + + List unitList = dao.getUnitsByProject(project); + + model.addAttribute("unitList", unitList); + + return "displayUnits"; + } + public String getUserName() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (!(authentication instanceof AnonymousAuthenticationToken)) { diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 6f565af..a99a4bb 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -189,4 +189,18 @@ public List
getForm(long homeEnrollmentNumber) { return formList; } + + public List getUnitsByProject(String project) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + Query query = session.getNamedQuery("Unit.byProjectName"); + query.setString("projectName", project); + List unitList = (List) query.list(); + + session.getTransaction().commit(); + session.close(); + + return unitList; + } } diff --git a/target/classes/ca/sheridancollege/beans/Builder.class b/target/classes/ca/sheridancollege/beans/Builder.class index bf2dfc2c49ac71e3520966fc125ba5e3101af0c2..c5ff135ab2e725d9e93ca4b976c9103b82a7cc0a 100644 GIT binary patch delta 394 zcmXAlJx;?w5QX0wue}EI7a2v4_z6Uj9WX*fLMTWPBtQ`)3aBWka)30E=#V%9W~sSC zK-_>U(82|1C~0{+Y4$zMw=-{cCzVO%aacYN%3=HMd!%;e5l2vH#0X)WYsOfZ*0LCj zQ`d?yhxq-@+w%?;A^-tz&Qd)GL^(*5&7y1-UBWW&M)u1;)+v0{Y+c`^t8{Cew9c>% zB&ef?O`cn})K#|>d%y~pVuo{Wt}o6_*5a6LKXsv+PeE6=SlqV1raHrRdm9vLmr*PB zCCK$YS=%vtZ;bs3GIby<3v=BeJCZ&|*il%huCQ0K9$8-)L+u~gxv-AO^?>X`m|Nq) e6zWpg2iX+v1)E%bG}# zVHG)2v|Ooc{wQXEb!iC1`MseyzgdgpQSMV0s(6Y{^e%^c?$^|27kDJ4`y;y));77mBD)sm&v-C}x)Jt4 Zc1t!O%j*7f5`I;O+NCCAoZ)84ZErwydT=F*C5(E1;Mq pSgk&r2CFSl+zu>W%%;!i2o~P~6n6!RyMe|3uxT@TP1ayH0sv^`B^3Yw diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class index 39bbc54fa04a696f12d294e454a01397c18ac5ed..5350ac1ec81bb44fc82f884b76d39bfa71105b21 100644 GIT binary patch delta 1232 zcmZvb-%b-j6vn^lZrf#DD^{T0R6#_f4v;p2rIgy%qJaDnv?|h8p+YSh!-X+ineY(% z0KR~U5?nDRni#$E&MR+x2%o@sX0{1rvb~u3wlnja^PMy2Z|qIn{Q2+mR{-PK-Z#H9 zw&c7E%(Lo2C=h3L239qp;i`r6=yn6X;r)6NvDF%PF}^wSP8uuq=>T%ysW8Hmvw#}FyY+lnME(-)(t2Wh-O`ZWv!0a2b98MSpg$ht$H zzz>mDX$hRBhy`tqPVCW_^MMSV(n>zZ?K`tZc z#~JczV}Sm-NUjGlOc_dH$jOIm$yxH^S zTasK+2Ekp%3XS3&9QR*Rxzmz+2Y03alFFSW?wsV(i@j zB)DQs^y1Bf@y5S_@os!G+XOS&%gmdZ_df4^XWqO`9t^ra{(kueAdl@G_d8>g@+X_v z^&&~O>cT>v<1~ijU>N7%II64(j&AfQYmy@oSW_Iyz?$ap0&9lj1Wqcys~o40a>=^R zQQv)IwHaHNf9!eIk~2;}dny~w{^cSZ@&Mw(VvOx!bcYrZoTbsF8N`Sog>z)_z)`lM zz1v%~>(E|83}v#O&6xEWVh=epdIUWf)zSIDA8DMYIEqxtG%=x+>0Ak=j4nW(k}}xx zchqZL5ko!-BIBbdvOY?}vwf6>=lG}yFY2Qzye=O#@d?)s^9!mUI0Kus#HoUA%G^u2 zJqXfsfle|sW-*3~@@3b0dKNdRnh}Z_qgh>vBR-<|fsEifqI&a^Y#r&hZemWpi}wu_ z5Ay}LRUnn)G8apwZ-w$oCa!L&$*T}=ns|fqS1gvE4`o(NW=%5}I?Rg6tP^uq zF>};2TI(Y2&}?e2n%p_fy^AHSy=rn7h`Xq{)Pb6N56dCkn#o<#-1}J3+?vT5sfd?Vn!h7Sbnu?oVMKi>C%`9R=7x54q^1$sID40dGsEAEnM9{Vjk3t`#Y;xP0 z`?&KMWt01yxGxm9tr}i6ULC`odZ*}2HDb50zv4;LI=;E=W6dPIqHpy2zYnS!U45|# Pp6RiTV>GMo-2(mrl2m~N diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index 8871f22343657f835bda9053ce4729c54b184a15..78c38afbb425ca9e54df020cc98781b87a2fdc5c 100644 GIT binary patch delta 107 zcmX@beTsWSB{QoS0}F%1gb<-J)n wSXCKV8Pp~-vWidcXVGWW1d7|T>H@{|fMRZphG2EEtQxGQKru70x`nKo0HGKaqW}N^ delta 107 zcmX@beTsWSB{Qou0}F%f?l%9C$1M=`2_<-J)n wShW~f8MG%evWidcXVGVL1B%bAe~WOlDRg1{Mb4$@7@qctwFMF$PWsaRxpHiOCpS+tzY;qK<#^j$YGLz>4`7W$tlOF^5O{_AL H)!8%wZsHdl delta 105 zcmcb>bAe~WOlDR|1{MaX$@7@qcx8bsIR;J!c?LcPg~=b8;{}y~BFaD!6`+VJgD`{I zAH}LMnVU^!@;p|3M$5_PSZ!Ht8CV(YCJV4R F003hj79jut diff --git a/target/classes/ca/sheridancollege/beans/MyUserDetailsService.class b/target/classes/ca/sheridancollege/beans/MyUserDetailsService.class index 306f97c54214f54ca8aab2d4ee6b46a843e567ac..03c353945f7b6c09bf48df68d150e0f16b554fe2 100644 GIT binary patch delta 67 zcmcaDep`IQLQYNr1{MY(27U&C$*VY{I3*Z386<&xsmZ)t?TiYOr*f?lRbk*@P-Bo| UP-idz(pC(b49*N%lS8=M0mEGk6#xJL delta 67 zcmcaDep`IQLQYOW1{MZk27U&?$*VY{IHedk8KfD67-S~%arVJgF%x) WjzNpT07zRg=rA}l=uQsdZU+FyV+=C@ diff --git a/target/classes/ca/sheridancollege/beans/Unit.class b/target/classes/ca/sheridancollege/beans/Unit.class index 91703fbb92b39fa24b977b18ad50408f1d30f955..47d9de5c2b5c29ad7315916e103b75d94ddd6600 100644 GIT binary patch delta 587 zcmYk2%}Z2K7{;G7depfy-uWPvE2Ncv47Xnv8%i09~2Q7VkgOCg7-1|Gf=Y7w8&r?5BUyC6p425(Qm8i1C z(CEpx(BBGu59MgK$FUmwBkb(vQN{;w{4?D38%r?9{0gCot1Blh^ji^zK{Ht`&uAls z7Vg(?EY2oJ1 zaSQFJM}RasxOSo!T^K+&M$m%-dhLm`qm1o}w0eEa-DmCrbN$Q>FgM5>zZuCp?J>fRqr(OyF74Ojd3_T9BnS1Tv`=fc&pKKV#A4-)M`w5WCf?HSJyYdfo(bvzNo4Gvmyx+_>SFy|3uTLJYLdKkX(?KWi zgF-xr3Ox98?DZ96Rm;NP zhHbq{z9xJ(+@rn#v Jf$+m<;y>mBWS{^5 diff --git a/target/classes/ca/sheridancollege/beans/User.class b/target/classes/ca/sheridancollege/beans/User.class index bf866d813fbafafdbf5cd3325e8f0e1d25e766e4..d95167f129b68c8798543cf83a598de39a4d4bee 100644 GIT binary patch delta 145 zcmbO)GGAmvARD9PC6L$T{w}AXg zc8$pr>@t)0vYSs%W*3{x#bGdcA&?)&;mc{kz``KHAi!Wbc@0OZq&1Xh!yw9F%OJ&I j#~{yO&!EcSFjK`6V delta 141 zcmbO)GGAmvAlu|yY+{qs*)%3gu**zd&89y&nO$u12OxhTkZ;1SKluxgU&*d9*@{DE z@?LgxM$5@x*IIec2Fm&XWqpCNev>b7`U3!JYafUJ diff --git a/target/classes/ca/sheridancollege/beans/UserRole.class b/target/classes/ca/sheridancollege/beans/UserRole.class index d023c207ccb224fb1b6652fd6d04767d73ebef2b..aeed3affeccdf6e3ea3be00bdf75bd35af44f8cb 100644 GIT binary patch delta 91 zcmZ3;zmR`J2rHxLyR!Ig{2C2ykY~qvGvFbC*PQC{eQv`}B0ma-HRVSyj*|KT^ n`C4E#2iWvkbr@I}bSHmdbK}(qvJ4nF84MZt7>p*nvqu2{a>Nn4 delta 91 zcmZ3;zmR`J2rHx9yRwV{j2Ia{LY~qvGvFbCbO}+;d(*lZV1I64J^(LpY*|Hh| n`Nm*12iWvkO&M4i%qD+fbK|uDvMd=m8LSxi7_29|vqu2{h`ka* diff --git a/target/classes/ca/sheridancollege/beans/WorkOrder.class b/target/classes/ca/sheridancollege/beans/WorkOrder.class index ecc141476701fb0283f5cfd4f1228e1859484011..81bfd903eae37a96f2f210966d048cd7a9545f0e 100644 GIT binary patch delta 95 zcmZqWZ{^>>#>y(pz``IpnVU64P#nmTVBlnsWZ+|vVh~}Fo?O71!zefTE~_o85(6uP r@?=ML@yTXv`iyFm)7WfTwSZ#UV6pvd=8Srizq7fr8Ue+OfnqKI;${&d delta 95 zcmZqWZ{^>>#>y(fz``IlnVU64Py)!3WZ-0wV&G$tW)NYJnOwk{!ze%bE~_o8G6O4v r%4A1&@yTXv`i$z6)7WfTwSi(fV6pvd=8XE2zq7fr8Uw{lfMPBH<#Z7; diff --git a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml index 1bccaf3..64ceeec 100644 --- a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml +++ b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml @@ -1,33 +1,33 @@ - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 - - - org.hibernate.dialect.MySQLDialect - - - true - - - update - - - - - - - - - - - - - + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/hibernatedb + root + 1234 + + + org.hibernate.dialect.MySQLDialect + + + true + + + update + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 7ffd42f..5894c59 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -1,51 +1,50 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 7047624..4ed76ce 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -1,51 +1,49 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 7c439edb7448bae0b64bec8cce05274b4d0a5954..f015ab24de85e586190eae33d135f030c851da6e 100644 GIT binary patch delta 2437 zcmZuz3vg8B75>id&EDOcdpG+|E_v*39=M=>p{-DtMJ=d(+K27AcLizd?A&|L zfBtjMf6jN#_s_n*_VhaCnfH$!2e5$Rhm>!)=x)*DjEFO?7IE2ik9}RNUF=b+S@xL^ zZJzv=@*0Jl+Y{+z|4`~Kf@3(HNRJE?XtTIqt!+4}VhReOFwxi7og7ZDPNWkGCZIX- zBth;S**VacOvyM-hzL)SE~eeGPrM-D%_HfZ1I=B@v`R6m70Uyaj(U|Es8RF>7D&y6Ml1f&KuBvcb8Mn{D$S<_ z;^n|jsfEzNC6tRsdyz;7YaENokm-8yXt343gqDi)!6tPfwVG)xCoGGJhER!^7m7J< zP-!Kt5 zuY@j<7J!5hicpLI0^(drs=SmjFNX&etcxIuN>uYN#PeAPNt`VWirxAnS{uGNb`z?ka23s#dGnR?>X3c1;SlhTb+G5H?AaymC>wWehJr09 z#qGjdzTGxQ7W<-6F&=e@gHdU8Bb#b`@aOF`Q!lhnq1%QNn9!9BzHRzmqs!nsA4XH_ zeVw{$pA!Cx(CBO~0Jsx&3@`|T49E~x;*;n^3VlfPY6QFSX$zpwKsB>v;7a&wO08H9 zvZOTI*(~XCtm0_q?m?C$OFG0-fh8Sg$ze%bxq7*WO?P7wPjDI`?83)!J0liFFS^i! zLOwo#Z7iusuv3VS$nW)D-RtE&!V%2ky;8Pu^Qw%W@-3iYWW?JQf$l6Et{wgH5%{e}NEtk5$hv%`N7IIrGtiy+!%UM%20u4k zy31e*kl0co5fNAC}@Fv|~TI zA+Qw>;}duUci}5s(^uK-fY=+U-|`EqS01kImkf6S2T0*%oa2B?xfQ=+oy;+A#INxi z?%P(5JHtAc)s_f1G4I*So_YK8Y@fG!MR=km`l~WF$e6I+)BFaLl5hd9S@^wv4StDe z$oV_o`~5I3iv7_r)1}4phM`$VYUU(oa7J8+){H)9cuW{Q*WzR%6!HB*SF^Zmcr71q z2Jf19dav!R-GZ%&#|U_ghv&OY^v6+)Lzs`lSj_|3!9&%9EOTOt=l>Y)#gi5b9)p*C z#!xKouPh(^3;t@&_!$1i3@|5U4DWp~<74QaPVH8TE5~JJd2I%-*;;uTHBsMVwiS)e#Q{dwC>hn1SA_{K%X2GQ4@S^V}LD z`e=TT%{q25!)=mR@{|3;!FRA0m=RyB3Rg*2{YzL|#?}_UsNhQD$RSQwMd*~cSQW05 zuUh{X8_D^%x%N*gz%lgY7( z>5<^?4xHyp^i{qtE{JV4(T=s;LKERVw2mb^$4Jw9mP}mx`JYh-k4_A6x`l3K%C+)N z0e@wV*-V|(#iO$WrPNIucytKQinBFKy%$-2gS-1C&%j&IaY>ZTUgW>c%$GJ=aB>G} G6Yw9SJNxwj delta 2405 zcmZuzd2kcw75_bHrInVItjjWMTUa)-F~~+7#&#ET1dPKKJJ`6bCn>Isg+l<7u|-b? zm9(ConGW+YJu(SR)694}?MwkD61EZ(r)ePWLE5HA+R&D!P)G<3Y13RZ>HAhOWZL|* z`@ZkJ?;XG2d*ANqTP|$&O}{fS37~;Ktind97w5b|5v9^&EB3hQPI0KHLQK1xL{Qsh zGi$|EQPbG8cAms3eO}!oI z1~g1aXipPadFW1{x)^Jj)j*GNsxcX@w(^$fe2U6+o;nYxja!*P+{+W)S z;}?Vy-d``SI*Yyb+W8wbc=3#mU*cCH;cZr))$yCLU0#LgFJpHVRnn}BI^4KK=&jwz z`Nzd6UxWW8g8kOk4KnJ>Qhi0}{)F=t9ar(HxXFLXhId3=z$8Ts1csDZgw^7pZH{<5 z5c6p8Xrz%>ry}x+x}Zq`t|H>$JT>xDh}}`KI25d>5^*wEQ)&?0ogJIk^>%ly>(nSr zWzwRY&>*(>%fy+GLsW#qEMKYi9@Gm`jCi(7rK_va+z3*=nA(wSL(EiR*UAVWex} z!+ew=&boTUut+>$9QQQBg=Pd`VlG-lZ|PJ1HEi38AllgGW+bpdG?qGG(KgK6}#c25v_YPk;SW2rXgA%*@x?su=?Q#2heL*Y9EXWp`&&|ZUl!lV;z7f0AIDZ39>=KR%HsR- z?EChz_`wZtT0GEcXa)OmEX&yOk-*SVPQZ?0epYeDz^53Q&!7~a#d7S&CLG`@K8HJS z5TC~95oQZn3n$H3&E~h1R$>*%lG4}*n1iQWX3E64{!h()|AC&@h}&f$7oLu zIj)n-j0aBSF~RFcXV#D9agx_lg>~Qw34_goA#A1iC8+o^m-rRT!&lLSd#uuBHXP-8 z>85z5!aeuL=;u<)STmdRDrcL>ZJ=R1iJ$O0g{N>zT&sxEX%UIe&;0Ze1TB`7EY6s! zq0SIEVY)a^!&OL0nnbhswdsD3_ai8Y2OgW@wqP`hAn$!ZDT-B!$u|&inA_|d+}+>DiM#LmU~t1oNTY!l4Lyg;rr$clef1AXfdBn1Q<$8ERuhhM zqvpAwNBJI^#8SS(TQP+WJi(AWi9v3IPvR8r#?w|S{Sbc6ZUiOb#i~f=pZJ$GBO`c? zCrHl72>#9BJ1yyTmQ+i6gC#koBY2bT+?MnfOL8Jd@HT5@{Uf->lFs?;Vw#?Vhcmhz zl1wk>)oGDg#F;f(6#6h&%N;$5|8Pn(GgmO{W9$oNXPHalj}OmW;9V<7Gq2?|C_#ca z99zVng;L)5zcC=&3`JxY3t~}vR&0t@@E0s$gk$9RUti7}lj!6K!1Lnb+zPu&E^(|h zWFxmY8>`M}Jvq|rv*a?2K^SW?*20RQ=H=0>PR58XoT+z2aKbIw{j!wKpAbJPHqIk mv{+oz;(wjxH<+t8nbEgk;F>s4(-iEI`O;R497dIRsQwEM6!4t@ diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 54bd9536caeda2ff783181ff8c42620f0889fbc8..3e3a31002093c23d255382a5db22fb01d58a67ca 100644 GIT binary patch delta 535 zcmWNOOK*%}7>2J28|TbSXUw64MyYWstzuNQb&RG-5$X^m2u&)Aj3!ctr0S5+mgLnI zacD!jK#@+6ieFJ%v9PnTvv+Nt_xs-Kx$p0J?(cVDy6|Z_8fghXqWS9i%mC&wlLajF zEcb0L5o?MZi##JNW{Gu{&o4u5Y*##HH^iiIswks|WC*e0M26X9iKBb?+YXE{a}C%DNe?r@p`&M@Td zDCZcbqx3Ub8)@id4(HwLg4=bG=c1EcqLIsfuc+_}opf7^+FaG9he59KjO&bXBebUe zC3>Cpmb3Pm;BA)Lljm+|PxqwnOCCu2B?G23XciAy%cJlo-JN(W9g+@9N7Ox0_cRnU zBf0027m`>0ol!F!V;!%l=MBw_hyL=qa6H?Qcx%@?yWX4rgc*G><&UPH41cq|xk+hB U`dN=JdVJMmN{?@PeAlD>Kb0h6!vFvP delta 525 zcmWNN*>8+d9EP8X90mmJ1?Ch%JU2H!l1S?mhXE^Zjz3_kHs_Z>9LR__z{}b%&qvLQRSZK$7u9 zP7!fZ)Q}8SiK($tXh?MAvP@KwVG3FD{_Dt5Pb~|n3j>LvXgZUap>LL~o|(*HE``vP zJfCTl%#+O5xqxXp8fo@y3Ez@W^F`?rX{&k5n9T}xE4^9e)DcFiU*=bF;JS>uF;{xi?D3+BY$d%}izs)oi7KZ7gEDkv$rBc(c=Q7yH>mANx4xbcq8Da*$CD zQKGl}CDj~jJ4zMDY~i@CJ4u1lZh3~~^wY_JfoIvP`LJ^z7o09~*`Vv5V_XTX>3>mh z*Q@S2NSY!07&hfv=**nR+>ne&Zc1+1;HV9a(ZucWJ98u|N$*JSO7H2rukS(V$qwfq zN*+m`*mc=vpV{GamhysjUWHS&Euky7J9@3^jjFe{|IUuy+x`dJPlZ3Z{`^PjC+TN1 RzMApfj2~uH%=l%-#{ab{Xs!SN From c7d25f1eb4086a1eb45918fc1b6e0da3e7646707 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 15:20:02 -0400 Subject: [PATCH 06/57] added tiles support --- src/ca/sheridancollege/config/tiles-layout.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 4ed76ce..80ad2df 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -46,4 +46,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file From ab7355d6453eac535fb3f37b573b0d75827cf68f Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 15:23:47 -0400 Subject: [PATCH 07/57] updated to meet add deficiency updates --- .../WEB-INF/jsps/workOrderAddDeficiency.jsp | 36 ++++++++++++------- .../controllers/HomeController.java | 8 ++--- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index 0ac105d..c12574a 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -27,12 +27,12 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> -Perds' Wiki +Add Deficiency: ${unit.homeEnrollmentNumber}
- +
@@ -41,12 +41,12 @@
- +
- +
@@ -81,15 +81,27 @@
+
+ +
+ +
+
+ - + - - - Back - - + + + + Back + +
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 5bccfb0..bd25e73 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -149,12 +149,12 @@ public String workOrderSaveDeficiency( @RequestParam String location, @RequestParam String description, @RequestParam String constructionPersonnel, -// @RequestParam String category, + @RequestParam String category, // @RequestParam Date deadline, -// @RequestParam Boolean status, @RequestParam long homeEnrollmentNumber ) { - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel); + boolean status = false; + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, status); List unit = dao.getUnit(homeEnrollmentNumber); System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); @@ -165,7 +165,7 @@ public String workOrderSaveDeficiency( List unitList = dao.getUnit(homeEnrollmentNumber); model.addAttribute("unit", unitList.get(0)); - return "workOrderDisplayUnitDeficiencies"; + return "displayUnitDeficiencies"; } @RequestMapping("/displayUnitInfo") From 6241fe0df0958d1ee5e5288503396fd99fbb89dc Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 16:13:32 -0400 Subject: [PATCH 08/57] fixed navigation issues --- WebContent/WEB-INF/jsps/displayUnits.jsp | 2 +- .../WEB-INF/jsps/workOrderAddDeficiency.jsp | 4 ++-- .../jsps/workOrderDisplayUnitDeficiencies.jsp | 2 +- .../controllers/HomeController.java | 2 +- .../ca/sheridancollege/beans/Unit.class | Bin 4824 -> 4966 bytes .../config/security-context.xml | 5 +++++ .../sheridancollege/config/tiles-layout.xml | 15 +++++++++++++++ .../controllers/HomeController.class | Bin 9928 -> 11636 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 7378 -> 7737 bytes 9 files changed, 25 insertions(+), 5 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayUnits.jsp b/WebContent/WEB-INF/jsps/displayUnits.jsp index 584d022..54fd1be 100644 --- a/WebContent/WEB-INF/jsps/displayUnits.jsp +++ b/WebContent/WEB-INF/jsps/displayUnits.jsp @@ -33,7 +33,7 @@
- + ${unit.lotNumber} + ${unit.address}
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index c12574a..13028f5 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -32,7 +32,7 @@
- +
@@ -98,7 +98,7 @@ - + Back diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index 4b67208..a00a8a6 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -44,7 +44,7 @@ Add Deficiency - + Back
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index bd25e73..755cfd2 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -165,7 +165,7 @@ public String workOrderSaveDeficiency( List unitList = dao.getUnit(homeEnrollmentNumber); model.addAttribute("unit", unitList.get(0)); - return "displayUnitDeficiencies"; + return "workOrderDisplayUnitDeficiencies"; } @RequestMapping("/displayUnitInfo") diff --git a/target/classes/ca/sheridancollege/beans/Unit.class b/target/classes/ca/sheridancollege/beans/Unit.class index 47d9de5c2b5c29ad7315916e103b75d94ddd6600..92968dcb06938774c951cbddd8da6001a0fe082f 100644 GIT binary patch delta 560 zcmYk(%}Z2K7zXg?Xa{CSov#e3)kSo;+URvmvl_?LYSJ=sp&+QxRCm&F{FoUnzsmdo ziIU<}6u7WW8yC?w(mx=Cz?CbPf~)=m@$p?$T<+reJ@0$&fxBOM81el&{;>m~0juAA zX^*naq^F{I#LdMO^mJ-;$~9x25A6!!zOj*f?Sq+~?D!M+VZJ++aTTi5+3}2Z+E`DA z-K=X({A;a*b?v`s3ccTS1ZQBISm2!5^+vtbOc&ur)F|J2O)ZndR0ls|C`COk;1a5M zGY5@)E+dX6wBZW6aMk?ueLWxNMl&}O+-Tv(b#Ao6LYtW@+N-+3_9oj~Y?Ewnv+ZEp zi3si>io5(m7f-uqri(wS9=TO{iLHB~(PvWrGLtTGRKNHZeULsR{)c{FyuoklM|78- zRKsH1v{70{W>vsZ6ZC}6)275;(Vofd?|`l6=?mg#gN|Ah?+@B~g}y4j5o}Ux;zz+c z{hIzpyfM_F-=YZb%u*<+-pj;6$kv}Y@mVIy!;abze;l^;CjE=}R=Bi2hC|T1$dFeB3|aO^fxY_#+4Jq2!X%= delta 449 zcmW;J%PT}-7zXg?;H$ZqF=vp=Y7*nPo*9?iV_e3lSr7|Kq9n?~G?L4>l?8>=hp}L# z6dT!6{s3iTrC8fY+1cUgU7SM-}^@Z4cNYO%{cU>L+fSdttvql zO116F*AZ8>GsvkNPFQ-$by!o$sftrIyr@AQYEcXu6$tSiMkDIbhI&MJW*m(=?7k{$ zVxyUj7B*VhXk()t0d(kZ_e(`5(=MhFrrk_?nD#R5Ll9Bk($5oP><{SA>{BByUzPS) zY7h!TI^iqOZywti5f6ARHA){7pZ40uxcD`Fl0GH=MV}V0%dylfeNKES$2R80ALtA8 zg!mtQk=~(}X)Cm-k&?YA``3pM{9gi$iR9M8`w-@>mM^9VqpLP diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 5894c59..0201ea2 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -16,8 +16,10 @@ + + @@ -26,9 +28,12 @@ + + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 4ed76ce..80ad2df 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -46,4 +46,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index f015ab24de85e586190eae33d135f030c851da6e..2c2b25fc19a17284205a51f86ff475a331d7a3a7 100644 GIT binary patch delta 4026 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 delta 2959 zcmai0d3;n?75>i5WZo=q_RLIPwwaIwCJRXmB)|)skWhj^AYo}hsRJ1>G$fb|Ae9nQ zjI|XC^%iTZt;H?cVrd~v2vaJcwiRuw)h=ogTI)tDidL;lq36B<$&dQeKjyu2&pr3t zbHDF=_s!eOpPBDHb@Awv047kY0uy1Zcuft6DCIsr)ngO)*|r8ZsOZ4Q2wAblxn)aj z=plsLM3W;&%(RzVx2U)UpAg;lSk@*&_9k(`9u$N2abm6Gw6kA@9iJl1k2Q+8vsOIs z@E0#HTWZIrai@Yi2;Oz^P4ViEc<0*cmMuNW#CjE80s6AR%{^9%N>_#EyfSbBJpV2+hF%82_^+>bAaIcmAO3lGS_gM|E; z*rx=5zlJ)Uq zTrP0g@C2t@wXwaUEzzyuNkWw2*TlOX#qYo|8E}G6wx+9ly@K!XW}~bprSq`Z?CvT3 zp^9f^_0F}4-vd`pW;O^&NIpKvWiy@ zb$TpBzdF?8jgWf)Z%R<#BHR?4E9oj1r+gE9=NZz4^$h7r{7KGV5FUTE^)D*k#$QFf z{~VF14(Ozab%Ab+n=nK4nF__lK#9u*mxEm7Q^`*OQJt+*P{QStr8+2^!kmtB2r)sH zLb1o`uqu>GC}IS1#hGk-IGSJY${S|6cvjZ!IHdE z8l%u?g3I7+W3s)Yx+RfRDMn?YH#o{#p;9G{6$8Numg-E0YvP??$WPsXtFpHnr5z}DIyxKQfp|MtYbQ1YD{#5b3}JIX8nLl zGijE1D7;{N1Hm0%y}D~-XL1&IO)}Bupc|-Bp*aNK)qbDZ)zy)Rcd9g(K6t1or;)@1 zx$DR)Y6Ii?QPm?}C77KPWtj64>)8>|EV6|4aDpi?|jSV3K4MSgx^_hUS5Mv$L= zE&!Oti5fW34VUMsx1)~}y#D~V zVGi#-M&Sox$Nzqcy5izRpVS?)(2$bC0^NBKx2LhI)xUcPcWcgJ+(Ss=^K$ZwDSRn~ zFKbToFczC|90Qsog>TBWBYY`5A`TQ6j2lt?XhsdVnXBz!5<8i!F3iLRG@~1BNb+bS zwqvunSX?xn@q~$^ci;e{Em7Qo$JmnS@4(}1Wf|5%wycJ=k^xjWayt%TP^>JOPKPBI z?J0wcZM;(E(=%KQRrs6J7-${B(F`FK{&X70c>L`v+*nDH_WKgUNHodRa`7kHKPO+gDzvrpk1v++xuVU|{M-V^Mz zBhI@>SfXISc)E`93w$jQ-oUTL zjM8B5Z?0irjud2u0h6JI-}2~pJ^1})=l_++f0j!E1yq(Q&@X!^8qCtHnxa`WThJbK zXwD&=^XM*vI~U8qAo<}jrM)lcUP+vHBr}qesQ(X|I)p#!K4T4E6@Qit`bKtM=Ju&F zdU-!`@hBs50A;L%@i@o`4WbE$8Pg%w)i5^WC~m_OtTJFfe6mvh&#)j?(EB(1-Ox}! z-eHAF4fW$6mo?Onf3hVnjDGx!Et_Heo8zQz`|&PYvTgfuk!K~K{kX)I%JtmLJiiJT zSM(vsZg6v5%|y3z$?6?c_I>1lDGEW)2;Bf0I` z^Z_`o0U6R72VxGgmRPdt`sqFtQSA&0-m% zke-z$tyRkkP~H#~=vFN&MNyVNm6)(B4L4srUa5KZ_fmP9syNGal_|Pjx2373RkO)% z8>WebA)2b&k08S8rx_+x1gPF}gl1pvow}<>s%3V-|8iV-kod;pH8{)n^6PxJy#X=0BHA>MDU}rT(R{YdoFqvL*pk4n<-f>HeBc;bX(26Q z(NE)TltwXbMTA$dA7bA4=gzoO4WsS) zVbmyHRxVDD!u?2Col{%3tG-QNE%#b^NeCltCfNID%Dc7D5>K$tI;D0Xn14=PJM%Jh z+jK0uaD_ot&l@s9pVnu(=+Rp8??}XCh0R<{McB!?G8q#Ylown{s_C(Oc;oo+TXIiRUdQrC${ JT4#o2egT&SK4|~| delta 50 zcmdmKbIDTR)W2Q(7#J8#7$w*lm>3zPCO_m8o_v;(eWO;P;AAZ!O-8=WAwnG7tPDU| FaR7+q3~m4b From ae40eb315ff75190cffb0c306cbf5dd510331680 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 16:22:38 -0400 Subject: [PATCH 09/57] added deadline to add deficiency --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 7 +++++++ WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp | 7 +++++++ src/ca/sheridancollege/controllers/HomeController.java | 10 ++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index fb3fada..fbb1cab 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -45,6 +45,13 @@
+
+ +
+ +
+
+
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index 13028f5..3f7282d 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -45,6 +45,13 @@
+
+ +
+ +
+
+
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 755cfd2..c4e5195 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -124,11 +124,10 @@ public String saveDeficiency( @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, -// @RequestParam Date deadline, + @RequestParam Date deadline, @RequestParam long homeEnrollmentNumber ) { - boolean status = false; - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, status); + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); List unit = dao.getUnit(homeEnrollmentNumber); System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); @@ -150,11 +149,10 @@ public String workOrderSaveDeficiency( @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, -// @RequestParam Date deadline, + @RequestParam Date deadline, @RequestParam long homeEnrollmentNumber ) { - boolean status = false; - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, status); + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); List unit = dao.getUnit(homeEnrollmentNumber); System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); From a8d05f27593839add70a7009b06f675ccc29535a Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 16:50:14 -0400 Subject: [PATCH 10/57] fixed delete deficiency issue --- .../WEB-INF/jsps/displayUnitDeficiencies.jsp | 7 ++++--- .../controllers/HomeController.java | 4 ++-- src/ca/sheridancollege/dao/DAO.java | 11 +++++++---- .../controllers/HomeController.class | Bin 11636 -> 11708 bytes 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp index ed45626..ea6bca9 100644 --- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp @@ -32,9 +32,10 @@
-
${unitDeficiency.id} + ${unitDeficiency.description}
- - Delete +
${unitDeficiency.id} + ${unitDeficiency.description} + + Delete +
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index c4e5195..4197ffe 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -124,7 +124,7 @@ public String saveDeficiency( @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam Date deadline, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, @RequestParam long homeEnrollmentNumber ) { Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); @@ -149,7 +149,7 @@ public String workOrderSaveDeficiency( @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam Date deadline, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, @RequestParam long homeEnrollmentNumber ) { Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index e2ed293..e96eecc 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -110,14 +110,17 @@ public void deleteDeficiency(int id, long homeEnrollmentNumber) { query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); List unitList = (List) query.list(); Unit unit = unitList.get(0); - List deficiencies = unit.getDeficiencies(); + List modDeficiencies = unit.getDeficiencies(); + List origDeficiencies = unit.getDeficiencies(); - for (Deficiency deficiency : unit.getDeficiencies()) { + for (Deficiency deficiency : origDeficiencies) { if (deficiency.getId() == id) { - deficiencies.remove(deficiency); + modDeficiencies.remove(deficiency); + break; } } - unit.setDeficiencies(deficiencies); + + unit.setDeficiencies(modDeficiencies); session.saveOrUpdate(unit); session.getTransaction().commit(); diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 2c2b25fc19a17284205a51f86ff475a331d7a3a7..23bef3a773e9ee11d01d0fa39c30fdd36d3aeedf 100644 GIT binary patch delta 3250 zcmd5;eRxx675|+i%}s7@nlF;{_JgJ^p=q1a@y$Z%7!(97l(jI{u>olty0FrgHZa-a z*5R}I_$Y4ESDlJ5kU4Z?0|rYdLH4E2;U+rpb25fwU!u6-ocIBF-W!lP_oqIOe z!yZ+fRF{kCo|e*k@dX9<5j?Bn>*96Y@t&@_8NI#TiFl8OFG7g2f(n<4E__*o9bX~z zM&^pRV-oxEUh?G^^#!)_s_X6eD!#7ZYXtWdU#;s0Qi;_XHsKrMfFoqtLI{ctTCmWD ztps&(Pcjv1P2Qe}so0Ef$~(3TmsVWzEe#K02f;GHn*?*DYOb{Sj)sTvh?t{QYn$Zmv!_a<-5T~_9Kn|AZB6wjd%9HY#S;ql5qt)+WN+O<)~9$k5od5| zY$qsvQq|p~V83Y2FD{VKRAg{KLkH%o$j3nq-^C%}b*?M5btdAS-N_z?=58{4u1zJo z>l)*!#8esK9;YsLIcG!a^joKW(PTZD15Pn6&2^pcIE0J0}kmz3!U!9O{Pipur zUSj~PpCjJ2`tzB%c@q2U8s5O0Vw`J=OXed~xfn7L_U~Do@mkizBYKl~bKYSJ7B8-9M^mJWW(+0>ODD6RnAqMw4i=81$E0 zuhu9=Q^gMd1k1EsYv|&fKj5sF2=UTEv-ivV3JK-uXA1sHB@BI{lxEtjd!c2S`t@sQQjIEEMZeW}NwzwUd#K(38{FG7yuHguz zbQ?YalOa9H=go%n6iXIEdYYv?LwbfKt06s$??I7L2bM7a8@pYNn{YE!2GPy{RxmAn z7=h(1X^69FfUn5ywf}3co%aaeXSik*u}wa&iuqTv6f}SzU=Hj4U#Sm@7b+Z==-FhLJ+^xK&J?HvDuO#egwOZprC3-muH;-$gl4`m(WPR_ZkgqWOJMrDzBT9lye_InfEcjNgbA;Se1c8^VFXOw7vH>eigcYTcT~t53jZw1Fj!Q!#}b z>r#gtiP;#EZo6d5phIcA6|?Jhqp`LiSmS+3x97}rMmykR-AACd7^q`0u0n82TCpE) z45I{DL~syeaR~Kz5_7pR7vUKu{#o3@ZLpr}_mf|-|G!Mofy%h>Nx*4d3732`6fPPX&Ooc&q0&sqJ6tr{6y1xy$D zO1lD5Fv+6eJq3#uWQ>335qyW}~C#$V}&E*S`-mab0Ct+*PKD zb(OAgrY+<*h8Pbso8RtNbw>t&jX8}xIOPyZLAVmwZAw6CEVrPA%$m-tc2XH1u8UCykXGm$ep z%b6v9QO8RIqsVRCGKI4syUpSw&y~KhvKDwpG*y*Wco~7o7>xz2EoRvmjpVzWQW_!d zsS45iVpmluzyA&Afe$+me%SeW>0B=${iEhC6^d)C!-GX_87iqw)5w@5OXY1*-D1hm zs90W>D%e2_3We}nx<=Fwk*wT(`~Yt zhG`ZdLm!XX_oI|Ml@^##bt;*S9)bv`XONWFvInb~z&mR4|R?en8P>KLX32hS0# zjOO6`=oZO%uC~3hEU6GSDu$OvqJ%=?Tus^dF0N{mQ7!TvXoJq*AxYK{*3&9J`ycN^ zx>YnqM^U#}6D_fi=8vBUd{iy&kCsud7>-uZ32{7H?-|28b#T*F2+~;gI$l)QPWJUN O9uuuGymEn2Kk!eVqo(ly delta 3152 zcmd5;X?T>?6@Jfb-z?uGvt*Vp3z?9FnQVj|`msoXSfG$VLcoARCu9i0EHoLk_)voK zq^*@o>5bI3icqT3Rw4pUh+|P&MTJ^zYpJa@fUVZ0+Jd&)O?&P)Y!AQv(I4~8x%ZxX z?m6#y&$;*U6(1~jpZNH(qW~sQQh`Y<3I;`lavzyK)oI!k6X$XRV!N|moO7;nJJE`5 zDjfI*VWBwZnqR!UY^ej=u|vT(37&QFo8r~&@y^!jhK)VRM2CuRL5MACgzgf1)cm|} z6P%5mZOKSO+bs#*iGF-XTKg^`Ajsk`E?eqCBkoagFLn_uJ*-7A$I9kO)!i!g;QJ!W zU2gBk59Hu}G1Fa?*N+EP?87*MJ=xWe>~8C9b>c^ONWqWACU@AgU)opJ^L(8Pm9 z?iukL6{n=juGU1du_w`88}CR+n=h;Q9eyuPXP4OipyE{w3x{Wl<&286hiW_)qQ8jw z-si<4SG|1zA4u%}E{c3D!4DaxMRORYllZ5c{TCq?n=f8)hDEiiiYI(l1^-d;UwkZ1 z`sR2&3ye%{NVc_Cb2N#m!tK9{oMNwECyyBRcT-3#&Z%(+;dWAxa#hNse6cr2rx6^^ zNLK+x_!KJQQ#fxUghy4xn1Iz%Oehj(a|(*;yV?_WDkV7T>lW0kYHX;fchX3T%3U$S zgqYY9E)+WhL3;s}t5iXi;&7lOZ#0cjsG8uu>|R46snS>)C*BW?v`tWHB25x`!3i{l zc{zIt`nhR)>d?gXRM;-p1Xuh3$G z_cGIGb#bimPL&#Hi8$seK9mfvAZivbYGGTP6HW>7o)!*_vC~>k_xkRxb&1u<1#LY^ zJFOCVx!Y{KwF|?C_UE3rnWBo=5smh`09pn+++3Ag&66Byv^M2eX%@|@*#eG1+@U+m z55pT&QmEBk2XSW_{Y}1|gScCB4dHu)6z-FYdsBEIg&%4z^AMJp@FWH_X9@@8-Ye!( zIC$BbTH&h~j*{%&4F~veGXne_#f$=OJa+J?#0t9NT>y+inJb4}-s#!M~rQe}K{1_o;$^1@?14 zCGd}m9fhIZCpaa*X3n_efi7v6!jnw7GzOXm@v|XJG-FwX@2ND7^Z40|ZlU zW8W_%H%$gNg9c~zGf4)Ra}Ohm1DK411{{(Ke99#*>S9x=!~6nTL|ruCdJ(_m^e6Bu z{95cQjr6{xTcke`SyNWcdZ}b|8~dl(GDnwdwiJH*DEvkZSyFgKS2X3K?s47DzH9ai zx*2Pyb%*9Ks&W@X6~5;*M@BuP^dS5^$Kfr$IzEdLpUz|jj=;tR;NcP|V7kU|6l1xX zr{Ngp@!hlpPhlmV##$W5Mm&Q}c$O>jq_}%j#fsOA`tqO`f8-Le^8Rl839qxgX+sviZ{`Tw{bJx;b!-)L7|7>W%&CL5<6r0z4(M1ne0}5MBK|{x9TGkBP)h_kxVg!UWwB%RM#i$) zwMm9^9+Y)5l~0g^eY)7`GHT5XdPeOnP8jh`zN0W$LN4Q!DU7+S1B;*3%XMSpS#Tm2 zmlqbh*#nc&7{ff9&$7`NDeGePC|jH=i_k~n!?HqtAQ;BIR~z?TZTu5y-0G(sn8n!& zKLy0?<)yvBra=lq>x(jTWdSE6; zo#`BtBcxH&VqoQW6%JCQM)K`LrE_Ik?3b>u;u|JRTg>&cJJ97IP&QC%bFNMd>` zEoI5fmXds7%bP5hpU4yFI_5?UP1HoonHw{B#mfH*=d_wu(DlrXHOQkIXeD!l_#MEA zE+l!E0bgcwX8tcqQ=Fq*y|B_xEkm@1ao}KDD>IS!sqOOp?30|NeAsCOd=x Date: Thu, 29 Sep 2016 16:54:26 -0400 Subject: [PATCH 11/57] fixed delete deficiency issue on work order --- .../jsps/workOrderDisplayUnitDeficiencies.jsp | 7 ++++--- .../classes/ca/sheridancollege/dao/DAO.class | Bin 7737 -> 7827 bytes 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index a00a8a6..19674b8 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -32,9 +32,10 @@
-
${unitDeficiency.id} + ${unitDeficiency.description}
- - Delete +
${unitDeficiency.id} + ${unitDeficiency.description} + + Delete +
diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index d79efae9c319feb8c9a92e715533dedd7e88fc6d..2c7d0fcbbae9ea249b88f4219b5497761c7740c8 100644 GIT binary patch delta 994 zcmZvaTS${}7{;G>2fv-1bMvroZaVE?P7)C%TC30`XhZ2HB8s4N+AL?-N+W7rWCzTw z{zYj~b|4EnStQNu0NDY{i@NEiKyM=GqRS4J>)lrkA>ljxzwdkA=lT8L?~VDyV$0~% z&?5ll47SGHRDQXjGNGq4k2$h2hH=6ZeDoS*!yrE8^uZ$QWJ3&}Rao7R)P&*-p*Q|cthLWq`(YKG z_Pl5-Y7jvX+Y!bNw4)8X__>3xhp`(cu?H6r#Z~NulcO78NC3cvT)rn(U-1p3tlC+x zf)VFX&wd(KbYe5MK#MYVZH6BySc)cm$7@Jfjyn8+KMEZKtivRK)^k}Fe&QF01lZCI z_21Gkm;Nc3O6sRrU&E?pP{*+bMhQe32_6Y$5_}T6m8*}VCV>1ntMxNTOsw>=3*jZ= zqD@{=xsTI3kdFPZ;{ayiAc}BE*?fWr@FX|yQCNxfZe`0VCg4MmqnK2}?R4hlayrn( ziX-gU&5lR8`WWWnI7%SICP$Gvg``Ao;1sJ)v#N(xy_|c7bI;D4OFGgs@$_5+wsP|u zIZZ`I(d8^4lX#P{#C4ukee8OXoi3pemr;r{a9vldc6)Vz5<|_Zx^8w738O delta 810 zcmZXRO-NKx7>3{P>Ud|a<2X8wGk0e0j7_0wSYkzFn$$u_$(^{UO=JX>6>1>;NxzGJ zG&-4OMp{wPFD4ly5^6>vZE9I9a#KN2ix&M@+UpggXmjr2obNpE^L`z zmPoAENO&}NoqFvVPtn|xB*|(d{iV27yLZs(6ND>vG}Nmeuc;a`E{Lf-nE?s+;Dk+!Mmq69x1l|ZrjO&P-MgngILwHx>GF|=n5bj2r=`>vleAG}oef?R`IrU04 z2Md!{!>eutV=ax?fF^9gF0PH(k7gXfZnR<#I7@XqpzVw@!J~NX!+AwKn+{* z)L;Tl8mbF@5>lV6Vrz)-VZt9Hj8Wv`2}k)9%lW^`F{a9*0g0%Z=rY~1rxX1RwIQ79 From fa9afc8d301e5e6e4cb0eebb42059ae2fda3fdb4 Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Thu, 29 Sep 2016 17:14:59 -0400 Subject: [PATCH 12/57] Categories.java added with all categories and subs --- src/ca/sheridancollege/beans/Categories.java | 311 ++++++++++++++++++ .../ca/sheridancollege/beans/Unit.class | Bin 4824 -> 4966 bytes .../config/security-context.xml | 5 + .../sheridancollege/config/tiles-layout.xml | 15 + .../controllers/HomeController.class | Bin 9928 -> 11636 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 7378 -> 7737 bytes 6 files changed, 331 insertions(+) create mode 100644 src/ca/sheridancollege/beans/Categories.java diff --git a/src/ca/sheridancollege/beans/Categories.java b/src/ca/sheridancollege/beans/Categories.java new file mode 100644 index 0000000..f6f1571 --- /dev/null +++ b/src/ca/sheridancollege/beans/Categories.java @@ -0,0 +1,311 @@ +package ca.sheridancollege.beans; + +import java.util.ArrayList; +import java.util.List; + +public class Categories { + + private List> categoryList = new ArrayList<>(); + + public Categories() { + List foundation = new ArrayList<>(); + foundation.add("1.1 Efflorescence is present on concrete or masonry foundation surface"); + foundation.add("1.2 Interior concrete surefaces are powdery"); + foundation.add("1.3 Concrete surface is flaking"); + foundation.add("1.4 Concrete basement floor is cracked"); + foundation.add("1.5 Concrete floor slab-on-ground has settled in a finished area"); + foundation.add("1.6 No reinforcement in basement concrete slab"); + foundation.add("1.7 Concrete block foundation wall is cracked"); + foundation.add("1.8 Parging (not brush coating) is falling off above grade"); + foundation.add("1.9 Exposed cast-in-place concrete foundation wall has holes in the surface"); + foundation.add("1.10 Cast-in-place concrete foundation wall is cracked "); + foundation.add("1.11 Condensation in crawl space"); + foundation.add("1.12 Basement wall or floor is damp"); + foundation.add("1.13 Foundation wall leaks"); + foundation.add("1.14 Water leakage through basement floor slab"); + foundation.add("1.15 Brush coating on above grade poured concrete foundation wall is falling off"); + foundation.add("1.16 Basement floor drain is too high"); + foundation.add("1.17 Condensation in cold room/cantina"); + foundation.add("1.18 Water/snow accumulation in basement window wells"); + categoryList.add(foundation); + + List floorFraming = new ArrayList<>(); + floorFraming.add("2.1 Wood joist, bean or post is split, checked or cupped"); + floorFraming.add("2.2 Floor framing damaged by weather during construction"); + floorFraming.add("2.3 Loose subfloor"); + floorFraming.add("2.4 Floor Squeaks"); + floorFraming.add("2.5 Finished floor above grade is out of level"); + floorFraming.add("2.6 Springiness, bounce, visible sag when loaded, or shaking is observed in the floor"); + categoryList.add(floorFraming); + + List wallFraming = new ArrayList<>(); + wallFraming.add("3.1 Wall is out of plumb"); + wallFraming.add("3.2 Wall is Bowed"); + wallFraming.add("3.3 Malfunction of windows"); + wallFraming.add("3.4 Window glass and or screen is damaged"); + wallFraming.add("3.5 Glass is scratched"); + wallFraming.add("3.6 Glass is cracked"); + wallFraming.add("3.7 Window unit leaks during rain"); + wallFraming.add("3.8 Condensation forming between insulating (factory sealed) glass unit"); + wallFraming.add("3.9 Exterior door is warped"); + wallFraming.add("3.10 Exterior metal door is dented"); + wallFraming.add("3.11 Shrinkage of inserted panels shows raw wood edges on exterior wood doors"); + wallFraming.add("3.12 Cracks and splits in exterior wood doors"); + wallFraming.add("3.13 Exterior door sticks"); + wallFraming.add("3.14 Exterior door will not close completely"); + wallFraming.add("3.15 Plastic moulding on exterior door is deformed"); + wallFraming.add("3.16 Exterior door swings open or closed by itself"); + wallFraming.add("3.17 Exterior door is crooked in the frame"); + wallFraming.add("3.18 Exterior door hardware or decorative metal trim has discoloured"); + wallFraming.add("3.19 Sliding door screen will not stay on track or sliding door does not roll smoothly"); + categoryList.add(wallFraming); + + List exteriorFinishing = new ArrayList<>(); + exteriorFinishing.add("4.1 Wood or hardwood or panel-type siding is bowed or wavy"); + exteriorFinishing.add("4.2 Wood or hardwood or panel- type siding- joints not tight"); + exteriorFinishing.add("4.3 Wood or hardwood or panel- type siding fasteners are excessively countersunk into finished surface"); + exteriorFinishing.add("4.4 Lap siding is not install on a straight line"); + exteriorFinishing.add("4.5 Tongue-and-groove wood siding has buckled"); + exteriorFinishing.add("4.6 Wood siding - fastener has stained siding "); + exteriorFinishing.add("4.7 Cedar shakes or shingles have “bled” through paint or stain applied by builder"); + exteriorFinishing.add("4.8 Plywood or veneer siding has delaminated"); + exteriorFinishing.add("4.9 Aluminum/vinyl siding is bowed or wavy"); + exteriorFinishing.add("4.10 Aluminum or vinyl siding - colour is faded"); + exteriorFinishing.add("4.11 Aluminum or vinyl siding, trim or accessory is loose"); + exteriorFinishing.add("4.12 Aluminum or vinyl siding trim and accessories - fasteners don’t match siding colour"); + exteriorFinishing.add("4.13 Above-grade masonry veneer cladding (including mortar) is cracked"); + exteriorFinishing.add("4.14 Cut bricks are of different thickness in relation to one another"); + exteriorFinishing.add("4.15 Horizontal masonry joint alignment is not uniform "); + exteriorFinishing.add("4.16 Mortar splatters and stains on exterior masonry "); + exteriorFinishing.add("4.17 Efflorescence (typically a white powdery film) is present on masonry exterior finishes"); + exteriorFinishing.add("4.18 Deteriorating masonry "); + exteriorFinishing.add("4.19 Water leakage at doors and windows or at the top of the foundation "); + exteriorFinishing.add("4.20 Clay bricks are chipped "); + exteriorFinishing.add("4.21 Bricks are different colours "); + exteriorFinishing.add("4.22 Cracks in exterior stucco wall surfaces"); + exteriorFinishing.add("4.23 Exterior stucco is peeling or bubbling "); + exteriorFinishing.add("4.24 Unsealed gaps between dissimilar cladding materials and penetrations through cladding "); + exteriorFinishing.add("4.25 Exterior wood trim is split "); + exteriorFinishing.add("4.26 Exterior wood trim is bowed, twisted or cupped "); + exteriorFinishing.add("4.27 Paint on repaired areas doesn’t match "); + exteriorFinishing.add("4.28 Exterior paint, stain or clear finish blisters and peels "); + exteriorFinishing.add("4.29 Exterior paint or stain has faded "); + exteriorFinishing.add("4.30 Mould or mildew is visible on exterior painted surfaces "); + exteriorFinishing.add("4.31 Leak in exterior wall "); + exteriorFinishing.add("4.32 Thickness of vertical mortar joints are not uniform in brick or masonry units "); + categoryList.add(exteriorFinishing); + + List roof = new ArrayList<>(); + roof.add("5.1 Roof trusses, riddes or rafters are bowed"); + roof.add("5.2 Roof appears wavy"); + roof.add("5.3 Leaks due to snow or rain driven into the attic through louvers or vents"); + roof.add("5.4 Roof or Flashing leaks"); + roof.add("5.5 Inadequate attic ventilation"); + roof.add("5.6 Ice buildup on the roof"); + roof.add("5.7 Roof shingles have blown off"); + roof.add("5.8 Tabs on asphalt shingles are not lined up"); + roof.add("5.9 Asphalt shingles not sealed"); + roof.add("5.10 Asphalt shingle edges are curled or cupped"); + roof.add("5.11 Asphalt shingles either do not overhang the edge of the roof or hang over too far"); + roof.add("5.12 Shading pattern is visible on an asphalt shingle roof"); + roof.add("5.13 Variation in colour after repairs"); + roof.add("5.14 Uneven roof sheathing causing visible irregularities in the roof surface"); + roof.add("5.15 Roofing nails are exposed"); + roof.add("5.16 Temporary safety straps left on roof"); + roof.add("5.17 Water is trapped under roofing membrane"); + roof.add("5.18 Asphalt roll roofing is blistered but does not admit water"); + roof.add("5.19 Standing water on a flat roof"); + roof.add("5.20 Eavestroughs or downspouts leak"); + roof.add("5.21 Eavestroughs overflow during normal rain"); + roof.add("5.22 Eavestroughs or downspouts not performing properly"); + roof.add("5.23 Eavestroughs don’t drain completely"); + roof.add("5.24 Skylight leaks"); + categoryList.add(roof); + + List plumbing = new ArrayList<>(); + plumbing.add("6.1 Inadequate water supply"); + plumbing.add("6.2 The domestic water supply system does not deliver water"); + plumbing.add("6.3 Pipes are leaking"); + plumbing.add("6.4 Faucet or fixture is leaking"); + plumbing.add("6.5 Plumbing pipes are frozen and/or burst"); + plumbing.add("6.6 Bathtub or shower leaks"); + plumbing.add("6.7 Condensation appears on water supply pipes and toilets"); + plumbing.add("6.8 Noisy water pipes or “water hammer”"); + plumbing.add("6.9 Defective plumbing fixtures, appliances or trim fittings"); + plumbing.add("6.10 Cracking or chipping of porcelain, enamel or fibreglass surfaces"); + plumbing.add("6.11 Lightweight (fibreglass and acrylic) bathtub or shower base flexes and creaks"); + plumbing.add("6.12 Manufactured solid-surface countertop (integrated basin) cracks at the drain"); + plumbing.add("6.13 Toilet takes more than one flush to em"); + plumbing.add("6.14 Sewer, drains or fixtures blocked"); + plumbing.add("6.15 Colour variation in sinks, tubs, toilets or bidets (plumbing fixtures)"); + categoryList.add(plumbing); + + List electrical = new ArrayList<>(); + electrical.add("7.1 Fuses blow or circuit breakers trip"); + electrical.add("7.2 Ground-fault circuit interrupter (gfci) trips frequently"); + electrical.add("7.3 Electrical outlets or switches don’t work"); + electrical.add("7.4 Electrical fixture doesn’t work"); + electrical.add("7.5 Receptacle/switch cover plate is not flush with the wall"); + electrical.add("7.6 Exhaust fan duct terminates in attic or crawl space"); + electrical.add("7.7 Interior light fixture tarnished"); + electrical.add("7.8 Ceiling fan vibrates and is noisy"); + categoryList.add(electrical); + + List interiorClimateControl = new ArrayList<>(); + interiorClimateControl.add("8.1 Draft felt at electrical outlet"); + interiorClimateControl.add("8.2 Exterior air infiltration through windows and doors"); + interiorClimateControl.add("8.3 Kitchen or bath fans allow cold air infiltration or drafts"); + interiorClimateControl.add("8.4 Condensation in attic space"); + interiorClimateControl.add("8.5 Condensation and/or frost on windows"); + interiorClimateControl.add("8.6 Condensation on interior ductwork and air handling equipment"); + interiorClimateControl.add("8.7 Insufficient insulation"); + interiorClimateControl.add("8.8 Heating, ventilating or air conditioning (hvac) systems not installed properly"); + interiorClimateControl.add("8.9 Inadequate heating"); + interiorClimateControl.add("8.10 Inadequate cooling"); + interiorClimateControl.add("8.11 Noisy ductwork"); + interiorClimateControl.add("8.12 Ductwork makes noise when floor is walked on- commonly known as “oil canning”"); + interiorClimateControl.add("8.13 Noise can be heard at register"); + interiorClimateControl.add("8.14 Ductwork comes a"); + interiorClimateControl.add("8.15 Condensate line is blocked"); + interiorClimateControl.add("8.16 Air conditioning coolant line leaks"); + interiorClimateControl.add("8.17 There are gaps between heat diffusers, cold air return grilles and ventilation grilles and the adjacent surface"); + categoryList.add(interiorClimateControl); + + List wallAndCeilingFinish = new ArrayList<>(); + wallAndCeilingFinish.add("9.1 Ceiling is uneven"); + wallAndCeilingFinish.add("9.2 Ceiling texture is unevenly applied"); + wallAndCeilingFinish.add("9.3 Gypsum wallboard corners are uneven"); + wallAndCeilingFinish.add("9.4 Cracks in interior wall and ceiling surfaces"); + wallAndCeilingFinish.add("9.5 Ceiling/wall joint separation commonly referred to as “truss uplift”"); + wallAndCeilingFinish.add("9.6 Drywall surface blemishes including nail/screw pops, blisters in taped joints, trowel marks, excess joint compound and dents or gouges"); + wallAndCeilingFinish.add("9.7 Finish of painted gypsum wallboard (drywall) varies"); + wallAndCeilingFinish.add("9.8 Finished surface is rough"); + wallAndCeilingFinish.add("9.9 Paint finish is unacceptable"); + wallAndCeilingFinish.add("9.10 Clear interior finishes have deteriorated"); + wallAndCeilingFinish.add("9.11 Paint is splattered on surfaces not intended to be painted"); + wallAndCeilingFinish.add("9.12 Wallcovering is peeling"); + wallAndCeilingFinish.add("9.13 Patterns in wallcovering are mismatched at the edges"); + wallAndCeilingFinish.add("9.14 water penetration behind ceramic tile and bathtub or shower enclosures"); + wallAndCeilingFinish.add("9.15 Mildew or fungus is visible on interior surfaces"); + categoryList.add(wallAndCeilingFinish); + + List interiorFinish = new ArrayList<>(); + interiorFinish.add("10.1 Interior door is warped"); + interiorFinish.add("10.2 Bi-fold and sliding doors come off tracks"); + interiorFinish.add("10.3 Pocket door rubs"); + interiorFinish.add("10.4 Door rubs on the doorjamb or does not latch"); + interiorFinish.add("10.5 Wood door panel has split"); + interiorFinish.add("10.6 Door drags on the floor"); + interiorFinish.add("10.7 Gap between the door and the doorjamb is not uniform"); + interiorFinish.add("10.8 Interior door swings open or closes by itself"); + interiorFinish.add("10.9 Doors bind from improperly installed hinges"); + interiorFinish.add("10.10 Hinges are painted"); + interiorFinish.add("10.11 Gaps exist between stair parts"); + interiorFinish.add("10.12 Squeaking stair riser or tread"); + interiorFinish.add("10.13 Gaps exist between railing parts"); + interiorFinish.add("10.14 Stair railings lack rigidity"); + interiorFinish.add("10.15 Joint quality of interior trim and moulding work"); + interiorFinish.add("10.16 Nailheads and fasteners are not properly set or filled"); + interiorFinish.add("10.17 Interior trim is split"); + interiorFinish.add("10.18 Hammer marks are visible on trim"); + interiorFinish.add("10.19 Resin bleeding through painted finish"); + interiorFinish.add("10.20 Wall area around cold room door is unfinished"); + interiorFinish.add("10.21 Interior door edge is not painted"); + interiorFinish.add("10.22 Stairs, treads and/or landings are out of level"); + categoryList.add(interiorFinish); + + List cabinetsAndCountertops = new ArrayList<>(); + cabinetsAndCountertops.add("11.1 Gap between cabinets and ceilings or walls"); + cabinetsAndCountertops.add("11.2 Cabinets do not line up with each other"); + cabinetsAndCountertops.add("11.3 Cabinet doors and drawer faces are warped"); + cabinetsAndCountertops.add("11.4 Cabinet door or drawer binds or rubs"); + cabinetsAndCountertops.add("11.5 Cabinet doors will not stay closed"); + cabinetsAndCountertops.add("11.6 Laminated countertop (including seams, joints or edges) has swelled"); + cabinetsAndCountertops.add("11.7 Laminated countertop is delaminated"); + cabinetsAndCountertops.add("11.8 Cracks in countertop surfaces"); + cabinetsAndCountertops.add("11.9 Scratches/chips on countertops"); + cabinetsAndCountertops.add("11.10 Seams (joints) in stone countertops are too wide or open"); + cabinetsAndCountertops.add("11.11 Surface pits, fissures or veins in natural stone countertops"); + categoryList.add(cabinetsAndCountertops); + + List flooring = new ArrayList<>(); + flooring.add("12.1 Transition between different types of flooring is not flush"); + flooring.add("12.2 Finished floor is uneven"); + flooring.add("12.3 Pattern of finished flooring is out of alignment with adjacent wall surfaces"); + flooring.add("12.4 Carpet seam is visible"); + flooring.add("12.5 Carpet is loose or stretching has occurred"); + flooring.add("12.6 Spots or fading on carpet"); + flooring.add("12.7 Carpet not uniform in colour"); + flooring.add("12.8 Carpet has dark stains around perimeter of rooms and at heating registers"); + flooring.add("12.9 Hollow areas in underpad below carpet surface"); + flooring.add("12.10 Protrusions appear on the surface of resilient flooring without breaking through"); + flooring.add("12.11 Resilient sheet flooring is loos"); + flooring.add("12.12 Resilient flooring joints not tight"); + flooring.add("12.13 Bubbles appear on vinyl flooring surface"); + flooring.add("12.14 Patterns on sheet vinyl flooring are not aligned across seams"); + flooring.add("12.15 Resilient (flexible) floor tile is loose"); + flooring.add("12.16 Patterns or corners of resilient floor tile are misaligned"); + flooring.add("12.17 Yellowing appears on surface of vinyl flooring"); + flooring.add("12.18 Dye lot variations in vinyl flooring"); + flooring.add("12.19 Variation in colour occurring during repair of vinyl flooring"); + flooring.add("12.20 Cracks developing between strips of hardwood or parquet flooring"); + flooring.add("12.21 Strip hardwood flooring is cupped (high edges)"); + flooring.add("12.22 The surface of one strip of hardwood or parquet flooring is higher than another"); + flooring.add("12.23 Floor finish on wood flooring is not uniform"); + flooring.add("12.24 Finish on wood flooring has cracked, blistered, bubbled, or peeled resulting in detachment of finish"); + flooring.add("12.25 Crowning of strip hardwood flooring has occurred (centre of strip is higher than edges)"); + flooring.add("12.26 Wood flooring buckles and detaches from substrate"); + flooring.add("12.27 Knots and colour variation in strip wood flooring"); + flooring.add("12.28 Splinters occur in strip wood flooring"); + flooring.add("12.29 “Sticker burn” appears on surface of strip flooring"); + flooring.add("12.30 Ceramic/porcelain tile, marble or stone flooring is broken or loose (including marble transitions)"); + flooring.add("12.31 Cracks appearing in grouting of ceramic tile joints or at junctions with other materials such as bathtubs"); + flooring.add("12.32 Adjacent marble units or ceramic tile surfaces installed at different elevations"); + flooring.add("12.33 Grout is not a uniform colour"); + flooring.add("12.34 Dye lot variations in ceramic floor tiles"); + flooring.add("12.35 Variation in colour in natural stone tile installations (granite, marble, travertine, slate and limestone)"); + flooring.add("12.36 Gaps developing at ends or along strips of laminate flooring"); + flooring.add("12.37 Laminate flooring is cupped (high edges)"); + flooring.add("12.38 Laminate flooring buckles"); + flooring.add("12.39 Laminate flooring strips are dented, scratched and/or chipped"); + categoryList.add(cabinetsAndCountertops); + + List chimneysAndFireplace = new ArrayList<>(); + chimneysAndFireplace.add("13.1 Joint or crack in chimney cap allows water leak"); + chimneysAndFireplace.add("13.2 Roof flashing leaks at chimney"); + chimneysAndFireplace.add("13.3 Bricks breaking up on surface of chimney"); + chimneysAndFireplace.add("13.4 Chimney serving solid-fuel-burning (wood, pellet, etc.) Appliance does not draw properly"); + chimneysAndFireplace.add("13.5 Fireplace firebox paint colour changed"); + chimneysAndFireplace.add("13.6 Firebrick is broken"); + categoryList.add(chimneysAndFireplace); + + List garageAndExterior = new ArrayList<>(); + garageAndExterior.add("14.1 Garage floor has heaved or settled"); + garageAndExterior.add("14.2 Concrete garage floor is cracked"); + garageAndExterior.add("14.3 No reinforcement in garage slab"); + garageAndExterior.add("14.4 Garage doors do not operate properly"); + garageAndExterior.add("14.5 Garage doors (vehicular and man-doors) allow entrance of snow or water"); + garageAndExterior.add("14.6 Water accumulates on garage floor"); + garageAndExterior.add("14.7 Asphalt or concrete driveway has cracked"); + garageAndExterior.add("14.8 Driveway has settled"); + garageAndExterior.add("14.9 Sod/seeding not completed"); + garageAndExterior.add("14.10 The shrubs, tree(s), plants, or sod have died"); + garageAndExterior.add("14.11 Tree stumps have been left on the property"); + garageAndExterior.add("14.12 Water ponding in surface grading of the site"); + garageAndExterior.add("14.13 Settling, heaving or separating of landings or steps"); + garageAndExterior.add("14.14 Exterior deck is springy or shaky"); + garageAndExterior.add("14.15 Exterior deck railing is shaky"); + garageAndExterior.add("14.16 Deck board spacing is not uniform"); + garageAndExterior.add("14.17 Exterior wood handrails have slivers"); + garageAndExterior.add("14.18 Exterior deck is out of level"); + garageAndExterior.add("14.19 Floor decking boards are split, warped or cupped"); + garageAndExterior.add("14.20 Stain colour variations on wood deck"); + garageAndExterior.add("14.21 Nailheads stick up on deck surface"); + garageAndExterior.add("14.22 Stains on exterior decking from nailheads"); + garageAndExterior.add("14.23 Twisting of open-end beams"); + categoryList.add(garageAndExterior); + + } + + +} diff --git a/target/classes/ca/sheridancollege/beans/Unit.class b/target/classes/ca/sheridancollege/beans/Unit.class index 47d9de5c2b5c29ad7315916e103b75d94ddd6600..92968dcb06938774c951cbddd8da6001a0fe082f 100644 GIT binary patch delta 560 zcmYk(%}Z2K7zXg?Xa{CSov#e3)kSo;+URvmvl_?LYSJ=sp&+QxRCm&F{FoUnzsmdo ziIU<}6u7WW8yC?w(mx=Cz?CbPf~)=m@$p?$T<+reJ@0$&fxBOM81el&{;>m~0juAA zX^*naq^F{I#LdMO^mJ-;$~9x25A6!!zOj*f?Sq+~?D!M+VZJ++aTTi5+3}2Z+E`DA z-K=X({A;a*b?v`s3ccTS1ZQBISm2!5^+vtbOc&ur)F|J2O)ZndR0ls|C`COk;1a5M zGY5@)E+dX6wBZW6aMk?ueLWxNMl&}O+-Tv(b#Ao6LYtW@+N-+3_9oj~Y?Ewnv+ZEp zi3si>io5(m7f-uqri(wS9=TO{iLHB~(PvWrGLtTGRKNHZeULsR{)c{FyuoklM|78- zRKsH1v{70{W>vsZ6ZC}6)275;(Vofd?|`l6=?mg#gN|Ah?+@B~g}y4j5o}Ux;zz+c z{hIzpyfM_F-=YZb%u*<+-pj;6$kv}Y@mVIy!;abze;l^;CjE=}R=Bi2hC|T1$dFeB3|aO^fxY_#+4Jq2!X%= delta 449 zcmW;J%PT}-7zXg?;H$ZqF=vp=Y7*nPo*9?iV_e3lSr7|Kq9n?~G?L4>l?8>=hp}L# z6dT!6{s3iTrC8fY+1cUgU7SM-}^@Z4cNYO%{cU>L+fSdttvql zO116F*AZ8>GsvkNPFQ-$by!o$sftrIyr@AQYEcXu6$tSiMkDIbhI&MJW*m(=?7k{$ zVxyUj7B*VhXk()t0d(kZ_e(`5(=MhFrrk_?nD#R5Ll9Bk($5oP><{SA>{BByUzPS) zY7h!TI^iqOZywti5f6ARHA){7pZ40uxcD`Fl0GH=MV}V0%dylfeNKES$2R80ALtA8 zg!mtQk=~(}X)Cm-k&?YA``3pM{9gi$iR9M8`w-@>mM^9VqpLP diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 5894c59..0201ea2 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -16,8 +16,10 @@ + + @@ -26,9 +28,12 @@ + + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 4ed76ce..80ad2df 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -46,4 +46,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index f015ab24de85e586190eae33d135f030c851da6e..a369575a44387f5a2b97f592ed46bb1faf112480 100644 GIT binary patch delta 4026 zcmd5ib%bR2}lbOj&GRb7akcE*oI6)8yDO(aC1dI!DNQN*Fk~lMnaUo(F zt<`GnrHfWj>)KY4MJM7^6sw@nR%=_WwYasmidw7H)@rLg_sx)`)VBZhkN)!ey}9q) zbIv{IJKs6)=EUnPwu%aC zB@KvX>yjG(sQIdBWJ_CbG%@Nu8i^BTj`?p88?3cX3$7ppMy(peF-xAf!FtSgjRGsa zLTIWK2ea$MyH;1(Srb=TaUHHVo9Pee8;_!@+G+ZLd&3x~Zh z@0$dh3?R@Ny(kj0VLNV+E^icb?S=lE6zsrGf+5bE1byYiMN;Dy1-Ifm;v##MvK_a} zmpcfBmEu-2V`n!v)=Q`~B(CL6M_Pr?0oKr|>rQ+=aQw1zK;jDp9d$s2?2pSQ#l z%EX$33Lb-vU=Me7t&GGI4dF!ChFx%2@B|;ec5}3ct8K<%Mw_V+aM^H3ZXRI_*7e0U zneihIt59j=wGBt*)&Y@l#4CQG;5nJCy*rX^Sc*lKauIW6ZeT!Cc` zT!EwbtK9xrC^59ZBu5yPL4jXwXU!ejj z6gBP;6>%DV2M1~+KLywum5A%zwNxe^aZkvvAXrzlEM3si*1BMYjY{bhsZmLoCYI+E zh^KRnqBz%U@l%yT)l?%+&n+*QM5mf5NN{My-JFQ_1Y08sg(lM!aY=5eX_`XQX@h|Qk_gP%WwE{ukgx$p>8jd=>0Y(;RQnB^t>SB7#_h+EXXj%rv?3m1Yc zn=Cr=59QRc?rCtNo^@uie72ZTuw3lU_tGYDIKQd1cQ=n)Jv{vM!pP4CHfUsng>0~h z4VJJ$i@p#2Vo$z@&KEliswpOp6ciS19y4`ujKFd>ZDrFoHeD?Yg(dnexKLCUR`Zw* zs=iql!OmKn_&7cPdaCY6P7)V4Rl5dj_G7vpt6i6kxy;g(&gFzUIH9n(tFWH7iTm<> zbh-GX@U;AKr>9ld!-gmduu(Mo7toNV`bAB3_++o=vucc06H--wCB7tctGSAE22L^a zgYf15{1ngo%a&gqvdJ90<|LX!_Pw|^h3)OGZ;aqus(nAcO-SNqxp`X>cP8;&)vn)< zl{!3%U8*gK-O_fPEQ!5hNs)ibxWpzfpupvf#1L0!m`i;H=HW`Lz*XqN)%t&E{WHk2mpqt&hz zDeP(=!4K1{t#&=0!XbWt^2Ga7DIDeZA7@zo6Ujf_xE{Ngao@$wdmm20Zq#8f=Op`2 zJB8(W{Kn^rXNs+ZPjh~H<|&g)E$>YRM?4 z-Mt*Ls#cBZJK?K#J*8UHzSBx~!OgPIfx@6c5#o<7n3yJ}pA#wg@h~cJ0F${vX5kdpH*c9ABA!> z8=lOc$cpBS=WzNvF-hx+W5~zLjL<8Xh}STcYtX>hw`jP(fnFTP7QDr?>m7~T_aH|G z3ZFP$>L2`!pv|RWBA!}uE)A0|Gna-*&nr2EhsnSzi?%Ydo}7ilWa5=1_Ar-Zz81+a zS$L&zJR7<0ufxF+ox?HBXM#=T2_e~$&5_N}VsoOml3VNuSve$01=)6KwY8&aZ!$TE z?{7iXTTXWEl$l&3*jVoZTU3HcT+BZq;dzzqjh_>o{t?*7uoaE8A=JwwiJ2WM<}m0NovTDB7b|0 zYA}pYambjW(stG8rt%S*5HhL8Bu(T2K(#uoP9ckDmQ!}Uluu1j9XmO#CP|@?B}KE_ zRf}rq<_SP&5JspmWPK3D-2SvkhiW%986KpT3|Z>Oa+ty802$%n!sT)4eX5*M;l`Q`S?X5=v4MP8BUr4A5GfGnEfsW+u2@E#zmk9p=RiZ{s delta 2959 zcmai0d3;n?75>i5WZo=q_RLIPwwaIwCJRXmB)|)skWhj^AYo}hsRJ1>G$fb|Ae9nQ zjI|XC^%iTZt;H?cVrd~v2vaJcwiRuw)h=ogTI)tDidL;lq36B<$&dQeKjyu2&pr3t zbHDF=_s!eOpPBDHb@Awv047kY0uy1Zcuft6DCIsr)ngO)*|r8ZsOZ4Q2wAblxn)aj z=plsLM3W;&%(RzVx2U)UpAg;lSk@*&_9k(`9u$N2abm6Gw6kA@9iJl1k2Q+8vsOIs z@E0#HTWZIrai@Yi2;Oz^P4ViEc<0*cmMuNW#CjE80s6AR%{^9%N>_#EyfSbBJpV2+hF%82_^+>bAaIcmAO3lGS_gM|E; z*rx=5zlJ)Uq zTrP0g@C2t@wXwaUEzzyuNkWw2*TlOX#qYo|8E}G6wx+9ly@K!XW}~bprSq`Z?CvT3 zp^9f^_0F}4-vd`pW;O^&NIpKvWiy@ zb$TpBzdF?8jgWf)Z%R<#BHR?4E9oj1r+gE9=NZz4^$h7r{7KGV5FUTE^)D*k#$QFf z{~VF14(Ozab%Ab+n=nK4nF__lK#9u*mxEm7Q^`*OQJt+*P{QStr8+2^!kmtB2r)sH zLb1o`uqu>GC}IS1#hGk-IGSJY${S|6cvjZ!IHdE z8l%u?g3I7+W3s)Yx+RfRDMn?YH#o{#p;9G{6$8Numg-E0YvP??$WPsXtFpHnr5z}DIyxKQfp|MtYbQ1YD{#5b3}JIX8nLl zGijE1D7;{N1Hm0%y}D~-XL1&IO)}Bupc|-Bp*aNK)qbDZ)zy)Rcd9g(K6t1or;)@1 zx$DR)Y6Ii?QPm?}C77KPWtj64>)8>|EV6|4aDpi?|jSV3K4MSgx^_hUS5Mv$L= zE&!Oti5fW34VUMsx1)~}y#D~V zVGi#-M&Sox$Nzqcy5izRpVS?)(2$bC0^NBKx2LhI)xUcPcWcgJ+(Ss=^K$ZwDSRn~ zFKbToFczC|90Qsog>TBWBYY`5A`TQ6j2lt?XhsdVnXBz!5<8i!F3iLRG@~1BNb+bS zwqvunSX?xn@q~$^ci;e{Em7Qo$JmnS@4(}1Wf|5%wycJ=k^xjWayt%TP^>JOPKPBI z?J0wcZM;(E(=%KQRrs6J7-${B(F`FK{&X70c>L`v+*nDH_WKgUNHodRa`7kHKPO+gDzvrpk1v++xuVU|{M-V^Mz zBhI@>SfXISc)E`93w$jQ-oUTL zjM8B5Z?0irjud2u0h6JI-}2~pJ^1})=l_++f0j!E1yq(Q&@X!^8qCtHnxa`WThJbK zXwD&=^XM*vI~U8qAo<}jrM)lcUP+vHBr}qesQ(X|I)p#!K4T4E6@Qit`bKtM=Ju&F zdU-!`@hBs50A;L%@i@o`4WbE$8Pg%w)i5^WC~m_OtTJFfe6mvh&#)j?(EB(1-Ox}! z-eHAF4fW$6mo?Onf3hVnjDGx!Et_Heo8zQz`|&PYvTgfuk!K~K{kX)I%JtmLJiiJT zSM(vsZg6v5%|y3z$?6?c_I>1lDGEW)2;Bf0I` z^Z_`o0U6R72VxGgmRPdt`sqFtQSA&0-m% zke-z$tyRkkP~H#~=vFN&MNyVNm6)(B4L4srUa5KZ_fmP9syNGal_|Pjx2373RkO)% z8>WebA)2b&k08S8rx_+x1gPF}gl1pvow}<>s%3V-|8iV-kod;pH8{)n^6PxJy#X=0BHA>MDU}rT(R{YdoFqvL*pk4n<-f>HeBc;bX(26Q z(NE)TltwXbMTA$dA7bA4=gzoO4WsS) zVbmyHRxVDD!u?2Col{%3tG-QNE%#b^NeCltCfNID%Dc7D5>K$tI;D0Xn14=PJM%Jh z+jK0uaD_ot&l@s9pVnu(=+Rp8??}XCh0R<{McB!?G8q#Ylown{s_C(Oc;oo+TXIiRUdQrC${ JT4#o2egT&SK4|~| delta 50 zcmdmKbIDTR)W2Q(7#J8#7$w*lm>3zPCO_m8o_v;(eWO;P;AAZ!O-8=WAwnG7tPDU| FaR7+q3~m4b From 0260eaf8978ffd472cb2e98f879e4e677fa288d5 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 17:21:28 -0400 Subject: [PATCH 13/57] deficiency auto increments --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 2 +- .../WEB-INF/jsps/workOrderAddDeficiency.jsp | 2 +- .../controllers/HomeController.java | 20 +++++++++++++----- .../controllers/HomeController.class | Bin 11708 -> 12016 bytes 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index fbb1cab..af362b3 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -41,7 +41,7 @@
- +
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index 3f7282d..d83cf12 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -41,7 +41,7 @@
- +
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4197ffe..0fde35a 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -52,11 +52,16 @@ public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency def @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - Deficiency deficiency = new Deficiency(); - List unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + Deficiency deficiency = new Deficiency(); + if(unit.getDeficiencies().size() > 0) { + deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); + } else { + deficiency.setId(1); + } - model.addAttribute("unit", unitList.get(0)); + model.addAttribute("unit", unit); model.addAttribute("deficiency", deficiency); return "addDeficiency"; @@ -65,9 +70,14 @@ public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - Deficiency deficiency = new Deficiency(); - List unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + Deficiency deficiency = new Deficiency(); + if(unit.getDeficiencies().size() > 0) { + deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); + } else { + deficiency.setId(1); + } model.addAttribute("unit", unitList.get(0)); model.addAttribute("deficiency", deficiency); diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 23bef3a773e9ee11d01d0fa39c30fdd36d3aeedf..9e2eb4a16d44aa4817e0ac01117f2f7216ebf528 100644 GIT binary patch delta 4221 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 UZ_}~9Z3JeK(@ne4gc1k-36Po#ivR!s From 879226ad32ba9772f36c97410881b88827d77138 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 29 Sep 2016 17:45:17 -0400 Subject: [PATCH 14/57] added subcategory and made refactors --- src/ca/sheridancollege/beans/Categories.java | 311 ----------------- src/ca/sheridancollege/beans/Category.java | 319 ++++++++++++++++++ src/ca/sheridancollege/beans/SubCategory.java | 34 ++ 3 files changed, 353 insertions(+), 311 deletions(-) delete mode 100644 src/ca/sheridancollege/beans/Categories.java create mode 100644 src/ca/sheridancollege/beans/Category.java create mode 100644 src/ca/sheridancollege/beans/SubCategory.java diff --git a/src/ca/sheridancollege/beans/Categories.java b/src/ca/sheridancollege/beans/Categories.java deleted file mode 100644 index f6f1571..0000000 --- a/src/ca/sheridancollege/beans/Categories.java +++ /dev/null @@ -1,311 +0,0 @@ -package ca.sheridancollege.beans; - -import java.util.ArrayList; -import java.util.List; - -public class Categories { - - private List> categoryList = new ArrayList<>(); - - public Categories() { - List foundation = new ArrayList<>(); - foundation.add("1.1 Efflorescence is present on concrete or masonry foundation surface"); - foundation.add("1.2 Interior concrete surefaces are powdery"); - foundation.add("1.3 Concrete surface is flaking"); - foundation.add("1.4 Concrete basement floor is cracked"); - foundation.add("1.5 Concrete floor slab-on-ground has settled in a finished area"); - foundation.add("1.6 No reinforcement in basement concrete slab"); - foundation.add("1.7 Concrete block foundation wall is cracked"); - foundation.add("1.8 Parging (not brush coating) is falling off above grade"); - foundation.add("1.9 Exposed cast-in-place concrete foundation wall has holes in the surface"); - foundation.add("1.10 Cast-in-place concrete foundation wall is cracked "); - foundation.add("1.11 Condensation in crawl space"); - foundation.add("1.12 Basement wall or floor is damp"); - foundation.add("1.13 Foundation wall leaks"); - foundation.add("1.14 Water leakage through basement floor slab"); - foundation.add("1.15 Brush coating on above grade poured concrete foundation wall is falling off"); - foundation.add("1.16 Basement floor drain is too high"); - foundation.add("1.17 Condensation in cold room/cantina"); - foundation.add("1.18 Water/snow accumulation in basement window wells"); - categoryList.add(foundation); - - List floorFraming = new ArrayList<>(); - floorFraming.add("2.1 Wood joist, bean or post is split, checked or cupped"); - floorFraming.add("2.2 Floor framing damaged by weather during construction"); - floorFraming.add("2.3 Loose subfloor"); - floorFraming.add("2.4 Floor Squeaks"); - floorFraming.add("2.5 Finished floor above grade is out of level"); - floorFraming.add("2.6 Springiness, bounce, visible sag when loaded, or shaking is observed in the floor"); - categoryList.add(floorFraming); - - List wallFraming = new ArrayList<>(); - wallFraming.add("3.1 Wall is out of plumb"); - wallFraming.add("3.2 Wall is Bowed"); - wallFraming.add("3.3 Malfunction of windows"); - wallFraming.add("3.4 Window glass and or screen is damaged"); - wallFraming.add("3.5 Glass is scratched"); - wallFraming.add("3.6 Glass is cracked"); - wallFraming.add("3.7 Window unit leaks during rain"); - wallFraming.add("3.8 Condensation forming between insulating (factory sealed) glass unit"); - wallFraming.add("3.9 Exterior door is warped"); - wallFraming.add("3.10 Exterior metal door is dented"); - wallFraming.add("3.11 Shrinkage of inserted panels shows raw wood edges on exterior wood doors"); - wallFraming.add("3.12 Cracks and splits in exterior wood doors"); - wallFraming.add("3.13 Exterior door sticks"); - wallFraming.add("3.14 Exterior door will not close completely"); - wallFraming.add("3.15 Plastic moulding on exterior door is deformed"); - wallFraming.add("3.16 Exterior door swings open or closed by itself"); - wallFraming.add("3.17 Exterior door is crooked in the frame"); - wallFraming.add("3.18 Exterior door hardware or decorative metal trim has discoloured"); - wallFraming.add("3.19 Sliding door screen will not stay on track or sliding door does not roll smoothly"); - categoryList.add(wallFraming); - - List exteriorFinishing = new ArrayList<>(); - exteriorFinishing.add("4.1 Wood or hardwood or panel-type siding is bowed or wavy"); - exteriorFinishing.add("4.2 Wood or hardwood or panel- type siding- joints not tight"); - exteriorFinishing.add("4.3 Wood or hardwood or panel- type siding fasteners are excessively countersunk into finished surface"); - exteriorFinishing.add("4.4 Lap siding is not install on a straight line"); - exteriorFinishing.add("4.5 Tongue-and-groove wood siding has buckled"); - exteriorFinishing.add("4.6 Wood siding - fastener has stained siding "); - exteriorFinishing.add("4.7 Cedar shakes or shingles have “bled” through paint or stain applied by builder"); - exteriorFinishing.add("4.8 Plywood or veneer siding has delaminated"); - exteriorFinishing.add("4.9 Aluminum/vinyl siding is bowed or wavy"); - exteriorFinishing.add("4.10 Aluminum or vinyl siding - colour is faded"); - exteriorFinishing.add("4.11 Aluminum or vinyl siding, trim or accessory is loose"); - exteriorFinishing.add("4.12 Aluminum or vinyl siding trim and accessories - fasteners don’t match siding colour"); - exteriorFinishing.add("4.13 Above-grade masonry veneer cladding (including mortar) is cracked"); - exteriorFinishing.add("4.14 Cut bricks are of different thickness in relation to one another"); - exteriorFinishing.add("4.15 Horizontal masonry joint alignment is not uniform "); - exteriorFinishing.add("4.16 Mortar splatters and stains on exterior masonry "); - exteriorFinishing.add("4.17 Efflorescence (typically a white powdery film) is present on masonry exterior finishes"); - exteriorFinishing.add("4.18 Deteriorating masonry "); - exteriorFinishing.add("4.19 Water leakage at doors and windows or at the top of the foundation "); - exteriorFinishing.add("4.20 Clay bricks are chipped "); - exteriorFinishing.add("4.21 Bricks are different colours "); - exteriorFinishing.add("4.22 Cracks in exterior stucco wall surfaces"); - exteriorFinishing.add("4.23 Exterior stucco is peeling or bubbling "); - exteriorFinishing.add("4.24 Unsealed gaps between dissimilar cladding materials and penetrations through cladding "); - exteriorFinishing.add("4.25 Exterior wood trim is split "); - exteriorFinishing.add("4.26 Exterior wood trim is bowed, twisted or cupped "); - exteriorFinishing.add("4.27 Paint on repaired areas doesn’t match "); - exteriorFinishing.add("4.28 Exterior paint, stain or clear finish blisters and peels "); - exteriorFinishing.add("4.29 Exterior paint or stain has faded "); - exteriorFinishing.add("4.30 Mould or mildew is visible on exterior painted surfaces "); - exteriorFinishing.add("4.31 Leak in exterior wall "); - exteriorFinishing.add("4.32 Thickness of vertical mortar joints are not uniform in brick or masonry units "); - categoryList.add(exteriorFinishing); - - List roof = new ArrayList<>(); - roof.add("5.1 Roof trusses, riddes or rafters are bowed"); - roof.add("5.2 Roof appears wavy"); - roof.add("5.3 Leaks due to snow or rain driven into the attic through louvers or vents"); - roof.add("5.4 Roof or Flashing leaks"); - roof.add("5.5 Inadequate attic ventilation"); - roof.add("5.6 Ice buildup on the roof"); - roof.add("5.7 Roof shingles have blown off"); - roof.add("5.8 Tabs on asphalt shingles are not lined up"); - roof.add("5.9 Asphalt shingles not sealed"); - roof.add("5.10 Asphalt shingle edges are curled or cupped"); - roof.add("5.11 Asphalt shingles either do not overhang the edge of the roof or hang over too far"); - roof.add("5.12 Shading pattern is visible on an asphalt shingle roof"); - roof.add("5.13 Variation in colour after repairs"); - roof.add("5.14 Uneven roof sheathing causing visible irregularities in the roof surface"); - roof.add("5.15 Roofing nails are exposed"); - roof.add("5.16 Temporary safety straps left on roof"); - roof.add("5.17 Water is trapped under roofing membrane"); - roof.add("5.18 Asphalt roll roofing is blistered but does not admit water"); - roof.add("5.19 Standing water on a flat roof"); - roof.add("5.20 Eavestroughs or downspouts leak"); - roof.add("5.21 Eavestroughs overflow during normal rain"); - roof.add("5.22 Eavestroughs or downspouts not performing properly"); - roof.add("5.23 Eavestroughs don’t drain completely"); - roof.add("5.24 Skylight leaks"); - categoryList.add(roof); - - List plumbing = new ArrayList<>(); - plumbing.add("6.1 Inadequate water supply"); - plumbing.add("6.2 The domestic water supply system does not deliver water"); - plumbing.add("6.3 Pipes are leaking"); - plumbing.add("6.4 Faucet or fixture is leaking"); - plumbing.add("6.5 Plumbing pipes are frozen and/or burst"); - plumbing.add("6.6 Bathtub or shower leaks"); - plumbing.add("6.7 Condensation appears on water supply pipes and toilets"); - plumbing.add("6.8 Noisy water pipes or “water hammer”"); - plumbing.add("6.9 Defective plumbing fixtures, appliances or trim fittings"); - plumbing.add("6.10 Cracking or chipping of porcelain, enamel or fibreglass surfaces"); - plumbing.add("6.11 Lightweight (fibreglass and acrylic) bathtub or shower base flexes and creaks"); - plumbing.add("6.12 Manufactured solid-surface countertop (integrated basin) cracks at the drain"); - plumbing.add("6.13 Toilet takes more than one flush to em"); - plumbing.add("6.14 Sewer, drains or fixtures blocked"); - plumbing.add("6.15 Colour variation in sinks, tubs, toilets or bidets (plumbing fixtures)"); - categoryList.add(plumbing); - - List electrical = new ArrayList<>(); - electrical.add("7.1 Fuses blow or circuit breakers trip"); - electrical.add("7.2 Ground-fault circuit interrupter (gfci) trips frequently"); - electrical.add("7.3 Electrical outlets or switches don’t work"); - electrical.add("7.4 Electrical fixture doesn’t work"); - electrical.add("7.5 Receptacle/switch cover plate is not flush with the wall"); - electrical.add("7.6 Exhaust fan duct terminates in attic or crawl space"); - electrical.add("7.7 Interior light fixture tarnished"); - electrical.add("7.8 Ceiling fan vibrates and is noisy"); - categoryList.add(electrical); - - List interiorClimateControl = new ArrayList<>(); - interiorClimateControl.add("8.1 Draft felt at electrical outlet"); - interiorClimateControl.add("8.2 Exterior air infiltration through windows and doors"); - interiorClimateControl.add("8.3 Kitchen or bath fans allow cold air infiltration or drafts"); - interiorClimateControl.add("8.4 Condensation in attic space"); - interiorClimateControl.add("8.5 Condensation and/or frost on windows"); - interiorClimateControl.add("8.6 Condensation on interior ductwork and air handling equipment"); - interiorClimateControl.add("8.7 Insufficient insulation"); - interiorClimateControl.add("8.8 Heating, ventilating or air conditioning (hvac) systems not installed properly"); - interiorClimateControl.add("8.9 Inadequate heating"); - interiorClimateControl.add("8.10 Inadequate cooling"); - interiorClimateControl.add("8.11 Noisy ductwork"); - interiorClimateControl.add("8.12 Ductwork makes noise when floor is walked on- commonly known as “oil canning”"); - interiorClimateControl.add("8.13 Noise can be heard at register"); - interiorClimateControl.add("8.14 Ductwork comes a"); - interiorClimateControl.add("8.15 Condensate line is blocked"); - interiorClimateControl.add("8.16 Air conditioning coolant line leaks"); - interiorClimateControl.add("8.17 There are gaps between heat diffusers, cold air return grilles and ventilation grilles and the adjacent surface"); - categoryList.add(interiorClimateControl); - - List wallAndCeilingFinish = new ArrayList<>(); - wallAndCeilingFinish.add("9.1 Ceiling is uneven"); - wallAndCeilingFinish.add("9.2 Ceiling texture is unevenly applied"); - wallAndCeilingFinish.add("9.3 Gypsum wallboard corners are uneven"); - wallAndCeilingFinish.add("9.4 Cracks in interior wall and ceiling surfaces"); - wallAndCeilingFinish.add("9.5 Ceiling/wall joint separation commonly referred to as “truss uplift”"); - wallAndCeilingFinish.add("9.6 Drywall surface blemishes including nail/screw pops, blisters in taped joints, trowel marks, excess joint compound and dents or gouges"); - wallAndCeilingFinish.add("9.7 Finish of painted gypsum wallboard (drywall) varies"); - wallAndCeilingFinish.add("9.8 Finished surface is rough"); - wallAndCeilingFinish.add("9.9 Paint finish is unacceptable"); - wallAndCeilingFinish.add("9.10 Clear interior finishes have deteriorated"); - wallAndCeilingFinish.add("9.11 Paint is splattered on surfaces not intended to be painted"); - wallAndCeilingFinish.add("9.12 Wallcovering is peeling"); - wallAndCeilingFinish.add("9.13 Patterns in wallcovering are mismatched at the edges"); - wallAndCeilingFinish.add("9.14 water penetration behind ceramic tile and bathtub or shower enclosures"); - wallAndCeilingFinish.add("9.15 Mildew or fungus is visible on interior surfaces"); - categoryList.add(wallAndCeilingFinish); - - List interiorFinish = new ArrayList<>(); - interiorFinish.add("10.1 Interior door is warped"); - interiorFinish.add("10.2 Bi-fold and sliding doors come off tracks"); - interiorFinish.add("10.3 Pocket door rubs"); - interiorFinish.add("10.4 Door rubs on the doorjamb or does not latch"); - interiorFinish.add("10.5 Wood door panel has split"); - interiorFinish.add("10.6 Door drags on the floor"); - interiorFinish.add("10.7 Gap between the door and the doorjamb is not uniform"); - interiorFinish.add("10.8 Interior door swings open or closes by itself"); - interiorFinish.add("10.9 Doors bind from improperly installed hinges"); - interiorFinish.add("10.10 Hinges are painted"); - interiorFinish.add("10.11 Gaps exist between stair parts"); - interiorFinish.add("10.12 Squeaking stair riser or tread"); - interiorFinish.add("10.13 Gaps exist between railing parts"); - interiorFinish.add("10.14 Stair railings lack rigidity"); - interiorFinish.add("10.15 Joint quality of interior trim and moulding work"); - interiorFinish.add("10.16 Nailheads and fasteners are not properly set or filled"); - interiorFinish.add("10.17 Interior trim is split"); - interiorFinish.add("10.18 Hammer marks are visible on trim"); - interiorFinish.add("10.19 Resin bleeding through painted finish"); - interiorFinish.add("10.20 Wall area around cold room door is unfinished"); - interiorFinish.add("10.21 Interior door edge is not painted"); - interiorFinish.add("10.22 Stairs, treads and/or landings are out of level"); - categoryList.add(interiorFinish); - - List cabinetsAndCountertops = new ArrayList<>(); - cabinetsAndCountertops.add("11.1 Gap between cabinets and ceilings or walls"); - cabinetsAndCountertops.add("11.2 Cabinets do not line up with each other"); - cabinetsAndCountertops.add("11.3 Cabinet doors and drawer faces are warped"); - cabinetsAndCountertops.add("11.4 Cabinet door or drawer binds or rubs"); - cabinetsAndCountertops.add("11.5 Cabinet doors will not stay closed"); - cabinetsAndCountertops.add("11.6 Laminated countertop (including seams, joints or edges) has swelled"); - cabinetsAndCountertops.add("11.7 Laminated countertop is delaminated"); - cabinetsAndCountertops.add("11.8 Cracks in countertop surfaces"); - cabinetsAndCountertops.add("11.9 Scratches/chips on countertops"); - cabinetsAndCountertops.add("11.10 Seams (joints) in stone countertops are too wide or open"); - cabinetsAndCountertops.add("11.11 Surface pits, fissures or veins in natural stone countertops"); - categoryList.add(cabinetsAndCountertops); - - List flooring = new ArrayList<>(); - flooring.add("12.1 Transition between different types of flooring is not flush"); - flooring.add("12.2 Finished floor is uneven"); - flooring.add("12.3 Pattern of finished flooring is out of alignment with adjacent wall surfaces"); - flooring.add("12.4 Carpet seam is visible"); - flooring.add("12.5 Carpet is loose or stretching has occurred"); - flooring.add("12.6 Spots or fading on carpet"); - flooring.add("12.7 Carpet not uniform in colour"); - flooring.add("12.8 Carpet has dark stains around perimeter of rooms and at heating registers"); - flooring.add("12.9 Hollow areas in underpad below carpet surface"); - flooring.add("12.10 Protrusions appear on the surface of resilient flooring without breaking through"); - flooring.add("12.11 Resilient sheet flooring is loos"); - flooring.add("12.12 Resilient flooring joints not tight"); - flooring.add("12.13 Bubbles appear on vinyl flooring surface"); - flooring.add("12.14 Patterns on sheet vinyl flooring are not aligned across seams"); - flooring.add("12.15 Resilient (flexible) floor tile is loose"); - flooring.add("12.16 Patterns or corners of resilient floor tile are misaligned"); - flooring.add("12.17 Yellowing appears on surface of vinyl flooring"); - flooring.add("12.18 Dye lot variations in vinyl flooring"); - flooring.add("12.19 Variation in colour occurring during repair of vinyl flooring"); - flooring.add("12.20 Cracks developing between strips of hardwood or parquet flooring"); - flooring.add("12.21 Strip hardwood flooring is cupped (high edges)"); - flooring.add("12.22 The surface of one strip of hardwood or parquet flooring is higher than another"); - flooring.add("12.23 Floor finish on wood flooring is not uniform"); - flooring.add("12.24 Finish on wood flooring has cracked, blistered, bubbled, or peeled resulting in detachment of finish"); - flooring.add("12.25 Crowning of strip hardwood flooring has occurred (centre of strip is higher than edges)"); - flooring.add("12.26 Wood flooring buckles and detaches from substrate"); - flooring.add("12.27 Knots and colour variation in strip wood flooring"); - flooring.add("12.28 Splinters occur in strip wood flooring"); - flooring.add("12.29 “Sticker burn” appears on surface of strip flooring"); - flooring.add("12.30 Ceramic/porcelain tile, marble or stone flooring is broken or loose (including marble transitions)"); - flooring.add("12.31 Cracks appearing in grouting of ceramic tile joints or at junctions with other materials such as bathtubs"); - flooring.add("12.32 Adjacent marble units or ceramic tile surfaces installed at different elevations"); - flooring.add("12.33 Grout is not a uniform colour"); - flooring.add("12.34 Dye lot variations in ceramic floor tiles"); - flooring.add("12.35 Variation in colour in natural stone tile installations (granite, marble, travertine, slate and limestone)"); - flooring.add("12.36 Gaps developing at ends or along strips of laminate flooring"); - flooring.add("12.37 Laminate flooring is cupped (high edges)"); - flooring.add("12.38 Laminate flooring buckles"); - flooring.add("12.39 Laminate flooring strips are dented, scratched and/or chipped"); - categoryList.add(cabinetsAndCountertops); - - List chimneysAndFireplace = new ArrayList<>(); - chimneysAndFireplace.add("13.1 Joint or crack in chimney cap allows water leak"); - chimneysAndFireplace.add("13.2 Roof flashing leaks at chimney"); - chimneysAndFireplace.add("13.3 Bricks breaking up on surface of chimney"); - chimneysAndFireplace.add("13.4 Chimney serving solid-fuel-burning (wood, pellet, etc.) Appliance does not draw properly"); - chimneysAndFireplace.add("13.5 Fireplace firebox paint colour changed"); - chimneysAndFireplace.add("13.6 Firebrick is broken"); - categoryList.add(chimneysAndFireplace); - - List garageAndExterior = new ArrayList<>(); - garageAndExterior.add("14.1 Garage floor has heaved or settled"); - garageAndExterior.add("14.2 Concrete garage floor is cracked"); - garageAndExterior.add("14.3 No reinforcement in garage slab"); - garageAndExterior.add("14.4 Garage doors do not operate properly"); - garageAndExterior.add("14.5 Garage doors (vehicular and man-doors) allow entrance of snow or water"); - garageAndExterior.add("14.6 Water accumulates on garage floor"); - garageAndExterior.add("14.7 Asphalt or concrete driveway has cracked"); - garageAndExterior.add("14.8 Driveway has settled"); - garageAndExterior.add("14.9 Sod/seeding not completed"); - garageAndExterior.add("14.10 The shrubs, tree(s), plants, or sod have died"); - garageAndExterior.add("14.11 Tree stumps have been left on the property"); - garageAndExterior.add("14.12 Water ponding in surface grading of the site"); - garageAndExterior.add("14.13 Settling, heaving or separating of landings or steps"); - garageAndExterior.add("14.14 Exterior deck is springy or shaky"); - garageAndExterior.add("14.15 Exterior deck railing is shaky"); - garageAndExterior.add("14.16 Deck board spacing is not uniform"); - garageAndExterior.add("14.17 Exterior wood handrails have slivers"); - garageAndExterior.add("14.18 Exterior deck is out of level"); - garageAndExterior.add("14.19 Floor decking boards are split, warped or cupped"); - garageAndExterior.add("14.20 Stain colour variations on wood deck"); - garageAndExterior.add("14.21 Nailheads stick up on deck surface"); - garageAndExterior.add("14.22 Stains on exterior decking from nailheads"); - garageAndExterior.add("14.23 Twisting of open-end beams"); - categoryList.add(garageAndExterior); - - } - - -} diff --git a/src/ca/sheridancollege/beans/Category.java b/src/ca/sheridancollege/beans/Category.java new file mode 100644 index 0000000..d77c1c8 --- /dev/null +++ b/src/ca/sheridancollege/beans/Category.java @@ -0,0 +1,319 @@ +package ca.sheridancollege.beans; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Perds on 9/29/2016. + */ +public class Category { + + private List categoryList = new ArrayList<>(); + + public Category() { + setCategoryList(); + } + + public List getCategoryList() { + return categoryList; + } + + public void setCategoryList() { + List foundation = new ArrayList<>(); + foundation.add("1.1 Efflorescence is present on concrete or masonry foundation surface"); + foundation.add("1.2 Interior concrete surefaces are powdery"); + foundation.add("1.3 Concrete surface is flaking"); + foundation.add("1.4 Concrete basement floor is cracked"); + foundation.add("1.5 Concrete floor slab-on-ground has settled in a finished area"); + foundation.add("1.6 No reinforcement in basement concrete slab"); + foundation.add("1.7 Concrete block foundation wall is cracked"); + foundation.add("1.8 Parging (not brush coating) is falling off above grade"); + foundation.add("1.9 Exposed cast-in-place concrete foundation wall has holes in the surface"); + foundation.add("1.10 Cast-in-place concrete foundation wall is cracked "); + foundation.add("1.11 Condensation in crawl space"); + foundation.add("1.12 Basement wall or floor is damp"); + foundation.add("1.13 Foundation wall leaks"); + foundation.add("1.14 Water leakage through basement floor slab"); + foundation.add("1.15 Brush coating on above grade poured concrete foundation wall is falling off"); + foundation.add("1.16 Basement floor drain is too high"); + foundation.add("1.17 Condensation in cold room/cantina"); + foundation.add("1.18 Water/snow accumulation in basement window wells"); + categoryList.add(new SubCategory(foundation, "Foundation")); + + List floorFraming = new ArrayList<>(); + floorFraming.add("2.1 Wood joist, bean or post is split, checked or cupped"); + floorFraming.add("2.2 Floor framing damaged by weather during construction"); + floorFraming.add("2.3 Loose subfloor"); + floorFraming.add("2.4 Floor Squeaks"); + floorFraming.add("2.5 Finished floor above grade is out of level"); + floorFraming.add("2.6 Springiness, bounce, visible sag when loaded, or shaking is observed in the floor"); + categoryList.add(new SubCategory(floorFraming, "Floor Framing")); + + List wallFraming = new ArrayList<>(); + wallFraming.add("3.1 Wall is out of plumb"); + wallFraming.add("3.2 Wall is Bowed"); + wallFraming.add("3.3 Malfunction of windows"); + wallFraming.add("3.4 Window glass and or screen is damaged"); + wallFraming.add("3.5 Glass is scratched"); + wallFraming.add("3.6 Glass is cracked"); + wallFraming.add("3.7 Window unit leaks during rain"); + wallFraming.add("3.8 Condensation forming between insulating (factory sealed) glass unit"); + wallFraming.add("3.9 Exterior door is warped"); + wallFraming.add("3.10 Exterior metal door is dented"); + wallFraming.add("3.11 Shrinkage of inserted panels shows raw wood edges on exterior wood doors"); + wallFraming.add("3.12 Cracks and splits in exterior wood doors"); + wallFraming.add("3.13 Exterior door sticks"); + wallFraming.add("3.14 Exterior door will not close completely"); + wallFraming.add("3.15 Plastic moulding on exterior door is deformed"); + wallFraming.add("3.16 Exterior door swings open or closed by itself"); + wallFraming.add("3.17 Exterior door is crooked in the frame"); + wallFraming.add("3.18 Exterior door hardware or decorative metal trim has discoloured"); + wallFraming.add("3.19 Sliding door screen will not stay on track or sliding door does not roll smoothly"); + categoryList.add(new SubCategory(wallFraming, "Wall Framing")); + + List exteriorFinishing = new ArrayList<>(); + exteriorFinishing.add("4.1 Wood or hardwood or panel-type siding is bowed or wavy"); + exteriorFinishing.add("4.2 Wood or hardwood or panel- type siding- joints not tight"); + exteriorFinishing.add("4.3 Wood or hardwood or panel- type siding fasteners are excessively countersunk into finished surface"); + exteriorFinishing.add("4.4 Lap siding is not install on a straight line"); + exteriorFinishing.add("4.5 Tongue-and-groove wood siding has buckled"); + exteriorFinishing.add("4.6 Wood siding - fastener has stained siding "); + exteriorFinishing.add("4.7 Cedar shakes or shingles have �bled� through paint or stain applied by builder"); + exteriorFinishing.add("4.8 Plywood or veneer siding has delaminated"); + exteriorFinishing.add("4.9 Aluminum/vinyl siding is bowed or wavy"); + exteriorFinishing.add("4.10 Aluminum or vinyl siding - colour is faded"); + exteriorFinishing.add("4.11 Aluminum or vinyl siding, trim or accessory is loose"); + exteriorFinishing.add("4.12 Aluminum or vinyl siding trim and accessories - fasteners don�t match siding colour"); + exteriorFinishing.add("4.13 Above-grade masonry veneer cladding (including mortar) is cracked"); + exteriorFinishing.add("4.14 Cut bricks are of different thickness in relation to one another"); + exteriorFinishing.add("4.15 Horizontal masonry joint alignment is not uniform "); + exteriorFinishing.add("4.16 Mortar splatters and stains on exterior masonry "); + exteriorFinishing.add("4.17 Efflorescence (typically a white powdery film) is present on masonry exterior finishes"); + exteriorFinishing.add("4.18 Deteriorating masonry "); + exteriorFinishing.add("4.19 Water leakage at doors and windows or at the top of the foundation "); + exteriorFinishing.add("4.20 Clay bricks are chipped "); + exteriorFinishing.add("4.21 Bricks are different colours "); + exteriorFinishing.add("4.22 Cracks in exterior stucco wall surfaces"); + exteriorFinishing.add("4.23 Exterior stucco is peeling or bubbling "); + exteriorFinishing.add("4.24 Unsealed gaps between dissimilar cladding materials and penetrations through cladding "); + exteriorFinishing.add("4.25 Exterior wood trim is split "); + exteriorFinishing.add("4.26 Exterior wood trim is bowed, twisted or cupped "); + exteriorFinishing.add("4.27 Paint on repaired areas doesn�t match "); + exteriorFinishing.add("4.28 Exterior paint, stain or clear finish blisters and peels "); + exteriorFinishing.add("4.29 Exterior paint or stain has faded "); + exteriorFinishing.add("4.30 Mould or mildew is visible on exterior painted surfaces "); + exteriorFinishing.add("4.31 Leak in exterior wall "); + exteriorFinishing.add("4.32 Thickness of vertical mortar joints are not uniform in brick or masonry units "); + categoryList.add(new SubCategory(exteriorFinishing, "Exterior Finishing")); + + List roof = new ArrayList<>(); + roof.add("5.1 Roof trusses, riddes or rafters are bowed"); + roof.add("5.2 Roof appears wavy"); + roof.add("5.3 Leaks due to snow or rain driven into the attic through louvers or vents"); + roof.add("5.4 Roof or Flashing leaks"); + roof.add("5.5 Inadequate attic ventilation"); + roof.add("5.6 Ice buildup on the roof"); + roof.add("5.7 Roof shingles have blown off"); + roof.add("5.8 Tabs on asphalt shingles are not lined up"); + roof.add("5.9 Asphalt shingles not sealed"); + roof.add("5.10 Asphalt shingle edges are curled or cupped"); + roof.add("5.11 Asphalt shingles either do not overhang the edge of the roof or hang over too far"); + roof.add("5.12 Shading pattern is visible on an asphalt shingle roof"); + roof.add("5.13 Variation in colour after repairs"); + roof.add("5.14 Uneven roof sheathing causing visible irregularities in the roof surface"); + roof.add("5.15 Roofing nails are exposed"); + roof.add("5.16 Temporary safety straps left on roof"); + roof.add("5.17 Water is trapped under roofing membrane"); + roof.add("5.18 Asphalt roll roofing is blistered but does not admit water"); + roof.add("5.19 Standing water on a flat roof"); + roof.add("5.20 Eavestroughs or downspouts leak"); + roof.add("5.21 Eavestroughs overflow during normal rain"); + roof.add("5.22 Eavestroughs or downspouts not performing properly"); + roof.add("5.23 Eavestroughs don�t drain completely"); + roof.add("5.24 Skylight leaks"); + categoryList.add(new SubCategory(roof, "Roof")); + + List plumbing = new ArrayList<>(); + plumbing.add("6.1 Inadequate water supply"); + plumbing.add("6.2 The domestic water supply system does not deliver water"); + plumbing.add("6.3 Pipes are leaking"); + plumbing.add("6.4 Faucet or fixture is leaking"); + plumbing.add("6.5 Plumbing pipes are frozen and/or burst"); + plumbing.add("6.6 Bathtub or shower leaks"); + plumbing.add("6.7 Condensation appears on water supply pipes and toilets"); + plumbing.add("6.8 Noisy water pipes or �water hammer�"); + plumbing.add("6.9 Defective plumbing fixtures, appliances or trim fittings"); + plumbing.add("6.10 Cracking or chipping of porcelain, enamel or fibreglass surfaces"); + plumbing.add("6.11 Lightweight (fibreglass and acrylic) bathtub or shower base flexes and creaks"); + plumbing.add("6.12 Manufactured solid-surface countertop (integrated basin) cracks at the drain"); + plumbing.add("6.13 Toilet takes more than one flush to em"); + plumbing.add("6.14 Sewer, drains or fixtures blocked"); + plumbing.add("6.15 Colour variation in sinks, tubs, toilets or bidets (plumbing fixtures)"); + categoryList.add(new SubCategory(plumbing, "Plumbing")); + + List electrical = new ArrayList<>(); + electrical.add("7.1 Fuses blow or circuit breakers trip"); + electrical.add("7.2 Ground-fault circuit interrupter (gfci) trips frequently"); + electrical.add("7.3 Electrical outlets or switches don�t work"); + electrical.add("7.4 Electrical fixture doesn�t work"); + electrical.add("7.5 Receptacle/switch cover plate is not flush with the wall"); + electrical.add("7.6 Exhaust fan duct terminates in attic or crawl space"); + electrical.add("7.7 Interior light fixture tarnished"); + electrical.add("7.8 Ceiling fan vibrates and is noisy"); + categoryList.add(new SubCategory(electrical, "Electrical")); + + List interiorClimateControl = new ArrayList<>(); + interiorClimateControl.add("8.1 Draft felt at electrical outlet"); + interiorClimateControl.add("8.2 Exterior air infiltration through windows and doors"); + interiorClimateControl.add("8.3 Kitchen or bath fans allow cold air infiltration or drafts"); + interiorClimateControl.add("8.4 Condensation in attic space"); + interiorClimateControl.add("8.5 Condensation and/or frost on windows"); + interiorClimateControl.add("8.6 Condensation on interior ductwork and air handling equipment"); + interiorClimateControl.add("8.7 Insufficient insulation"); + interiorClimateControl.add("8.8 Heating, ventilating or air conditioning (hvac) systems not installed properly"); + interiorClimateControl.add("8.9 Inadequate heating"); + interiorClimateControl.add("8.10 Inadequate cooling"); + interiorClimateControl.add("8.11 Noisy ductwork"); + interiorClimateControl.add("8.12 Ductwork makes noise when floor is walked on- commonly known as �oil canning�"); + interiorClimateControl.add("8.13 Noise can be heard at register"); + interiorClimateControl.add("8.14 Ductwork comes a"); + interiorClimateControl.add("8.15 Condensate line is blocked"); + interiorClimateControl.add("8.16 Air conditioning coolant line leaks"); + interiorClimateControl.add("8.17 There are gaps between heat diffusers, cold air return grilles and ventilation grilles and the adjacent surface"); + categoryList.add(new SubCategory(interiorClimateControl, "Interior Climate Control")); + + List wallAndCeilingFinish = new ArrayList<>(); + wallAndCeilingFinish.add("9.1 Ceiling is uneven"); + wallAndCeilingFinish.add("9.2 Ceiling texture is unevenly applied"); + wallAndCeilingFinish.add("9.3 Gypsum wallboard corners are uneven"); + wallAndCeilingFinish.add("9.4 Cracks in interior wall and ceiling surfaces"); + wallAndCeilingFinish.add("9.5 Ceiling/wall joint separation commonly referred to as �truss uplift�"); + wallAndCeilingFinish.add("9.6 Drywall surface blemishes including nail/screw pops, blisters in taped joints, trowel marks, excess joint compound and dents or gouges"); + wallAndCeilingFinish.add("9.7 Finish of painted gypsum wallboard (drywall) varies"); + wallAndCeilingFinish.add("9.8 Finished surface is rough"); + wallAndCeilingFinish.add("9.9 Paint finish is unacceptable"); + wallAndCeilingFinish.add("9.10 Clear interior finishes have deteriorated"); + wallAndCeilingFinish.add("9.11 Paint is splattered on surfaces not intended to be painted"); + wallAndCeilingFinish.add("9.12 Wallcovering is peeling"); + wallAndCeilingFinish.add("9.13 Patterns in wallcovering are mismatched at the edges"); + wallAndCeilingFinish.add("9.14 water penetration behind ceramic tile and bathtub or shower enclosures"); + wallAndCeilingFinish.add("9.15 Mildew or fungus is visible on interior surfaces"); + categoryList.add(new SubCategory(wallAndCeilingFinish, "Wall and Ceiling Finish")); + + List interiorFinish = new ArrayList<>(); + interiorFinish.add("10.1 Interior door is warped"); + interiorFinish.add("10.2 Bi-fold and sliding doors come off tracks"); + interiorFinish.add("10.3 Pocket door rubs"); + interiorFinish.add("10.4 Door rubs on the doorjamb or does not latch"); + interiorFinish.add("10.5 Wood door panel has split"); + interiorFinish.add("10.6 Door drags on the floor"); + interiorFinish.add("10.7 Gap between the door and the doorjamb is not uniform"); + interiorFinish.add("10.8 Interior door swings open or closes by itself"); + interiorFinish.add("10.9 Doors bind from improperly installed hinges"); + interiorFinish.add("10.10 Hinges are painted"); + interiorFinish.add("10.11 Gaps exist between stair parts"); + interiorFinish.add("10.12 Squeaking stair riser or tread"); + interiorFinish.add("10.13 Gaps exist between railing parts"); + interiorFinish.add("10.14 Stair railings lack rigidity"); + interiorFinish.add("10.15 Joint quality of interior trim and moulding work"); + interiorFinish.add("10.16 Nailheads and fasteners are not properly set or filled"); + interiorFinish.add("10.17 Interior trim is split"); + interiorFinish.add("10.18 Hammer marks are visible on trim"); + interiorFinish.add("10.19 Resin bleeding through painted finish"); + interiorFinish.add("10.20 Wall area around cold room door is unfinished"); + interiorFinish.add("10.21 Interior door edge is not painted"); + interiorFinish.add("10.22 Stairs, treads and/or landings are out of level"); + categoryList.add(new SubCategory(interiorFinish, "Interior Finish")); + + List cabinetsAndCountertops = new ArrayList<>(); + cabinetsAndCountertops.add("11.1 Gap between cabinets and ceilings or walls"); + cabinetsAndCountertops.add("11.2 Cabinets do not line up with each other"); + cabinetsAndCountertops.add("11.3 Cabinet doors and drawer faces are warped"); + cabinetsAndCountertops.add("11.4 Cabinet door or drawer binds or rubs"); + cabinetsAndCountertops.add("11.5 Cabinet doors will not stay closed"); + cabinetsAndCountertops.add("11.6 Laminated countertop (including seams, joints or edges) has swelled"); + cabinetsAndCountertops.add("11.7 Laminated countertop is delaminated"); + cabinetsAndCountertops.add("11.8 Cracks in countertop surfaces"); + cabinetsAndCountertops.add("11.9 Scratches/chips on countertops"); + cabinetsAndCountertops.add("11.10 Seams (joints) in stone countertops are too wide or open"); + cabinetsAndCountertops.add("11.11 Surface pits, fissures or veins in natural stone countertops"); + categoryList.add(new SubCategory(cabinetsAndCountertops, "Cabinets and Countertops")); + + List flooring = new ArrayList<>(); + flooring.add("12.1 Transition between different types of flooring is not flush"); + flooring.add("12.2 Finished floor is uneven"); + flooring.add("12.3 Pattern of finished flooring is out of alignment with adjacent wall surfaces"); + flooring.add("12.4 Carpet seam is visible"); + flooring.add("12.5 Carpet is loose or stretching has occurred"); + flooring.add("12.6 Spots or fading on carpet"); + flooring.add("12.7 Carpet not uniform in colour"); + flooring.add("12.8 Carpet has dark stains around perimeter of rooms and at heating registers"); + flooring.add("12.9 Hollow areas in underpad below carpet surface"); + flooring.add("12.10 Protrusions appear on the surface of resilient flooring without breaking through"); + flooring.add("12.11 Resilient sheet flooring is loos"); + flooring.add("12.12 Resilient flooring joints not tight"); + flooring.add("12.13 Bubbles appear on vinyl flooring surface"); + flooring.add("12.14 Patterns on sheet vinyl flooring are not aligned across seams"); + flooring.add("12.15 Resilient (flexible) floor tile is loose"); + flooring.add("12.16 Patterns or corners of resilient floor tile are misaligned"); + flooring.add("12.17 Yellowing appears on surface of vinyl flooring"); + flooring.add("12.18 Dye lot variations in vinyl flooring"); + flooring.add("12.19 Variation in colour occurring during repair of vinyl flooring"); + flooring.add("12.20 Cracks developing between strips of hardwood or parquet flooring"); + flooring.add("12.21 Strip hardwood flooring is cupped (high edges)"); + flooring.add("12.22 The surface of one strip of hardwood or parquet flooring is higher than another"); + flooring.add("12.23 Floor finish on wood flooring is not uniform"); + flooring.add("12.24 Finish on wood flooring has cracked, blistered, bubbled, or peeled resulting in detachment of finish"); + flooring.add("12.25 Crowning of strip hardwood flooring has occurred (centre of strip is higher than edges)"); + flooring.add("12.26 Wood flooring buckles and detaches from substrate"); + flooring.add("12.27 Knots and colour variation in strip wood flooring"); + flooring.add("12.28 Splinters occur in strip wood flooring"); + flooring.add("12.29 �Sticker burn� appears on surface of strip flooring"); + flooring.add("12.30 Ceramic/porcelain tile, marble or stone flooring is broken or loose (including marble transitions)"); + flooring.add("12.31 Cracks appearing in grouting of ceramic tile joints or at junctions with other materials such as bathtubs"); + flooring.add("12.32 Adjacent marble units or ceramic tile surfaces installed at different elevations"); + flooring.add("12.33 Grout is not a uniform colour"); + flooring.add("12.34 Dye lot variations in ceramic floor tiles"); + flooring.add("12.35 Variation in colour in natural stone tile installations (granite, marble, travertine, slate and limestone)"); + flooring.add("12.36 Gaps developing at ends or along strips of laminate flooring"); + flooring.add("12.37 Laminate flooring is cupped (high edges)"); + flooring.add("12.38 Laminate flooring buckles"); + flooring.add("12.39 Laminate flooring strips are dented, scratched and/or chipped"); + categoryList.add(new SubCategory(flooring, "Flooring")); + + List chimneysAndFireplace = new ArrayList<>(); + chimneysAndFireplace.add("13.1 Joint or crack in chimney cap allows water leak"); + chimneysAndFireplace.add("13.2 Roof flashing leaks at chimney"); + chimneysAndFireplace.add("13.3 Bricks breaking up on surface of chimney"); + chimneysAndFireplace.add("13.4 Chimney serving solid-fuel-burning (wood, pellet, etc.) Appliance does not draw properly"); + chimneysAndFireplace.add("13.5 Fireplace firebox paint colour changed"); + chimneysAndFireplace.add("13.6 Firebrick is broken"); + categoryList.add(new SubCategory(chimneysAndFireplace, "Chimneys and Fireplace")); + + List garageAndExterior = new ArrayList<>(); + garageAndExterior.add("14.1 Garage floor has heaved or settled"); + garageAndExterior.add("14.2 Concrete garage floor is cracked"); + garageAndExterior.add("14.3 No reinforcement in garage slab"); + garageAndExterior.add("14.4 Garage doors do not operate properly"); + garageAndExterior.add("14.5 Garage doors (vehicular and man-doors) allow entrance of snow or water"); + garageAndExterior.add("14.6 Water accumulates on garage floor"); + garageAndExterior.add("14.7 Asphalt or concrete driveway has cracked"); + garageAndExterior.add("14.8 Driveway has settled"); + garageAndExterior.add("14.9 Sod/seeding not completed"); + garageAndExterior.add("14.10 The shrubs, tree(s), plants, or sod have died"); + garageAndExterior.add("14.11 Tree stumps have been left on the property"); + garageAndExterior.add("14.12 Water ponding in surface grading of the site"); + garageAndExterior.add("14.13 Settling, heaving or separating of landings or steps"); + garageAndExterior.add("14.14 Exterior deck is springy or shaky"); + garageAndExterior.add("14.15 Exterior deck railing is shaky"); + garageAndExterior.add("14.16 Deck board spacing is not uniform"); + garageAndExterior.add("14.17 Exterior wood handrails have slivers"); + garageAndExterior.add("14.18 Exterior deck is out of level"); + garageAndExterior.add("14.19 Floor decking boards are split, warped or cupped"); + garageAndExterior.add("14.20 Stain colour variations on wood deck"); + garageAndExterior.add("14.21 Nailheads stick up on deck surface"); + garageAndExterior.add("14.22 Stains on exterior decking from nailheads"); + garageAndExterior.add("14.23 Twisting of open-end beams"); + categoryList.add(new SubCategory(garageAndExterior, "Garbage and Exterior")); + } +} diff --git a/src/ca/sheridancollege/beans/SubCategory.java b/src/ca/sheridancollege/beans/SubCategory.java new file mode 100644 index 0000000..43cb508 --- /dev/null +++ b/src/ca/sheridancollege/beans/SubCategory.java @@ -0,0 +1,34 @@ +package ca.sheridancollege.beans; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Perds on 9/29/2016. + */ +public class SubCategory { + + private List subCategoryList = new ArrayList<>(); + private String subCategoryName; + + public SubCategory(List subCategoryList, String subCategoryName) { + this.subCategoryList = subCategoryList; + this.subCategoryName = subCategoryName; + } + + public List getSubCategoryList() { + return subCategoryList; + } + + public void setSubCategoryList(List subCategoryList) { + this.subCategoryList = subCategoryList; + } + + public String getSubCategoryName() { + return subCategoryName; + } + + public void setSubCategoryName(String subCategoryName) { + this.subCategoryName = subCategoryName; + } +} From 8aae1dc492471132e7c6faeaf8ee8c3533fdffbc Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Thu, 29 Sep 2016 18:00:43 -0400 Subject: [PATCH 15/57] Changed wording --- src/ca/sheridancollege/beans/Category.java | 56 +++++++++---------- .../sheridancollege/config/hibernate.cfg.xml | 6 +- .../sheridancollege/config/hibernate.cfg.xml | 6 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/ca/sheridancollege/beans/Category.java b/src/ca/sheridancollege/beans/Category.java index d77c1c8..d9ebf16 100644 --- a/src/ca/sheridancollege/beans/Category.java +++ b/src/ca/sheridancollege/beans/Category.java @@ -38,7 +38,7 @@ public void setCategoryList() { foundation.add("1.16 Basement floor drain is too high"); foundation.add("1.17 Condensation in cold room/cantina"); foundation.add("1.18 Water/snow accumulation in basement window wells"); - categoryList.add(new SubCategory(foundation, "Foundation")); + categoryList.add(new SubCategory(foundation, "Foundation/Basement")); List floorFraming = new ArrayList<>(); floorFraming.add("2.1 Wood joist, bean or post is split, checked or cupped"); @@ -77,33 +77,33 @@ public void setCategoryList() { exteriorFinishing.add("4.3 Wood or hardwood or panel- type siding fasteners are excessively countersunk into finished surface"); exteriorFinishing.add("4.4 Lap siding is not install on a straight line"); exteriorFinishing.add("4.5 Tongue-and-groove wood siding has buckled"); - exteriorFinishing.add("4.6 Wood siding - fastener has stained siding "); - exteriorFinishing.add("4.7 Cedar shakes or shingles have �bled� through paint or stain applied by builder"); + exteriorFinishing.add("4.6 Wood siding - fastener has stained siding"); + exteriorFinishing.add("4.7 Cedar shakes or shingles have 'bled' through paint or stain applied by builder"); exteriorFinishing.add("4.8 Plywood or veneer siding has delaminated"); exteriorFinishing.add("4.9 Aluminum/vinyl siding is bowed or wavy"); exteriorFinishing.add("4.10 Aluminum or vinyl siding - colour is faded"); exteriorFinishing.add("4.11 Aluminum or vinyl siding, trim or accessory is loose"); - exteriorFinishing.add("4.12 Aluminum or vinyl siding trim and accessories - fasteners don�t match siding colour"); + exteriorFinishing.add("4.12 Aluminum or vinyl siding trim and accessories - fasteners don't match siding colour"); exteriorFinishing.add("4.13 Above-grade masonry veneer cladding (including mortar) is cracked"); exteriorFinishing.add("4.14 Cut bricks are of different thickness in relation to one another"); - exteriorFinishing.add("4.15 Horizontal masonry joint alignment is not uniform "); - exteriorFinishing.add("4.16 Mortar splatters and stains on exterior masonry "); + exteriorFinishing.add("4.15 Horizontal masonry joint alignment is not uniform"); + exteriorFinishing.add("4.16 Mortar splatters and stains on exterior masonry"); exteriorFinishing.add("4.17 Efflorescence (typically a white powdery film) is present on masonry exterior finishes"); - exteriorFinishing.add("4.18 Deteriorating masonry "); - exteriorFinishing.add("4.19 Water leakage at doors and windows or at the top of the foundation "); - exteriorFinishing.add("4.20 Clay bricks are chipped "); - exteriorFinishing.add("4.21 Bricks are different colours "); + exteriorFinishing.add("4.18 Deteriorating masonry"); + exteriorFinishing.add("4.19 Water leakage at doors and windows or at the top of the foundation"); + exteriorFinishing.add("4.20 Clay bricks are chipped"); + exteriorFinishing.add("4.21 Bricks are different colours"); exteriorFinishing.add("4.22 Cracks in exterior stucco wall surfaces"); - exteriorFinishing.add("4.23 Exterior stucco is peeling or bubbling "); - exteriorFinishing.add("4.24 Unsealed gaps between dissimilar cladding materials and penetrations through cladding "); - exteriorFinishing.add("4.25 Exterior wood trim is split "); - exteriorFinishing.add("4.26 Exterior wood trim is bowed, twisted or cupped "); - exteriorFinishing.add("4.27 Paint on repaired areas doesn�t match "); - exteriorFinishing.add("4.28 Exterior paint, stain or clear finish blisters and peels "); - exteriorFinishing.add("4.29 Exterior paint or stain has faded "); - exteriorFinishing.add("4.30 Mould or mildew is visible on exterior painted surfaces "); - exteriorFinishing.add("4.31 Leak in exterior wall "); - exteriorFinishing.add("4.32 Thickness of vertical mortar joints are not uniform in brick or masonry units "); + exteriorFinishing.add("4.23 Exterior stucco is peeling or bubbling"); + exteriorFinishing.add("4.24 Unsealed gaps between dissimilar cladding materials and penetrations through cladding"); + exteriorFinishing.add("4.25 Exterior wood trim is split"); + exteriorFinishing.add("4.26 Exterior wood trim is bowed, twisted or cupped"); + exteriorFinishing.add("4.27 Paint on repaired areas doesn't match"); + exteriorFinishing.add("4.28 Exterior paint, stain or clear finish blisters and peels"); + exteriorFinishing.add("4.29 Exterior paint or stain has faded"); + exteriorFinishing.add("4.30 Mould or mildew is visible on exterior painted surfaces"); + exteriorFinishing.add("4.31 Leak in exterior wall"); + exteriorFinishing.add("4.32 Thickness of vertical mortar joints are not uniform in brick or masonry units"); categoryList.add(new SubCategory(exteriorFinishing, "Exterior Finishing")); List roof = new ArrayList<>(); @@ -129,9 +129,9 @@ public void setCategoryList() { roof.add("5.20 Eavestroughs or downspouts leak"); roof.add("5.21 Eavestroughs overflow during normal rain"); roof.add("5.22 Eavestroughs or downspouts not performing properly"); - roof.add("5.23 Eavestroughs don�t drain completely"); + roof.add("5.23 Eavestroughs don't drain completely"); roof.add("5.24 Skylight leaks"); - categoryList.add(new SubCategory(roof, "Roof")); + categoryList.add(new SubCategory(roof, "Roofs")); List plumbing = new ArrayList<>(); plumbing.add("6.1 Inadequate water supply"); @@ -141,7 +141,7 @@ public void setCategoryList() { plumbing.add("6.5 Plumbing pipes are frozen and/or burst"); plumbing.add("6.6 Bathtub or shower leaks"); plumbing.add("6.7 Condensation appears on water supply pipes and toilets"); - plumbing.add("6.8 Noisy water pipes or �water hammer�"); + plumbing.add("6.8 Noisy water pipes or water hammer"); plumbing.add("6.9 Defective plumbing fixtures, appliances or trim fittings"); plumbing.add("6.10 Cracking or chipping of porcelain, enamel or fibreglass surfaces"); plumbing.add("6.11 Lightweight (fibreglass and acrylic) bathtub or shower base flexes and creaks"); @@ -154,8 +154,8 @@ public void setCategoryList() { List electrical = new ArrayList<>(); electrical.add("7.1 Fuses blow or circuit breakers trip"); electrical.add("7.2 Ground-fault circuit interrupter (gfci) trips frequently"); - electrical.add("7.3 Electrical outlets or switches don�t work"); - electrical.add("7.4 Electrical fixture doesn�t work"); + electrical.add("7.3 Electrical outlets or switches don't work"); + electrical.add("7.4 Electrical fixture doesn't work"); electrical.add("7.5 Receptacle/switch cover plate is not flush with the wall"); electrical.add("7.6 Exhaust fan duct terminates in attic or crawl space"); electrical.add("7.7 Interior light fixture tarnished"); @@ -174,7 +174,7 @@ public void setCategoryList() { interiorClimateControl.add("8.9 Inadequate heating"); interiorClimateControl.add("8.10 Inadequate cooling"); interiorClimateControl.add("8.11 Noisy ductwork"); - interiorClimateControl.add("8.12 Ductwork makes noise when floor is walked on- commonly known as �oil canning�"); + interiorClimateControl.add("8.12 Ductwork makes noise when floor is walked on- commonly known as oil canning"); interiorClimateControl.add("8.13 Noise can be heard at register"); interiorClimateControl.add("8.14 Ductwork comes a"); interiorClimateControl.add("8.15 Condensate line is blocked"); @@ -187,7 +187,7 @@ public void setCategoryList() { wallAndCeilingFinish.add("9.2 Ceiling texture is unevenly applied"); wallAndCeilingFinish.add("9.3 Gypsum wallboard corners are uneven"); wallAndCeilingFinish.add("9.4 Cracks in interior wall and ceiling surfaces"); - wallAndCeilingFinish.add("9.5 Ceiling/wall joint separation commonly referred to as �truss uplift�"); + wallAndCeilingFinish.add("9.5 Ceiling/wall joint separation commonly referred to as truss uplift"); wallAndCeilingFinish.add("9.6 Drywall surface blemishes including nail/screw pops, blisters in taped joints, trowel marks, excess joint compound and dents or gouges"); wallAndCeilingFinish.add("9.7 Finish of painted gypsum wallboard (drywall) varies"); wallAndCeilingFinish.add("9.8 Finished surface is rough"); @@ -268,7 +268,7 @@ public void setCategoryList() { flooring.add("12.26 Wood flooring buckles and detaches from substrate"); flooring.add("12.27 Knots and colour variation in strip wood flooring"); flooring.add("12.28 Splinters occur in strip wood flooring"); - flooring.add("12.29 �Sticker burn� appears on surface of strip flooring"); + flooring.add("12.29 'Sticker burn' appears on surface of strip flooring"); flooring.add("12.30 Ceramic/porcelain tile, marble or stone flooring is broken or loose (including marble transitions)"); flooring.add("12.31 Cracks appearing in grouting of ceramic tile joints or at junctions with other materials such as bathtubs"); flooring.add("12.32 Adjacent marble units or ceramic tile surfaces installed at different elevations"); diff --git a/src/ca/sheridancollege/config/hibernate.cfg.xml b/src/ca/sheridancollege/config/hibernate.cfg.xml index 64ceeec..2166121 100644 --- a/src/ca/sheridancollege/config/hibernate.cfg.xml +++ b/src/ca/sheridancollege/config/hibernate.cfg.xml @@ -5,9 +5,9 @@ com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 + jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb + root + 12345678 org.hibernate.dialect.MySQLDialect diff --git a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml index 64ceeec..2166121 100644 --- a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml +++ b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml @@ -5,9 +5,9 @@ com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 + jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb + root + 12345678 org.hibernate.dialect.MySQLDialect From 2aa396228a763ce125bdad5b7256412e7f15923a Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 29 Sep 2016 18:10:09 -0400 Subject: [PATCH 16/57] saves img to database having issue with calling image back out of db --- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 2 +- WebContent/scripts/signing.js | 2 +- src/ca/sheridancollege/beans/Form.java | 27 +++++- .../config/security-context.xml | 1 + .../controllers/HomeController.java | 39 ++++++++ src/ca/sheridancollege/dao/DAO.java | 43 ++++++++- .../ca/sheridancollege/beans/Builder.class | Bin 2351 -> 2351 bytes .../beans/ConstructionPersonnel.class | Bin 1882 -> 1882 bytes .../ca/sheridancollege/beans/Deficiency.class | Bin 3056 -> 3056 bytes .../ca/sheridancollege/beans/Form.class | Bin 1482 -> 2116 bytes .../ca/sheridancollege/beans/HomeOwner.class | Bin 1616 -> 1616 bytes .../beans/MyUserDetailsService.class | Bin 3035 -> 3035 bytes .../ca/sheridancollege/beans/Unit.class | Bin 4815 -> 4824 bytes .../ca/sheridancollege/beans/User.class | Bin 2591 -> 2591 bytes .../ca/sheridancollege/beans/UserRole.class | Bin 1953 -> 1953 bytes .../ca/sheridancollege/beans/WorkOrder.class | Bin 1925 -> 1925 bytes .../sheridancollege/config/hibernate.cfg.xml | 58 +++++------ .../config/security-context.xml | 90 +++++++++--------- .../sheridancollege/config/tiles-layout.xml | 88 +++++++++-------- .../controllers/HomeController.class | Bin 9830 -> 11058 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 7394 -> 8511 bytes 21 files changed, 226 insertions(+), 124 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index 4648562..bf5c482 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -263,7 +263,7 @@ Extra Large Button CSS Next
-
+
- com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 - - - org.hibernate.dialect.MySQLDialect - - - true - - - update - - - - - - - - - - - - - + + + + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/hibernatedb + root + 1234 + + + org.hibernate.dialect.MySQLDialect + + + true + + + update + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 7ffd42f..0a9073c 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -1,51 +1,51 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 7047624..4ed76ce 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -1,51 +1,49 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 7c439edb7448bae0b64bec8cce05274b4d0a5954..7ff3a370947bb0fd5d8ec32a8eaefd6412d3c67a 100644 GIT binary patch delta 3001 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 diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 54bd9536caeda2ff783181ff8c42620f0889fbc8..8d92b302b7cb8f9d639ab8de044471038a8b77f8 100644 GIT binary patch delta 1803 zcmaJ?>u*zK9DaUV+cQcT>$2B8bCWID41xx^Fg8}Mo~;O`UjZ!NqtVcK>1>tyyrdd^Sr;y^ZZWw z>*`Bw1z-I0{)YgT$rc4Uf>Ql@zC-_7l(SV=3f3uN7ufb`cWb^-#Mc!X4djVKP~Pqz z-X0Ic;=}D)Vz?tR5gv_bBk|!_U~hjYxFi}5TBSgoHYhSj;PmKQW;&BRDY1zvr2@-n zARJ8GDaiGBdlV@X6ldq?4oAlm{fSsW8?%Z_<{EM43GANUY*wRpz(C7wvOpFJOr(zp z%$}h(Z#MyGR;d(^B8vqM-mBMqqgpuV>pZY05KV+4VVii7Czu_Lg~H6H?b*LArtJw> zrCMqgsS&s-g_`V&#Kvs0M0|o7@jzm0Aj%e}^9-MYh~<^$K7K@a)#PS4jCN@ z)LUp-Z8i!dK&3KxcAb_;xKWV?{qKTyY0{hQyOSfKcyv@dn6AR)=`mEOmNuKTO9x8~ z-Yn7N@eZ{q(j_R#)@{>x;)c9=vR<(0f8E@+V^hY^PH|eLQ+yk2(rc(;o`{7Kl&cdO z$L5yKvQy|M>@~AzL!cm!>kQ6XkABte_2na%dpk^UpqS4xzS+nCO5ny^J_YkIfBMc# zdP8BSqmXQ14$)#PCa<3Jsuw=voC_lk-E@AqIOHjvYI{y}Gn zwDz-+ZJ34aD8c{}4PqH~GRzQ(!?+E*5a1eyhC|#P#$G&zAf84Dr?3yNVgLCb=QK!j z7&8%}7I(3`7;BER$^=?4&fF8ce1PPGJegpadl}{sjv~u)sq!eweO-b?5i+O(21##`HofNm$TFWq9g3t`*6>86Mb>6M3E9rd^2kWsP<>-nscYn znuE(yosw3+<$`q5j&+mL?N?MqwWOp+RZ`MtXwL&`&j^D;1&0LO?iPwH{1^s#P|18Z zP56dATxAd6vWM^3!}sjr2Qq)6@Ym3fpLr+w3y1$Y?!a#t!|$BvKS&0)X3D zU)qIzX%}+I8pM8#GGQG$BqPRJ{zn;hSeU>@J2ukGUDI|bSyGXomWl>>nSu@t!9s^j RhCirR(3EY_rnEVm{{xl6UO4~& delta 677 zcmW-f*-KPW9LGOr%Eqj0bnd<5j9yKxbks^*3M(x&gEAtFo?0-n71}op4b)k}Xt5A_gzr+eX?ALqOL&iS4**6^by^zQG-C{Sgxf&>gP z`#n8u$4zjkRpVqST5P!!k9ef04l@x~l}iR55yEzd zlV=9(1*a)H#w0PKgoxp5&Lx{7a;PBJesj9q0@5gyZkDhjW>QQEaogdZkCq9UBV?YG z<>X6IMy1ATTk1XbYlJQox>$a7%x0;04O(eb)nxy8!~O~}R*JDo`qgq?BYg`CSW7MI z5}zVjrhYvW*uXS4;;@NQTB%~QEVoG5rj@Pwx3Pzvw6mMDsxGmYPWIEs0R}jjh({|; z?GdJMR4E+O>5dcUgm!t7C7fb8r)7ACT@oKs-Ofc-9bA@CkH&tk*z2)huGL=?9;qmXuxFH)Vu Date: Thu, 29 Sep 2016 18:21:40 -0400 Subject: [PATCH 17/57] fixed delete deficiency bug --- .../jsps/workOrderDisplayUnitDeficiencies.jsp | 2 +- src/ca/sheridancollege/config/security-context.xml | 1 + .../sheridancollege/controllers/HomeController.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index 19674b8..578ac36 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -33,7 +33,7 @@
${unitDeficiency.id} + ${unitDeficiency.description} - + Delete
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index 0201ea2..39cbd87 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -22,6 +22,7 @@ + diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 0fde35a..d109ee4 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -97,6 +97,18 @@ public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable return "displayUnitDeficiencies"; } + @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + + dao.deleteDeficiency(id, homeEnrollmentNumber); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return "workOrderDisplayUnitDeficiencies"; + } + @RequestMapping("/displayUnits") public String displayUnits(Model model) { From 5f6998821d91c9928e9a3c2576cfd69073cd04f5 Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Thu, 29 Sep 2016 18:34:57 -0400 Subject: [PATCH 18/57] Added condominiums --- .../controllers/HomeController.java | 13 +++++++++++-- .../config/security-context.xml | 1 + .../controllers/HomeController.class | Bin 12016 -> 12505 bytes 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index d109ee4..32490bc 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -303,8 +303,17 @@ public String displayBuildingProjects(Model model) { List projectList = new ArrayList<>(); - projectList.add("Blue Skys Project"); - + + projectList.add("Blue Skys Project"); // Fake project + + //Condominiums by Times Group Inc + projectList.add("Eden Park II"); + projectList.add("River Park"); + projectList.add("River Walk East"); + //coming soon + projectList.add("Luxr Towns"); + projectList.add("Village Park Phase II"); + projectList.add("River Side"); model.addAttribute("projectList", projectList); return "displayBuildingProjects"; diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 0201ea2..39cbd87 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -22,6 +22,7 @@ + diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 9e2eb4a16d44aa4817e0ac01117f2f7216ebf528..353e15b0f11fc7b0c78c5ff13f3eb9751428c842 100644 GIT binary patch delta 3519 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 L>GEdL(^lZ$F;xFg delta 3084 zcmd5;YjjlA75?_jWbU1rJCk{2UI~+A@*tDUkc3Bg3@_!8f+Yz}2oNogK!z9y1d@RQ z0$J3q{7@>7qxPxTheazQh)f7mE!C=(`oy+YT6wh9S{0#M+iIzFpF2Ubu*)C))wPm) z_w2LJKKp#%x6eJVwq9IhJ@N6e#{i6>t%s~1TEsSMIR7>cJJCh3wI`C-c6K(e=}7jd zSfb)qLe2(}ZS#tg)?1A#z9CwyrH7Z;CX)Fcd|$!$#66nN_yhb<3}|K6A8D{)AE7HE zcG+6Qbi3btKORuF5CSf6^95`xmaOS$L2)biUT+-Q#?ZO z3Nm@L^7+!2($J5i;)1~Re zTKr=Omd1uTGnX_s&1|&NNE$0AjT70v32KZcXcVW3Vy>?wZ!%3)XbQo;vUNji)%s*d zXH`=osnIobt=Q=+GEdiN2F(=xzA^L#@s4kly;jy&OV?@iMVcd`{ti<;p@GW}i4n$Z z;mj>oZ8Vn}75b96;Gbe_qIse^P^s0?d|AQ*!sLk95(tQ|1|sGbjjpE~#KAy4EjoNT z&`GpPbmj&|uVi*;4Z$_7bA6()Y1O8l!nxgDD-+9;HZ;>zmDVv`YcrlX9X&~vZWQHt zJIr6vXe0BK&bx)Yhiiw`W{Gn#uK_#6x}u!2uh&K0yJ7>VF=Byx_d)I|BfR`{@Egpx ziVnE3O6)J1NPEQU0zV0HsCa^?EVX54V!B~P5Av{Hm`Y~S?Rv}|GA8%VtJB@Yp<6g~ zn+!F66WT9@#w=cHtjZ6@wYsDjQ`P3BZ z4*o9~&`EJN=39xE zVdM1M7&HUFmf!DKk9xhXvu_Ug7(3~ zzW-9aNv}T6EeBSl8IQw>ClJDuD2w1JjO25E5}v_qoWMLhi^X^jH{yA0!VBC?FJcE? z7E8;cy?@sg=tM96fu#&Z2;KN6wsOKr%-e_TQ#eO0KEl74*~OgqH2W-Q@P{II0+i%eg*zzTuUcoOuHn=M5j^{^#7tdDXy&Z1jhwxk04$j74+tv>Rz zrExi(%;Hwqxu8XmTsyd|CY|eSE^M66u#+z?to_pz;EE)%KJJZ7*fORj6LyKICjQo* zjrogn^+m=rDY6wz9?JW)pUmt9J`#&!1vE@-jrnb%D|}ME*c&S(h~qp~pl2$)I#c+n zOr*$6y+u^aV$0*q4$eP}|3lo9JyfE1WVVq9h6+ITWeuY!QQ4lR(w2TI8|CK-A^@fb1*AK0c0^>*l3Z{=(fu5g-G@`gI=VjfyOKwZ3N zu6ym^N8Ll+pMHkjQke|3O2gr%2trh$3t09)Ct~RY_${p|n94k;2+}&1yg?U}Hs}ej zqaJn<->s88@v~g67l*1!$~M&V)nde8hh2TOplZJNjDm;8h)Y#r+9dL;i|H*ft$LDc hJdaF(lj88xL@r>m*jYW!vzf~>&`tVktW4Sh{0HO6fwuqv From 36fa28b7b8ecb2b8cea181e90ea42b8470642a23 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 11:07:08 -0400 Subject: [PATCH 19/57] added services class and moved code from home controller to controller services. also changed add deficiency to incorporate new category system --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 6 +- .../WEB-INF/jsps/workOrderAddDeficiency.jsp | 6 +- .../sheridancollege/config/hibernate.cfg.xml | 2 +- .../controllers/HomeController.java | 131 +++------------- .../services/ControllerServices.java | 144 ++++++++++++++++++ 5 files changed, 169 insertions(+), 120 deletions(-) create mode 100644 src/ca/sheridancollege/services/ControllerServices.java diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index af362b3..e86a00a 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -92,13 +92,15 @@
+ + diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index d83cf12..6459afc 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -92,9 +92,9 @@
diff --git a/src/ca/sheridancollege/config/hibernate.cfg.xml b/src/ca/sheridancollege/config/hibernate.cfg.xml index 2166121..879b8ea 100644 --- a/src/ca/sheridancollege/config/hibernate.cfg.xml +++ b/src/ca/sheridancollege/config/hibernate.cfg.xml @@ -6,7 +6,7 @@ com.mysql.jdbc.Driver jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb - root + root 12345678 diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index d109ee4..bd1a1fa 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -2,6 +2,8 @@ import ca.sheridancollege.beans.*; import ca.sheridancollege.dao.DAO; +import ca.sheridancollege.services.ControllerServices; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -10,6 +12,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Controller; +import org.springframework.stereotype.Service; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; @@ -23,6 +26,9 @@ public class HomeController { private DAO dao = new DAO(); private long num = 0; + @Autowired + private ControllerServices controllerServices; + @RequestMapping("/") public String home(Model model) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); @@ -52,17 +58,7 @@ public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency def @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - List unitList = dao.getUnit(homeEnrollmentNumber); - Unit unit = unitList.get(0); - Deficiency deficiency = new Deficiency(); - if(unit.getDeficiencies().size() > 0) { - deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); - } else { - deficiency.setId(1); - } - - model.addAttribute("unit", unit); - model.addAttribute("deficiency", deficiency); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); return "addDeficiency"; } @@ -70,17 +66,7 @@ public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - List unitList = dao.getUnit(homeEnrollmentNumber); - Unit unit = unitList.get(0); - Deficiency deficiency = new Deficiency(); - if(unit.getDeficiencies().size() > 0) { - deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); - } else { - deficiency.setId(1); - } - - model.addAttribute("unit", unitList.get(0)); - model.addAttribute("deficiency", deficiency); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); return "workOrderAddDeficiency"; } @@ -88,11 +74,7 @@ public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollm @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { - dao.deleteDeficiency(id, homeEnrollmentNumber); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); return "displayUnitDeficiencies"; } @@ -100,11 +82,7 @@ public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { - dao.deleteDeficiency(id, homeEnrollmentNumber); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); return "workOrderDisplayUnitDeficiencies"; } @@ -123,8 +101,7 @@ public String displayUnits(Model model) { @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); return "displayUnitDeficiencies"; } @@ -132,8 +109,7 @@ public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmen @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); return "workOrderDisplayUnitDeficiencies"; } @@ -149,16 +125,8 @@ public String saveDeficiency( @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, @RequestParam long homeEnrollmentNumber ) { - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); - - List unit = dao.getUnit(homeEnrollmentNumber); - System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); - unit.get(0).addDeficiency(deficiency); - - dao.saveOrUpdateUnit(unit.get(0)); - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); return "displayUnitDeficiencies"; } @@ -174,16 +142,8 @@ public String workOrderSaveDeficiency( @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, @RequestParam long homeEnrollmentNumber ) { - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); - - List unit = dao.getUnit(homeEnrollmentNumber); - System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); - unit.get(0).addDeficiency(deficiency); - dao.saveOrUpdateUnit(unit.get(0)); - - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); return "workOrderDisplayUnitDeficiencies"; } @@ -201,24 +161,7 @@ public String displayUnitInfo(Model model) { @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { - String builderUserName = this.getUserName(); - - List returns = dao.getUnit(homeEnrollmentNumber); - Unit match = returns.get(0); - //System.out.println("testing " + match.getAddress()); - model.addAttribute("unit", match); - num = match.getHomeEnrollmentNumber(); - - List returnsBuilder = dao.getBuilder(builderUserName); - Builder matchBuilder = returnsBuilder.get(0); - model.addAttribute("builder", matchBuilder); - - List form = dao.getForm(homeEnrollmentNumber); - if (form.size() > 0) { - model.addAttribute("form", form.get(0)); - } else { - model.addAttribute("form", new Form()); - } + model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); return "displayUnitInfo"; } @@ -238,21 +181,7 @@ public String saveUnit( @RequestParam String repName ) { - Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan); - - dao.saveOrUpdateUnit(unit); - String builderUserName = this.getUserName(); - - List returns = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", returns.get(0)); - - List returnsBuilder = dao.getBuilder(builderUserName); - model.addAttribute("builder", returnsBuilder.get(0)); - - Form form = new Form(homeEnrollmentNumber, "PDI", repName); - - dao.createForm(form); - model.addAttribute("form", form); + model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName); return "displayUnitInfo"; } @@ -264,35 +193,18 @@ public String addSignOff(Model model) { @RequestMapping(value = "/login", method = RequestMethod.GET) public String login(Model model) { - return "loginForm"; } @RequestMapping("/createAccount") public String createAccount(Model model) { - - return "createAccount"; } @RequestMapping("/register") public String register(Model model, @RequestParam String username, @RequestParam String password) { - String encryptedPassword = new BCryptPasswordEncoder().encode(password); - User user = new User(username, encryptedPassword, true); - - UserRole userRole = new UserRole(user, "ROLE_USER"); - user.getUserRole().add(userRole); - - DAO dao = new DAO(); - dao.createUser(user); - - UserDetails userDetails = new MyUserDetailsService().loadUserByUsername(username); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(userDetails, - encryptedPassword, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(auth); - - model.addAttribute("accountCreated", true); + model = controllerServices.register(model, username, password); return "home"; @@ -320,13 +232,4 @@ public String displayUnits(Model model, @PathVariable String project) { return "displayUnits"; } - public String getUserName() { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUserName = authentication.getName(); - return currentUserName; - } - return null; - } - } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java new file mode 100644 index 0000000..9e6b534 --- /dev/null +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -0,0 +1,144 @@ +package ca.sheridancollege.services; + +import ca.sheridancollege.beans.*; +import ca.sheridancollege.dao.DAO; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.ui.Model; + +import java.util.Date; +import java.util.List; + +/** + * Created by Perds on 9/30/2016. + */ +public class ControllerServices { + + private DAO dao = new DAO(); + + public Model displayUnitDeficiencies(Model model, Long homeEnrollmentNumber) { + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return model; + } + + public Model saveDeficiency(Model model, int id, String location, String description, String constructionPersonnel, String category, Date deadline, long homeEnrollmentNumber) { + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); + + List unit = dao.getUnit(homeEnrollmentNumber); + System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); + unit.get(0).addDeficiency(deficiency); + + dao.saveOrUpdateUnit(unit.get(0)); + + List unitList = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", unitList.get(0)); + + return model; + } + + public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) { + String builderUserName = getUserName(); + + List returns = dao.getUnit(homeEnrollmentNumber); + Unit match = returns.get(0); + //System.out.println("testing " + match.getAddress()); + model.addAttribute("unit", match); + num = match.getHomeEnrollmentNumber(); + + List returnsBuilder = dao.getBuilder(builderUserName); + Builder matchBuilder = returnsBuilder.get(0); + model.addAttribute("builder", matchBuilder); + + List form = dao.getForm(homeEnrollmentNumber); + if (form.size() > 0) { + model.addAttribute("form", form.get(0)); + } else { + model.addAttribute("form", new Form()); + } + + return model; + } + + public String getUserName() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (!(authentication instanceof AnonymousAuthenticationToken)) { + String currentUserName = authentication.getName(); + return currentUserName; + } + return null; + } + + public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate, int lotNumber, String address, String projectName, String municipality, int level, int unitNum, String plan, String repName) { + Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan); + + dao.saveOrUpdateUnit(unit); + String builderUserName = this.getUserName(); + + List returns = dao.getUnit(homeEnrollmentNumber); + model.addAttribute("unit", returns.get(0)); + + List returnsBuilder = dao.getBuilder(builderUserName); + model.addAttribute("builder", returnsBuilder.get(0)); + + Form form = new Form(homeEnrollmentNumber, "PDI", repName); + + dao.createForm(form); + model.addAttribute("form", form); + + return model; + } + + public Model register(Model model, String username, String password) { + String encryptedPassword = new BCryptPasswordEncoder().encode(password); + User user = new User(username, encryptedPassword, true); + + UserRole userRole = new UserRole(user, "ROLE_USER"); + user.getUserRole().add(userRole); + + DAO dao = new DAO(); + dao.createUser(user); + + UserDetails userDetails = new MyUserDetailsService().loadUserByUsername(username); + UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(userDetails, + encryptedPassword, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(auth); + + model.addAttribute("accountCreated", true); + + return model; + } + + public Model addDeficiency(Model model, long homeEnrollmentNumber) { + List unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + Deficiency deficiency = new Deficiency(); + if(unit.getDeficiencies().size() > 0) { + deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); + } else { + deficiency.setId(1); + } + Category categories = new Category(); + + model.addAttribute("categories", categories); + model.addAttribute("unit", unit); + model.addAttribute("deficiency", deficiency); + + return model; + } + + public Model deleteDeficiency(Model model, int id, long homeEnrollmentNumber) { + dao.deleteDeficiency(id, homeEnrollmentNumber); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return model; + } +} From a5940fa93e9a97acb69c31fafea2436ac30a08bf Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 12:17:49 -0400 Subject: [PATCH 20/57] fixed database connection issues --- .../controllers/HomeController.java | 14 +++++--------- .../sheridancollege/config/hibernate.cfg.xml | 2 +- .../config/security-context.xml | 1 + .../controllers/HomeController.class | Bin 12016 -> 8757 bytes 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index bd1a1fa..5bed33f 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -1,18 +1,16 @@ package ca.sheridancollege.controllers; -import ca.sheridancollege.beans.*; +import ca.sheridancollege.beans.Builder; +import ca.sheridancollege.beans.Deficiency; +import ca.sheridancollege.beans.Form; +import ca.sheridancollege.beans.Unit; import ca.sheridancollege.dao.DAO; import ca.sheridancollege.services.ControllerServices; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.authentication.AnonymousAuthenticationToken; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Controller; -import org.springframework.stereotype.Service; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; @@ -25,9 +23,7 @@ public class HomeController { private DAO dao = new DAO(); private long num = 0; - - @Autowired - private ControllerServices controllerServices; + private ControllerServices controllerServices = new ControllerServices(); @RequestMapping("/") public String home(Model model) { diff --git a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml index 2166121..879b8ea 100644 --- a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml +++ b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml @@ -6,7 +6,7 @@ com.mysql.jdbc.Driver jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb - root + root 12345678 diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 0201ea2..39cbd87 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -22,6 +22,7 @@ + diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 9e2eb4a16d44aa4817e0ac01117f2f7216ebf528..d4fcb08f0b21f0b7bf8d25312773dd5bc01af15e 100644 GIT binary patch literal 8757 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 literal 12016 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 Date: Fri, 30 Sep 2016 12:19:24 -0400 Subject: [PATCH 21/57] Uploading and displaying img from database is now working -- displaying img on the signing page currently for testing purposes(this will be needed for the reposts page) Steps for all of us to use: 1. Make a folder --->>> C:\abode 2. Open Chrome and change download options, done by Settings > More Advanced Settings and clicking the checkbox "Ask where to save each file before downloading" So when we save the sig during signing the download prompt will make sure we save it there 3. All of use will now have the same path for uploading to the database -- so just make sure all the images go there for this project --- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 12 ++++-- WebContent/scripts/signing.js | 1 - .../controllers/HomeController.java | 38 +++++++++++++++--- src/ca/sheridancollege/dao/DAO.java | 9 +++-- .../controllers/HomeController.class | Bin 11058 -> 10560 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 8511 -> 8497 bytes 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index bf5c482..5441f6a 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -73,8 +73,7 @@ Extra Large Button CSS
- +
@@ -263,12 +262,17 @@ Extra Large Button CSS Next -
+ +
+ + +
- + diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js index 6b60e42..becd778 100644 --- a/WebContent/scripts/signing.js +++ b/WebContent/scripts/signing.js @@ -28,7 +28,6 @@ function accept(){ } - /* function download() { diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index a70f020..b670bc7 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -156,14 +156,17 @@ public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumb if (form.size() > 0) { model.addAttribute("form", form.get(0)); - //this downloads it to your computer -- getting it out the the database + //this downloads it to your computer -- good for testing + /* try{ - FileOutputStream input = new FileOutputStream("C:\\Users\\Cat\\Downloads\\refSigTWO.png"); + FileOutputStream input = new FileOutputStream("C:\\abode\\refSigTWO.png"); + String st = input.toString(); + System.out.print(st); input.write(form.get(0).getRepSig()); input.close(); } catch(Exception e){ e.printStackTrace(); - } + }*/ } else { model.addAttribute("form", new Form()); } @@ -257,7 +260,19 @@ public String getUserName() { return null; } - //need this to work to display image from database + //this displays an image from the database + @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") + public void getImage(HttpServletResponse response,@PathVariable long homeEnrollmentNumber) throws IOException { + response.setContentType("image/png"); + List form = dao.getForm(homeEnrollmentNumber); + Form f = form.get(0); + byte[] imageBytes = f.getRepSig(); + response.getOutputStream().write(imageBytes); + response.getOutputStream().flush(); + } + + //old image display code -- probably not needed + /* @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}", method = RequestMethod.GET) public void showImage(Model model, @PathVariable long homeEnrollmentNumber, HttpServletResponse response, HttpServletRequest request) @@ -275,6 +290,19 @@ public void showImage(Model model, @PathVariable long homeEnrollmentNumber, Http response.getOutputStream().close(); + } + + @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") + public byte[] showImage2(@PathVariable long homeEnrollmentNumber) { - } + + //Form form = DAO.getForm(1234).get(0); + List form = dao.getForm(homeEnrollmentNumber); + Form f = form.get(0); + + + return f.getRepSig(); + } */ + + } diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 8a29194..42c39f2 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -174,18 +174,21 @@ public void createForm(Form form) { Session session = sessionFactory.openSession(); session.beginTransaction(); - File sig = new File("C:\\Users\\Cat\\Downloads\\refSig.png"); + //this code puts the sig img in db + File sig = new File("C:\\abode\\refSig.png"); byte[] sigImg = new byte[(int)sig.length()]; - + try{ FileInputStream input = new FileInputStream(sig); - input.read(sigImg); + input.read(sigImg); input.close(); } catch(Exception e){ e.printStackTrace(); } form.setRepSig(sigImg); + + session.save(form); session.getTransaction().commit(); diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 7ff3a370947bb0fd5d8ec32a8eaefd6412d3c67a..c39b0ce737155ec6c4208e4f2de0cf9f7d4dbda6 100644 GIT binary patch delta 1978 zcmZ8i`)?Fg6#l;5*`3|#?7O?mbb)SLO1BoQ(DHCu0b7a`QMA0QAh6(4D|K7jtw>_5 zXli2Oi`>M2fkgcQ#I)2#Q37f(Mxu#|itiUH_C^^wD`mR8NK* z)KihBB)%uyH!W*7a2RLo^|M4q*7q1Q4Ff^^Wa4N1qQcSBE?iLOqFHKceym?BBbKT? zuIcJ{Y(~I9z@WjP$q>WpTrA6|3I(PH*9{c<4Mtclg&9{{%V#sG9xtC+VG;h0)vMaJ ztXtF8VKBjz9Wj+?R_SO;oi0!LBAjlrl4)heXQZk*LuU;UxHErGzHzYB-P5?HP%>G| znd!=Wc(XQZf(1(*jVA&PHn0XZn!Jj0)Hm^NHmREvYrXThK<9jQzpGZA zNLcQLyjuN`xY9S5i)EJCtvJpZ0YUoDddYLuj7h?XOitSeO-l8`(6320x?Tfrs`uW>(>)T+r8TheWmW+ z;(*Q#>RW3`{8k~P+YW5(D|VG}6F2L;O>M4dn7#!{b{{B|T6>G7Lb0@VcV9u8#k|RF z+^+TpV}>1HFu8+WYF|ap-_4ym?snn#Jfr4CMA)?6nWd$ zVk`k2YcqUs!HY-mE?T8Z7(;juTj9Yp^y7V;l(ihz-~;jLXvcDVh>s*^Gv?qW@%fRL zI%&8kGq*`*ZiAC>N)jf*K9;a$5>^A(MM37*K^^lo9iQk}r(>VA1)8TDqlKzPLYb zSY@O5Mm=78Lp1uGWsc&9Y~+gP5wRj8_)(p$oi=m?6*wxuj-ei}p$V@G(BoK*H{@(@ zqKLP!3n%a(-gcOL77=@+OH2-5VscoHYBOoC{)*p(N!$7zgTjYx{UPjn9qUiAbjSJ& ztwWMzFaIrpc9Vwjk65+>hH*{;%N*-pu}lHFQ+PdzfI!{kv@0lpJDhff1oC{RNnrt< zl-8UVsCH`-0%{^^n~*yZbxN8=T#$;Ysk*%8qO;9HaoPB_7)3V_+g6lUyuf>EX$Axo}LnQNXKoJ9!Hx^W4$gdTAmS3v%F)h za$&f8976q{!@9BfK)}8|U0k%V#TRjLpO-vswQkR9gNqUgJVTjMr+1 z*g83Mi}tINnb4f?q#NH0k7tmIn@WyK?JU1~ORHE$Bl>_Cb)vqL>p z-x9efS1AxCk)#Wju=;NOg3ubSg+`eusYZ9ho{;ni-pOi~HgWm9jKf)v&Dhqgw_%L86P9;`cTAWgEFO@2x1*Qob}bqLsSGjs z7p56N9fO$55PBCe>?mTfGYYv&ipcS9_B%q$O^#7aG;Uunnp`bYW%SPr19gbA#6iim ab!|%gMAXL;<>Ec!b8(k*ZHQ=jFYq4{zj}rM delta 2390 zcmZ`)Yj7LY75v1xz~|QF?~Yy z(EmGBj6l41pqTLA$QkUT^x++-u{4sRV4$CQw`;C6}! z%Q}4|5$rej5AxZ`X(q|yY}p!_+$t%wLP*|sY*Z;Oc%xJ++I(3lMA$5j+3Lh8U&zx0 zk3vnTUHq%=er<|EXK)%H?h1e%@O z=w_LQ#bbeP`z{vcu;{3$64zFQojX+8NfTmE#kS5#LP>mjIz5*% z`dDd(zE7dsXtzwe2;NUy-kVO(>hY9HdnkV5e8nJn+_~G+hXxPC6WqdsVvnodwslDS zplX#ZW=b^(_wL@s=e-W5PXiDZuF&7hMqFUj%0K*;R`B#k?s;5+9u~woRjI8 zNNFL5LPznYSkyMEa#pu^5?UzD{&C!kui-2BI!C{O$MFQ7#Bn@@Z}Lvhpn@|qMJA|36~8ejbfX7kS-aqZ z4NesBNAxjr8J@~rUN`zrhme}}@G zJMa(uldU*|2VwsNZZG?bAn!9sap^_4(a%{euwUk#+%ibUdP&B=WNepl-1>cie@*{e z?o#IaA^y#fHN2>b-&Qj3+DS;1!$+d4Dd_r`otJXBEaLTkk#1^icmyhZoISsU;}gMv zLvw1fCTXsKJD_MQ76{_`rknhJvTN!BIilXSZ^5g13*-{sP;LG+s_`8(;k#(X_t1%# zneHnX#`pQuuOf{f;xK-MdvMmO@zd~{J1y6Ee!0f;d|onDD68$Wo@f z!D?R_ldi-ms$i;Se=3+%F>5cbWWCQFBdTOX@#AWLh^nl8HgaXn14w?-p5>>_5}=d4 zz)wYRRee)6udrR+8p=@(UY_L38fR#wc%nH-uZuIy^?Z?@t*!`B-PPdrSA(B7!Rw^5_mxvDweG_gR1+vt?%tgZ8l{F;as6+;vt*7!x!@306lpM;!c=88bq+QQ*s|7cL|(*|J+XL?L|5`z~% zrpjJndZrd*=6nPT_z4%+S-i{m!s42;ER03E(*{jiq|XyH*}TOlpa0~&KzBdK>+P0m zs!g%;pRvNDP)TKIATQRkj-#wP^Rn7vjX-R9kYdY&6k8so7~MnnT7wj$FVQ@gM!_}K lb>!rAA-az>E~CX1xypwr1}|DwxSxGCdcdj#3z!}R{sR?)`=9^- diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 8d92b302b7cb8f9d639ab8de044471038a8b77f8..91b2378810d60f022a6b95d1735f5a11653cd526 100644 GIT binary patch delta 164 zcmWN}JqrPG0D$plrKHR1ZNVg#OJU%Y$;MzHx!fp&?;!gPzJd`~-b#cbL|t7(I?7)I75<*NHHP9lmas}=6c=;`fPQH zlNAbUDK~`J5@Sb_y;KLIq5a}V5hoF65f>3x5jWD@<@X@ZlOiul*i?8^<3pXV(ebzc D+8-_% From 706031a6999d397365350662af9300f6f0c12a08 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 12:23:17 -0400 Subject: [PATCH 22/57] added additional controller services mapping --- .../controllers/HomeController.java | 22 ++--------- .../services/ControllerServices.java | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 5bed33f..200280d 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -14,9 +14,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.Date; -import java.util.List; @Controller public class HomeController { @@ -42,11 +40,7 @@ public String home(Model model) { @RequestMapping("/saveOrUpdateDeficiency") public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, @ModelAttribute long homeEnrollmentNumber) { - dao.saveOrUpdate(deficiency); - - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); + model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); return "displayDeficiencies"; } @@ -86,9 +80,7 @@ public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @Path @RequestMapping("/displayUnits") public String displayUnits(Model model) { - List unitList = dao.getAllUnits(); - - model.addAttribute("unitList", unitList); + model = controllerServices.displayUnits(model); return "displayUnits"; } @@ -209,11 +201,7 @@ public String register(Model model, @RequestParam String username, @RequestParam @RequestMapping("/displayBuildingProjects") public String displayBuildingProjects(Model model) { - List projectList = new ArrayList<>(); - - projectList.add("Blue Skys Project"); - - model.addAttribute("projectList", projectList); + model = controllerServices.displayBuildingProjects(model); return "displayBuildingProjects"; } @@ -221,9 +209,7 @@ public String displayBuildingProjects(Model model) { @RequestMapping("/displayUnits/{project}") public String displayUnits(Model model, @PathVariable String project) { - List unitList = dao.getUnitsByProject(project); - - model.addAttribute("unitList", unitList); + model = controllerServices.displayUnitsByProject(model, project); return "displayUnits"; } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 9e6b534..ce6cd75 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -10,6 +10,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.ui.Model; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -141,4 +142,40 @@ public Model deleteDeficiency(Model model, int id, long homeEnrollmentNumber) { return model; } + + public Model updateDeficiency(Model model, Deficiency deficiency, long homeEnrollmentNumber) { + dao.saveOrUpdate(deficiency); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return model; + } + + public Model displayUnits(Model model) { + List unitList = dao.getAllUnits(); + + model.addAttribute("unitList", unitList); + + return model; + } + + public Model displayBuildingProjects(Model model) { + List projectList = new ArrayList<>(); + + projectList.add("Blue Skys Project"); + + model.addAttribute("projectList", projectList); + + return model; + } + + public Model displayUnitsByProject(Model model, String project) { + List unitList = dao.getUnitsByProject(project); + + model.addAttribute("unitList", unitList); + + return model; + } } From 08b2a8e631692f5c4f978730559d572e4b50c337 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 12:45:50 -0400 Subject: [PATCH 23/57] added maven dependency --- pom.xml | 5 +++++ .../controllers/HomeController.java | 8 +------- .../controllers/HomeController.class | Bin 10560 -> 10560 bytes 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b7bf326..da207e7 100644 --- a/pom.xml +++ b/pom.xml @@ -101,5 +101,10 @@ tiles-extras 3.0.5 + + javax.servlet + servlet-api + 2.5 + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index b670bc7..3f24d70 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -13,17 +13,11 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import java.io.FileOutputStream; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; -import java.sql.Blob; import java.util.Date; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - @Controller public class HomeController { diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index c39b0ce737155ec6c4208e4f2de0cf9f7d4dbda6..475b5f8b56d32c24f86c13b8dc3afd8d82df160e 100644 GIT binary patch delta 428 zcmWNNO-R#W9LGNo__Dt-bZOc)_u_P$15sxT#c2sTL_9=GvB2Ig>OqDMQG{5frzjMC zP@zL7yTlISPJ-l=aui*Huv@1@X=EW?=6dnRb9i{Z&-eFz`K6=j=tk0JuB3p=lwzfV zO1))^UvgmJq6{}xc&MRHj!$>lH_Z*0XyhWz)Y78=+xIPP!fmIV4&ijt#5H|Ty=#sL z+AC~v&`y% zJ8wx)%p-~O7(Y*FWnPDB{)V1X#4`!{90v>3vq+F7iLxxlngLe0%c|(CiOxC?c_qx( zsZmcx1-8ZRjkMSyz%EzVqldR#=N-2LEayy8=cUgdS^Gbo d^Y2*;FjOJsstC6##;;7YD1)#n(Vy$b&jBfoWo-Ze delta 428 zcmWNMT`1jg7{@<92?zf<$4heF9OF2Sl)Ri#BzZ|o(oPDAur@9vN#0^gUQ$Z@wl*8P za)k>ySMHFPWr-xNcDE~<$hO83&(+iO?fZPcpJ&s*>0ev58g_zl5=A1h*!70BJ1!X$ zZp@?-PZ~+2lR}0rwyhi4gpo@$FGwa|Kic*zMdB?ch7$3Vl1aHfvu_!dqE?AoE$S=1 z7gP6D+l5lWqFS8Adjb(g9ide2?2e#(BCb%DX9 z1pSikD|}p2#0}-#;^#MY{GmnWTmI6;Ki+Y#3q7lrM@$OLN)fMuNKnE0&a<5mE@}iZ VDiW76@Tg~Gt0)STS)ZnLJON(%W2*oF From 4394403d1c5e3ec41c6463f8a204b5d404952c48 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 13:15:21 -0400 Subject: [PATCH 24/57] moved methods to controller service --- .../controllers/HomeController.java | 73 +------------------ .../services/ControllerServices.java | 29 +++++++- 2 files changed, 30 insertions(+), 72 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 04e70fa..f1f3264 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Date; +import java.util.List; @Controller public class HomeController { @@ -151,38 +152,6 @@ public String displayUnitInfo(Model model) { @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { - String builderUserName = this.getUserName(); - - List returns = dao.getUnit(homeEnrollmentNumber); - Unit match = returns.get(0); - //System.out.println("testing " + match.getAddress()); - model.addAttribute("unit", match); - num = match.getHomeEnrollmentNumber(); - - List returnsBuilder = dao.getBuilder(builderUserName); - Builder matchBuilder = returnsBuilder.get(0); - model.addAttribute("builder", matchBuilder); - - List form = dao.getForm(homeEnrollmentNumber); - if (form.size() > 0) { - model.addAttribute("form", form.get(0)); - - //this downloads it to your computer -- good for testing - /* - try{ - FileOutputStream input = new FileOutputStream("C:\\abode\\refSigTWO.png"); - String st = input.toString(); - System.out.print(st); - input.write(form.get(0).getRepSig()); - input.close(); - } catch(Exception e){ - e.printStackTrace(); - }*/ - } else { - model.addAttribute("form", new Form()); - } - - //String img = form.get(0).getRepSig().toString(); model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); return "displayUnitInfo"; @@ -251,46 +220,8 @@ public String displayUnits(Model model, @PathVariable String project) { //this displays an image from the database @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") public void getImage(HttpServletResponse response,@PathVariable long homeEnrollmentNumber) throws IOException { - response.setContentType("image/png"); - List form = dao.getForm(homeEnrollmentNumber); - Form f = form.get(0); - byte[] imageBytes = f.getRepSig(); - response.getOutputStream().write(imageBytes); - response.getOutputStream().flush(); - } - - //old image display code -- probably not needed - /* - @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}", method = RequestMethod.GET) - public void showImage(Model model, @PathVariable long homeEnrollmentNumber, HttpServletResponse response, - HttpServletRequest request) - throws ServletException, IOException{ - - - //Form form = DAO.getForm(1234).get(0); - List form = dao.getForm(homeEnrollmentNumber); - Form f = form.get(0); - - - response.setContentType("image/jpeg, image/jpg, image/png, image/gif"); - response.getOutputStream().write(f.getRepSig()); - //response.getOutputStream().write(item.getItemImage()); - - response.getOutputStream().close(); + response = controllerServices.getImage(response, homeEnrollmentNumber); } - @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") - public byte[] showImage2(@PathVariable long homeEnrollmentNumber) { - - - //Form form = DAO.getForm(1234).get(0); - List form = dao.getForm(homeEnrollmentNumber); - Form f = form.get(0); - - - return f.getRepSig(); - } */ - - } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index ce6cd75..d4e404e 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -10,6 +10,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.ui.Model; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -44,7 +46,7 @@ public Model saveDeficiency(Model model, int id, String location, String descrip } public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) { - String builderUserName = getUserName(); + String builderUserName = this.getUserName(); List returns = dao.getUnit(homeEnrollmentNumber); Unit match = returns.get(0); @@ -59,10 +61,24 @@ public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) { List form = dao.getForm(homeEnrollmentNumber); if (form.size() > 0) { model.addAttribute("form", form.get(0)); + + //this downloads it to your computer -- good for testing + /* + try{ + FileOutputStream input = new FileOutputStream("C:\\abode\\refSigTWO.png"); + String st = input.toString(); + System.out.print(st); + input.write(form.get(0).getRepSig()); + input.close(); + } catch(Exception e){ + e.printStackTrace(); + }*/ } else { model.addAttribute("form", new Form()); } + //String img = form.get(0).getRepSig().toString(); + return model; } @@ -178,4 +194,15 @@ public Model displayUnitsByProject(Model model, String project) { return model; } + + public HttpServletResponse getImage(HttpServletResponse response, long homeEnrollmentNumber) throws IOException { + response.setContentType("image/png"); + List form = dao.getForm(homeEnrollmentNumber); + Form f = form.get(0); + byte[] imageBytes = f.getRepSig(); + response.getOutputStream().write(imageBytes); + response.getOutputStream().flush(); + + return response; + } } From 8cbe14433fe3863385f95023090da3de9804bffe Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Fri, 30 Sep 2016 14:15:11 -0400 Subject: [PATCH 25/57] Merge branch 'develop' of C:\Users\Kirk\Desktop\2016 Term5\Sem2\intelij\aBode with conflicts. --- .../controllers/HomeController.class | Bin 8757 -> 12307 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index d4fcb08f0b21f0b7bf8d25312773dd5bc01af15e..39f384699c788392bae07b7bb3a92ae995b69c45 100644 GIT binary patch literal 12307 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 From 174fb7470adedc194cb5bfb6ee252a2567987b8c Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 30 Sep 2016 14:40:18 -0400 Subject: [PATCH 26/57] moved home controller data to service class --- .../controllers/HomeController.java | 14 -------------- .../services/ControllerServices.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 733ab5d..f1f3264 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -204,20 +204,6 @@ public String register(Model model, @RequestParam String username, @RequestParam @RequestMapping("/displayBuildingProjects") public String displayBuildingProjects(Model model) { - List projectList = new ArrayList<>(); - - - projectList.add("Blue Skys Project"); // Fake project - - //Condominiums by Times Group Inc - projectList.add("Eden Park II"); - projectList.add("River Park"); - projectList.add("River Walk East"); - //coming soon - projectList.add("Luxr Towns"); - projectList.add("Village Park Phase II"); - projectList.add("River Side"); - model.addAttribute("projectList", projectList); model = controllerServices.displayBuildingProjects(model); return "displayBuildingProjects"; diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index d4e404e..72d6ce7 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -135,7 +135,7 @@ public Model addDeficiency(Model model, long homeEnrollmentNumber) { List unitList = dao.getUnit(homeEnrollmentNumber); Unit unit = unitList.get(0); Deficiency deficiency = new Deficiency(); - if(unit.getDeficiencies().size() > 0) { + if (unit.getDeficiencies().size() > 0) { deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); } else { deficiency.setId(1); @@ -180,8 +180,18 @@ public Model displayUnits(Model model) { public Model displayBuildingProjects(Model model) { List projectList = new ArrayList<>(); + // Fake project projectList.add("Blue Skys Project"); + //Condominiums by Times Group Inc + projectList.add("Eden Park II"); + projectList.add("River Park"); + projectList.add("River Walk East"); + + //Coming soon + projectList.add("Luxr Towns"); + projectList.add("Village Park Phase II"); + projectList.add("River Side"); model.addAttribute("projectList", projectList); return model; From 35701f77ff0d2fd8e4b129918fd3213970c9eebe Mon Sep 17 00:00:00 2001 From: perds Date: Tue, 4 Oct 2016 10:11:39 -0400 Subject: [PATCH 27/57] added a toggle for deficiencies to toggle completed or not --- .../jsps/workOrderDisplayUnitDeficiencies.jsp | 2 ++ .../config/security-context.xml | 1 + .../controllers/HomeController.java | 8 +++++ src/ca/sheridancollege/dao/DAO.java | 32 ++++++++++++++++++ .../services/ControllerServices.java | 10 ++++++ .../controllers/HomeController.class | Bin 8757 -> 9038 bytes 6 files changed, 53 insertions(+) diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index 578ac36..1badb50 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -35,6 +35,8 @@
${unitDeficiency.id} + ${unitDeficiency.description} Delete + + Is Completed: ${unitDeficiency.status}
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index a47aed7..e0dd2c6 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -24,6 +24,7 @@ + diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index f1f3264..83803a7 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -80,6 +80,14 @@ public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @Path return "workOrderDisplayUnitDeficiencies"; } + @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderCompleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + + model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); + + return "workOrderDisplayUnitDeficiencies"; + } + @RequestMapping("/displayUnits") public String displayUnits(Model model) { diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 3cb9b2b..801db2f 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -249,4 +249,36 @@ public List getUnitsByProject(String project) { return unitList; } + + public void completeDeficiency(int id, long homeEnrollmentNumber) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + Query query = session.getNamedQuery("Unit.byHomeEnrollmentNumber"); + query.setLong("homeEnrollmentNumber", homeEnrollmentNumber); + List unitList = (List) query.list(); + Unit unit = unitList.get(0); + List modDeficiencies = unit.getDeficiencies(); + List origDeficiencies = unit.getDeficiencies(); + + for (Deficiency deficiency : origDeficiencies) { + if (deficiency.getId() == id) { + Deficiency newDeficiency = deficiency; + if (deficiency.getStatus()) { + newDeficiency.setStatus(false); + } else { + newDeficiency.setStatus(true); + } + modDeficiencies.remove(deficiency); + modDeficiencies.add(newDeficiency); + break; + } + } + + unit.setDeficiencies(modDeficiencies); + + session.saveOrUpdate(unit); + session.getTransaction().commit(); + session.close(); + } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index d4e404e..55baa3a 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -205,4 +205,14 @@ public HttpServletResponse getImage(HttpServletResponse response, long homeEnrol return response; } + + public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) { + dao.completeDeficiency(id, homeEnrollmentNumber); + + List unitList = dao.getUnit(homeEnrollmentNumber); + + model.addAttribute("unit", unitList.get(0)); + + return model; + } } diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index d4fcb08f0b21f0b7bf8d25312773dd5bc01af15e..98875cfcb388f547f7c556edbdb9705a526d799d 100644 GIT binary patch delta 2992 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 Date: Tue, 4 Oct 2016 10:21:52 -0400 Subject: [PATCH 28/57] work order home page added and ability to sort by builder or project has been added --- WebContent/WEB-INF/jsps/home.jsp | 4 +- WebContent/WEB-INF/jsps/workOrderHome.jsp | 44 +++++++++++++++++++ .../config/security-context.xml | 1 + .../sheridancollege/config/tiles-layout.xml | 5 +++ .../controllers/HomeController.java | 6 +++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 WebContent/WEB-INF/jsps/workOrderHome.jsp diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp index 6519512..547a350 100644 --- a/WebContent/WEB-INF/jsps/home.jsp +++ b/WebContent/WEB-INF/jsps/home.jsp @@ -57,7 +57,7 @@ Extra Large Button CSS

Welcome to aBode Software

- + @@ -70,7 +70,7 @@ Extra Large Button CSS
- View Work Orders + View Work Orders Generate Report
diff --git a/WebContent/WEB-INF/jsps/workOrderHome.jsp b/WebContent/WEB-INF/jsps/workOrderHome.jsp new file mode 100644 index 0000000..12817e3 --- /dev/null +++ b/WebContent/WEB-INF/jsps/workOrderHome.jsp @@ -0,0 +1,44 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + +aBode + + + +
+
+ Sort By: + + Projects + + Builder +
+
+ + + \ No newline at end of file diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index e0dd2c6..d9c2d79 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -37,6 +37,7 @@ + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 80ad2df..5aa9ca6 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -61,4 +61,9 @@ + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 83803a7..511bece 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -209,6 +209,12 @@ public String register(Model model, @RequestParam String username, @RequestParam } + @RequestMapping("/workOrderHome") + public String workOrderHome(Model model) { + + return "workOrderHome"; + } + @RequestMapping("/displayBuildingProjects") public String displayBuildingProjects(Model model) { From 5c8f79ca91b3cc538d8adf5f3b9bf0c7264b6c2c Mon Sep 17 00:00:00 2001 From: perds Date: Wed, 5 Oct 2016 18:33:09 -0400 Subject: [PATCH 29/57] added builder pages to select deficiencies by builder --- .../WEB-INF/jsps/displayBuildingBuilders.jsp | 43 +++++++++++++++++++ .../config/security-context.xml | 1 + .../sheridancollege/config/tiles-layout.xml | 5 +++ .../controllers/HomeController.java | 8 ++++ .../services/ControllerServices.java | 10 +++++ 5 files changed, 67 insertions(+) create mode 100644 WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp diff --git a/WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp b/WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp new file mode 100644 index 0000000..387a3d8 --- /dev/null +++ b/WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp @@ -0,0 +1,43 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + +aBode + + + +
+
+ + + ${project} + +
+
+ + + \ No newline at end of file diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index d9c2d79..82657f3 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -38,6 +38,7 @@ + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 5aa9ca6..b7cd9f4 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -66,4 +66,9 @@ + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 511bece..562ca81 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -223,6 +223,14 @@ public String displayBuildingProjects(Model model) { return "displayBuildingProjects"; } + @RequestMapping("/displayBuildingBuilder") + public String displayBuildingBuilder(Model model) { + + model = controllerServices.displayBuildingBuilder(model); + + return "displayBuildingProjects"; + } + @RequestMapping("/displayUnits/{project}") public String displayUnits(Model model, @PathVariable String project) { diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 55baa3a..4476d2d 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -215,4 +215,14 @@ public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) return model; } + + public Model displayBuildingBuilder(Model model) { + List projectList = new ArrayList<>(); + + projectList.add("Blue Skys Project"); + + model.addAttribute("projectList", projectList); + + return model; + } } From 5c72330df418fa6f0191a539e7b7876141cc5858 Mon Sep 17 00:00:00 2001 From: perds Date: Wed, 5 Oct 2016 18:55:11 -0400 Subject: [PATCH 30/57] changed builder references to construction personnel --- ...uilders.jsp => displayConstructionPersonnel.jsp} | 6 +++--- .../sheridancollege/controllers/HomeController.java | 9 ++++----- src/ca/sheridancollege/dao/DAO.java | 13 +++++++++++++ .../services/ControllerServices.java | 8 +++----- 4 files changed, 23 insertions(+), 13 deletions(-) rename WebContent/WEB-INF/jsps/{displayBuildingBuilders.jsp => displayConstructionPersonnel.jsp} (84%) diff --git a/WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp similarity index 84% rename from WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp rename to WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp index 387a3d8..a97640b 100644 --- a/WebContent/WEB-INF/jsps/displayBuildingBuilders.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp @@ -32,9 +32,9 @@ diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 562ca81..e0de213 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Date; -import java.util.List; @Controller public class HomeController { @@ -223,12 +222,12 @@ public String displayBuildingProjects(Model model) { return "displayBuildingProjects"; } - @RequestMapping("/displayBuildingBuilder") - public String displayBuildingBuilder(Model model) { + @RequestMapping("/displayConstructionPersonnel") + public String displayConstructionPersonnel(Model model) { - model = controllerServices.displayBuildingBuilder(model); + model = controllerServices.displayConstructionPersonnel(model); - return "displayBuildingProjects"; + return "displayConstructionPersonnel"; } @RequestMapping("/displayUnits/{project}") diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 801db2f..a11d859 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -281,4 +281,17 @@ public void completeDeficiency(int id, long homeEnrollmentNumber) { session.getTransaction().commit(); session.close(); } + + public List getAllConstructionPersonnel() { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + Query query = session.createQuery("from ConstructionPersonnel"); + List constructionPersonnelList = (List) query.list(); + + session.getTransaction().commit(); + session.close(); + + return constructionPersonnelList; + } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 0f5a433..f3d6403 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -226,12 +226,10 @@ public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) return model; } - public Model displayBuildingBuilder(Model model) { - List projectList = new ArrayList<>(); - - projectList.add("Blue Skys Project"); + public Model displayConstructionPersonnel(Model model) { + List constructionPersonnelList = dao.getAllConstructionPersonnel(); - model.addAttribute("projectList", projectList); + model.addAttribute("constructionPersonnelList", constructionPersonnelList); return model; } From ab6cb4ef38a62e8e0057b73cc8a161debd5360d8 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 10:29:33 -0400 Subject: [PATCH 31/57] added constructor to form --- src/ca/sheridancollege/beans/Form.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index 778ac4a..902cdaa 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -31,7 +31,14 @@ public Form(long homeEnrollmentNumber, String formType, String repName) { this.repName = repName; } - public String byteString(byte[] repSig){ + public Form(long homeEnrollmentNumber, String formType, String repName, byte[] repSig) { + this.homeEnrollmentNumber = homeEnrollmentNumber; + this.formType = formType; + this.repName = repName; + this.repSig = repSig; + } + + public String byteString(byte[] repSig){ String sigImgData = repSig.toString(); return sigImgData; } From dda65c54a5d1703aa963efbc33453e1e0dafdc7b Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 11:50:39 -0400 Subject: [PATCH 32/57] added contractor flow through the web pages and made the contractor list dynamic for add deficiency --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 9 +++------ WebContent/WEB-INF/jsps/displayBuildingProjects.jsp | 6 ++++++ WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp | 9 +++------ WebContent/WEB-INF/jsps/workOrderHome.jsp | 4 ++-- src/ca/sheridancollege/config/security-context.xml | 2 +- src/ca/sheridancollege/config/tiles-layout.xml | 4 ++-- src/ca/sheridancollege/services/ControllerServices.java | 2 ++ 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index e86a00a..dbd97a1 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -78,12 +78,9 @@
diff --git a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp index 387a3d8..726dad3 100644 --- a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp +++ b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp @@ -39,5 +39,11 @@ +
+ + + Back +
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp index 6459afc..6ea8e46 100644 --- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp @@ -78,12 +78,9 @@
diff --git a/WebContent/WEB-INF/jsps/workOrderHome.jsp b/WebContent/WEB-INF/jsps/workOrderHome.jsp index 12817e3..673c09a 100644 --- a/WebContent/WEB-INF/jsps/workOrderHome.jsp +++ b/WebContent/WEB-INF/jsps/workOrderHome.jsp @@ -35,8 +35,8 @@ Sort By: Projects - - Builder + + Contractors diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index 82657f3..e0c0575 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -38,7 +38,7 @@ - + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index b7cd9f4..ecf7d70 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -66,9 +66,9 @@ - + - + \ No newline at end of file diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index f3d6403..35cafe5 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -132,6 +132,7 @@ public Model register(Model model, String username, String password) { } public Model addDeficiency(Model model, long homeEnrollmentNumber) { + List constructionPersonnelList = dao.getAllConstructionPersonnel(); List unitList = dao.getUnit(homeEnrollmentNumber); Unit unit = unitList.get(0); Deficiency deficiency = new Deficiency(); @@ -145,6 +146,7 @@ public Model addDeficiency(Model model, long homeEnrollmentNumber) { model.addAttribute("categories", categories); model.addAttribute("unit", unit); model.addAttribute("deficiency", deficiency); + model.addAttribute("constructionPersonnelList", constructionPersonnelList); return model; } From db41d856aca9176c7673a8274e18cb19d01e5b6f Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 12:23:46 -0400 Subject: [PATCH 33/57] added the construction personnel deficiency list display page --- ...splayConstructionPersonnelDeficiencies.jsp | 47 ++++++++++++++++++ .../beans/ConstructionPersonnel.java | 3 ++ src/ca/sheridancollege/beans/Deficiency.java | 23 ++++----- .../config/security-context.xml | 1 + .../sheridancollege/config/tiles-layout.xml | 5 ++ .../controllers/HomeController.java | 8 +++ src/ca/sheridancollege/dao/DAO.java | 14 ++++++ .../services/ControllerServices.java | 22 +++++++- .../ca/sheridancollege/beans/Builder.class | Bin 2351 -> 2351 bytes .../beans/ConstructionPersonnel.class | Bin 1882 -> 1882 bytes .../ca/sheridancollege/beans/Deficiency.class | Bin 3103 -> 3103 bytes .../ca/sheridancollege/beans/Form.class | Bin 1482 -> 2304 bytes .../ca/sheridancollege/beans/HomeOwner.class | Bin 1616 -> 1616 bytes .../ca/sheridancollege/beans/Unit.class | Bin 4966 -> 4966 bytes .../ca/sheridancollege/beans/User.class | Bin 2591 -> 2591 bytes .../ca/sheridancollege/beans/UserRole.class | Bin 1953 -> 1953 bytes .../ca/sheridancollege/beans/WorkOrder.class | Bin 1925 -> 1925 bytes .../sheridancollege/config/hibernate.cfg.xml | 33 ------------ .../config/security-context.xml | 4 ++ .../sheridancollege/config/tiles-layout.xml | 10 ++++ .../controllers/HomeController.class | Bin 9038 -> 9341 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 7827 -> 10251 bytes 22 files changed, 123 insertions(+), 47 deletions(-) create mode 100644 WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp delete mode 100644 target/classes/ca/sheridancollege/config/hibernate.cfg.xml diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp new file mode 100644 index 0000000..9a7b355 --- /dev/null +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp @@ -0,0 +1,47 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + +aBode + + + +
+
+ +
${deficiency.id} + ${deficiency.description} + + Delete + + Is Completed: ${deficiency.status} +
+ +
+
+ + + \ No newline at end of file diff --git a/src/ca/sheridancollege/beans/ConstructionPersonnel.java b/src/ca/sheridancollege/beans/ConstructionPersonnel.java index 71706c9..ff6f82c 100644 --- a/src/ca/sheridancollege/beans/ConstructionPersonnel.java +++ b/src/ca/sheridancollege/beans/ConstructionPersonnel.java @@ -1,11 +1,14 @@ package ca.sheridancollege.beans; +import org.hibernate.annotations.NamedQuery; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import java.io.Serializable; @Entity +@NamedQuery(name = "ConstructionPersonnel.byId", query = "from ConstructionPersonnel where id = :id") public class ConstructionPersonnel implements Serializable { @Id diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java index df4329a..f21905c 100644 --- a/src/ca/sheridancollege/beans/Deficiency.java +++ b/src/ca/sheridancollege/beans/Deficiency.java @@ -15,19 +15,19 @@ public class Deficiency implements Serializable { private String description; private String constructionPersonnel; private String category; - private String[] categories; private Date deadline; private Boolean status; + private long homeEnrollmentNumber; public Deficiency() { - this(0, null, null, null, null, false); + this(0, null, null, null, null, false, 0); } - public Deficiency(int id, String location, String description, String constructionPersonnel, String category, boolean status) { - this(id, location, description, constructionPersonnel, category, null, status); + public Deficiency(int id, String location, String description, String constructionPersonnel, String category, boolean status, long homeEnrollmentNumber) { + this(id, location, description, constructionPersonnel, category, null, status, homeEnrollmentNumber); } - public Deficiency(int id, String location, String description, String constructionPersonnel, String category, Date deadline, Boolean status) { + public Deficiency(int id, String location, String description, String constructionPersonnel, String category, Date deadline, Boolean status, long homeEnrollmentNumber) { this.id = id; this.location = location; this.description = description; @@ -35,7 +35,7 @@ public Deficiency(int id, String location, String description, String constructi this.category = category; this.deadline = deadline; this.status = status; - setCategories(); + this.homeEnrollmentNumber = homeEnrollmentNumber; } @@ -83,10 +83,6 @@ public int getId() { return id; } - public String[] getCategories() { - return categories; - } - public void setId(int id) { this.id = id; } @@ -99,8 +95,11 @@ public void setConstructionPersonnel(String constructionPersonnel) { this.constructionPersonnel = constructionPersonnel; } - public void setCategories() { - categories = new String[]{"Add Categories"}; + public long getHomeEnrollmentNumber() { + return homeEnrollmentNumber; } + public void setHomeEnrollmentNumber(long homeEnrollmentNumber) { + this.homeEnrollmentNumber = homeEnrollmentNumber; + } } diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index e0c0575..8a21977 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -39,6 +39,7 @@ + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index ecf7d70..4504370 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -71,4 +71,9 @@ + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index e0de213..66b625d 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -245,4 +245,12 @@ public void getImage(HttpServletResponse response,@PathVariable long homeEnrollm response = controllerServices.getImage(response, homeEnrollmentNumber); } + @RequestMapping("/displayDeficiencies/{id}") + public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { + + model = controllerServices.displayDeficienciesByConstructionPersonnel(model, id); + + return "displayConstructionPersonnelDeficiencies"; + } + } diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index a11d859..2f06797 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -294,4 +294,18 @@ public List getAllConstructionPersonnel() { return constructionPersonnelList; } + + public List getConstructionPersonnel(int id) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + Query query = session.getNamedQuery("ConstructionPersonnel.byId"); + query.setInteger("id", id); + List constructionPersonnelList = (List) query.list(); + + session.getTransaction().commit(); + session.close(); + + return constructionPersonnelList; + } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 35cafe5..236fa20 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -31,8 +31,7 @@ public Model displayUnitDeficiencies(Model model, Long homeEnrollmentNumber) { } public Model saveDeficiency(Model model, int id, String location, String description, String constructionPersonnel, String category, Date deadline, long homeEnrollmentNumber) { - Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false); - + Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false, homeEnrollmentNumber); List unit = dao.getUnit(homeEnrollmentNumber); System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); unit.get(0).addDeficiency(deficiency); @@ -235,4 +234,23 @@ public Model displayConstructionPersonnel(Model model) { return model; } + + public Model displayDeficienciesByConstructionPersonnel(Model model, int id) { + List deficiencyList = new ArrayList<>(); + List unitList = dao.getAllUnits(); + List constructionPersonnelList = dao.getConstructionPersonnel(id); + ConstructionPersonnel constructionPersonnel = constructionPersonnelList.get(0); + + for (Unit unit : unitList) { + for (Deficiency deficiency : unit.getDeficiencies()) { + if (deficiency.getConstructionPersonnel().equals(constructionPersonnel.getName())) { + deficiencyList.add(deficiency); + } + } + } + + model.addAttribute("deficiencyList", deficiencyList); + + return model; + } } diff --git a/target/classes/ca/sheridancollege/beans/Builder.class b/target/classes/ca/sheridancollege/beans/Builder.class index c5ff135ab2e725d9e93ca4b976c9103b82a7cc0a..f8f6d33b880e3df57109f7acef064ff0bdcc06c2 100644 GIT binary patch literal 2351 zcma);+iu%N5Qb+ZN~#^jvK`y4633>TrjeBcb8H(Yc56Eh5JAnsPJA0s(nj8ZB2$uT z>b^%Gqd*H(DA0>OKp(2;KTBGSXbQ>A%yRhe?6zGL$}o9z{eSH+X{}Pue!F|@f=6?q}7(T8(6O(K=S1b zvS+S*>A~RjO2+G^r`%o78T4HU3^$_U^@7)Iqd@VYa#gq`C|_ScglyOA0>08xCyXy` z6p452b!_L*_7y+JK_fg;sM^|O`kko$0BF@u*Q|Lu^eGVro$1LiP9D{Jp}u~4E_6Xk zx0u1f31^dpC*6XQpkHQ_3@0y)dXuNjB~wPHJeR0PvBg9;cKC~lb}U{=^l`sc5@j4I zLBp*fsD_Pytb0nBAF0>s9})A$rVqS<-;s|MpL{tk^9{Zlg3jwIk6)2JT&VCEhx}E` z^Ly5jLT|fvC@nj=ToxZw_r*Z^ESx_{+CFBk=m-lx@>@Z7-uPbMj1}g4TnlLq#`@OW zG&ja0Wjaq6$}~r_WjaIUGR^bo9GeQ81zHqjPOMYB7*3ma8C~pW?YFWM3R=)1Bcu9=U;u}?jpMlTuy4r(Ddk|?4DD8n1GYgxKeJ{vx0% z5}?p@0d^VTJMaR&(D;kQAA0UZ*lElnhz&?rFk%9TXq8NOPEdp81iwt@Eq1Nb9jA+4Y{KlV@`yHYj7LKY(bUAZ>Um_muZwqQ(tf=>v zY$B@AIu>o{3`>z}1YC@P(YSPF1d@}7&j*&rV@dekFN0MeWQ!p+JcH|Z8E-=`0owUh?=Ars`bzQsIwtXWIxio5{G i{sfTdgOS5;5MPgb`g5~@(bstX1|FY|Z|QzO8~+1!%ByDp literal 2351 zcma)+ZFAd15Xbi%KhRXIlhjFZNE6wl!FC_ik``#%q$FuNQ;%tBQu4MV+gIm0wp1h; z2;YN`!3@mcVTKoc06rAMe|2(HD>CrHcjwja-f#E*cYpo;$Dc%Wj}8iy5oC63%RiBx z>e^1n?e}F*T5V}NzO^@0{jT&1lod4h*8a}6`nJ=vUbNrJPEeq{pi*d6u62ZXyRUw< z+kGkMQd>tJ$~Vu413{uGsC+nd0yU7w%2#mObsRUa1LZotprsb)`N4W8Jzx2ObUM;{ z)_o|*h!PzPY}FUE5c+9~qrg*64?Y(opXc@fTVIa;?Yo0_wsVS@$nf=v>qyYFr6(vm z^m$rqO|AVKI3W2-3fT)szH%|(^J>cHrmLKNw?7;>aL78Eiudzh^QaB^N6Jybj-Z)Z z{TOchZdcCI3@sb9L{|kBTWU=EO80c3<#z1;v5h{XeUUL6oGA3KI=zlPeG))v)y{XX zdEWGYEcN3HB&cH0B{F#Ru|Wm;fLGTIx~y%V7*y1&x^osE#{Q93i?L^9 zDZqzih0dYye^(y&@}WU-DS?g&X47fwb)SiduYN-Iqh@vE#xxY5SD9^kL?{<*$M^-+1o8j6BTm z@vum9IH7)X+uWM8PzB}A;FqI3WmrpCU%(rc$2^NU!wL##C@!3#vT%mR!Wo^4Vv6uy zfb9zYmwZ};Ao0S`Rg53Pyop(0&NY6g@~>g+M;K=jMO3CNEz=5ChIXQBw2FV6U=1TD z_z9#1%oR@1xG^HLVUDQUC}&5s-YDlrw9zQ%M^uZGuZ96DNPZ1vt%7KcN@QZI3dU-< z;SP#L(r80oaj8sN2^+$A6~0`^!YeL37p}N9+^7cKh!8Ezy2jtg`~^-K;u_hB=z3~> zH|bUsyaR9EEFabu7oj^;$EJ-i!;fmX8>tV0b#K+$QSegqt-|))~zJS wSE(S6Xgdm?5bIX5BQF7RI0ZyM7#Z3LRrxr4Zc5PSm-xSn8BfO^?fdlPA6=HKssI20 diff --git a/target/classes/ca/sheridancollege/beans/ConstructionPersonnel.class b/target/classes/ca/sheridancollege/beans/ConstructionPersonnel.class index f3bbdf29c79e7c2b494b182d0bd8456c42269496..924f5f02a6db8bf583d466faf484bf91ed13690c 100644 GIT binary patch literal 1882 zcmb7^TTc@~6vxlB+ifZ3B0{+-AgGjbSribp1Y;1jga8pzpSSG<2A5s3-5T|C_%Srm z#Ky!2KY$;~_&>Ad)-De|^vv0rGiQG1KWF;q@2}rPv`mFGrRZS?C25JxGMg1PkJzjx z>2Z>tBTaM;WJ%Rj*^$p(*9+`Gd2UTmcKg_VZ-1~(rC(FEK)Mxa z6{`h7lMxHAq$_KPmerT?$l4p z(g)8LR^*AT96{!qa#gS{D4v@sA=!q<@jct>Ed0O*E~ob@wo|fw#ox_IBREpvU)-+P zR_#dos%pCx&vE3Tw93+UYt{w|4E%b9E8RnRp6f~nV1-<n{GE|_b%&*da6N^=9Y>n?Aakp?>NWwD5lyC#aW?44Z7Xd@L)0png52JZm2fU_0s) zHwfLqLr9UJ4oXmr0pMrwc+&Xl!q|;pjG6QZEIooukATD2g+1Vh9mLlXMu9Pr|4HJz z4jY2ygoJGdDjJ5D34>^aM)Ac7ZozVb&lCp~(F7;Rk2WZlpKDM&Ki?oDpEVlDJZv_| zyvRMKFjZdhW5BflLXzS zF<2(FFba%`{11wKffK`_q=N_tMwK^?l;P%eMDt;$F72X-P@pN?!(E*r8%CW2n@wPW zJDZFEiGOPWnT`aRLi$#aS;*T8G7FHoYd}~pR^VPFh|vmSMS|Rq1~FPemH@JR4G3Qs zgG^HnHoTe`yzpugUt1JejRcvYd~@?U?w)Vo%#WkXT0sf`S-S>=yM;k!BNZ`Q6?qm3 zG8e7LrA7~XWCI{Ct^wg@Wsv#vep}HZ;E7$-!`)2u`cew~JLz}GFL6Qt3B=Il+}Mly K?|^qaAo>SftRfu% literal 1882 zcmb7F>rN9<5S~+dfwEjgC=?LNMQO`rQ9#s^8iS}M4GoXp?d=3JF@P7<%JWx@Og|D~@H! zn$*kEup9cWV>djvS@BHAK9X+3v2AI^C@g6B%y?($mSNZQ!}6J|crl6!8dbZdqaOp! zu*{D}*^+`nW>t_V2ui+g+MZdLC9`4Ts^`tW;fbBX}8K)jfXf#5%1q~I=i;E|INh3w4Vpt^uWulPwX4pG5QOSDo z{{#iaT)NQBynAQAdn;4wBSCjGicv3nvl?kMz}}ojgTA+*(GU&u-d&Au(EtjsNw0vW zpkA~k((s?c=>nG@!{LFFb2Odl&WHfS`vGI=?sJCd1;mN3dM|?8?jUxLuJ-`x(S<=o z{IeZS?_YrI`3+)_wyOc;jpM#ObgSIP@k-E)a&7Trr|DMY3zJ81GH{gFc;s-XiuiZ* z_Asd4haAm8wH|yU_=H$w_E^;g_Qw5flv%K#Q@o<7ENbYS~QbgZDA`BZqa-; z8Ew(x750pZPXK!yr}No1PDIz_WIt@7n5%9!nZ?D@sA$K^4*6i*bgv&SWdmB&R! zNzgr7!paPFSOFW!ey8cra6(8-Du|FUsJt{~+L!Z)=44S-+Eo$0Knv)@qC!acQI~|H zZNh@Gv>ZTW=4%I$r9dJpwAw{v8S-`#Sq71n8;G!8tiW0zkyIxUJ&=eVOeEDwWCKJt zZy>_$Vj}BwAFJP*5Iny%^Itj?*$yP~K#eS4&ZGC-{b+U;Q`Si&2O>K+5aDTIBAbDV zEOsjLG?2(vup-w6-Jg+N5P5zB5gt}1^6+xrwv-5X#jfh%X(oDg4FdmN>OJH)aa;We Rgy@mF_*nfM@Qo)#e*xJMB9H(8 diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class index 5350ac1ec81bb44fc82f884b76d39bfa71105b21..3aa03e524baf2f93449a9c02f7a170c458e42a07 100644 GIT binary patch literal 3103 zcmb`IYjYD-7{~wHT$`q8NhvlI0V!a*TsDFTTIAMp2^3lzC{j?|CQG`^c9%&uj5vM* z-}yQ8h0YjpoY7al@{{-})cH6!Y)3H*GzrOnB(bvuy4I?(4w5o=zx1 zEo0GhI@>N~lCHUJaW}W)I3_(4OawHf9m{R{TYO6Vp<%i%w5?8EHe02P=em|dFA`c! zuk}hpE?C+Ycbs}0N1Sa~X2Y>vZa3Nc-tle6SfU0&(oBcn5$BNaHP3S_Q#jKXZP)fM zX-Jgk*NMI8HK;SOOu2iV?M!#7(VnG_FTlXBt zYFfr7_1ngh^~|o@OwB9qb+=p%F$5X^Z*MjPR@>0v{ePO#+=a;c`I247nwBrg=rzdR z@_fi{*hTHI(RBHrHX>D^)Ka+J3Uu4?LN;3*G{YD_hn|#ozx2gENVxdour%n7sQ_bW zArPaKsRcbU-4{`3q8~MFsMELE7Y?RxB0?z&Re8$TNjzucLvq!-l#cD*6s5&0S+0u6 zjJU<0iW!MM{?oX8>ZM6-maBQ4R^7T`OY2SyoA9(8cnt?tId-1h>umN$Lz;UbkCQl? zftANIH09x(45#v#K`D>@n9bvW3`b=+CPNwXdFVKi$33w-j<3sHtnv{-SqE_YC(8Dx)FuQm(?4XBzgEH^R-@uN~gv4ZDYz zQxT(#ZVG$3p5}Emf_?mF&}z-N)y&ZO{Y|c?IUhssbY>UOpG#RZq&?t zsF`U}Gc(0`itbD+$J2az9~rKIF+HL2FYy}M_sZDdn4>802Im=6xXSlT@ea=LNo39j zGG8J~A)u(wo;+1bmQvbu`X`LMMk1;<%a{)+wOc)pK#jgCW`QY6wbkB5DLG@6cM@Jw ztt7ydTIu|mODmFd0m*Ol%ko=Ae~qL*+eJ!0*+p7E)kQ`xCA-M#rBoNAdMVvSPA_G; zjQvOChnza&1v8w)Ay(!v3e4~nj<6ncd~=kocZ`WV4uk2HtgQ9+8^lo=#8DZ~v3simD&N#4WxAR>daWF@8lfb@4RYBL+^n@&kXxw6IFCo8 zco^$^8+QWdVLIi|N27SmD4y&Rg`rVLw@+07HPLLMh literal 3103 zcmb`JZBrXn6vxk!N5T@?@E|D_i^O`8f->yj*CJIih-*>tSq zC-9x0Ltp5Ov5qtP%2$38KZW`~cQ@Ivvzc)mnMwBU?mg%H{^#L_KmPjVHzK-D#|avc zXtt`U&11b`)HJJVo2FjZ)k9sgnrcx$GOC7dRbMA4D$$u2+AB>pHLI@f9KO)2PJ-eR zjftm*t(M_JGmS5`LsQ4*rns%>jizB+PfA6Jr27&L7i_EPXqHpa%$6Rj{r&Z~d*7H> zB^oel*in)wY1&oIfsI6&Z9ih!X&6?0MWUga-mEr^m+qGAqn70uCwj$b8i>1LS+*mr zn-ZN9=3l5UnW5=GhprZEvvp#@P1Mp(fSI&frpd$+WP~J&o4QqZj&T?HQ=;)I(>7XF z4z>$7wq@xitU##O?Z#_~Qr^LO3x!>Ds?fO&5FUo_83iZ0V)f)*q?>lf6MDAN^EB}%;Fe%LvZXd<^i z-^1U@1Z#euHKSMT|4*|U$*)I9WX_7TpP~qT!0~4WL2^?jnTC0FOQtl9@M=Y-Gw$j` znI_%UZJDy}YD1>;^fvD+$TUswu%0_I-K7}}MN@YQZbykW8mj9KC*5uFv0QIH{5gP; zziB+zL+Bvr`W^m=_%FJmjPBov`jSZ>9s{r^_`ccKdtO!|-=7#30<1 zy)GZ`I1%Sar@GjKz@0r4y<$3B*ij6QN;oGl3pgo;eR7dDxDJ^=PWdyL&e0U?5rpld zxe~jZWC!6BKFN6qdzGNWQzxOD>mGSCh2Cr7*L0h32kVo)|(ID^>l*D=vr_=zY@In8HHM&n+(R+A*7VB|bGq4;dz6t z(9AFyo;eXa!!rl1{EX#A#fk;S#A=$ZQCyH*^+<~d{;-F&kms@&u0g8fSS(^QIdPK+9t0_bf_#jA zaYye|Y1V@v_W-ih2ZXzYLCW+v1Y|P^@*ouC301;CHiIBL0NL#W!p+JcPwA5okQ?6x znzbAXvPb(N#s@(aPeYAArO!NLKb<`EK@|s3@vM&uK5ALT^Uwxc4T3xm1^GO@!B&GH zRe;p`fba>&Ao#BV-+Vl;VmHrzT8aKj+Fm46Ew||)=(7$1$30YOZ;S^>7Zo@XzZ-l` H)`|WBDliiq diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index 78c38afbb425ca9e54df020cc98781b87a2fdc5c..ced6ffcc10b2ecfff34cc2322935a98b437312be 100644 GIT binary patch literal 2304 zcma)-TTdHD6vxjjzF^}flo|*)#0C;#mXK`XEKbOD3*RpT8HfoK??~B2hx|J z9m{sZcDoWr#nZr(dwvL7Px|qzuGf^IpwSZmAD^EAVnWGis@0>bXS+JH+{lrj zN`VSA%DsgGeMC37ceg+{>4qTl{|UX_)>8KiG)^Dm@XhmB>X0IhRV-h1&gWk#&;wdU zQsUs!x>!xHg<|A%4!zE<9ovG^9T^{@fDp|irv0oySsKNBq~}xBBM$Qz%(y&tw#TqI z7)@5M67ilq_Pn{QfIPPJ2h&)2nOIWOFiT#^X*E?vsp>MUaAFQ$2xUT);>eI;7Q|Wa8l6E;X9JYD35jwkHO`pS`?dV zQEIA1?ey%&&`#j_B%&e~1z!`qr(w2+R-jFrf6%Sp)V^7~*#prnO3^Hp&?{&ox=nK! zvA`X?S-=Bf8to(tnB@y9o2wTzZ_cDHXmKDorHpPva1KYf1Bx$(0JD;cbnl3bfJ=?hvK0L&`W1xPFc;4Z}O0bmK|yRRVD6=10k zQR+jK`Vgfa1YGjX#14EMXt{@Th?Y^aE5DQZ&4XXjH6VW(OcUlS%2h?1^<8C^7^m5w zhX6AmWYMQRSxb#ML+|O)FMZJrmI-D_*;&Isjn2*%TrpFIGxKN=4V~XLxLj8XQ*Z*S zK2oMvZGt|h)jr5&sl2E8!Ra)}<3x}z=y4y!&@RjsRL3yL20%8i0pSW@$6qFbEDnP_ zO9c5U8RUZk)e+eN$nG^DT!0MnBr!GR;nW-?f@~zGraT;xuK`lK21MTud|c=$aQG5h z3QX6?(r`pxCxUFzv)<+{Bt~VQQ}e-%(GjTw~;IS>qbp}tK;^tLhHLAx8# J9_>eT@Gs#!hSUH6 delta 730 zcmZva$w~u35QhI*P2w11%wiVf7Bw?5#<*RC2;LOIgHI4pf?_-v@jAYO%yTFT34#Y7 zASVw#jR*1Xo`J|Pm#Xfj>aVY=`Y}D4OpJa%J^}1v_bKt?ohf-UV)61{I-KP(mDKBr%T+DpK8H9V!TQ&o)-vMJxsCO>+2n z11vu?$j39~<5DDA6{|sVn`jzyOo6pLX7QU_CDEEx$jN5SpgF)bF#$0qg#qhY-Nm7p{`L`c` nCVM2=$D!DGcqpd$cO+4!-N()!vhh7Q diff --git a/target/classes/ca/sheridancollege/beans/HomeOwner.class b/target/classes/ca/sheridancollege/beans/HomeOwner.class index cb23a7d4551fa3a3f801f5d1e8a08fe3521fa27d..316d3935c78d2676f3876b41ab4165e8c7492d2f 100644 GIT binary patch literal 1616 zcma)5YflqF6ur}KTPU?fTv|bqf;`&gu^JyAe2@@>QPO~lA@Sq39or%8EbeYa{7)vD zKurAL5Aa7B&&>7#bcuvyhPiv@oHOU%{`vdsHxWIgdud8id6W`lsbxhit0`Jb(Rzw( zMuv3SoY6$(!1?UhEk`!&y}%Q)@s!cnVbhg-r_-)-kI~e-jtoSb?+ag4TYOVWH*f;s zN}o|)U;knsa?cljz-5iwuj`;Nn{JzLNzZMy+FS-bF1F1m`AkR=Y%q$K%KI?#!mYzd zt|EGp?;Xe}Yi`YH?K_@O=WfvmngY5Dm6~JwP40=hBWn=h4Q^MtBYpc7gm;f5_uyi= zH2l2bigHo95^`HXQw<*M=jV4ZA7Oedz?;b_N}{)x+y= zJKR&i;()e#9PK9YNnsgne)Qb-0AD;p?|88p@xtQs;*+R)hH^BXp%EI*P+Be5D9dR6 z|8u}-d@$p?)dOA&FrT_4Tzd~QnE`v8a9D74GN+OGUx{W2m~5LCQag`2=Z7J!3QAY*mH`&S~;bd zwR%eN0hJ;lTr+TGlnU^0Q&SehYh6kZXzxlUr`^Z2Ora~&0y=?j=6M-w?v#vyR$gPK zp>+#dx1luytvg!J(mu?-p4rzkyLw<(4T2Jb$EmKejXg~0gks-eA%YGb;%`rS8%1Hd8k#eMwnP?+tx)T~%gOT-1jD(ZK zkm77V5!D+tGbdzxyO7BJNFzlg)k`F<8=tgh&$TWz@(4yAUt&bHh9ReUt$0@tw~6xt O&WqSbe1y5|Q|TXP6Da8b literal 1616 zcma)*YflqF6o$|A3Z=GKmV)KhBA2#YR^#P^7ZPGHN*YixP5iiR$970Ni@RG9|C5O( z5)(i81N>3OcV>G5xu*;%@=luAD&9?#3{mP^4R)lnQcop&BNL;uX}NdF*5Y2u+1YVSZ(pysP{k>?26e9UO#q-9Hf(CyT?!|2wVuJlBQSA{E(x+|saS)Q<^%P6bUKba@oafRz~ zS?A`<1|*CY(DtMQ+zyvsUyJQCiailhcsq>3#Zna@&+GQ3ox+40;-}Xx|0{dnPhU(@ zl5Q}HH@SD9O*V?9(OL*_`vKDd`pTOWBwk(YMG7gG4rUOcreM@+xC^sqkP!SmQUouf z#F5=~>ioG-Ly;N`)V3N6M!A6g?qM3dGkCgIv7M&b5||QcdEB&ylVPfhH(qzSqXP3o z+1gn!P4t6`WwiU=u{*=~{3+(1=UV|c%s*m2CEWyhsZGY zv=S(9oYQQ1^PF-+DJ4Qkj39L!X(^i3l6gO^CkX+~u2|BVKBUXc_sX;p9mO}}a+z}B zoEC<)vN|S*T655tN38{1U{TjAYYt;j&luD*di9{LMj4eDEm6K#*~IQU^qpqE0wDxR z-&TV8LGBc2xtF|yXys%~J2M3J{app_npVjAQ3JSG50268K#<&3kWwJXN-)TU?)V^E z0NK6<#GfQat3dTzZUVON$ikN^j@%6dS*PN_k+5!jth{uobw0=gfIPegM74&YbV*k% U>)|%=zJd2m>~WX2Xxk<8FGuPryZ`_I diff --git a/target/classes/ca/sheridancollege/beans/Unit.class b/target/classes/ca/sheridancollege/beans/Unit.class index 92968dcb06938774c951cbddd8da6001a0fe082f..e28de9a1d76f75f0dd29b934853a5fc31831852b 100644 GIT binary patch literal 4966 zcmb_g+jA3T6hGVM(xlsRX#oo&jR>YeSU|aimP+jfS`se3aTm79wpmDa!)5~%K~Z7G z2c6LwA9ThCeb*VCA%mA0-+b}^@WFq=@pryWH=FH-DWlWLe!Jg(-#NeYJLmkqo&NdH zufG$~Tl6GOy>v51J#>pNMZT2yVnoS|Q-p5DsZ6(d#_FI7k2YVbe7VDyyHUCqr*)2z zBbV4ca|;lrk1nMs3lFJuCiIdTDTZfZ9K1cwp4AssPGIn$fc^G=k&5#)a_-7!bRQxDAk{~WC~#f<0r8r^zg z5#<`dU;u^ep<_w2GfpWZ;pm%=iaQZX3X<1hNw%r@dy@mJJ)lUiwRz#Dl7Nw;mRK>w4-Y8_U?>78pDgC@6>ulClMcg5S$bKtnoY4!`jj$J>z=A&KLi z`_RoHcr~P(v3e(%H@9hp7&OONmxFXu;4dZu%y_elCVJeuKISFuMO-kqT~Jcj38XKX zY~9|Cb%VS$o_9ry6>BZphE3p&WkRSbbM8JwnRB7CQ6^j5#b?Z_mD4747Nr<3-Nz?{ zM8`6wwWL(aEclBSWd5#c-BN4|TB-_hR8;q1QDz&{Y7zRhRn%?sF*A-s$zI0Gq_AAj zabQ8mHIJQ&!ski;d=&z&RajN;sKqLP?Ow|kwjDCWfwWBovalRnv*FutfJ_W6T4t%A zm-gSqnW6OuovHoD`;P_9L&ED$nyNPCx9K@3*_7u|roFUJrp>fPrmeJ1rk82EOs~*( ziMlxlirb@6`aq^f^r1{Us2_)BR<&*w)RIgI-tj8$-N~2NcyCW*?}%lo%UrKA?V{aL z`bega=`jwomX*XIL0^Okai*MI;A0-&8)8Z~l^Ns)hxmQx7~9Q7qL$TMK~r*Osf3RV z=SzVz_?st0INeJ#_T@c-fkxCB-90E>Mn2@MR6CHGe1DC-> z4?ei?n&Q;PoZ|i^e2GOc_F-&eip2<)#R#Is2uj5WF2x8s#Rx{l2vWre24UrOai0{n zyI^|&zm!IM=nXiKIHR~KSo9`F31c|*jHI8$uKl<&I)bGTCFua}WM>f_#0J9sUVJ+` z1}3N-f7rnWQaftY*09no-lSk<55?e`Eo~N-<8@2y$zg$Q9;(~?8~b8dn{{obw%4dV z)fcK!DAgCP0q$=Ux%7;pp`WRvMzPe!c#S$!n<6!mQ=2f;mFkPus2j`HVcGf`ZD_zc zh;RrDgupb~;VHo#ENDn@ufp;X_;;#< zXOft4YVW8BEnUy(UkI%eE7Q*l4atj%v>}m5ArgsTkw~PryOF(p!q6x}9)q)Sggk+e zPa>342ze5qrci395pD*#%L)n>1+QtBg0xFP+NB`vQjm5jNVAd&3eqfMf`YW5g)1Q~ z$lyXv3xeVZ_85}kG=_rF>8z(De~(3NB4ga?MCSx7e^(75gU;q*tmY1kq_%;GM(|Ew z&Z4a5gaxOYB5q(20gfFHqY737>HN_LdC~$1OEm*Ii_Ub!*xSAv{6Ibl0OH8r zc^H|dnYs}+=Cm=oN1Q;8Y&*5`DFA)e0uYNU{&9dhb3`H{#8s+`>nz^Q(LAnvZj9Bv z$SCIxdw!vfZFIpO{O3^3FFd|vS2AR}Ko?<2qDz5w+2yaxF9U*?=yGsfcKLyPg`mIo z0P$)UpDhgJN?W7*+Ot@pCHJwwkNUr(^}M(M literal 4966 zcmb_fOK%fb6h4#qk(f!K;nhHa7z%Y9$Pk`&UJytE4mPiZ@Gea3NjzZBnDH10g_gD; zb=Rd#x zPDBUjX_VR|+LBY1NLsA0Kamb59u0#r#e?9_AM{u(=m01H#O7R$nqyyJ}&h!=8=!^=PJLm?u|omq*5dvNIqMQ$>wq zd7RUe_qdGhqm#96_KM${tn|Uop?X+E{ zt+Y*|)fwH;oNUcGne54!Ikh;iBD=^|eKBMgbhy8*wLdHy>>EnV^v`#aMEx>FsY9Z% z#7x?WicnHLW6!Sy7^NMg-7>8rnK1`t>Y{F*?UiXYbw_ERMBPG=Zf;{VMB8I@kPb)b zkVLyoYe`YdYObIuIkQxP>Ky5?B83<(Kou34-li0C36*6{!!E$r9SMh|i#(F<_pdOO z5t-J|YaKKO^<-7+c0n!i@)4PO9Ig{Gt#$Yxmua0do04fg^FJZc+6Mm#%TkwFH!+%~ z?Tj)b(+1ioQT9JX(L-8DmUUqNe|Rseao%=Av$i1By1s6_Bp;72;vhTEUS*{Ngv48S zENOPeIpjDBs3;v3cOjI3)NmGHl5Hvr>k{>pdv|~#K5aH!Ul)tljv?0o@@#W4>RG{T z2n%*V^x3U_PJaxz5r8KHOD()YvE2xu;P)~Ipixw1cE9l$!`q3K5*x!i_o16z@K)Du z=IUMGxVhy_l*wiv>xDAawPK_JKKNW7C11;$L)G5^MQ z9F?q#ncPyNfn;x}MthRI;TkE)-)QLaGuj{enGV!wIN38=qw(bWNR5sr*LT$DSh6=- zqe+-e!|Y^@(hXYsM92m~OTjjK5x60=;(dtBe(J}iSiyziARVF+I!qI|3uGuIsGmo= zK+2__tyAYUP8)|I%a;-$^Ndp$7Bfy(M9er%Q8DAhar(E?DK}vm5z;?^#A1lQ!2RCN zx=ZcE`PwQ#N3iiITpGhB<8bK+TsjKK2|@pwh-uuVA9v};UHWmCe%z%W=NpTlALo0D z*eT9;7ZHv)-${U+1q(+dyu!+3*G|_n`WIYU1&h>+Ttf1OMcR-^q!5XOlSpI?iELzV zPyii=tCQGd3WTOX<^)_l30Kn)=nSNG3i-?+cUj^3qKIe8bv@;}o^oAJxvr;N*He6( z6RxND0w-KgiEywIQX&W})RYKJ49=dRvvrphj1u03lRweX?=Wc-nc|a9FbX z<8fH?35+B+BM=SeopU({SzQna&S{Fcjzt7H-guVg>R4VP<3IR_TnZ#|f##nhGJpf- zCvpu$uD2k<@nRwu=~4iZVLy?ZfkZCTl^`O+ej<4g(OMAU6f%*kbj>BwhMAL^#P`04 z6atA{cMIM)q|7Hh;wyGeYKkCIYC&YB(7h9=kpaI(%7H{~1Z!l#9}ycwsx63cvEqo_ z4AjUTe`@Xr5>bOSvd2&4A&5L`L4<216Ilo(qWFnC4kVHbCZhO>JOPoXEr@WbW+Hj0 zXr+5DqMQ(#0k1n+N&5+X97t%13NDB)K+d|y8K+2eBByLSn)w98K5apai!1))0|BSF zMnrLCO1J1XewpHA9bHDHNe}!&#WuR=cm6Zfxz9a&$ZpAy$)XC7@PA;SE|2+j`9+}9 z)nHv7^Aq_J&VJ<~;;miWQ<%uzKsikMqyKdvk$b^%@N^I->feCKw=IZpo0AaL`-pBE pEsMrEgj4?j&+p>zA>KZ^N^M8!J-mOvLXYW#3VrB4e#DPY{sl`>w+8?K diff --git a/target/classes/ca/sheridancollege/beans/User.class b/target/classes/ca/sheridancollege/beans/User.class index d95167f129b68c8798543cf83a598de39a4d4bee..f2524dac6cb51c99f12edf8af9f897635f20ea88 100644 GIT binary patch literal 2591 zcma)7ZF3q`6g~?J6oSo5lT^}%(rOWC6Rf7u8cLg_iH)XB3^6lh{Ib9mwzKRayQ{|W z*ZA2FI%B3YI^z%UM>#&{-h}`Gn-AQ(=bpFcyz&4v35wFo7#+muFh*Z#bj5c?*EZThqq+Up#`i|iGVErt;&n~CxuH?&$hSSSEly0= ztXX2ywjIy#OviRLT9gVu7CWNrnyx48x+v~7ptLlGvF%uX+Xhot-lD#3e&>rYAZvhO z`<7+E0n?;W)Dm{nYcaI~ZpU!lADnK3>5@hQaO7ABVOoXYd!|*a2oK)k z6|-p@p5Fy`ZJ1lyuNy_TCAwzAu~7BBsFO>~brquc~e-LOuKuE})psCz9F^}aP39Xn*- z?x635+(p;<6NT_FsHoC8r{bo&(<^Q`mq&RMu-SjobJd=OUX3)G?Zr4y_w~`Y%T~J= zf@-L_AcVeU_P#irBUCrY(C<)G)2iIUFRc3 zOG&yxHFYF=1*!q z^xR(lgl=P{#<8Xn6rm8~!S_4ZO=(b9aZi&@GcFjjRhpw~Rhp-TJz4}8umjlz+|v|h zx$AwAcOinH0+AUh5@L~*5(#m%kXeS45ZtlTIY`|Cl@Y*ohu(APeNcBP8(5jb{Q-WG z!9=svy~E(Bk#iAI->vF+fyHJOY%@Xd^Ik zh`V1RodJahO7swb)+YesHq)pC4b=cqG+r7n%FAPXVd8Ky)NOP-H_2?_4La#BioOcJ zq1YKohpH#8!Z9H>ovzUgJsN;N+wZJ0Jq=+00=Wp}v!e!Orxos>QK+zt3>Q**;6;U% zrWmv~0xu<6pvRb{GN$7R=HaRIx~44myD=MdBfQDs!870hEWy@?B zcHOZo*_5RtY1nS*8&|fH6caT3+W5gJS%%##?Hs+9buUQ?L1SvybV~aOHZ1dJq)yV zOWO?uWqTMl9LqnkVT|c&3Ewuq_hl5l3Ba&@%VI>lCP4{H+D-46SM#u*8m{}J(`xX# zEGQ{$_H76fwV;JPhr1clE%=^kp-&Ih2KLRSZFqhQ)}^b~a`k_?D7;W`)#r5;Ota#4yiPU>h8zIVg)}AU1~X^c@}+-rBwGhs8KYIFZdiu~ z)B>)9&6sy=V)9e{adK%!;kKg~FLZ;LJJeWrgV{2ghiSUSXgK;}A2T%F&5MCY3v)I0 zTuIY7O$bWCGc?8uwTr9_Lu+E>f`K+wtaR>OPYYc5Nt)iL4=x+jMMi@L!y1g^QOD-> zig4t_Rqmmmfd539bbjux#1o||0&v{ZFcw)S}Sa~ zV``T}_iSo<>qTRW1g)QzQiAyt>Zxp{c{vv!X@I8PlXA-Lv-h&jQvoTB9v7{N8xoFt2>f%KrrRfG*&ZoH^?%G z_lNi?11~PdQNml`9WVY#_kLG7=kQFZ%?uUsoz@O?pB`W(Xr31EPtFvsLFhxN>o#alfFWJh~S;9 zYP>=(0wR9FItK6Qci_ELMi!@mK&9qo1NELE>n4zHDU?N>FGM*VqMQy^b)xu Tw4-i?A$;v({WY-R{@D8uoyYrP diff --git a/target/classes/ca/sheridancollege/beans/UserRole.class b/target/classes/ca/sheridancollege/beans/UserRole.class index aeed3affeccdf6e3ea3be00bdf75bd35af44f8cb..522176dd36cb745fc9ac1563884691a7dae06e0a 100644 GIT binary patch literal 1953 zcmah}Yfl?T6g{&xHaI3EB&LOw5NOgGhh*E7^p%u^5~y5JA_WI2cZ53-( zJgH(`p_W8Cd=~h+-BY--`P%#0bA8YD-L{Q&UxyDArk^D?HV1mgL}t&|tJVgw7n{IF z3R9`YFYX&1Mkb22?P|B(qtQaa!*|;1(2I3%$MX|SrO_xBxqo=3K0S2~-=zBOC+l0C zcISn{OacB{;3o%`xMk}dXob4O_9|p>uMDHBB-Z?t=o0gy=-Vc~?=c>cK^sw4nA_}n zZnUpM)AMXM@O>u1-P4|p+~-sv_-ujaA3S^537%RZIr5{9yZgm@8}gI~Q{G(NWgyoJ z;Jy!xJq~76h-CqlB^HIr)Fdm@b{rbpr`w9JZ9m?ZXznPC_jN3Mk1E?}E)E!-)V919 z^oTgIX{_E#4)%1|k(`K+pzHZNUT8$lFU#@1VbMQ4J4fP^gvO)O6sDR53>J43sySDM zd9pk&{nZ?nEz>+l`3PJHDO^33g5$giUZ&6(B$&SoMCGBeCSFk}HAP%L&+R~%11Poa zAPKvA!w8r0quSh+fh+Fjbq-y8$V5)3fTw3HEePMz@l9Ktb-A21_!=jZb7gGIyPE~Z z&(k?LQ6tU;wmN5Li*pmzF^aJ|-oyKK%;83zzsP;o=FGxm8N77zeLUTJt-CR^o?e;2 z-R4MnzWG(!3G@7lDjd2hN^ry-&oy@LP0AOz*C~%{T*L$}@#=DfNnF{*RWx=nMGJDv zEv`|T=6Ocr8a}`*MQUF^QY8OevB5pZn#*42+gPA)_A~t|+@fEXyW&35`UC1W9vpnc zRj2|De9Tp-Q2|XXa#v{KHdirTp|-=l(z^W?>UW+p>sop{O`Dk%K>`rW3_(s=0u+{T zC&wBj;tUg+EhKU`W&b}S&M*F>J}b&dX_&|&iL~B9 zB&!>T4fk^_!OTkYC(6T6ODHpSMdew>=Q+R&rd@u=i53B*L{4kzEe2Rk5=2^{%<#vU zfQz`7Lf**Cj_Wm%w;!QoJ_zgJi?rHb=1uJ2E6QK3OGrNnFy5fh<^WHP(-gEEv=dbTS09?UR9vOkDmTmbP(o=0)w_L}O9cisgTl?0k zFTLlkBlE}#9DHNHw=Kuk9qZZp8`%o-$O#;YPL*q|5WsfSM|<6o0);Sft+fRX*LPfN zIv~DxTVV8gr~|bro61-8nb+D4>_EBN7Z`~=K3H$1=PN&ux+Sezn@-ay7muZuo*l?` z({@5hqX9oK`_9&$_I#e@8d=8ux6=~@7_Wf(ie&t!BP4p53r2N|8d)X#!zEZ>`F_LOM`r^hzU%_ z$gydun{;Anz;bt#R>3`izH+5mKp*ZDaTB)$uKbTmR}#AL3M+2twd9gA{06r*JZ~B^ zz3La)oWT~;JQ@M+?!`zh-bHO5wE|T;6gR>GJDB~abilKj6zA2bUv|uhv!CA`_SiD} z%f}QG)yH2y$BZc-uJ^J2X1FhK-p_qeVh{%~#G`{g4q2w^0)N)QZsoB)AyIGv;tU>eKhG1^;zKOFgm{2Qh-oA%iyw0wp(Mp@fVqB z0x|KzAK;HNzGt>AA8r#!yy(pA%$fIn=FFM?{`2z}5v|eFG$m9&Al*3W(TcPc>aTX!}yodQ{B%VC&~Shfb*sspPtH zRZtcb&o5L38Jk`Mq9YaM%Gd3~n)Kh=$dI71idVOts_iTO?oJxPz5?dlV7GUk|6#{( zNFP>P`R&1h(HV(4TZuWd=W#kmJ*1=mV{+L9GE1T3 zXjG@pvE8P%Q#+9LK+w3JQl7PkH*Y)YGd~r2fPbMR2})6%Vr+$R8vj>md|gLx;um9g z-2(vYH}!Z7(SixlW-wDkFVH6nKS+GnAz8F6LYxb-PJ%WEvMDg!*5U=sLZB81CW;@>WS%twOE(p(=T7FrY*kY`50 MV_n94PfJ990sR4`OaK4? literal 1925 zcmb_dT~8B16ur}rt<;q-X`vt>px7?LBE_eY8iF5zG(yDG=WRQd!DW|hx5oP7FEY^t zV&a28z#nBiGutjuw+SRZbob88opa7Tb7%Ye&(B{(v`J4>6l1hlx6IZN_e8^T>aK0` zCO2!`a$4p)*ZZ*VHMp0e1f$Vo>!W4bmeVx%Ysb9qr$}Qop=O0^9sK#b4D@I zV8r$q<=(U%U!3r&XbG%rJC5sHzHpruqijWP{$!qVuO(VOck0~SZImD>V&N5cxM%si zQMK$gN79ho<~k0y8Ld|a7O?{=-)q+;=Rt1=w(AZ4UepCh1&5Z5qBPsSu+44HvpN+h zk}QX!=~#Z-Ls45%Ia`CNpZ6F#r81zjE#U~i%qX5OR2e09+y+lmoU%HN(_Ka*72)vL z?UNe!-Ucp?SKPW~S1mXT@4Ax-|42aagTcJvxq);yzc)BB+MB2}Y0sl%ll!~qKsb#aOtykiBEKig(6JbH0;7$5 z;ie7&1CW<6ius#DNFgH-684Dd!bxaR7wVrrEJv?g*GrH=@l~>^d?c4t_AGMgx?~a| zedxBmI)5qT*I+p8$Te9VqiMx__2$38cf#+KXaNTt$1jOzOrAaBA$+gW7^U&PjbBW5 zf_kG5us*8dF_nwEgqaD<6!B(wCygJJ`L0qX@svP>qy%MX3XvWpQI4iDVz`Vm$Os_s zDWETqlEhj@0vYq?G;6G$)4Y*OoYR5?j*|q=s-#H(PeE}GJvxo;Gm6B(EC9MBG72h_ zk*p=IR%JB_T0$I%$^c^wGq~>b5Kmc^32{MHXEgg26EQ`usmZy>ik9h7cXJs;l1fum z^n0?10+tj)R(Yg_a<#5pMtLfPLVEU|(fqeQANRkp3^4LUqq{=`2YX_ diff --git a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml b/target/classes/ca/sheridancollege/config/hibernate.cfg.xml deleted file mode 100644 index 879b8ea..0000000 --- a/target/classes/ca/sheridancollege/config/hibernate.cfg.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb - root - 12345678 - - - org.hibernate.dialect.MySQLDialect - - - true - - - update - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 39cbd87..e0c0575 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -15,6 +15,7 @@ + @@ -23,6 +24,7 @@ + @@ -35,6 +37,8 @@ + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 80ad2df..ecf7d70 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -61,4 +61,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 98875cfcb388f547f7c556edbdb9705a526d799d..e68043698454f5d64f5929287b200e010f193250 100644 GIT binary patch delta 768 zcmaJfN+ml4JmLTO^>E<15u-}3QGrIPFY{5>(op=`h)GOQi8U)e&~0md z@r)7Em_2W@3E`wtd$in+B2-`@oUpQnT*r|sX`?ePH!x~e(Fmh$jJ7lCkvsXN zR=VQqmV02rUaGDk(l|}AC_MA<+-_GZq6r0 zRp!_~nd33@#C+yBGba?L_7GmsW~WWOq*yTId=)bvogX{JW1m*W?s$Xs{I1{?zvZ>Q z7*dSZyI-9F;hS{_5u+dT#GOGx5k?Gzn`q%5up&v#veL4D);8($E!!NvANM==e&^i3EmN7mi_Ir_00;1A zJa8;5z2S!7LJ;$~QHXhk!;%g;QX4tse;>pLtjM)UUVV{zEA9Ul#3y_oxoIh7q^I;q zu|WZB>_!w3#NfclTI&6f$(Hx&URby-(-jw_xuQ?sAqnYa@m*|3KQj(s4+hbId-ACAmL9<_j7p>PNYSQnb>z6)sGfUj%+2X3W|{FO+83{rhw+g8He0gzfa~?K8=T3<`kFc4 zY~|e6jU{E4F* diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 2c7d0fcbbae9ea249b88f4219b5497761c7740c8..2d040d128bd1bfde843e5fe1193ed2d145826863 100644 GIT binary patch delta 2827 zcmZuz3v63w75f#CG!Xn5KoPI0MFq*PGiHSW(ZS>TSQO1ZcNxgk9~op_fZ$6M2@h(}PG z9d%DQI-eLw#B~3hLn>sQ8E3t~>Fvw*YN;7EtyQYrE*k|_x=#vh-m%V_Jv6}YkWEsf zh?fX?uG!xh@`tAzcb^F8(L^v3R;3np!P;mn7-lwqV0JL(59ki5m(7Ya2t12+ZJ{R; zn^UDxngn@qJ#j#fvclyw!z>_fzOA_x7z^a~o;g}9W1Vykngt28Timj$Y!Qe~qB8bu zn7NT~iy~W%HO?-3tH5o-F`l_iGh)v61;=DC9u4_VrV&}ay(S^`(xpnb>?Yjln{ch( znz2qr?h%w_Q@C$FvBI=n_6Rmo%AvR(i;s8t6XV^Hus1gwNk8;f1**7I{c^_CcIXe zb~d(XK6c8CDzmu8X7NulLqS+SUVpPTib|n6LZPlmIG%{j2h85wPYEL7upSb0dyQ*K z-N>rembMnVL`nHnEHbx#RTp+$V70(~!8kjz(|ALvEnD>wv*3R>_WTIS(5T}(W9FlJv@I8W8cg3z1WWX z=+l3p%vB~G1IWQ33NVCX3^UOvw&EbejL~r%58@DXKEv?iJzTvXQ#gZZd;~$9#SEUs z?1iJHKG_{cJ|e92C@YK+bDSs>XvaKrA45M*@bF27d5Eib^LK)w7H}GmFw~=X2Jgjl zc;AIL%W9?MF@k=apihyeCrHX^hC5?4mOrFDNy{QF1}z_khey45illth_*VIR$tP)j zn$}Oz`e~l~49}hAIhQfve#G-xT0ckYv#7v1O7I+-@CCHsi|D`$ixr~_QcEUsd23JA zeg#?z8wCCJDeM=FTo&iSA}P8kC3_o^Quf$OcAxdKR2*!$D3v~&X49-m*)XEnl2UyR z4s$0dchs4?b@g>A3|cV4NTY%jIEY*x5uAshnmo75CgydM3@W#V>CY4Biv;>r0!`8- zMO80Rv&(dTiD17@MqfrBUZHH?#$kMi%zl@?pt_0)pTt!1FIQrhJf?9_$Vqxx=+!G* zq?rk;(II!rR(5A23S^ty)dm}b+hn`k%~d~-SHQAF1#JpMk$MHSiZ~V7VZLq3g@_MP zhMcCSMOutMR#eGO!{KT3e2)oVWdW}-!uQGa56JY7$n=jH|0jzT+Zx)~S~m6|pb}jZ zilt4Mhaq=K2Y2!S86q+}Jrc%;+{Nj@?gh=3lR}3DFH3z=I(@m9rH8WIdr^9Qil%6} zNx4r`lCsy-fE(1H;U?=`9?7u2i#?VdTwy)I-hMdE`b?Vj9D0pn79l2VLbqh9-^G6p zO#XA3KqdeCsNJDu`jsqh=%40>f;2J(6&XV=6|tInpjpArY)SUBjc!PCzwu2^RsMk# z5*F-jD3U?rny1Ttp$$b`Wn!~5^MMje{{&B3;)SR!0KPmb-sG4fc ztTnslNa1zP0#|BEf?SY1N|4 zz?xQ6yFwP;hHwhGX$oke!)s{)tsJLRT0k2wwa-)hUdq;vkKy0+P&kfH;vMeUIW?#7 zAFlE^Y~A=T{ztN7*e)Ti)U>GUIeM8GVaCXuyuNbsI`Z<;qjwrMV6cvVV{e2X;xSi zJd&$9WKmhCGQTCsQ+uUy%1`^zQRiXhk$R_Yq$nix^mVtlG(~C}I$IR1|8~--WvN6N z(ZcaIEJGr6*yO9$VY9;r2QuJ99yHmhkGnir2``di!ayoQNJA$4@>?G?LPS;*$$$rI z;OF@|WRaIGG555YOEiyYKG_9GMW6msNML8=rlV3^YD)P6Y2-^_G z_L)+TTUG2v9BN_19va$9@qLurk5U}K4jjZ0)S(53(1m&opaD@dVi-*rO^*4RjbWlAL@yJ)!pN>Nm{F{U$ai1AD@ODh(d$HS zkb9HdTja*fJ47ak+(QcPGtdXfq5Bd%LIs{kVW2?j(t>hZud1G8 Date: Thu, 6 Oct 2016 12:35:33 -0400 Subject: [PATCH 34/57] added back buttons --- WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp | 6 ++++++ .../jsps/displayConstructionPersonnelDeficiencies.jsp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp index a97640b..efd5fe4 100644 --- a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp @@ -39,5 +39,11 @@ +
+ + + Back +
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp index 9a7b355..ac836f8 100644 --- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp @@ -43,5 +43,11 @@ +
+ + + Back +
+ \ No newline at end of file From 3d191f6dc249d5f582b8438ebc1e0c4e6c048f18 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 13:16:32 -0400 Subject: [PATCH 35/57] Form object totally works home page has colours --- WebContent/WEB-INF/jsps/addDeficiency.jsp | 4 +- WebContent/WEB-INF/jsps/addSignOff.jsp | 120 +++++++----------- .../WEB-INF/jsps/displayUnitDeficiencies.jsp | 2 +- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 9 +- WebContent/WEB-INF/jsps/header.jsp | 2 +- WebContent/WEB-INF/jsps/home.jsp | 8 +- src/ca/sheridancollege/beans/Form.java | 45 ++++++- src/ca/sheridancollege/beans/HomeOwner.java | 3 + .../sheridancollege/config/hibernate.cfg.xml | 6 +- .../config/security-context.xml | 2 +- .../controllers/HomeController.java | 14 +- src/ca/sheridancollege/dao/DAO.java | 26 +++- .../services/ControllerServices.java | 35 +++++ 13 files changed, 183 insertions(+), 93 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp index e86a00a..3c430f0 100644 --- a/WebContent/WEB-INF/jsps/addDeficiency.jsp +++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp @@ -57,10 +57,12 @@
diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index b378283..61152e7 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -46,104 +46,83 @@ - - - -
- + - - - -
- + +
SignOff Form -
-

I have inspected my new home and I agree that the descriptions of the items listed on this form are accurate.

+

I have inspected my new home and I agree that the descriptions of the items listed on + this form are accurate.

- +
- -
+
+
+
- +
- +
+
+ +
+ - - -
- +
+
+ + + +
+ - - +
+ +
- +
- +


-
- - - - +
- -
-

* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they - provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf

-
- -
+ +





+
+

* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they + provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf

+
+ +
-
+ + +
Finish -
- -
- - - -
+ + - - +
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp index ea6bca9..9538227 100644 --- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp @@ -45,7 +45,7 @@ Add Deficiency - + Next
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index 5441f6a..47e1c52 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -77,11 +77,8 @@ Extra Large Button CSS - -
- +
-
@@ -264,8 +261,8 @@ Extra Large Button CSS
- - +
diff --git a/WebContent/WEB-INF/jsps/header.jsp b/WebContent/WEB-INF/jsps/header.jsp index d9cd9a6..bc34670 100644 --- a/WebContent/WEB-INF/jsps/header.jsp +++ b/WebContent/WEB-INF/jsps/header.jsp @@ -24,7 +24,7 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> -Title +aBode aBode diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index 778ac4a..22056e9 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -7,6 +7,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; @Entity @NamedQuery(name = "Form.byHomeEnrollmentNumber", query = "from Form where homeEnrollmentNumber = :homeEnrollmentNumber") @@ -20,15 +22,23 @@ public class Form implements Serializable { private String repName; @Column(columnDefinition="mediumblob") private byte[] repSig; + private String desName; + private String date; + private String purchName; + @Column(columnDefinition="mediumblob") + private byte[] finalSig; public Form() { - + Date today = new Date(); + this.date = new SimpleDateFormat("yyyy-M-dd").format(today); } public Form(long homeEnrollmentNumber, String formType, String repName) { this.homeEnrollmentNumber = homeEnrollmentNumber; this.formType = formType; this.repName = repName; + Date today = new Date(); + this.date = new SimpleDateFormat("yyyy-mm-dd").format(today); } public String byteString(byte[] repSig){ @@ -75,4 +85,37 @@ public byte[] getRepSig() { public void setRepSig(byte[] repSig) { this.repSig = repSig; } + + public String getDesName() { + return desName; + } + + public void setDesName(String desName) { + this.desName = desName; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getPurchName() { + return purchName; + } + + public void setPurchName(String purchName) { + this.purchName = purchName; + } + + public byte[] getFinalSig() { + return finalSig; + } + + public void setFinalSig(byte[] finalSig) { + this.finalSig = finalSig; + } + } diff --git a/src/ca/sheridancollege/beans/HomeOwner.java b/src/ca/sheridancollege/beans/HomeOwner.java index 979ca0f..3e49a01 100644 --- a/src/ca/sheridancollege/beans/HomeOwner.java +++ b/src/ca/sheridancollege/beans/HomeOwner.java @@ -3,6 +3,7 @@ import org.hibernate.annotations.NamedQuery; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; import java.io.Serializable; @@ -12,6 +13,8 @@ public class HomeOwner implements Serializable { private String name; @Id + @GeneratedValue + private long id; private String phoneNumber; private long homeEnrollmentNumber; diff --git a/src/ca/sheridancollege/config/hibernate.cfg.xml b/src/ca/sheridancollege/config/hibernate.cfg.xml index 879b8ea..8292fea 100644 --- a/src/ca/sheridancollege/config/hibernate.cfg.xml +++ b/src/ca/sheridancollege/config/hibernate.cfg.xml @@ -5,9 +5,9 @@ com.mysql.jdbc.Driver - jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb - root - 12345678 + jdbc:mysql://localhost:3306/hibernatedb + root + 1234 org.hibernate.dialect.MySQLDialect diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index a47aed7..a688730 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -26,7 +26,7 @@ - + diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index f1f3264..2093fc5 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -177,8 +177,18 @@ public String saveUnit( return "displayUnitInfo"; } - @RequestMapping("/addSignOff") - public String addSignOff(Model model) { + @RequestMapping("/addSignOff/{homeEnrollmentNumber}") + public String addSignOff(Model model, @PathVariable long homeEnrollmentNumber) { + model = controllerServices.loadSignOff(model, homeEnrollmentNumber); + return "addSignOff"; + } + + @RequestMapping(value = "/addSignOff", method = RequestMethod.POST) + public String saveForm(Model model, @RequestParam long homeEnrollmentNumber, + @RequestParam String desName) { + + model = controllerServices.saveForm(model, homeEnrollmentNumber, desName); + return "addSignOff"; } diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 3cb9b2b..3d58da1 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -188,7 +188,7 @@ public void createForm(Form form) { } catch(Exception e){ e.printStackTrace(); } - + form.setRepSig(sigImg); @@ -249,4 +249,28 @@ public List getUnitsByProject(String project) { return unitList; } + + public void addSig(Form form) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + //this code puts the sig img in db + File sig = new File("C:\\abode\\refSig.png"); + byte[] sigImg = new byte[(int)sig.length()]; + + try{ + FileInputStream input = new FileInputStream(sig); + input.read(sigImg); + input.close(); + } catch(Exception e){ + e.printStackTrace(); + } + + form.setFinalSig(sigImg); + + + session.saveOrUpdate(form); + session.getTransaction().commit(); + session.close(); + } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index d4e404e..d380773 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -104,12 +104,47 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate model.addAttribute("builder", returnsBuilder.get(0)); Form form = new Form(homeEnrollmentNumber, "PDI", repName); + + List returnPurch = dao.getHomeOwner(homeEnrollmentNumber); + HomeOwner ho = returnPurch.get(0); + + form.setPurchName(ho.getName()); dao.createForm(form); model.addAttribute("form", form); return model; } + + public Model saveForm(Model model, long homeEnrollmentNumber, String desName){ + + List
returns = dao.getForm(homeEnrollmentNumber); + Form addSignOff = returns.get(0); + + addSignOff.setDesName(desName); + dao.addSig(addSignOff); + model.addAttribute("form", addSignOff); + + dao.saveOrUpdateForm(addSignOff); + + return model; + } + + public Model loadSignOff(Model model, long homeEnrollmentNumber){ + + List returns = dao.getForm(homeEnrollmentNumber); + Form addSignOff = returns.get(0); + + List home = dao.getHomeOwner(homeEnrollmentNumber); + HomeOwner ho = home.get(0); + + addSignOff.setPurchName(ho.getName()); + model.addAttribute("form", addSignOff); + + dao.saveOrUpdateForm(addSignOff); + + return model; + } public Model register(Model model, String username, String password) { String encryptedPassword = new BCryptPasswordEncoder().encode(password); From 7596b52bcd9665ba48316aa09421b617d53e869e Mon Sep 17 00:00:00 2001 From: Elviis Date: Thu, 6 Oct 2016 13:24:25 -0400 Subject: [PATCH 36/57] For Transport do not merge --- WebContent/WEB-INF/jsps/pdiReport.jsp | 253 ++++++++++++++++++ WebContent/WEB-INF/jsps/selectReport.jsp | 74 +++++ src/ca/sheridancollege/beans/Form.java | 9 +- .../ca/sheridancollege/beans/Form.class | Bin 1482 -> 2304 bytes .../config/security-context.xml | 2 + .../classes/ca/sheridancollege/dao/DAO.class | Bin 7827 -> 9832 bytes 6 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 WebContent/WEB-INF/jsps/pdiReport.jsp create mode 100644 WebContent/WEB-INF/jsps/selectReport.jsp diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp new file mode 100644 index 0000000..8aed847 --- /dev/null +++ b/WebContent/WEB-INF/jsps/pdiReport.jsp @@ -0,0 +1,253 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> + +<%@ taglib prefix="security" + uri="http://www.springframework.org/security/tags"%> + + + + + + + + + + + + + +Tarion PDI Form: ${unit.homeEnrollmentNumber} + + +
+
+ + + +
+ TARION Pre-Delivery Inspection Form +
+ + + + + + + + + + + + + + + + + + + + + + + + +
#Item #Room LocationDescription:
1Column contentColumn contentColumn content
2Column contentColumn contentColumn content
+ + +
+
+
+
+ +
+ +
+ +
+ + +
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + + +
+ +
+ + + +
+ + +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ +
+ +
+ +
+ + +
+ +
+
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ +
+ + +
+ +
+ + + + +
+
+ + + + + + + + Back + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/selectReport.jsp b/WebContent/WEB-INF/jsps/selectReport.jsp new file mode 100644 index 0000000..4b6b58c --- /dev/null +++ b/WebContent/WEB-INF/jsps/selectReport.jsp @@ -0,0 +1,74 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> + +<%@ taglib prefix="security" + uri="http://www.springframework.org/security/tags"%> + + + + + + + + + + + + + + +Tarion Report Selection + + +
+
+ +
+ +
+ Report Selection +
+ +
+ +
+ +
+ +
+
+ + + + + + + Back + +
+ + \ No newline at end of file diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index 778ac4a..902cdaa 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -31,7 +31,14 @@ public Form(long homeEnrollmentNumber, String formType, String repName) { this.repName = repName; } - public String byteString(byte[] repSig){ + public Form(long homeEnrollmentNumber, String formType, String repName, byte[] repSig) { + this.homeEnrollmentNumber = homeEnrollmentNumber; + this.formType = formType; + this.repName = repName; + this.repSig = repSig; + } + + public String byteString(byte[] repSig){ String sigImgData = repSig.toString(); return sigImgData; } diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index 78c38afbb425ca9e54df020cc98781b87a2fdc5c..ced6ffcc10b2ecfff34cc2322935a98b437312be 100644 GIT binary patch literal 2304 zcma)-TTdHD6vxjjzF^}flo|*)#0C;#mXK`XEKbOD3*RpT8HfoK??~B2hx|J z9m{sZcDoWr#nZr(dwvL7Px|qzuGf^IpwSZmAD^EAVnWGis@0>bXS+JH+{lrj zN`VSA%DsgGeMC37ceg+{>4qTl{|UX_)>8KiG)^Dm@XhmB>X0IhRV-h1&gWk#&;wdU zQsUs!x>!xHg<|A%4!zE<9ovG^9T^{@fDp|irv0oySsKNBq~}xBBM$Qz%(y&tw#TqI z7)@5M67ilq_Pn{QfIPPJ2h&)2nOIWOFiT#^X*E?vsp>MUaAFQ$2xUT);>eI;7Q|Wa8l6E;X9JYD35jwkHO`pS`?dV zQEIA1?ey%&&`#j_B%&e~1z!`qr(w2+R-jFrf6%Sp)V^7~*#prnO3^Hp&?{&ox=nK! zvA`X?S-=Bf8to(tnB@y9o2wTzZ_cDHXmKDorHpPva1KYf1Bx$(0JD;cbnl3bfJ=?hvK0L&`W1xPFc;4Z}O0bmK|yRRVD6=10k zQR+jK`Vgfa1YGjX#14EMXt{@Th?Y^aE5DQZ&4XXjH6VW(OcUlS%2h?1^<8C^7^m5w zhX6AmWYMQRSxb#ML+|O)FMZJrmI-D_*;&Isjn2*%TrpFIGxKN=4V~XLxLj8XQ*Z*S zK2oMvZGt|h)jr5&sl2E8!Ra)}<3x}z=y4y!&@RjsRL3yL20%8i0pSW@$6qFbEDnP_ zO9c5U8RUZk)e+eN$nG^DT!0MnBr!GR;nW-?f@~zGraT;xuK`lK21MTud|c=$aQG5h z3QX6?(r`pxCxUFzv)<+{Bt~VQQ}e-%(GjTw~;IS>qbp}tK;^tLhHLAx8# J9_>eT@Gs#!hSUH6 delta 730 zcmZva$w~u35QhI*P2w11%wiVf7Bw?5#<*RC2;LOIgHI4pf?_-v@jAYO%yTFT34#Y7 zASVw#jR*1Xo`J|Pm#Xfj>aVY=`Y}D4OpJa%J^}1v_bKt?ohf-UV)61{I-KP(mDKBr%T+DpK8H9V!TQ&o)-vMJxsCO>+2n z11vu?$j39~<5DDA6{|sVn`jzyOo6pLX7QU_CDEEx$jN5SpgF)bF#$0qg#qhY-Nm7p{`L`c` nCVM2=$D!DGcqpd$cO+4!-N()!vhh7Q diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index 39cbd87..e0dd2c6 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -15,6 +15,7 @@ + @@ -23,6 +24,7 @@ + diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 2c7d0fcbbae9ea249b88f4219b5497761c7740c8..f877dea8a6254440f4923fc60f0add7d3dc759e4 100644 GIT binary patch delta 2524 zcmZuy3v63w89kq4=Q=kx>70j?o5bm3?drVhEVS$DG)ePlwq{McHP0^T+MDDiIB{&( zarzh<)_7?vtzfw@USsP7TeqPhx`K<_fd&I4rtuOIMS#S+3?{~4AjW`(bM3TsC1mO5 zzyJ3--#OoRW3|1uTYcrqg|7qHEYY*7)3Z&H5`i{r95Di+XrMO~Hr-MtDD4i88xzqf zb3ATN4}@km#UeARc*LtgkqSY%-@2!;JjokflPakewJbzuEB0fPyZq{9q z*kWQJ5jTx_Rcd6loo9`}?Nx=4o+^bBj$LA4FXdh#aSihDYe>QrbU7B-G&5IOyQHX)7Dtx1pUB;1+naGn0Tu`WgK z5LD(;xOXvejcK>+60E0`LknhnVZ7T&jQ2#3M#52JYGFm#!I8aLZF|M5N^i65)}-HN z#&t9vN|3o;7=o%By38$MebIAJ2CU+eisX=>Fcy!_nv;n=#yophR^9|9lhOHD*i4u` z=5%N>WJV^BtGF!tHMv*DvTaeV#NvWIS#>#-bw#6L(}=XHazG9$avvuq(`<&%6{9AH z@HatHo5(s38{tI)KOhsDObX{mIbz@Jofdfg_x|7P#4@ePjBtGIiMWczyE2`*)i|Ps z*eZ4OC@tfUexlu5tV2`mE|ve zw7eE7R>Om}&~Y=?^H+}z*4Y}b^~ch~x}VlMS{qP>M*3{xGr-tet%b4|d|PO}jn>;y zjcvFELE5(S*@hkHu)50AzHWN-(4&{}cQE&zjPJu%+(n=MbCupo=^Q{F22q3|lwp{K zMzI6QN-7_E(H(SNl$!lb=cP92(p|bUC2L1?S4uXVfok8RU!1nk`N394!}T5YULO8D-KgtizN$q?0!VfD93tn;r@4 zqt#`Z#MMdNm6t}R120KqO1gsi7p0f7+<9L5f{L!_`6;g?=T68~SIs zp&$X4pdw?)ry@>U540%Qo-4`S9HXm}++%&ix2|ws8VLvXG?mJr^@gv-_a+jDK)_{>iV$+f@1;tF5*|hOMF6t)(NRBcp`lIB^%T&r8-@6{BMVdSM#B5>DXd zpsK4WyjFc0?YbJ&_#&ez8UGYk=~~`b#Yl;H2AZxpvuE9{t7*K>UEoPeONgg4D6;eY zMeyn6XRTwEP00x^FK~rllVy~OpjI5HlRUJDldIxFujHd&+%P%W5m6DBLOdWEJ|snW zScQ71+}?)h>~Rw;|j@UfKdW=FzPU)+y=k+yi KnI~e0ME(ceQ4~u6 delta 729 zcmXw1X-`v86r5WzNNdw{d2L_m>%s%8AczeW1uCl=H$>we(I6HQNCB~^aX~&^m}iyG zZOy_Vf7=eF90!C)wmV#^SHLtd*xwWDOtf~yV*>gAPV$UWCMb z*#;l%2*H6coU+S#OYy*nLRg_eg&)NTpcFxAb&aaUL`sN+;K5P^dA}TGRXDKy|hd75RjASajr9wH+rju;?0^Asd zj*FDLB;(pCb&SYWBG-sqXIwWJN(vQ_Dc_JXPVhFtI|T2Nc8|3C^0IGSdq8A@$Rl_$ z$t)kEl8x8mDH`!iwgn^dm|vH(&KBhbD_^p5nwxmVywXg3hMRB(#3E4uK{$vb9K`@3 ztQ^pQZoUtLu*r|UB4L*$?zP%$R=uIfEbX$io1@)Z+P$OQhn!tVVYUmgnasu1tb{`- z!pR#UTnysBrdwL{B9od$!hqItyC{@(dN}fl>Yu6pg-id+rGMl6^IZ9NhW&$%e63Uh VSFUjtxvxoRa#F9(&z%gy{}=vjhs*!~ From 8fc041ba6718d3005f44ee35fb55b1e4b895582d Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 13:28:39 -0400 Subject: [PATCH 37/57] added a sorting algorithm to deficiencies in the dao --- src/ca/sheridancollege/beans/Deficiency.java | 8 +++++++- src/ca/sheridancollege/dao/DAO.java | 13 ++++++++++++- .../services/ControllerServices.java | 6 ++---- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java index f21905c..830e21b 100644 --- a/src/ca/sheridancollege/beans/Deficiency.java +++ b/src/ca/sheridancollege/beans/Deficiency.java @@ -3,10 +3,11 @@ import javax.persistence.Column; import javax.persistence.Embeddable; import java.io.Serializable; +import java.util.Comparator; import java.util.Date; @Embeddable -public class Deficiency implements Serializable { +public class Deficiency implements Serializable, Comparable { private static final long serialVersionUID = 7277687991400754226L; private int id; @@ -102,4 +103,9 @@ public long getHomeEnrollmentNumber() { public void setHomeEnrollmentNumber(long homeEnrollmentNumber) { this.homeEnrollmentNumber = homeEnrollmentNumber; } + + @Override + public int compareTo(Deficiency o) { + return ido.getId()?1:0; + } } diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 2f06797..0720b91 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -11,6 +11,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -250,7 +251,7 @@ public List getUnitsByProject(String project) { return unitList; } - public void completeDeficiency(int id, long homeEnrollmentNumber) { + public Unit completeDeficiency(int id, long homeEnrollmentNumber) { Session session = sessionFactory.openSession(); session.beginTransaction(); @@ -276,10 +277,13 @@ public void completeDeficiency(int id, long homeEnrollmentNumber) { } unit.setDeficiencies(modDeficiencies); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); session.saveOrUpdate(unit); session.getTransaction().commit(); session.close(); + + return unit; } public List getAllConstructionPersonnel() { @@ -308,4 +312,11 @@ public List getConstructionPersonnel(int id) { return constructionPersonnelList; } + + public List sortDeficiencyList (List deficiencyList) { + + Collections.sort(deficiencyList); + + return deficiencyList; + } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 236fa20..1a50152 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -218,11 +218,9 @@ public HttpServletResponse getImage(HttpServletResponse response, long homeEnrol } public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) { - dao.completeDeficiency(id, homeEnrollmentNumber); + Unit unit = dao.completeDeficiency(id, homeEnrollmentNumber); - List unitList = dao.getUnit(homeEnrollmentNumber); - - model.addAttribute("unit", unitList.get(0)); + model.addAttribute("unit", unit); return model; } From 81fccb3426767f9400b32fbd46c212719ae56cb3 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 13:29:56 -0400 Subject: [PATCH 38/57] online db --- src/ca/sheridancollege/config/hibernate.cfg.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ca/sheridancollege/config/hibernate.cfg.xml b/src/ca/sheridancollege/config/hibernate.cfg.xml index 8292fea..446096f 100644 --- a/src/ca/sheridancollege/config/hibernate.cfg.xml +++ b/src/ca/sheridancollege/config/hibernate.cfg.xml @@ -5,9 +5,9 @@ com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/hibernatedb - root - 1234 + jdbc:mysql://hibernatedb.casvessiigsc.us-east-1.rds.amazonaws.com:3306/abodedb + root + 12345678 org.hibernate.dialect.MySQLDialect From bcb66e00ec7e2cc1b7a5a184f53989508fd2b277 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 13:57:44 -0400 Subject: [PATCH 39/57] added sorting to unit deficiencies and fixed it for all controller services --- src/ca/sheridancollege/dao/DAO.java | 10 +----- .../services/ControllerServices.java | 33 ++++++++++++++----- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index e8ba3d5..79aa09b 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -275,7 +275,7 @@ public void addSig(Form form) { session.close(); } - public void completeDeficiency(int id, long homeEnrollmentNumber) { + public Unit completeDeficiency(int id, long homeEnrollmentNumber) { Session session = sessionFactory.openSession(); session.beginTransaction(); @@ -301,7 +301,6 @@ public void completeDeficiency(int id, long homeEnrollmentNumber) { } unit.setDeficiencies(modDeficiencies); - unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); session.saveOrUpdate(unit); session.getTransaction().commit(); @@ -336,11 +335,4 @@ public List getConstructionPersonnel(int id) { return constructionPersonnelList; } - - public List sortDeficiencyList (List deficiencyList) { - - Collections.sort(deficiencyList); - - return deficiencyList; - } } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index b9e1b69..7f7d12f 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -32,14 +33,17 @@ public Model displayUnitDeficiencies(Model model, Long homeEnrollmentNumber) { public Model saveDeficiency(Model model, int id, String location, String description, String constructionPersonnel, String category, Date deadline, long homeEnrollmentNumber) { Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false, homeEnrollmentNumber); - List unit = dao.getUnit(homeEnrollmentNumber); - System.out.println("Unit Size:" + unit.size() + homeEnrollmentNumber); - unit.get(0).addDeficiency(deficiency); + List unitList = dao.getUnit(homeEnrollmentNumber); + System.out.println("Unit Size:" + unitList.size() + homeEnrollmentNumber); + unitList.get(0).addDeficiency(deficiency); - dao.saveOrUpdateUnit(unit.get(0)); + dao.saveOrUpdateUnit(unitList.get(0)); - List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); + + model.addAttribute("unit", unit); return model; } @@ -169,6 +173,7 @@ public Model addDeficiency(Model model, long homeEnrollmentNumber) { List constructionPersonnelList = dao.getAllConstructionPersonnel(); List unitList = dao.getUnit(homeEnrollmentNumber); Unit unit = unitList.get(0); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); Deficiency deficiency = new Deficiency(); if (unit.getDeficiencies().size() > 0) { deficiency.setId(unit.getDeficiencies().get(unit.getDeficiencies().size() - 1).getId() + 1); @@ -189,8 +194,10 @@ public Model deleteDeficiency(Model model, int id, long homeEnrollmentNumber) { dao.deleteDeficiency(id, homeEnrollmentNumber); List unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); - model.addAttribute("unit", unitList.get(0)); + model.addAttribute("unit", unit); return model; } @@ -199,8 +206,10 @@ public Model updateDeficiency(Model model, Deficiency deficiency, long homeEnrol dao.saveOrUpdate(deficiency); List unitList = dao.getUnit(homeEnrollmentNumber); + Unit unit = unitList.get(0); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); - model.addAttribute("unit", unitList.get(0)); + model.addAttribute("unit", unit); return model; } @@ -254,6 +263,7 @@ public HttpServletResponse getImage(HttpServletResponse response, long homeEnrol public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) { Unit unit = dao.completeDeficiency(id, homeEnrollmentNumber); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); model.addAttribute("unit", unit); @@ -286,4 +296,11 @@ public Model displayDeficienciesByConstructionPersonnel(Model model, int id) { return model; } + + public List sortDeficiencyList (List deficiencyList) { + + Collections.sort(deficiencyList); + + return deficiencyList; + } } From e1101f177ff549cfbd134c043b3eed812ccc9495 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 14:15:46 -0400 Subject: [PATCH 40/57] one small thing wasnt working --- src/ca/sheridancollege/services/ControllerServices.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 7f7d12f..c89d65b 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -26,7 +26,9 @@ public class ControllerServices { public Model displayUnitDeficiencies(Model model, Long homeEnrollmentNumber) { List unitList = dao.getUnit(homeEnrollmentNumber); - model.addAttribute("unit", unitList.get(0)); + Unit unit = unitList.get(0); + unit.setDeficiencies(sortDeficiencyList(unit.getDeficiencies())); + model.addAttribute("unit", unit); return model; } From 59bd0bde44a90c80845776eeb2420d0784e4ed4d Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Thu, 6 Oct 2016 18:46:18 -0400 Subject: [PATCH 41/57] Added help page --- WebContent/WEB-INF/jsps/home.jsp | 3 +- .../config/security-context.xml | 1 + .../sheridancollege/config/tiles-layout.xml | 5 + .../controllers/HomeController.java | 332 +++++++++--------- .../beans/ConstructionPersonnel.class | Bin 1882 -> 2018 bytes .../ca/sheridancollege/beans/Deficiency.class | Bin 3103 -> 3513 bytes .../ca/sheridancollege/beans/Form.class | Bin 2304 -> 3356 bytes .../ca/sheridancollege/beans/HomeOwner.class | Bin 1616 -> 1670 bytes .../ca/sheridancollege/beans/Unit.class | Bin 4966 -> 4966 bytes .../ca/sheridancollege/beans/WorkOrder.class | Bin 1925 -> 1925 bytes .../config/security-context.xml | 4 +- .../sheridancollege/config/tiles-layout.xml | 10 + .../controllers/HomeController.class | Bin 9341 -> 10294 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 10251 -> 11075 bytes 14 files changed, 182 insertions(+), 173 deletions(-) diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp index 44ae383..1fe0f4c 100644 --- a/WebContent/WEB-INF/jsps/home.jsp +++ b/WebContent/WEB-INF/jsps/home.jsp @@ -62,6 +62,7 @@ Extra Large Button CSS + @@ -81,7 +82,7 @@ Extra Large Button CSS
- Form Status + Help Confirm Repairs
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index cce3e63..45b8c94 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -38,6 +38,7 @@ + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 4504370..8957edf 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -76,4 +76,9 @@ + + + + + \ No newline at end of file diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4c59810..99db457 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -21,246 +21,236 @@ @Controller public class HomeController { - private DAO dao = new DAO(); - private long num = 0; - private ControllerServices controllerServices = new ControllerServices(); + private DAO dao = new DAO(); + private long num = 0; + private ControllerServices controllerServices = new ControllerServices(); - @RequestMapping("/") - public String home(Model model) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + @RequestMapping("/") + public String home(Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUserName = authentication.getName(); + if (!(authentication instanceof AnonymousAuthenticationToken)) { + String currentUserName = authentication.getName(); - model.addAttribute("user", currentUserName); + model.addAttribute("user", currentUserName); - return "home"; - } - return "loginForm"; - } + return "home"; + } + return "loginForm"; + } - @RequestMapping("/saveOrUpdateDeficiency") - public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, @ModelAttribute long homeEnrollmentNumber) { + @RequestMapping("/saveOrUpdateDeficiency") + public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, + @ModelAttribute long homeEnrollmentNumber) { - model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); + model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); - return "displayDeficiencies"; - } + return "displayDeficiencies"; + } - @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") - public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") + public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.addDeficiency(model, homeEnrollmentNumber); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); - return "addDeficiency"; - } + return "addDeficiency"; + } - @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") - public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") + public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.addDeficiency(model, homeEnrollmentNumber); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); - return "workOrderAddDeficiency"; - } + return "workOrderAddDeficiency"; + } - @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") - public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") + public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); - return "displayUnitDeficiencies"; - } + return "displayUnitDeficiencies"; + } - @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderDeleteDeficiency(Model model, @PathVariable int id, + @PathVariable long homeEnrollmentNumber) { - model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderCompleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderCompleteDeficiency(Model model, @PathVariable int id, + @PathVariable long homeEnrollmentNumber) { - model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/displayUnits") - public String displayUnits(Model model) { + @RequestMapping("/displayUnits") + public String displayUnits(Model model) { - model = controllerServices.displayUnits(model); + model = controllerServices.displayUnits(model); - return "displayUnits"; - } + return "displayUnits"; + } + @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") + public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") - public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); - model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); + return "displayUnitDeficiencies"; + } - return "displayUnitDeficiencies"; - } + @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") + public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") - public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); - model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); + return "workOrderDisplayUnitDeficiencies"; + } - return "workOrderDisplayUnitDeficiencies"; - } + @RequestMapping("/saveDeficiency") + public String saveDeficiency(Model model, @RequestParam int id, @RequestParam String location, + @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber) { - @RequestMapping("/saveDeficiency") - public String saveDeficiency( - Model model, - @RequestParam int id, - @RequestParam String location, - @RequestParam String description, - @RequestParam String constructionPersonnel, - @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber - ) { + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, + deadline, homeEnrollmentNumber); - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); + return "displayUnitDeficiencies"; + } - return "displayUnitDeficiencies"; - } + @RequestMapping("/workOrderSaveDeficiency") + public String workOrderSaveDeficiency(Model model, @RequestParam int id, @RequestParam String location, + @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber) { - @RequestMapping("/workOrderSaveDeficiency") - public String workOrderSaveDeficiency( - Model model, - @RequestParam int id, - @RequestParam String location, - @RequestParam String description, - @RequestParam String constructionPersonnel, - @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber - ) { + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, + deadline, homeEnrollmentNumber); - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); + return "workOrderDisplayUnitDeficiencies"; + } - return "workOrderDisplayUnitDeficiencies"; - } + @RequestMapping("/displayUnitInfo") + public String displayUnitInfo(Model model) { + dao.addTestData(); + model.addAttribute("unit", new Unit()); + model.addAttribute("builder", new Builder()); + model.addAttribute("form", new Form()); + // dao.getUnit(homeEnrollmentNumber); + return "displayUnitInfo"; + } - @RequestMapping("/displayUnitInfo") - public String displayUnitInfo(Model model) { - dao.addTestData(); - model.addAttribute("unit", new Unit()); - model.addAttribute("builder", new Builder()); - model.addAttribute("form", new Form()); - //dao.getUnit(homeEnrollmentNumber); - return "displayUnitInfo"; - } + @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) + public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { - @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) - public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { + model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); - model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); + return "displayUnitInfo"; + } - return "displayUnitInfo"; - } + @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) + public String saveUnit(Model model, @RequestParam long homeEnrollmentNumber, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, @RequestParam int lotNumber, + @RequestParam String address, @RequestParam String projectName, @RequestParam String municipality, + @RequestParam int level, @RequestParam int unitNum, @RequestParam String plan, + @RequestParam String repName) { - @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) - public String saveUnit( - Model model, - @RequestParam long homeEnrollmentNumber, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, - @RequestParam int lotNumber, - @RequestParam String address, - @RequestParam String projectName, - @RequestParam String municipality, - @RequestParam int level, - @RequestParam int unitNum, - @RequestParam String plan, - @RequestParam String repName - ) { + model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, + municipality, level, unitNum, plan, repName); - model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName); + return "displayUnitInfo"; + } - return "displayUnitInfo"; - } + @RequestMapping("/addSignOff/{homeEnrollmentNumber}") + public String addSignOff(Model model, @PathVariable long homeEnrollmentNumber) { + model = controllerServices.loadSignOff(model, homeEnrollmentNumber); + return "addSignOff"; + } - @RequestMapping("/addSignOff/{homeEnrollmentNumber}") - public String addSignOff(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.loadSignOff(model, homeEnrollmentNumber); - return "addSignOff"; - } - - @RequestMapping(value = "/addSignOff", method = RequestMethod.POST) - public String saveForm(Model model, @RequestParam long homeEnrollmentNumber, - @RequestParam String desName) { + @RequestMapping(value = "/addSignOff", method = RequestMethod.POST) + public String saveForm(Model model, @RequestParam long homeEnrollmentNumber, @RequestParam String desName) { - model = controllerServices.saveForm(model, homeEnrollmentNumber, desName); + model = controllerServices.saveForm(model, homeEnrollmentNumber, desName); - return "addSignOff"; - } + return "addSignOff"; + } - @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(Model model) { - return "loginForm"; - } + @RequestMapping(value = "/login", method = RequestMethod.GET) + public String login(Model model) { + return "loginForm"; + } - @RequestMapping("/createAccount") - public String createAccount(Model model) { - return "createAccount"; - } + @RequestMapping("/createAccount") + public String createAccount(Model model) { + return "createAccount"; + } - @RequestMapping("/register") - public String register(Model model, @RequestParam String username, @RequestParam String password) { + @RequestMapping("/register") + public String register(Model model, @RequestParam String username, @RequestParam String password) { - model = controllerServices.register(model, username, password); + model = controllerServices.register(model, username, password); - return "home"; + return "home"; - } + } - @RequestMapping("/workOrderHome") - public String workOrderHome(Model model) { + @RequestMapping("/workOrderHome") + public String workOrderHome(Model model) { - return "workOrderHome"; - } + return "workOrderHome"; + } - @RequestMapping("/displayBuildingProjects") - public String displayBuildingProjects(Model model) { + @RequestMapping("/displayBuildingProjects") + public String displayBuildingProjects(Model model) { - model = controllerServices.displayBuildingProjects(model); + model = controllerServices.displayBuildingProjects(model); - return "displayBuildingProjects"; - } + return "displayBuildingProjects"; + } - @RequestMapping("/displayConstructionPersonnel") - public String displayConstructionPersonnel(Model model) { + @RequestMapping("/displayConstructionPersonnel") + public String displayConstructionPersonnel(Model model) { - model = controllerServices.displayConstructionPersonnel(model); + model = controllerServices.displayConstructionPersonnel(model); - return "displayConstructionPersonnel"; - } + return "displayConstructionPersonnel"; + } - @RequestMapping("/displayUnits/{project}") - public String displayUnits(Model model, @PathVariable String project) { + @RequestMapping("/displayUnits/{project}") + public String displayUnits(Model model, @PathVariable String project) { - model = controllerServices.displayUnitsByProject(model, project); + model = controllerServices.displayUnitsByProject(model, project); - return "displayUnits"; - } + return "displayUnits"; + } - //this displays an image from the database - @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") - public void getImage(HttpServletResponse response,@PathVariable long homeEnrollmentNumber) throws IOException { + // this displays an image from the database + @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") + public void getImage(HttpServletResponse response, @PathVariable long homeEnrollmentNumber) throws IOException { - response = controllerServices.getImage(response, homeEnrollmentNumber); - } + response = controllerServices.getImage(response, homeEnrollmentNumber); + } - @RequestMapping("/displayDeficiencies/{id}") - public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { + @RequestMapping("/displayDeficiencies/{id}") + public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { - model = controllerServices.displayDeficienciesByConstructionPersonnel(model, id); + model = controllerServices.displayDeficienciesByConstructionPersonnel(model, id); - return "displayConstructionPersonnelDeficiencies"; - } + return "displayConstructionPersonnelDeficiencies"; + } + + @RequestMapping("/help") + public String help(Model model) { + + return "help"; + } } diff --git a/target/classes/ca/sheridancollege/beans/ConstructionPersonnel.class b/target/classes/ca/sheridancollege/beans/ConstructionPersonnel.class index 924f5f02a6db8bf583d466faf484bf91ed13690c..3cc123e4282ed46ee329e86c67fb14ab7a3bbef5 100644 GIT binary patch literal 2018 zcmb7F+j0{}5bcq5F=lOuV`O~6UK|3_0$##3u|X7}fRdvE5>v|aNIS>_t68$U;`SZ+ zjHD{5iYirk$Oq)3QaL>pG8rjE9i#9gHwV%e?^srY-V;Nxc_^X4+sK?s0yRf7RCQ>PJ{NSNr9T{emX);Fin=mvOO%O1MvKMtK%`gA!+s8=I8HXw~%ig9#4$ZT7)}e*W`@*3UbduM;bm%jhN8vq{ zHbDyN1udl{n-yzKF291!$F`kIwff|Z2ta%maH=-B&nae+;#t=9Sp<*V1*|?j$^oti z3k!(&WVu+|`;g>8Mi3_%xek*27{xE2!~xT|+|AP{*EY8w4dSkPs9A!mxl-O{$zjtL z@u~D4K&a_EP;LcLt2(TcJF6IE)_-zb`mkZ<)U7i4P5$zoZvJD{q6d>F$?!a~~5O*BN)m$Kc zJ`i^t$V~vbH3bOM#XzpmR~R#D3h**&wtgM!$WAVht5&jnxB>2&{j#?Sm5l>w0La}b zKv*pdAd)-De|^vv0rGiQG1KWF;q@2}rPv`mFGrRZS?C25JxGMg1PkJzjx z>2Z>tBTaM;WJ%Rj*^$p(*9+`Gd2UTmcKg_VZ-1~(rC(FEK)Mxa z6{`h7lMxHAq$_KPmerT?$l4p z(g)8LR^*AT96{!qa#gS{D4v@sA=!q<@jct>Ed0O*E~ob@wo|fw#ox_IBREpvU)-+P zR_#dos%pCx&vE3Tw93+UYt{w|4E%b9E8RnRp6f~nV1-<n{GE|_b%&*da6N^=9Y>n?Aakp?>NWwD5lyC#aW?44Z7Xd@L)0png52JZm2fU_0s) zHwfLqLr9UJ4oXmr0pMrwc+&Xl!q|;pjG6QZEIooukATD2g+1Vh9mLlXMu9Pr|4HJz z4jY2ygoJGdDjJ5D34>^aM)Ac7ZozVb&lCp~(F7;Rk2WZlpKDM&Ki?oDpEVlDJZv_| zyvRMKFjZdhW5BflLXzS zF<2(FFba%`{11wKffK`_q=N_tMwK^?l;P%eMDt;$F72X-P@pN?!(E*r8%CW2n@wPW zJDZFEiGOPWnT`aRLi$#aS;*T8G7FHoYd}~pR^VPFh|vmSMS|Rq1~FPemH@JR4G3Qs zgG^HnHoTe`yzpugUt1JejRcvYd~@?U?w)Vo%#WkXT0sf`S-S>=yM;k!BNZ`Q6?qm3 zG8e7LrA7~XWCI{Ct^wg@Wsv#vep}HZ;E7$-!`)2u`cew~JLz}GFL6Qt3B=Il+}Mly K?|^qaAo>SftRfu% diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class index 3aa03e524baf2f93449a9c02f7a170c458e42a07..a35246a516e74c8f5c50ee77948f4b2fe2ea74b5 100644 GIT binary patch literal 3513 zcmb_e+inwA6y3+yI1C9SPKddNyE6$G3@sOjkl=)38mn~K5c%YS9sfMZ#RiFFR&*)dQUHi<~o=nFQs+uT1XXfm^&szJkoZtWY^Y zL0S3MbP6j7p;_h^+J<_>Hc|Pi!n4^Ffm;I{1rUsmom?G79Vo}_oDi$^*@dieoX z8Lwk9>ci++Fo+DotoZFd)(IkYp;J!SAWp|-JV>Tv!hw{FIyp_OKme&9YOj0I}N~8h1<8P&`0zT(gw$! zpsqi^rEU51w5^<;*p@smQz4Bu1P!h@t%hz~H(64LdrEzpM+)g&F>5virh!u<&>DU$ z?@dUwO98u{V9&l2r8#KULFvC;RhOV!)ha7R3A2LAQH+w5rVJ(`L!5>kP}dkK_`?Lr zJ?2NQm>!&uVn2p83*WIOMrwSW_RvIya&W;|NmC4!TrpB|#X!jwIOOeF77ozmcg!#$cg!&S0!8ghRM@5)2Om;Su0Jii{jXUXSDV1WnUPItxaeqsKB2#V)5}ms7FJso3RI>~boy z7)nk>7DLIY$YKaiV8CLCYzg{+Zusm9SUFco^(VUY12!?hAUN{NnLxpk-GWu7*nHzWBpPAf+&n^N~Q7qk)vdKrRBvr9MEskq~q% z63Epskl9Eex1)hv4Fj16kcB=#xNw}2J9O92Zm={9VIYf60J+x(2)8W*fu=_Qx$qqtE7+{7kw6~N`oDni z42OX{1dvC4fOvW$=;O#9xf0IE<47QnqkH5^7|0U<(fR;k>EeuhLZ5as62s0L-=*(E z8L37B`HY_U&T~*U*2I*0Xq#Gjhy0U-q2>a a8StNjOa@=}OzxhOCD*$A{$qW!iT(kI=xav+ literal 3103 zcmb`IYjYD-7{~wHT$`q8NhvlI0V!a*TsDFTTIAMp2^3lzC{j?|CQG`^c9%&uj5vM* z-}yQ8h0YjpoY7al@{{-})cH6!Y)3H*GzrOnB(bvuy4I?(4w5o=zx1 zEo0GhI@>N~lCHUJaW}W)I3_(4OawHf9m{R{TYO6Vp<%i%w5?8EHe02P=em|dFA`c! zuk}hpE?C+Ycbs}0N1Sa~X2Y>vZa3Nc-tle6SfU0&(oBcn5$BNaHP3S_Q#jKXZP)fM zX-Jgk*NMI8HK;SOOu2iV?M!#7(VnG_FTlXBt zYFfr7_1ngh^~|o@OwB9qb+=p%F$5X^Z*MjPR@>0v{ePO#+=a;c`I247nwBrg=rzdR z@_fi{*hTHI(RBHrHX>D^)Ka+J3Uu4?LN;3*G{YD_hn|#ozx2gENVxdour%n7sQ_bW zArPaKsRcbU-4{`3q8~MFsMELE7Y?RxB0?z&Re8$TNjzucLvq!-l#cD*6s5&0S+0u6 zjJU<0iW!MM{?oX8>ZM6-maBQ4R^7T`OY2SyoA9(8cnt?tId-1h>umN$Lz;UbkCQl? zftANIH09x(45#v#K`D>@n9bvW3`b=+CPNwXdFVKi$33w-j<3sHtnv{-SqE_YC(8Dx)FuQm(?4XBzgEH^R-@uN~gv4ZDYz zQxT(#ZVG$3p5}Emf_?mF&}z-N)y&ZO{Y|c?IUhssbY>UOpG#RZq&?t zsF`U}Gc(0`itbD+$J2az9~rKIF+HL2FYy}M_sZDdn4>802Im=6xXSlT@ea=LNo39j zGG8J~A)u(wo;+1bmQvbu`X`LMMk1;<%a{)+wOc)pK#jgCW`QY6wbkB5DLG@6cM@Jw ztt7ydTIu|mODmFd0m*Ol%ko=Ae~qL*+eJ!0*+p7E)kQ`xCA-M#rBoNAdMVvSPA_G; zjQvOChnza&1v8w)Ay(!v3e4~nj<6ncd~=kocZ`WV4uk2HtgQ9+8^lo=#8DZ~v3simD&N#4WxAR>daWF@8lfb@4RYBL+^n@&kXxw6IFCo8 zco^$^8+QWdVLIi|N27SmD4y&Rg`rVLw@+07HPLLMh diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index ced6ffcc10b2ecfff34cc2322935a98b437312be..f0c76175d62cb6df5053f0ceebe09a71594ec165 100644 GIT binary patch literal 3356 zcma)-3vU}m5XWa-KVs)dOPZ#nCW%}6u-&HDLPJR(fwW0l2Pb``H4UYKv%PVy`0i5s zTxukc_!@i%B#;P|sKf{0Lm~dNdvzjbjfmvz-tO$o@BTA8_xC@4{zXJr$V*X7&}7ZA z+uO3`)*ZhVG@G&^?W%PAw!Iv*U=kN}IU{Y4m(Zv zd#Bozf?{r6kXR8k@v!5Et|u#Q+r`d;?+2k1x`E#oG+ySzuk0P!YP;=F`ZZ~n>emIG zGHl$DzHB+6tXG_7N5W`qJMiR^-vX^C{cx@0Rb@-i&=!Cnb$0+Us@!Pg^|0mo4IE3g z^c0#vlFTz!Z zrf4!nrvRunLisAR*IjR?DS4Z-#*n^~Qy*E4jI&a%gIf{x`6icqMqMZuyX zorer8m=g**9hvrGUoRXynP{DG>#%zqg7W#5gDeME3Ki!2*dmLDc=m}!@6ZU(u32=LMuzAHGN**{ zJSZio`2QR~y`^1$YS9sT7e1=pQ0kgO9p|xq5QYdsG-Ox;9m-^d=~paD(Gb?#dOe@NKDQu+@7wj-9*4 zyK@|7=AE?mriwV8FYtv)YoBT#*mccL^)a*^+j`HnB4J%wFV z-`R4|YS`N@x`+=b+u3VXHeclWgN|&mVcb{kBdZ)&yJo=>FW6epjjdMT<=8a$9r~-x znYvc)X6~A49k&!UfM0^r6yp-WJdL)U!BYm~Fn%#Eb~U2Z)rdk@BPunrAI3O}-_bUW z;Q*4N3~-Cp2&vTwElmf;v55AB|5=!AQXDRbri!oW{WmnV@tShw;u|`-G5W!4I&=OH z%J0&J-;~3P_&*AJqG|lkf%GIz(kZgBGOoSQCAy3!3w9sUM~K0(u0*kZ#;GKBFLA8m z^e)X7XLjjoaU#A;b5ZPT2_5`8f=?v+qfbFKqSNqm2Fjhqi=Kl7c~BHUQB)*Xpf6%X zBs^n9g<4}x52+ce8ppY#iZh`&Z$_Ly!G<}rCeGqSVwdLk1UaEhFTmLhkS@Zl4WvsD z`0_rSY!4^f!^v_tQ#e`fX7GTJ+>r1Bfn%ph2oQs#J9Ia4YpZ9XMDcej{nB%q#5U2Ka%ib}B629`b1FxN=MjpT zlAOlUo*G=rL^ly~UU|@Ek?bKQqp}yYN=rQuE)xxMb?@yo$bu1M4SCn~JCA@IGFd#2 zQtAg;0?6_J5Eh>U-!p>D^@Eg*AotB6bNwKz09hLV!ntRV2gcOQ_NV575#*scHM9L7 zj{#B{0HW`Spmll#9PSRb0@JCP?^k5Q2=W;24XN38V|0x?1IXq85Z&qoePK+^lYS7# z2=b*lHBb5#kpS5m0K%=6Q}fgavhOPDVs(umUztJnHC3&M2M~V%2={gdd1eIJ>{sN4 z5#$>)$Y#GH9e}(X0Ky*^262ovQtb!n8bRvj8mab!`~Z+22Y~3WTZ|;iG=>E7hm^mD Q4UF3u-8Ma^Z`;)T7f*jC-T(jq literal 2304 zcma)-TTdHD6vxjjzF^}flo|*)#0C;#mXK`XEKbOD3*RpT8HfoK??~B2hx|J z9m{sZcDoWr#nZr(dwvL7Px|qzuGf^IpwSZmAD^EAVnWGis@0>bXS+JH+{lrj zN`VSA%DsgGeMC37ceg+{>4qTl{|UX_)>8KiG)^Dm@XhmB>X0IhRV-h1&gWk#&;wdU zQsUs!x>!xHg<|A%4!zE<9ovG^9T^{@fDp|irv0oySsKNBq~}xBBM$Qz%(y&tw#TqI z7)@5M67ilq_Pn{QfIPPJ2h&)2nOIWOFiT#^X*E?vsp>MUaAFQ$2xUT);>eI;7Q|Wa8l6E;X9JYD35jwkHO`pS`?dV zQEIA1?ey%&&`#j_B%&e~1z!`qr(w2+R-jFrf6%Sp)V^7~*#prnO3^Hp&?{&ox=nK! zvA`X?S-=Bf8to(tnB@y9o2wTzZ_cDHXmKDorHpPva1KYf1Bx$(0JD;cbnl3bfJ=?hvK0L&`W1xPFc;4Z}O0bmK|yRRVD6=10k zQR+jK`Vgfa1YGjX#14EMXt{@Th?Y^aE5DQZ&4XXjH6VW(OcUlS%2h?1^<8C^7^m5w zhX6AmWYMQRSxb#ML+|O)FMZJrmI-D_*;&Isjn2*%TrpFIGxKN=4V~XLxLj8XQ*Z*S zK2oMvZGt|h)jr5&sl2E8!Ra)}<3x}z=y4y!&@RjsRL3yL20%8i0pSW@$6qFbEDnP_ zO9c5U8RUZk)e+eN$nG^DT!0MnBr!GR;nW-?f@~zGraT;xuK`lK21MTud|c=$aQG5h z3QX6?(r`pxCxUFzv)<+{Bt~VQQ}e-%(GjTw~;IS>qbp}tK;^tLhHLAx8# J9_>eT@Gs#!hSUH6 diff --git a/target/classes/ca/sheridancollege/beans/HomeOwner.class b/target/classes/ca/sheridancollege/beans/HomeOwner.class index 316d3935c78d2676f3876b41ab4165e8c7492d2f..8756c6fc53da808fdd2f12966eb3d06c990ca003 100644 GIT binary patch literal 1670 zcma)6YflqV5S`m6luEHIMarWKBD4irP(Ju1A;uSJK*coiuFOSX4$cPrw5GSNh0 z;s<|#KgxLS-9CUW(KOxJJ3Djc%$eE!{paT|BHE@qNs2I9s+)$_;;z*&McuJ&-sDD& zo5C|*IBkA#BDkBR7^8_J^P_3lrf3=mwIg2llayejDX--ihd?lG>$6$2Iir{`+c4S6 zAnDL|Ezx|)C}K4ju{}mJZ#u%a+PrFc7P5AQaD3CZ9N{s_smxEtF?T)7^SP*V<7ETc zOCb-QbC5KB-l&>(ha+h0xaA1G-)Yyl3yv)`@>IBJuFZwtb0;2I!t!?*MT?~>C_ix; zJVjB`(lkNW8D%O~594jnRkq^PO}lEMQ}FFNV}8p5;pNJ|bp*53;;Fy`7|o_B zNh9)ZK275^!l?LP*?U2{o~8_?7$uwB-&f<%ilyON2=ICVQz7_Ln{hzAIxp!sQZ6{A z5h3?wSZ1h;Sx+M&{CTVhzKl|bPRFhDXO>)_@&4*<$OU4Q51IN?ERTN*O;;+8+ca7h zhAprKhB;UyLpI)c-Qlhb)CaJ&({MKN4>Fd~?t9m1590L`ydhj~g>2J zf~Y>ZM3)?+TcJeeE)!V~C9)DuQPO~lA@Sq39or%8EbeYa{7)vD zKurAL5Aa7B&&>7#bcuvyhPiv@oHOU%{`vdsHxWIgdud8id6W`lsbxhit0`Jb(Rzw( zMuv3SoY6$(!1?UhEk`!&y}%Q)@s!cnVbhg-r_-)-kI~e-jtoSb?+ag4TYOVWH*f;s zN}o|)U;knsa?cljz-5iwuj`;Nn{JzLNzZMy+FS-bF1F1m`AkR=Y%q$K%KI?#!mYzd zt|EGp?;Xe}Yi`YH?K_@O=WfvmngY5Dm6~JwP40=hBWn=h4Q^MtBYpc7gm;f5_uyi= zH2l2bigHo95^`HXQw<*M=jV4ZA7Oedz?;b_N}{)x+y= zJKR&i;()e#9PK9YNnsgne)Qb-0AD;p?|88p@xtQs;*+R)hH^BXp%EI*P+Be5D9dR6 z|8u}-d@$p?)dOA&FrT_4Tzd~QnE`v8a9D74GN+OGUx{W2m~5LCQag`2=Z7J!3QAY*mH`&S~;bd zwR%eN0hJ;lTr+TGlnU^0Q&SehYh6kZXzxlUr`^Z2Ora~&0y=?j=6M-w?v#vyR$gPK zp>+#dx1luytvg!J(mu?-p4rzkyLw<(4T2Jb$EmKejXg~0gks-eA%YGb;%`rS8%1Hd8k#eMwnP?+tx)T~%gOT-1jD(ZK zkm77V5!D+tGbdzxyO7BJNFzlg)k`F<8=tgh&$TWz@(4yAUt&bHh9ReUt$0@tw~6xt O&WqSbe1y5|Q|TXP6Da8b diff --git a/target/classes/ca/sheridancollege/beans/Unit.class b/target/classes/ca/sheridancollege/beans/Unit.class index e28de9a1d76f75f0dd29b934853a5fc31831852b..92968dcb06938774c951cbddd8da6001a0fe082f 100644 GIT binary patch literal 4966 zcmb_fOK%fb6h4#qk(f!K;nhHa7z%Y9$Pk`&UJytE4mPiZ@Gea3NjzZBnDH10g_gD; zb=Rd#x zPDBUjX_VR|+LBY1NLsA0Kamb59u0#r#e?9_AM{u(=m01H#O7R$nqyyJ}&h!=8=!^=PJLm?u|omq*5dvNIqMQ$>wq zd7RUe_qdGhqm#96_KM${tn|Uop?X+E{ zt+Y*|)fwH;oNUcGne54!Ikh;iBD=^|eKBMgbhy8*wLdHy>>EnV^v`#aMEx>FsY9Z% z#7x?WicnHLW6!Sy7^NMg-7>8rnK1`t>Y{F*?UiXYbw_ERMBPG=Zf;{VMB8I@kPb)b zkVLyoYe`YdYObIuIkQxP>Ky5?B83<(Kou34-li0C36*6{!!E$r9SMh|i#(F<_pdOO z5t-J|YaKKO^<-7+c0n!i@)4PO9Ig{Gt#$Yxmua0do04fg^FJZc+6Mm#%TkwFH!+%~ z?Tj)b(+1ioQT9JX(L-8DmUUqNe|Rseao%=Av$i1By1s6_Bp;72;vhTEUS*{Ngv48S zENOPeIpjDBs3;v3cOjI3)NmGHl5Hvr>k{>pdv|~#K5aH!Ul)tljv?0o@@#W4>RG{T z2n%*V^x3U_PJaxz5r8KHOD()YvE2xu;P)~Ipixw1cE9l$!`q3K5*x!i_o16z@K)Du z=IUMGxVhy_l*wiv>xDAawPK_JKKNW7C11;$L)G5^MQ z9F?q#ncPyNfn;x}MthRI;TkE)-)QLaGuj{enGV!wIN38=qw(bWNR5sr*LT$DSh6=- zqe+-e!|Y^@(hXYsM92m~OTjjK5x60=;(dtBe(J}iSiyziARVF+I!qI|3uGuIsGmo= zK+2__tyAYUP8)|I%a;-$^Ndp$7Bfy(M9er%Q8DAhar(E?DK}vm5z;?^#A1lQ!2RCN zx=ZcE`PwQ#N3iiITpGhB<8bK+TsjKK2|@pwh-uuVA9v};UHWmCe%z%W=NpTlALo0D z*eT9;7ZHv)-${U+1q(+dyu!+3*G|_n`WIYU1&h>+Ttf1OMcR-^q!5XOlSpI?iELzV zPyii=tCQGd3WTOX<^)_l30Kn)=nSNG3i-?+cUj^3qKIe8bv@;}o^oAJxvr;N*He6( z6RxND0w-KgiEywIQX&W})RYKJ49=dRvvrphj1u03lRweX?=Wc-nc|a9FbX z<8fH?35+B+BM=SeopU({SzQna&S{Fcjzt7H-guVg>R4VP<3IR_TnZ#|f##nhGJpf- zCvpu$uD2k<@nRwu=~4iZVLy?ZfkZCTl^`O+ej<4g(OMAU6f%*kbj>BwhMAL^#P`04 z6atA{cMIM)q|7Hh;wyGeYKkCIYC&YB(7h9=kpaI(%7H{~1Z!l#9}ycwsx63cvEqo_ z4AjUTe`@Xr5>bOSvd2&4A&5L`L4<216Ilo(qWFnC4kVHbCZhO>JOPoXEr@WbW+Hj0 zXr+5DqMQ(#0k1n+N&5+X97t%13NDB)K+d|y8K+2eBByLSn)w98K5apai!1))0|BSF zMnrLCO1J1XewpHA9bHDHNe}!&#WuR=cm6Zfxz9a&$ZpAy$)XC7@PA;SE|2+j`9+}9 z)nHv7^Aq_J&VJ<~;;miWQ<%uzKsikMqyKdvk$b^%@N^I->feCKw=IZpo0AaL`-pBE pEsMrEgj4?j&+p>zA>KZ^N^M8!J-mOvLXYW#3VrB4e#DPY{sl`>w+8?K literal 4966 zcmb_g+jA3T6hGVM(xlsRX#oo&jR>YeSU|aimP+jfS`se3aTm79wpmDa!)5~%K~Z7G z2c6LwA9ThCeb*VCA%mA0-+b}^@WFq=@pryWH=FH-DWlWLe!Jg(-#NeYJLmkqo&NdH zufG$~Tl6GOy>v51J#>pNMZT2yVnoS|Q-p5DsZ6(d#_FI7k2YVbe7VDyyHUCqr*)2z zBbV4ca|;lrk1nMs3lFJuCiIdTDTZfZ9K1cwp4AssPGIn$fc^G=k&5#)a_-7!bRQxDAk{~WC~#f<0r8r^zg z5#<`dU;u^ep<_w2GfpWZ;pm%=iaQZX3X<1hNw%r@dy@mJJ)lUiwRz#Dl7Nw;mRK>w4-Y8_U?>78pDgC@6>ulClMcg5S$bKtnoY4!`jj$J>z=A&KLi z`_RoHcr~P(v3e(%H@9hp7&OONmxFXu;4dZu%y_elCVJeuKISFuMO-kqT~Jcj38XKX zY~9|Cb%VS$o_9ry6>BZphE3p&WkRSbbM8JwnRB7CQ6^j5#b?Z_mD4747Nr<3-Nz?{ zM8`6wwWL(aEclBSWd5#c-BN4|TB-_hR8;q1QDz&{Y7zRhRn%?sF*A-s$zI0Gq_AAj zabQ8mHIJQ&!ski;d=&z&RajN;sKqLP?Ow|kwjDCWfwWBovalRnv*FutfJ_W6T4t%A zm-gSqnW6OuovHoD`;P_9L&ED$nyNPCx9K@3*_7u|roFUJrp>fPrmeJ1rk82EOs~*( ziMlxlirb@6`aq^f^r1{Us2_)BR<&*w)RIgI-tj8$-N~2NcyCW*?}%lo%UrKA?V{aL z`bega=`jwomX*XIL0^Okai*MI;A0-&8)8Z~l^Ns)hxmQx7~9Q7qL$TMK~r*Osf3RV z=SzVz_?st0INeJ#_T@c-fkxCB-90E>Mn2@MR6CHGe1DC-> z4?ei?n&Q;PoZ|i^e2GOc_F-&eip2<)#R#Is2uj5WF2x8s#Rx{l2vWre24UrOai0{n zyI^|&zm!IM=nXiKIHR~KSo9`F31c|*jHI8$uKl<&I)bGTCFua}WM>f_#0J9sUVJ+` z1}3N-f7rnWQaftY*09no-lSk<55?e`Eo~N-<8@2y$zg$Q9;(~?8~b8dn{{obw%4dV z)fcK!DAgCP0q$=Ux%7;pp`WRvMzPe!c#S$!n<6!mQ=2f;mFkPus2j`HVcGf`ZD_zc zh;RrDgupb~;VHo#ENDn@ufp;X_;;#< zXOft4YVW8BEnUy(UkI%eE7Q*l4atj%v>}m5ArgsTkw~PryOF(p!q6x}9)q)Sggk+e zPa>342ze5qrci395pD*#%L)n>1+QtBg0xFP+NB`vQjm5jNVAd&3eqfMf`YW5g)1Q~ z$lyXv3xeVZ_85}kG=_rF>8z(De~(3NB4ga?MCSx7e^(75gU;q*tmY1kq_%;GM(|Ew z&Z4a5gaxOYB5q(20gfFHqY737>HN_LdC~$1OEm*Ii_Ub!*xSAv{6Ibl0OH8r zc^H|dnYs}+=Cm=oN1Q;8Y&*5`DFA)e0uYNU{&9dhb3`H{#8s+`>nz^Q(LAnvZj9Bv z$SCIxdw!vfZFIpO{O3^3FFd|vS2AR}Ko?<2qDz5w+2yaxF9U*?=yGsfcKLyPg`mIo z0P$)UpDhgJN?W7*+Ot@pCHJwwkNUr(^}M(M diff --git a/target/classes/ca/sheridancollege/beans/WorkOrder.class b/target/classes/ca/sheridancollege/beans/WorkOrder.class index a643ca5a8d71912539f4ad7cf1c07908ce76bd1a..81bfd903eae37a96f2f210966d048cd7a9545f0e 100644 GIT binary patch literal 1925 zcmb_dT~8B16ur}rt<;q-X`vt>px7?LBE_eY8iF5zG(yDG=WRQd!DW|hx5oP7FEY^t zV&a28z#nBiGutjuw+SRZbob88opa7Tb7%Ye&(B{(v`J4>6l1hlx6IZN_e8^T>aK0` zCO2!`a$4p)*ZZ*VHMp0e1f$Vo>!W4bmeVx%Ysb9qr$}Qop=O0^9sK#b4D@I zV8r$q<=(U%U!3r&XbG%rJC5sHzHpruqijWP{$!qVuO(VOck0~SZImD>V&N5cxM%si zQMK$gN79ho<~k0y8Ld|a7O?{=-)q+;=Rt1=w(AZ4UepCh1&5Z5qBPsSu+44HvpN+h zk}QX!=~#Z-Ls45%Ia`CNpZ6F#r81zjE#U~i%qX5OR2e09+y+lmoU%HN(_Ka*72)vL z?UNe!-Ucp?SKPW~S1mXT@4Ax-|42aagTcJvxq);yzc)BB+MB2}Y0sl%ll!~qKsb#aOtykiBEKig(6JbH0;7$5 z;ie7&1CW<6ius#DNFgH-684Dd!bxaR7wVrrEJv?g*GrH=@l~>^d?c4t_AGMgx?~a| zedxBmI)5qT*I+p8$Te9VqiMx__2$38cf#+KXaNTt$1jOzOrAaBA$+gW7^U&PjbBW5 zf_kG5us*8dF_nwEgqaD<6!B(wCygJJ`L0qX@svP>qy%MX3XvWpQI4iDVz`Vm$Os_s zDWETqlEhj@0vYq?G;6G$)4Y*OoYR5?j*|q=s-#H(PeE}GJvxo;Gm6B(EC9MBG72h_ zk*p=IR%JB_T0$I%$^c^wGq~>b5Kmc^32{MHXEgg26EQ`usmZy>ik9h7cXJs;l1fum z^n0?10+tj)R(Yg_a<#5pMtLfPLVEU|(fqeQANRkp3^4LUqq{=`2YX_ literal 1925 zcmb`HT~8B16o${V+g9odh_q1rKmoB7VUglhNe#h|KpG)p>h-oA%iyw0wp(Mp@fVqB z0x|KzAK;HNzGt>AA8r#!yy(pA%$fIn=FFM?{`2z}5v|eFG$m9&Al*3W(TcPc>aTX!}yodQ{B%VC&~Shfb*sspPtH zRZtcb&o5L38Jk`Mq9YaM%Gd3~n)Kh=$dI71idVOts_iTO?oJxPz5?dlV7GUk|6#{( zNFP>P`R&1h(HV(4TZuWd=W#kmJ*1=mV{+L9GE1T3 zXjG@pvE8P%Q#+9LK+w3JQl7PkH*Y)YGd~r2fPbMR2})6%Vr+$R8vj>md|gLx;um9g z-2(vYH}!Z7(SixlW-wDkFVH6nKS+GnAz8F6LYxb-PJ%WEvMDg!*5U=sLZB81CW;@>WS%twOE(p(=T7FrY*kY`50 MV_n94PfJ990sR4`OaK4? diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index e0c0575..45b8c94 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,9 @@ + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index ecf7d70..8957edf 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -71,4 +71,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index e68043698454f5d64f5929287b200e010f193250..f805a57290295747b346c1424fc5503d3d8ca94f 100644 GIT binary patch delta 1443 zcmZuwYiyHM7=GThU)RgGZtK0>)^^chU*g zTtk+#Do$dG&$xEdIUaE@wf(4K8e6QG=J(wl>O~bZdNe~=Ayp#W>glljuHp**;7y(h z`iB>L+b#d9xJKZu-W>~CQt8}4e{%B*tuMVUt!3n&TfVs?o5>9gZd^B%&Stu_!CW?z z(fT=C9;4NKtJ&R52)50U*fyL_ZIzQyxk@Ioa+Ot27&S-lCOhGlLdKlMZ|+Ypuh;qq z2uhp&wUUEvz9Fi8d&IYilvX&fh~Eg+b4?(nEQTFR_??D&el^ge+$GU6BWemJmAD{R z3Gz0c2zD!-60I?!&QQ1VphP_qZB*96hKKo7EW+`c`<3;mz@xmYW<(i~*`UnkbE39~ zcJfPg;qYT`i3iG1E29f$8HWY51=aHPVuTOZX}qj151#MNBeo0TDM4%(#M6Q}TKx>l z@vL0;bC`$caR*-DvG6wKML6*?FO9rHAMlCDqC)l_S$z!w?2(?YvnTo__40wBmkx0} z&=mYQ;rgt|$S%x)H${TIx&+(0VU-mUPffyvnCt~4YLKO?EjEIDiiIs>;U453Pq|c7x z9sv@L@#Uz0;a4}P92dDDqL6VIldGe6K8sQ0Jw6hR$YYoa`D0&~fWIjPAJD<3lQ?CF zcA7t|Ul=@-a4j$5@}hktZaAoW%KfeI(q(kwJDHiJwRsj7CHoS$H~M@;q+0}X z{(@cP;hLqLXEiB?D{Q(Ngok9*Z>CE$(S71H{7^eimV}#ZrR1+jgR6!eqA>ATC}JXc x#8V;P1Ed;dmPkpxu-Q!&#pJw_vqqvXzmIUiM&^Qz%E&2sWmIW6S~92#_zyo%K^p)7 delta 880 zcmZuvTS!z<6kW&hnlp1V=gw1`W}Hz*>@`A#6hv5t6(fdWF@%JnRzzlz^;3vMKYc{B zp%+0=ef6beB1K01RHjZ@S(#dy*-I@ewKwg1Mwl4-x#zBZ)>`{@n%DkbWor9#r4_(J z{Ax5=v>E1Lc}2y#ZCk2~tE!T5hy2zhB0^=>J;rVoU3e_8netP;bl4gouWh~Pp}n@n z#uqC3us<1n)M8tqzE&}yqXB_}DY8bLsdg%|yOZ9l_<&*BX>S#uX}%*rX6)McSo$*FK@lgBd|;aQn!UUZE_433+79%%O(#5@ji)WfJAi3@a;{S;));*9Rc8{N{$N*5l$Kw~becu427=B7OgY0G2GXm1@nxQIS}>l3Vz zb*11b{~5TT9+~V}T(aJnMYQT}Sy`V>4)#lO0UPO)RcALLeNHo;hqRY5RWxxg@2Owk zlNgZ7SN~NGhP0u0adwy>Z?+?VNqm#5G9!#++2(gi{sBLq`apgH Fe*vy9(J}x4 diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index 2d040d128bd1bfde843e5fe1193ed2d145826863..8fa5add54bb23426473edce1cd302b1a9dc85ae7 100644 GIT binary patch delta 1658 zcmZuxYiyHc6n;)u>DG1P*2{WX%hp}Hu?+^}w&4I_*fDTsT*lpQ{Wc2a>*%_{xQ)9( zkRQAPUQi)X5G6)gf({g8@RFcNG{i{Ms1fl8VgeCSLG;;X_+`GNJ>PrI^PF>@^PX>4 z!`ZnHoV$DK41m$H%>;wMtwuVm>b#iVEY@sQLqg$jW2DV2!)3lj7RU%eYKNAnjp(5$ z&jlGRv6bynEul@-S|cqHO>gNIy9NmQ9}MV44(sXV5R+X}`tOV}hW zg7oE~u26Y2q_>q%iN&H?NVkZF8v;x7;OpE_v{N%nv$R=cnM9P?UN~fhMWV7&jkO1i zF^jaTu)Rk*)n)spN@tsvcqpcKB;uVdiAYRu(Bd62UDu)lYf&&zKaj065s8-9M>-N! zf@wTe*^ViXCd+#E{lD0<=I&rP8MjhVAw3q^B%1|h3J}y2TALOZ6c-H=546#kh)49c zs-XJL;84wu60xa0j)^H5Fv5mRWT=ad6=|99!HGh+Pyvss&)jbx1~ame4nNQG_~fG) z1?pDjPrWIjs@IRj32b6W%fOj-_`zJeYt2RM9_?)`OUYNvhS==bg%k zX^fao{KI4p5 zs4|aJUCVYv{()J5bV)*%7?Dpzxg=w(q@Y^Nm@KKNmHSaI>1dP;EDY`%`x>e zQfwdpX-P6sTm&pcnCAvY1!bgEFn2z0UNoo1x=P%mo4$1a9prsS|nKXl1OT=K9%^07k-uu}@Lml_?EVjPhY9AjLsl;f0) z#97vVK}O+AsT}CKoj00Q_jlbxqu;zm)u|z^HQ2zmQ#t8=0gM#pG`As&`*`h-a&~nb zLJgkfgg&KswY;%^@hq8(up75&r4Th0cknkwjB^O9Xj!%WKiUiJV0 delta 1181 zcmX9-X-rgS6g_tsw((7sWrlgc3^0P@fYz1Tx`YyOiAthTsT(4U4@8C;Rs%GOty-(V z5B*d$?s3=n1F6KpB_`M=8ntcOlt!C0t;!FLiAx*T(w;(I^5y2;bIy0~x%cZSXqi9k zR)6<3028G?5+*^SdTx(XcOkW$(N{J>uS*;e>JQ1aul*t;k!R9ru)uck5 zvo%YV%Cc`%EeT$URTmScMaRI5I3yrOy-TRD+TmjCfdk`NS*>G_%>@fm5Q8-67>;y) znaEHseXBl_880(gNW>`SKjb-vym9K9e!-c|>_^Ogj3j)55tz)}RG!oDDRNX>V#qn2 zh&&=@l0S>Ov&o->NtjDaey1cLO8H$Uum8cGIlObmIzIpn`M=u9*j8JxaHP@Wh1A7-=CXS3i3uGA#2*flEyAN*KnA895S; znG%6~iGm@~2#5tWG6d^I!&hR(Hu(TMWf%?!4VPG)A+A&G=oSZhM924%h+ia$MgUd3 zf%S5fE^rO*N6B0rN{0Qf2ouEf^5J3<2;tdgzoXrlr<-aH{ z+jhKT6irqh-s2xSSc6I8XQXlUfmH7NphkcigUo(}4^Wln-EXbrD>8A-X{rR&H(s{{ zRj+r9&X+2Dsgi~yal Date: Thu, 6 Oct 2016 19:02:17 -0400 Subject: [PATCH 42/57] good to go --- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 2 +- WebContent/WEB-INF/jsps/home.jsp | 3 +- WebContent/WEB-INF/jsps/pdiReport.jsp | 56 +++++++++++++----- WebContent/WEB-INF/jsps/selectReport.jsp | 18 +++--- .../config/security-context.xml | 3 + .../sheridancollege/config/tiles-layout.xml | 10 ++++ .../controllers/HomeController.java | 23 ++++++- src/ca/sheridancollege/dao/DAO.java | 16 +++++ .../services/ControllerServices.java | 17 ++++++ .../config/security-context.xml | 3 + .../sheridancollege/config/tiles-layout.xml | 10 ++++ .../controllers/HomeController.class | Bin 9038 -> 9343 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 9832 -> 10066 bytes 13 files changed, 130 insertions(+), 31 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index 5441f6a..9079c0d 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -69,7 +69,7 @@ Extra Large Button CSS - +
diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp index 6519512..78f5cc0 100644 --- a/WebContent/WEB-INF/jsps/home.jsp +++ b/WebContent/WEB-INF/jsps/home.jsp @@ -58,6 +58,7 @@ Extra Large Button CSS +
@@ -71,7 +72,7 @@ Extra Large Button CSS
View Work Orders - Generate Report + Generate Report
diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp index 8aed847..8aba53f 100644 --- a/WebContent/WEB-INF/jsps/pdiReport.jsp +++ b/WebContent/WEB-INF/jsps/pdiReport.jsp @@ -31,7 +31,27 @@ Tarion PDI Form: ${unit.homeEnrollmentNumber} -
+
+ + + + + +
+ + + + +
+ +
+ + + +
+ + +
-
- +
- +
@@ -210,7 +229,9 @@ - + + +
@@ -222,12 +243,16 @@ -
+
- + readonly />
- +
@@ -235,19 +260,18 @@
- - - - Back - + Back +
\ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/selectReport.jsp b/WebContent/WEB-INF/jsps/selectReport.jsp index 4b6b58c..aa37986 100644 --- a/WebContent/WEB-INF/jsps/selectReport.jsp +++ b/WebContent/WEB-INF/jsps/selectReport.jsp @@ -45,17 +45,16 @@
+ +
@@ -63,11 +62,10 @@ - + - - Back + + Next
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml index e0dd2c6..4e63fc4 100644 --- a/src/ca/sheridancollege/config/security-context.xml +++ b/src/ca/sheridancollege/config/security-context.xml @@ -15,6 +15,9 @@ + + + diff --git a/src/ca/sheridancollege/config/tiles-layout.xml b/src/ca/sheridancollege/config/tiles-layout.xml index 80ad2df..9eb591b 100644 --- a/src/ca/sheridancollege/config/tiles-layout.xml +++ b/src/ca/sheridancollege/config/tiles-layout.xml @@ -15,6 +15,16 @@ + + + + + + + + + + diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 83803a7..b88c9de 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -195,9 +195,26 @@ public String login(Model model) { return "loginForm"; } - @RequestMapping("/createAccount") - public String createAccount(Model model) { - return "createAccount"; + @RequestMapping("/pdiReport") + public String pdiReport(Model model) { + + //model = controllerServices.displayPdiReport(model); + + return "pdiReport"; + } + + @RequestMapping("/pdiReportData") + public String pdiReportData(Model model,@RequestParam long homeEnrollmentNumber) { + + model = controllerServices.displayPdiReport(model,homeEnrollmentNumber); + + return "pdiReport"; + } + + + @RequestMapping("/selectReport") + public String selectReport(Model model) { + return "selectReport"; } @RequestMapping("/register") diff --git a/src/ca/sheridancollege/dao/DAO.java b/src/ca/sheridancollege/dao/DAO.java index 801db2f..c25c50e 100644 --- a/src/ca/sheridancollege/dao/DAO.java +++ b/src/ca/sheridancollege/dao/DAO.java @@ -76,6 +76,22 @@ public List getBuilder(String builderUserName) { return builderList; } + + public List getBuilderRefNum(String builderUserName) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + + Query query = session.getNamedQuery("Builder.byUserName"); + query.setString("users_username", "batman"); + List builderList = (List) query.list(); + + session.getTransaction().commit(); + session.close(); + + return builderList; + } + + public void addTestData() { diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 472b0cf..f7234e9 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -225,4 +225,21 @@ public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) return model; } + + public Model displayPdiReport(Model model, long homeEnrollmentNumber) { + + List unit = dao.getUnit(homeEnrollmentNumber); + List form = dao.getForm(homeEnrollmentNumber); + List builder = dao.getBuilderRefNum("batman"); + + model.addAttribute("form", form.get(0)); + model.addAttribute("unit", unit.get(0)); + model.addAttribute("builder", builder.get(0)); + + + + return model; + } + + } diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml index e0dd2c6..4e63fc4 100644 --- a/target/classes/ca/sheridancollege/config/security-context.xml +++ b/target/classes/ca/sheridancollege/config/security-context.xml @@ -15,6 +15,9 @@ + + + diff --git a/target/classes/ca/sheridancollege/config/tiles-layout.xml b/target/classes/ca/sheridancollege/config/tiles-layout.xml index 80ad2df..9eb591b 100644 --- a/target/classes/ca/sheridancollege/config/tiles-layout.xml +++ b/target/classes/ca/sheridancollege/config/tiles-layout.xml @@ -15,6 +15,16 @@ + + + + + + + + + + diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 98875cfcb388f547f7c556edbdb9705a526d799d..7dd0d5cc4c4111c74dff35087d0af687f2cbff87 100644 GIT binary patch delta 635 zcmZ8dO-mb56g@AIIGIdBn8bzzYmxyswGax0;-ZK(NGStWOBdqC&}0!2j3$c~THL$n z=KTc!K*f+k7g@ScP&BQY_z{iYY3p}eqoTbtViLkI@7{afedpYJW;<_RiqkjW(g2>~ zdO~cKN6oQtv?mf98c8sSfpQ^Wj=@?kgP}x-!B)A~01+^EkHVd2KA)nW{fIi;sZfMJ(i&iun=wSFvr{uvPxn|Jc2z$}cK?cLI4>u*si${EiL0(#dStq|8Vx1x+fjrAr0rPLq=KX;au% z<=tAYeV9??Up-#qd+h1D`&?C;-3O}tskZl+7CY4zbN$wJ898`FejJlV9ciENCoTs& zOFzp!??_Q@Tc>PP30KH@Rk0PE{{}jg7}T+KnL>V>xTC7N`holC605&MmzXZ2 lmepXz$_zgOyn&y2!ZY*V(;y5?Y4F0E2Cq=L>-qKud;x}ZXYl|4 diff --git a/target/classes/ca/sheridancollege/dao/DAO.class b/target/classes/ca/sheridancollege/dao/DAO.class index f877dea8a6254440f4923fc60f0add7d3dc759e4..d5f7ba1bdfc24d58c91943cd0d4e6cfc32eb4b86 100644 GIT binary patch delta 3203 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 XwQ;)TiY2+pwi#shTk`X$MN!~C-SDjM delta 3217 zcmaJ@3v?9a75?sKcW1IYd2JqK$%D<4JV~-9kSvHvfIuJ#Xn+`#h?`^*0?BT=*$9zi zb6VRTq+rBfvFxb z=eyti?)|@+vo#-Ag`XNbavVS*xh3cbGetyrq&Q8|P}W&F-t25`U9I+b7dyR98Fvu$ z1@@~7CEQ6!;6STb6&zN6HzBmZZmV#6IMP<-bg44#Aw-mS_NunpjeR|~RUY>SwZ$vr zCxl?TtyyjLxZPbQ4B&nR5_XG+gUj^~5K6^vr8LZhJuqvBy$T-2PsLnQ@k|-}2*zfo zx6A1=VF~tY_YD#d8AwCjchS>CfBBc2BY6vsM zn{WYtR`3^;5)AFCx3blY1^BCiPw_WV7n+iM9v2mShR?ay_0FCeb+eZcl#zLZ*2FIr z`~&|yyeG7P+SCKay_cEOQuRO6qy-YK`|z(pelu`DW6Gh@^tXjP=)wB z@>Z%9-BB}Wjo2EMCtsj?g>Ik*@pM#raTBeR=tkaVQ}oN-?oQRoC#E(YM!CjJ0}mK{}D zPry2YBtmu02v!m5Mlnzyg`Ikfu!$S_kD3;V) z9y>|(?)Tu-tx5N*9L8X;JND6B;`u16v2d43zP9F4dUO;Gvh zf)n56)eq5z9cafcbYL$wU_Uk@o>AH+YDEGPHM77zoDxHEkxPGzm-t^HdT<&qL(jMy z@d}o~!01hQ6)i9_dL_=_EbmnpO7I$f2bpta;&r^iN)pcDO<|6&svFR%_2KspdEzJ7 z%B8$RaF_>?W;KuCkAxGr;4oQDK71Uv7vWafY8t^OI@Ap!M2q-4;r{V+teNb?7goJr z6LBa$ZJi5dxDko(Fn9VD)UQm>rwY z#rcer@neDbF>xSamVH3N0{$}Ic_3+=F@hx!=_O=Iu=_7w4&hm3&l?wCC!~?q_>{7( zoalCL{x-zo$4KEaGP$W*8@1FxR)Bn#pB5V{Uuk8UI?lmgaa&@V%tMv!BVCr&ndn1I zbni5*X+%jTZC0ieHKCgcw=*vtnZ?nhWKzUXa-6u7l#=iWNA6?f{fst<+1$N+Jc{{v z3}yI*a3mKcgmPyL{(dNon~x|8r7%826wVxPv89wn)JIa}Fh$qo`Y3kmQQ4s%rTF^X zVM=rutOl#zM@e;7gOAb%Vbad{C_P&{o1K$Ag4H~ftXyP2arFyu4b5ihmE;AUo$vLs=DFMTNXE^AJKsG?xo3gMsEzF|VqbNIZ1oyblaKT@vMJ<3$k?m1zHF z8(9p;G?C}~MP3jP`9&_`6c_Olqnu`uUuGF!Ws%Qtj@SGmFZ@4|7ZN99+)^qN+mlmC zLrcrZ@liSZA62mA%Z6$Br0>xRb^@x=^wq3^(#2SE+@jfB&Xkhpn8ce*;w>ieHj{XV zNxX+rywB==!0z`UJKjg^MHkS_kMJ&h!h8Qy(U?-yKS8dPU+*-Dj2y49L@Qa}rb&sU zY4fp|Ca7zoC1|2Gz{sLa+mX{$TgB#ac{H!p9v66q+o8Q_l?R>`B0SY>zHS6w9cpqT zX|q*i8mzSeh$)J9RMw9l8Ds2dt}I From 21457a8b36e64c4d2eceed6ccfc2d8e4df38c039 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 19:03:23 -0400 Subject: [PATCH 43/57] formatted --- .../controllers/HomeController.java | 318 +++++++++--------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 99db457..4b0d10c 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -21,236 +21,236 @@ @Controller public class HomeController { - private DAO dao = new DAO(); - private long num = 0; - private ControllerServices controllerServices = new ControllerServices(); + private DAO dao = new DAO(); + private long num = 0; + private ControllerServices controllerServices = new ControllerServices(); - @RequestMapping("/") - public String home(Model model) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + @RequestMapping("/") + public String home(Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (!(authentication instanceof AnonymousAuthenticationToken)) { - String currentUserName = authentication.getName(); + if (!(authentication instanceof AnonymousAuthenticationToken)) { + String currentUserName = authentication.getName(); - model.addAttribute("user", currentUserName); + model.addAttribute("user", currentUserName); - return "home"; - } - return "loginForm"; - } + return "home"; + } + return "loginForm"; + } - @RequestMapping("/saveOrUpdateDeficiency") - public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, - @ModelAttribute long homeEnrollmentNumber) { + @RequestMapping("/saveOrUpdateDeficiency") + public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, + @ModelAttribute long homeEnrollmentNumber) { - model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); + model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); - return "displayDeficiencies"; - } + return "displayDeficiencies"; + } - @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") - public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/addDeficiency/{homeEnrollmentNumber}") + public String addDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.addDeficiency(model, homeEnrollmentNumber); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); - return "addDeficiency"; - } + return "addDeficiency"; + } - @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") - public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderAddDeficiency/{homeEnrollmentNumber}") + public String workOrderAddDeficiency(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.addDeficiency(model, homeEnrollmentNumber); + model = controllerServices.addDeficiency(model, homeEnrollmentNumber); - return "workOrderAddDeficiency"; - } + return "workOrderAddDeficiency"; + } - @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") - public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/deleteDeficiency/{id}/{homeEnrollmentNumber}") + public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); - return "displayUnitDeficiencies"; - } + return "displayUnitDeficiencies"; + } - @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderDeleteDeficiency(Model model, @PathVariable int id, - @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderDeleteDeficiency(Model model, @PathVariable int id, + @PathVariable long homeEnrollmentNumber) { - model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderCompleteDeficiency(Model model, @PathVariable int id, - @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") + public String workOrderCompleteDeficiency(Model model, @PathVariable int id, + @PathVariable long homeEnrollmentNumber) { - model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); + model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/displayUnits") - public String displayUnits(Model model) { + @RequestMapping("/displayUnits") + public String displayUnits(Model model) { - model = controllerServices.displayUnits(model); + model = controllerServices.displayUnits(model); - return "displayUnits"; - } + return "displayUnits"; + } - @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") - public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/displayUnitDeficiencies/{homeEnrollmentNumber}") + public String viewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); - return "displayUnitDeficiencies"; - } + return "displayUnitDeficiencies"; + } - @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") - public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { + @RequestMapping("/workOrderDisplayUnitDeficiencies/{homeEnrollmentNumber}") + public String workOrderViewUnitDeficiencies(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); + model = controllerServices.displayUnitDeficiencies(model, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/saveDeficiency") - public String saveDeficiency(Model model, @RequestParam int id, @RequestParam String location, - @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber) { + @RequestMapping("/saveDeficiency") + public String saveDeficiency(Model model, @RequestParam int id, @RequestParam String location, + @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber) { - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, - deadline, homeEnrollmentNumber); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, + deadline, homeEnrollmentNumber); - return "displayUnitDeficiencies"; - } + return "displayUnitDeficiencies"; + } - @RequestMapping("/workOrderSaveDeficiency") - public String workOrderSaveDeficiency(Model model, @RequestParam int id, @RequestParam String location, - @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber) { + @RequestMapping("/workOrderSaveDeficiency") + public String workOrderSaveDeficiency(Model model, @RequestParam int id, @RequestParam String location, + @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber) { - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, - deadline, homeEnrollmentNumber); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, + deadline, homeEnrollmentNumber); - return "workOrderDisplayUnitDeficiencies"; - } + return "workOrderDisplayUnitDeficiencies"; + } - @RequestMapping("/displayUnitInfo") - public String displayUnitInfo(Model model) { - dao.addTestData(); - model.addAttribute("unit", new Unit()); - model.addAttribute("builder", new Builder()); - model.addAttribute("form", new Form()); - // dao.getUnit(homeEnrollmentNumber); - return "displayUnitInfo"; - } + @RequestMapping("/displayUnitInfo") + public String displayUnitInfo(Model model) { + dao.addTestData(); + model.addAttribute("unit", new Unit()); + model.addAttribute("builder", new Builder()); + model.addAttribute("form", new Form()); + // dao.getUnit(homeEnrollmentNumber); + return "displayUnitInfo"; + } - @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) - public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { + @RequestMapping(value = "/displayUnitData", method = RequestMethod.POST) + public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumber) { - model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); + model = controllerServices.displayUnitData(model, homeEnrollmentNumber, num); - return "displayUnitInfo"; - } + return "displayUnitInfo"; + } - @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) - public String saveUnit(Model model, @RequestParam long homeEnrollmentNumber, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, @RequestParam int lotNumber, - @RequestParam String address, @RequestParam String projectName, @RequestParam String municipality, - @RequestParam int level, @RequestParam int unitNum, @RequestParam String plan, - @RequestParam String repName) { + @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) + public String saveUnit(Model model, @RequestParam long homeEnrollmentNumber, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, @RequestParam int lotNumber, + @RequestParam String address, @RequestParam String projectName, @RequestParam String municipality, + @RequestParam int level, @RequestParam int unitNum, @RequestParam String plan, + @RequestParam String repName) { - model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, - municipality, level, unitNum, plan, repName); + model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, + municipality, level, unitNum, plan, repName); - return "displayUnitInfo"; - } + return "displayUnitInfo"; + } - @RequestMapping("/addSignOff/{homeEnrollmentNumber}") - public String addSignOff(Model model, @PathVariable long homeEnrollmentNumber) { - model = controllerServices.loadSignOff(model, homeEnrollmentNumber); - return "addSignOff"; - } + @RequestMapping("/addSignOff/{homeEnrollmentNumber}") + public String addSignOff(Model model, @PathVariable long homeEnrollmentNumber) { + model = controllerServices.loadSignOff(model, homeEnrollmentNumber); + return "addSignOff"; + } - @RequestMapping(value = "/addSignOff", method = RequestMethod.POST) - public String saveForm(Model model, @RequestParam long homeEnrollmentNumber, @RequestParam String desName) { + @RequestMapping(value = "/addSignOff", method = RequestMethod.POST) + public String saveForm(Model model, @RequestParam long homeEnrollmentNumber, @RequestParam String desName) { - model = controllerServices.saveForm(model, homeEnrollmentNumber, desName); + model = controllerServices.saveForm(model, homeEnrollmentNumber, desName); - return "addSignOff"; - } + return "addSignOff"; + } - @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(Model model) { - return "loginForm"; - } + @RequestMapping(value = "/login", method = RequestMethod.GET) + public String login(Model model) { + return "loginForm"; + } - @RequestMapping("/createAccount") - public String createAccount(Model model) { - return "createAccount"; - } + @RequestMapping("/createAccount") + public String createAccount(Model model) { + return "createAccount"; + } - @RequestMapping("/register") - public String register(Model model, @RequestParam String username, @RequestParam String password) { + @RequestMapping("/register") + public String register(Model model, @RequestParam String username, @RequestParam String password) { - model = controllerServices.register(model, username, password); + model = controllerServices.register(model, username, password); - return "home"; + return "home"; - } + } - @RequestMapping("/workOrderHome") - public String workOrderHome(Model model) { + @RequestMapping("/workOrderHome") + public String workOrderHome(Model model) { - return "workOrderHome"; - } + return "workOrderHome"; + } - @RequestMapping("/displayBuildingProjects") - public String displayBuildingProjects(Model model) { + @RequestMapping("/displayBuildingProjects") + public String displayBuildingProjects(Model model) { - model = controllerServices.displayBuildingProjects(model); + model = controllerServices.displayBuildingProjects(model); - return "displayBuildingProjects"; - } + return "displayBuildingProjects"; + } - @RequestMapping("/displayConstructionPersonnel") - public String displayConstructionPersonnel(Model model) { + @RequestMapping("/displayConstructionPersonnel") + public String displayConstructionPersonnel(Model model) { - model = controllerServices.displayConstructionPersonnel(model); + model = controllerServices.displayConstructionPersonnel(model); - return "displayConstructionPersonnel"; - } + return "displayConstructionPersonnel"; + } - @RequestMapping("/displayUnits/{project}") - public String displayUnits(Model model, @PathVariable String project) { + @RequestMapping("/displayUnits/{project}") + public String displayUnits(Model model, @PathVariable String project) { - model = controllerServices.displayUnitsByProject(model, project); + model = controllerServices.displayUnitsByProject(model, project); - return "displayUnits"; - } + return "displayUnits"; + } - // this displays an image from the database - @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") - public void getImage(HttpServletResponse response, @PathVariable long homeEnrollmentNumber) throws IOException { + // this displays an image from the database + @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}") + public void getImage(HttpServletResponse response, @PathVariable long homeEnrollmentNumber) throws IOException { - response = controllerServices.getImage(response, homeEnrollmentNumber); - } + response = controllerServices.getImage(response, homeEnrollmentNumber); + } - @RequestMapping("/displayDeficiencies/{id}") - public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { + @RequestMapping("/displayDeficiencies/{id}") + public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { - model = controllerServices.displayDeficienciesByConstructionPersonnel(model, id); + model = controllerServices.displayDeficienciesByConstructionPersonnel(model, id); - return "displayConstructionPersonnelDeficiencies"; - } + return "displayConstructionPersonnelDeficiencies"; + } - @RequestMapping("/help") - public String help(Model model) { + @RequestMapping("/help") + public String help(Model model) { - return "help"; - } + return "help"; + } } From c0d3632a14053a18f000b9062a218e31aa21c20a Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 19:06:42 -0400 Subject: [PATCH 44/57] more formatting --- .../controllers/HomeController.java | 55 ++++++++++++------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4b0d10c..2d1a191 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -40,8 +40,7 @@ public String home(Model model) { } @RequestMapping("/saveOrUpdateDeficiency") - public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, - @ModelAttribute long homeEnrollmentNumber) { + public String saveOrUpdateDeficiency(Model model, @ModelAttribute Deficiency deficiency, @ModelAttribute long homeEnrollmentNumber) { model = controllerServices.updateDeficiency(model, deficiency, homeEnrollmentNumber); @@ -73,8 +72,7 @@ public String deleteDeficiency(Model model, @PathVariable int id, @PathVariable } @RequestMapping("/workOrderDeleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderDeleteDeficiency(Model model, @PathVariable int id, - @PathVariable long homeEnrollmentNumber) { + public String workOrderDeleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { model = controllerServices.deleteDeficiency(model, id, homeEnrollmentNumber); @@ -82,8 +80,7 @@ public String workOrderDeleteDeficiency(Model model, @PathVariable int id, } @RequestMapping("/workOrderCompleteDeficiency/{id}/{homeEnrollmentNumber}") - public String workOrderCompleteDeficiency(Model model, @PathVariable int id, - @PathVariable long homeEnrollmentNumber) { + public String workOrderCompleteDeficiency(Model model, @PathVariable int id, @PathVariable long homeEnrollmentNumber) { model = controllerServices.completeDeficiency(model, id, homeEnrollmentNumber); @@ -115,10 +112,16 @@ public String workOrderViewUnitDeficiencies(Model model, @PathVariable long home } @RequestMapping("/saveDeficiency") - public String saveDeficiency(Model model, @RequestParam int id, @RequestParam String location, - @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber) { + public String saveDeficiency( + Model model, + @RequestParam int id, + @RequestParam String location, + @RequestParam String description, + @RequestParam String constructionPersonnel, + @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber + ) { model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); @@ -127,10 +130,16 @@ public String saveDeficiency(Model model, @RequestParam int id, @RequestParam St } @RequestMapping("/workOrderSaveDeficiency") - public String workOrderSaveDeficiency(Model model, @RequestParam int id, @RequestParam String location, - @RequestParam String description, @RequestParam String constructionPersonnel, @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber) { + public String workOrderSaveDeficiency( + Model model, + @RequestParam int id, + @RequestParam String location, + @RequestParam String description, + @RequestParam String constructionPersonnel, + @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber + ) { model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); @@ -157,11 +166,19 @@ public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumb } @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) - public String saveUnit(Model model, @RequestParam long homeEnrollmentNumber, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, @RequestParam int lotNumber, - @RequestParam String address, @RequestParam String projectName, @RequestParam String municipality, - @RequestParam int level, @RequestParam int unitNum, @RequestParam String plan, - @RequestParam String repName) { + public String saveUnit( + Model model, + @RequestParam long homeEnrollmentNumber, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, + @RequestParam int lotNumber, + @RequestParam String address, + @RequestParam String projectName, + @RequestParam String municipality, + @RequestParam int level, + @RequestParam int unitNum, + @RequestParam String plan, + @RequestParam String repName + ) { model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName); From 45229e1c49492f1ee9967b4dda54050607713073 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 19:07:12 -0400 Subject: [PATCH 45/57] more formatting --- .../controllers/HomeController.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 2d1a191..4754cb3 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -113,14 +113,14 @@ public String workOrderViewUnitDeficiencies(Model model, @PathVariable long home @RequestMapping("/saveDeficiency") public String saveDeficiency( - Model model, - @RequestParam int id, - @RequestParam String location, - @RequestParam String description, - @RequestParam String constructionPersonnel, - @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber + Model model, + @RequestParam int id, + @RequestParam String location, + @RequestParam String description, + @RequestParam String constructionPersonnel, + @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber ) { model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, @@ -131,14 +131,14 @@ public String saveDeficiency( @RequestMapping("/workOrderSaveDeficiency") public String workOrderSaveDeficiency( - Model model, - @RequestParam int id, - @RequestParam String location, - @RequestParam String description, - @RequestParam String constructionPersonnel, - @RequestParam String category, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, - @RequestParam long homeEnrollmentNumber + Model model, + @RequestParam int id, + @RequestParam String location, + @RequestParam String description, + @RequestParam String constructionPersonnel, + @RequestParam String category, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date deadline, + @RequestParam long homeEnrollmentNumber ) { model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, @@ -167,17 +167,17 @@ public String displayUnitData(Model model, @RequestParam long homeEnrollmentNumb @RequestMapping(value = "/saveUnit", method = RequestMethod.POST) public String saveUnit( - Model model, - @RequestParam long homeEnrollmentNumber, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, - @RequestParam int lotNumber, - @RequestParam String address, - @RequestParam String projectName, - @RequestParam String municipality, - @RequestParam int level, - @RequestParam int unitNum, - @RequestParam String plan, - @RequestParam String repName + Model model, + @RequestParam long homeEnrollmentNumber, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date posessionDate, + @RequestParam int lotNumber, + @RequestParam String address, + @RequestParam String projectName, + @RequestParam String municipality, + @RequestParam int level, + @RequestParam int unitNum, + @RequestParam String plan, + @RequestParam String repName ) { model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, From 35739bd75406338ec2fae998c781c31a41af1cc4 Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 19:08:14 -0400 Subject: [PATCH 46/57] more formatting --- src/ca/sheridancollege/controllers/HomeController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4754cb3..3fd167a 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -141,8 +141,7 @@ public String workOrderSaveDeficiency( @RequestParam long homeEnrollmentNumber ) { - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, - deadline, homeEnrollmentNumber); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); return "workOrderDisplayUnitDeficiencies"; } @@ -180,8 +179,7 @@ public String saveUnit( @RequestParam String repName ) { - model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, - municipality, level, unitNum, plan, repName); + model = controllerServices.saveUnit(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName); return "displayUnitInfo"; } From 9f716f349882c0de4774fec24ce77e1e9433d46c Mon Sep 17 00:00:00 2001 From: perds Date: Thu, 6 Oct 2016 19:09:05 -0400 Subject: [PATCH 47/57] more formatting --- src/ca/sheridancollege/controllers/HomeController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 3fd167a..4d74d6f 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -123,8 +123,7 @@ public String saveDeficiency( @RequestParam long homeEnrollmentNumber ) { - model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, - deadline, homeEnrollmentNumber); + model = controllerServices.saveDeficiency(model, id, location, description, constructionPersonnel, category, deadline, homeEnrollmentNumber); return "displayUnitDeficiencies"; } From 0c23cd9f70553265905f5dd8bb0b1d977c903474 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 19:52:59 -0400 Subject: [PATCH 48/57] most CSS for enter PDI response for second image may have an issue with builder ref number -- but it is there --- WebContent/WEB-INF/jsps/addSignOff.jsp | 27 +++++--- .../WEB-INF/jsps/displayBuildingProjects.jsp | 2 +- .../WEB-INF/jsps/displayUnitDeficiencies.jsp | 41 +++++++++++-- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 61 +++++++++++-------- WebContent/scripts/signing.js | 4 ++ src/ca/sheridancollege/beans/Form.java | 10 +++ .../controllers/HomeController.java | 6 ++ .../services/ControllerServices.java | 19 +++++- 8 files changed, 128 insertions(+), 42 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index 61152e7..03f8ecb 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -40,6 +40,12 @@ #canvasContainer { border: 1px solid grey; border-radius: 5px; + background-color:white; +} +#smallJum{ + background-color:#EDEEFF; + padding: 2%; + border-radius: 15px; } SignOff Form @@ -51,8 +57,9 @@ - +
+ SignOff Form
@@ -95,7 +102,7 @@
- +
@@ -109,14 +116,14 @@
-
+


-
+
- + -





+

* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf

@@ -152,11 +159,15 @@
- Finish + Finish
- +
+ + Back + +
diff --git a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp index 726dad3..66e2b4a 100644 --- a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp +++ b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp @@ -42,7 +42,7 @@
- Back + Back
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp index 9538227..ae12b91 100644 --- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp @@ -25,28 +25,59 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + + - +
+

Unit ${unit.unitNum} Deficiency List

+ + + + + + + + + + + -
${unitDeficiency.id} + ${unitDeficiency.description} +
+ + + + + + + +
#LocationDeficiency TypeDescription
${unitDeficiency.id}${unitDeficiency.location}${unitDeficiency.category}${unitDeficiency.description} Delete - +
- +
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index 47e1c52..1f64805 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -7,6 +7,21 @@ + + + @@ -14,9 +29,6 @@ - - + + @@ -78,12 +85,12 @@ Extra Large Button CSS
- +
- +
- +
@@ -245,24 +252,26 @@ Extra Large Button CSS - -
+ +


-
+
- +

+ +
- Next + Next
+ Working! -->
diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js index becd778..4bb2e32 100644 --- a/WebContent/scripts/signing.js +++ b/WebContent/scripts/signing.js @@ -25,7 +25,11 @@ function accept(){ var link = document.getElementById("signature").toDataURL(); document.getElementById("acc2").innerHTML='SAVE'; + showNext(); +} +function showNext(){ + document.getElementById("nextBtn").show(); } /* diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index b306445..2a61827 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -27,6 +27,7 @@ public class Form implements Serializable { private String purchName; @Column(columnDefinition="mediumblob") private byte[] finalSig; + private long builderRefNum; public Form() { Date today = new Date(); @@ -124,5 +125,14 @@ public byte[] getFinalSig() { public void setFinalSig(byte[] finalSig) { this.finalSig = finalSig; } + + public long getBuilderRefNum() { + return builderRefNum; + } + + public void setBuilderRefNum(long builderRefNum) { + this.builderRefNum = builderRefNum; + } + } diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4c59810..dca124a 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -254,6 +254,12 @@ public void getImage(HttpServletResponse response,@PathVariable long homeEnrollm response = controllerServices.getImage(response, homeEnrollmentNumber); } + + @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}/2") + public void getImage2(HttpServletResponse response,@PathVariable long homeEnrollmentNumber) throws IOException { + + response = controllerServices.getImage(response, homeEnrollmentNumber); + } @RequestMapping("/displayDeficiencies/{id}") public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) { diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 7c7d7e2..cba7006 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -100,6 +100,7 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate model.addAttribute("unit", returns.get(0)); List returnsBuilder = dao.getBuilder(builderUserName); + Builder b = returnsBuilder.get(0); model.addAttribute("builder", returnsBuilder.get(0)); Form form = new Form(homeEnrollmentNumber, "PDI", repName); @@ -108,7 +109,8 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate HomeOwner ho = returnPurch.get(0); form.setPurchName(ho.getName()); - + form.setBuilderRefNum(b.getBuilderRefNum()); + dao.createForm(form); model.addAttribute("form", form); @@ -240,7 +242,8 @@ public Model displayUnitsByProject(Model model, String project) { return model; } - + + //gets first sig public HttpServletResponse getImage(HttpServletResponse response, long homeEnrollmentNumber) throws IOException { response.setContentType("image/png"); List form = dao.getForm(homeEnrollmentNumber); @@ -251,6 +254,18 @@ public HttpServletResponse getImage(HttpServletResponse response, long homeEnrol return response; } + + //get final sig + public HttpServletResponse getImage2(HttpServletResponse response, long homeEnrollmentNumber) throws IOException { + response.setContentType("image/png"); + List form = dao.getForm(homeEnrollmentNumber); + Form f = form.get(0); + byte[] imageBytes = f.getFinalSig(); + response.getOutputStream().write(imageBytes); + response.getOutputStream().flush(); + + return response; + } public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) { dao.completeDeficiency(id, homeEnrollmentNumber); From 929de6099c57ed776cc8735cb26ba015b93e0e42 Mon Sep 17 00:00:00 2001 From: Elviis Date: Thu, 6 Oct 2016 20:04:04 -0400 Subject: [PATCH 49/57] Good to go --- WebContent/WEB-INF/jsps/pdiReport.jsp | 46 ++++++------------ .../controllers/HomeController.class | Bin 10294 -> 10575 bytes .../classes/ca/sheridancollege/dao/DAO.class | Bin 11075 -> 11309 bytes 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp index 8aba53f..5ed4339 100644 --- a/WebContent/WEB-INF/jsps/pdiReport.jsp +++ b/WebContent/WEB-INF/jsps/pdiReport.jsp @@ -31,7 +31,8 @@ Tarion PDI Form: ${unit.homeEnrollmentNumber} -
+
+
@@ -41,7 +42,7 @@ - +
@@ -52,7 +53,8 @@
-
+ +
@@ -69,36 +71,20 @@ Description: - - - 1 - Column content - Column content - Column content - - - 2 - Column content - Column content - Column content - - - + - - + +
${deficiency.id} + ${deficiency.location} + ${deficiency.description} +
+ +
- -
- -
+ @@ -244,7 +230,7 @@ Name
-
@@ -268,9 +254,9 @@ style="margin-left: 8.33333333333%" /> - - Back + + Back
diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index f805a57290295747b346c1424fc5503d3d8ca94f..40b0c87edf7abec24ec7e0a13a3a3c6b386b37dc 100644 GIT binary patch delta 1193 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 delta 3535 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 LU(8b(MVI^+g~0Aj From 3b911d0f40456c0a78b13cd490e62c6bb42639c0 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 20:14:03 -0400 Subject: [PATCH 50/57] signoffpage changes --- WebContent/WEB-INF/jsps/addSignOff.jsp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index 03f8ecb..3932a0e 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -8,11 +8,6 @@ - - - - - @@ -48,16 +43,20 @@ border-radius: 15px; } + + + + SignOff Form
- +
-
+
SignOff Form @@ -123,7 +122,7 @@
-
+





* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf

From 5c3522cc287ff3f4bb7a5a1e6e82b1bd76b8d4f8 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 7 Oct 2016 10:28:08 -0400 Subject: [PATCH 51/57] added formatting to the deficiency lists in work order --- ...splayConstructionPersonnelDeficiencies.jsp | 45 ++++++++++++++++--- .../jsps/workOrderDisplayUnitDeficiencies.jsp | 45 ++++++++++++++++--- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp index ac836f8..53d06b4 100644 --- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp @@ -25,23 +25,56 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + aBode - +
+

Unit ${unit.unitNum} Deficiency List

+ + + + + + + + + + + -
${deficiency.id} + ${deficiency.description} - +
+ + + + + + + + +
#LocationDeficiency TypeDescription
${deficiency.id}${deficiency.location}${deficiency.category}${deficiency.description} + + Is Completed: ${deficiency.status} + + Delete - - Is Completed: ${deficiency.status} - +
+
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index 1badb50..b28cce7 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -25,22 +25,57 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + + +
+

Unit ${unit.unitNum} Deficiency List

+ + + + + + + + + + + -
${unitDeficiency.id} + ${unitDeficiency.description} - - Delete +
+ + + + + + + + +
#LocationDeficiency TypeDescription
${unitDeficiency.id}${unitDeficiency.location}${unitDeficiency.category}${unitDeficiency.description} - Is Completed: ${unitDeficiency.status} - + Is Completed: ${unitDeficiency.status} + + + Delete +
+
From 51338783cf591eb31ab44f55d4985cbae4c59a00 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 7 Oct 2016 11:11:15 -0400 Subject: [PATCH 52/57] sign off signtaure 2 working --- WebContent/WEB-INF/jsps/addSignOff.jsp | 25 +++++++++--------- .../ca/sheridancollege/beans/Builder.class | Bin 2351 -> 2351 bytes .../ca/sheridancollege/beans/Form.class | Bin 3356 -> 3565 bytes .../ca/sheridancollege/beans/User.class | Bin 2591 -> 2591 bytes .../ca/sheridancollege/beans/UserRole.class | Bin 1953 -> 1953 bytes .../controllers/HomeController.class | Bin 10575 -> 10764 bytes 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index 3932a0e..bac12d6 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -8,6 +8,10 @@ + + + + @@ -43,22 +47,16 @@ border-radius: 15px; } - - - - SignOff Form
-
+
+
- + -
- SignOff Form
@@ -91,8 +89,7 @@
-
@@ -104,7 +101,6 @@
-
@@ -119,7 +115,10 @@


-
+ +
+ +






diff --git a/target/classes/ca/sheridancollege/beans/Builder.class b/target/classes/ca/sheridancollege/beans/Builder.class index f8f6d33b880e3df57109f7acef064ff0bdcc06c2..c5ff135ab2e725d9e93ca4b976c9103b82a7cc0a 100644 GIT binary patch literal 2351 zcma)+ZFAd15Xbi%KhRXIlhjFZNE6wl!FC_ik``#%q$FuNQ;%tBQu4MV+gIm0wp1h; z2;YN`!3@mcVTKoc06rAMe|2(HD>CrHcjwja-f#E*cYpo;$Dc%Wj}8iy5oC63%RiBx z>e^1n?e}F*T5V}NzO^@0{jT&1lod4h*8a}6`nJ=vUbNrJPEeq{pi*d6u62ZXyRUw< z+kGkMQd>tJ$~Vu413{uGsC+nd0yU7w%2#mObsRUa1LZotprsb)`N4W8Jzx2ObUM;{ z)_o|*h!PzPY}FUE5c+9~qrg*64?Y(opXc@fTVIa;?Yo0_wsVS@$nf=v>qyYFr6(vm z^m$rqO|AVKI3W2-3fT)szH%|(^J>cHrmLKNw?7;>aL78Eiudzh^QaB^N6Jybj-Z)Z z{TOchZdcCI3@sb9L{|kBTWU=EO80c3<#z1;v5h{XeUUL6oGA3KI=zlPeG))v)y{XX zdEWGYEcN3HB&cH0B{F#Ru|Wm;fLGTIx~y%V7*y1&x^osE#{Q93i?L^9 zDZqzih0dYye^(y&@}WU-DS?g&X47fwb)SiduYN-Iqh@vE#xxY5SD9^kL?{<*$M^-+1o8j6BTm z@vum9IH7)X+uWM8PzB}A;FqI3WmrpCU%(rc$2^NU!wL##C@!3#vT%mR!Wo^4Vv6uy zfb9zYmwZ};Ao0S`Rg53Pyop(0&NY6g@~>g+M;K=jMO3CNEz=5ChIXQBw2FV6U=1TD z_z9#1%oR@1xG^HLVUDQUC}&5s-YDlrw9zQ%M^uZGuZ96DNPZ1vt%7KcN@QZI3dU-< z;SP#L(r80oaj8sN2^+$A6~0`^!YeL37p}N9+^7cKh!8Ezy2jtg`~^-K;u_hB=z3~> zH|bUsyaR9EEFabu7oj^;$EJ-i!;fmX8>tV0b#K+$QSegqt-|))~zJS wSE(S6Xgdm?5bIX5BQF7RI0ZyM7#Z3LRrxr4Zc5PSm-xSn8BfO^?fdlPA6=HKssI20 literal 2351 zcma);+iu%N5Qb+ZN~#^jvK`y4633>TrjeBcb8H(Yc56Eh5JAnsPJA0s(nj8ZB2$uT z>b^%Gqd*H(DA0>OKp(2;KTBGSXbQ>A%yRhe?6zGL$}o9z{eSH+X{}Pue!F|@f=6?q}7(T8(6O(K=S1b zvS+S*>A~RjO2+G^r`%o78T4HU3^$_U^@7)Iqd@VYa#gq`C|_ScglyOA0>08xCyXy` z6p452b!_L*_7y+JK_fg;sM^|O`kko$0BF@u*Q|Lu^eGVro$1LiP9D{Jp}u~4E_6Xk zx0u1f31^dpC*6XQpkHQ_3@0y)dXuNjB~wPHJeR0PvBg9;cKC~lb}U{=^l`sc5@j4I zLBp*fsD_Pytb0nBAF0>s9})A$rVqS<-;s|MpL{tk^9{Zlg3jwIk6)2JT&VCEhx}E` z^Ly5jLT|fvC@nj=ToxZw_r*Z^ESx_{+CFBk=m-lx@>@Z7-uPbMj1}g4TnlLq#`@OW zG&ja0Wjaq6$}~r_WjaIUGR^bo9GeQ81zHqjPOMYB7*3ma8C~pW?YFWM3R=)1Bcu9=U;u}?jpMlTuy4r(Ddk|?4DD8n1GYgxKeJ{vx0% z5}?p@0d^VTJMaR&(D;kQAA0UZ*lElnhz&?rFk%9TXq8NOPEdp81iwt@Eq1Nb9jA+4Y{KlV@`yHYj7LKY(bUAZ>Um_muZwqQ(tf=>v zY$B@AIu>o{3`>z}1YC@P(YSPF1d@}7&j*&rV@dekFN0MeWQ!p+JcH|Z8E-=`0owUh?=Ars`bzQsIwtXWIxio5{G i{sfTdgOS5;5MPgb`g5~@(bstX1|FY|Z|QzO8~+1!%ByDp diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index f0c76175d62cb6df5053f0ceebe09a71594ec165..3b3f61623d21bcb6846e9b81e874420347fbf7cb 100644 GIT binary patch literal 3565 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 Q4UF3u-8Ma^Z`;)T7f*jC-T(jq diff --git a/target/classes/ca/sheridancollege/beans/User.class b/target/classes/ca/sheridancollege/beans/User.class index f2524dac6cb51c99f12edf8af9f897635f20ea88..d95167f129b68c8798543cf83a598de39a4d4bee 100644 GIT binary patch literal 2591 zcma)7Yf~Fl7=BN#CB$+mph+7pRnm|aLKUc$6iX;rG%X0oOf!C2l4ID;vWwYW6~|xW zXFuqSOlNe)AK;Jb_`K&VOUT7COm_F2_x8Nc`<%nSZ~yv-h?ZzSNfAN0x>0hEWy@?B zcHOZo*_5RtY1nS*8&|fH6caT3+W5gJS%%##?Hs+9buUQ?L1SvybV~aOHZ1dJq)yV zOWO?uWqTMl9LqnkVT|c&3Ewuq_hl5l3Ba&@%VI>lCP4{H+D-46SM#u*8m{}J(`xX# zEGQ{$_H76fwV;JPhr1clE%=^kp-&Ih2KLRSZFqhQ)}^b~a`k_?D7;W`)#r5;Ota#4yiPU>h8zIVg)}AU1~X^c@}+-rBwGhs8KYIFZdiu~ z)B>)9&6sy=V)9e{adK%!;kKg~FLZ;LJJeWrgV{2ghiSUSXgK;}A2T%F&5MCY3v)I0 zTuIY7O$bWCGc?8uwTr9_Lu+E>f`K+wtaR>OPYYc5Nt)iL4=x+jMMi@L!y1g^QOD-> zig4t_Rqmmmfd539bbjux#1o||0&v{ZFcw)S}Sa~ zV``T}_iSo<>qTRW1g)QzQiAyt>Zxp{c{vv!X@I8PlXA-Lv-h&jQvoTB9v7{N8xoFt2>f%KrrRfG*&ZoH^?%G z_lNi?11~PdQNml`9WVY#_kLG7=kQFZ%?uUsoz@O?pB`W(Xr31EPtFvsLFhxN>o#alfFWJh~S;9 zYP>=(0wR9FItK6Qci_ELMi!@mK&9qo1NELE>n4zHDU?N>FGM*VqMQy^b)xu Tw4-i?A$;v({WY-R{@D8uoyYrP literal 2591 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 F007EyCPn}N delta 157 zcmeAPIUmGz>ff$?3=9k=jFKC<0>vj!5N~AT=V9b#6qqc)p)}c2LWxmma*TuxqwwUJ z5+#gsoB1TW_!)U7D{6`|@=i9?5Si?)Dagj>Bg`ncVe&%_VMejZWty5m)rGQRDvTlw xyg;)p7#JCtfHaFRqv!@8&BP!BB-wzX42&|9Z)wU4i-ANL#Tk?!;*1gu3;-5C8{Gf^ From 9330674234e3cb09e34da13e324058565f95af2f Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 7 Oct 2016 11:37:13 -0400 Subject: [PATCH 53/57] fixed deficiency list header --- .../WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp | 1 + WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp | 1 + 2 files changed, 2 insertions(+) diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp index 53d06b4..317bb4a 100644 --- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp @@ -51,6 +51,7 @@ Deficiency Type Description + diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp index b28cce7..50671b6 100644 --- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp @@ -52,6 +52,7 @@ Deficiency Type Description + From b0894cf0a046929c8d9afefc0f77537588813d36 Mon Sep 17 00:00:00 2001 From: Kirk Moreton Date: Fri, 7 Oct 2016 11:59:43 -0400 Subject: [PATCH 54/57] Added help page --- WebContent/WEB-INF/jsps/help.jsp | 76 ++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 WebContent/WEB-INF/jsps/help.jsp diff --git a/WebContent/WEB-INF/jsps/help.jsp b/WebContent/WEB-INF/jsps/help.jsp new file mode 100644 index 0000000..951e353 --- /dev/null +++ b/WebContent/WEB-INF/jsps/help.jsp @@ -0,0 +1,76 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="security" + uri="http://www.springframework.org/security/tags"%> + + + + + + + + + + + + + + +aBode + + + +

Help

+ +
+ Select link to ask questions here: Send Mail +
+

Abode Contact # 647-232-2699

+

Times Group Inc # (905) 940-6286

+ + + + + + + + \ No newline at end of file From b86bc8c089e5ef696b71bc0dae653ecf72f51530 Mon Sep 17 00:00:00 2001 From: perds Date: Fri, 7 Oct 2016 12:18:30 -0400 Subject: [PATCH 55/57] added some formatting to the help page --- WebContent/WEB-INF/jsps/help.jsp | 103 +++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 27 deletions(-) diff --git a/WebContent/WEB-INF/jsps/help.jsp b/WebContent/WEB-INF/jsps/help.jsp index 951e353..5163303 100644 --- a/WebContent/WEB-INF/jsps/help.jsp +++ b/WebContent/WEB-INF/jsps/help.jsp @@ -31,34 +31,83 @@ -

Help

- +
  • + Home enrolment number will not generate data +
    • + +
    +
    +
  • + Next button is not functioning +
    • + + +
    +
    +
  • + No Deficiencies displaying +
    • + + +
    Select link to ask questions here: Date: Fri, 7 Oct 2016 12:28:00 -0400 Subject: [PATCH 56/57] Good to go --- WebContent/WEB-INF/jsps/pdiReport.jsp | 332 ++++++++++-------- WebContent/WEB-INF/jsps/selectReport.jsp | 10 +- .../ca/sheridancollege/beans/Form.class | Bin 3356 -> 3565 bytes .../controllers/HomeController.class | Bin 10575 -> 10764 bytes 4 files changed, 190 insertions(+), 152 deletions(-) diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp index 5ed4339..1f3182f 100644 --- a/WebContent/WEB-INF/jsps/pdiReport.jsp +++ b/WebContent/WEB-INF/jsps/pdiReport.jsp @@ -28,41 +28,56 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + + Tarion PDI Form: ${unit.homeEnrollmentNumber} + +
    +
    -
    - +
    -
    -
    - - - - +
    + +
    -
    +
    -
    - -
    - +
    TARION Pre-Delivery Inspection Form
    - +
    @@ -71,193 +86,208 @@ - -
    #Description:
    - -
    ${deficiency.id} + ${deficiency.location} + ${deficiency.description} - -
    + + + + ${unitDeficiency.id} + ${unitDeficiency.location} + ${unitDeficiency.category} + ${unitDeficiency.description} + + + + + -
    +
    -
    - -
    - - - -
    - + +
    + +
    + +
    + +
    - - -
    - - +
    + +
    - - -
    +
    + - + id="lotNumber" value="${unit.lotNumber}" required="required" type="text" />
    - - - -
    +
    + + placeholder="" required="required" type="text" value="${unit.plan}" />
    - - -
    +
    + - + id="municipality" value="${unit.municipality}" required="required" type="text" />
    - - -
    + +
    + + id="condoProjName" value="${unit.projectName}" required="required" + type="text" />
    - - -
    +
    + + placeholder="" required="required" type="text" + value="${unit.level}" />
    - + -
    +
    + + placeholder="" required="required" type="text" + value="${unit.unitNum}" />
    - -
    + +
    + + id="homeCivicAddress" placeholder="" required="required" + type="text" value="${unit.address}" />
    - -
    + +
    + + id="venBuildName" placeholder="" required="required" type="text" + value="${builder.builderName}" />
    - -
    - + +
    + +
    +
    + +
    +
    +
    + + +
    - -
    + -
    -
    -
    - +
    -
    - - - - +
    +
    + + +
    + + + + +
    +
    + + - - Back + + + Back + + + Done +
    + +
    +
    \ No newline at end of file diff --git a/WebContent/WEB-INF/jsps/selectReport.jsp b/WebContent/WEB-INF/jsps/selectReport.jsp index aa37986..fbe83b4 100644 --- a/WebContent/WEB-INF/jsps/selectReport.jsp +++ b/WebContent/WEB-INF/jsps/selectReport.jsp @@ -28,7 +28,15 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + Tarion Report Selection @@ -42,7 +50,7 @@ Report Selection
    -
    +
    diff --git a/target/classes/ca/sheridancollege/beans/Form.class b/target/classes/ca/sheridancollege/beans/Form.class index f0c76175d62cb6df5053f0ceebe09a71594ec165..3b3f61623d21bcb6846e9b81e874420347fbf7cb 100644 GIT binary patch literal 3565 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 Q4UF3u-8Ma^Z`;)T7f*jC-T(jq diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class index 40b0c87edf7abec24ec7e0a13a3a3c6b386b37dc..cad25577c58807918da18c833bfb27d327ffef08 100644 GIT binary patch delta 234 zcmX>f)DyyW>ff$?3=9k=jM5vq0>ybb(^E@4a}(23jTjl!CeIgBVbV9694X$+Cdk9c z%P2HifJ13Ai-Z!R$Yga18%EK|DH0`&@|$l;bn#EVt**exGkKwu$YcQxWmXXeE}*o9 zhNdJhBOe1ZgA&jZJ_bexWgu3GW?(F4Qgc-#VTG)W142(*XWi{o6B|ru-N`h?!iUSQ| F007EyCPn}N delta 157 zcmeAPIUmGz>ff$?3=9k=jFKC<0>vj!5N~AT=V9b#6qqc)p)}c2LWxmma*TuxqwwUJ z5+#gsoB1TW_!)U7D{6`|@=i9?5Si?)Dagj>Bg`ncVe&%_VMejZWty5m)rGQRDvTlw xyg;)p7#JCtfHaFRqv!@8&BP!BB-wzX42&|9Z)wU4i-ANL#Tk?!;*1gu3;-5C8{Gf^ From 969c687af81029119776bc6ba2ca092444e9dffd Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Fri, 7 Oct 2016 12:31:08 -0400 Subject: [PATCH 57/57] styling --- WebContent/WEB-INF/jsps/addSignOff.jsp | 2 +- .../jsps/displayConstructionPersonnel.jsp | 22 ++++++++++++- WebContent/WEB-INF/jsps/selectReport.jsp | 14 ++++++-- WebContent/WEB-INF/jsps/workOrderHome.jsp | 33 +++++++++++++++++-- 4 files changed, 65 insertions(+), 6 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index bac12d6..1723fc3 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -121,7 +121,7 @@
    -





    +

    * Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf

    diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp index efd5fe4..d80624d 100644 --- a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp +++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp @@ -25,6 +25,26 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + aBode @@ -34,7 +54,7 @@
    - ${constructionPersonnel.name} + ${constructionPersonnel.name}
    diff --git a/WebContent/WEB-INF/jsps/selectReport.jsp b/WebContent/WEB-INF/jsps/selectReport.jsp index aa37986..a6f0892 100644 --- a/WebContent/WEB-INF/jsps/selectReport.jsp +++ b/WebContent/WEB-INF/jsps/selectReport.jsp @@ -28,6 +28,16 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + Tarion Report Selection @@ -42,7 +52,7 @@ Report Selection
    -
    +
    @@ -65,7 +75,7 @@ - Next + Next
    diff --git a/WebContent/WEB-INF/jsps/workOrderHome.jsp b/WebContent/WEB-INF/jsps/workOrderHome.jsp index 673c09a..78b6b50 100644 --- a/WebContent/WEB-INF/jsps/workOrderHome.jsp +++ b/WebContent/WEB-INF/jsps/workOrderHome.jsp @@ -25,18 +25,47 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + aBode
    + Work Order Selections
    Sort By: - Projects + Projects - Contractors + Contractors