Skip to content

Commit 2bf1264

Browse files
arunkpatraarunkpatra
committed
Merge pull request #2 from arunkpatra/redesign
Merging redesign branch.
2 parents 3ab4f97 + 43898cd commit 2bf1264

File tree

154 files changed

+5252
-4088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+5252
-4088
lines changed

‎pom.xml‎

Lines changed: 105 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,28 @@
3838
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
3939
<properties>
4040
<apache.commons.lang3.version>3.1</apache.commons.lang3.version>
41-
<apache.dbcp.version>1.2.2</apache.dbcp.version>
42-
<commons.collections.version>3.2</commons.collections.version>
43-
<derby.client.version>10.10.1.1</derby.client.version>
44-
<hibernate.version>3.6.10.Final</hibernate.version>
45-
<java.version>1.7</java.version>
41+
<apache.dbcp.version>1.2.2</apache.dbcp.version>
42+
<bootstrap.version>3.1.0</bootstrap.version>
43+
<!-- <bootstrap.version>3.0.2</bootstrap.version> -->
44+
<commons.collections.version>3.2</commons.collections.version>
45+
<copyright.year>2014</copyright.year>
46+
<derby.client.version>10.10.1.1</derby.client.version>
47+
<hibernate.version>3.6.10.Final</hibernate.version>
48+
<java.version>1.7</java.version>
4649
<javax.mail.version>1.4.3</javax.mail.version>
47-
<jasperreports.version>5.5.0</jasperreports.version>
48-
<junit.version>4.11</junit.version>
50+
<jasperreports.version>5.5.0</jasperreports.version>
51+
<jquery.version>2.1.0</jquery.version>
52+
<!-- <jquery.version>1.8.3</jquery.version> -->
53+
<junit.version>4.11</junit.version>
4954
<maven.jacoco.version>0.6.4.201312101107</maven.jacoco.version>
50-
<mojarra-version>2.1.7</mojarra-version>
51-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<primefaces-version>3.1.1</primefaces-version>
55+
<!-- <mojarra-version>2.1.7</mojarra-version> -->
56+
<mojarra-version>2.2.4</mojarra-version>
57+
<omnifaces.version>1.6.3</omnifaces.version>
58+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59+
<primefaces-version>4.0</primefaces-version>
5360
<springframework-version>4.0.0.RELEASE</springframework-version>
54-
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
55-
<!-- <springsecurity-version>3.2.1.CI-SNAPSHOT</springsecurity-version> -->
56-
<slf4j-version>1.5.10</slf4j-version>
61+
<springsecurity-version>3.2.0.RELEASE</springsecurity-version>
62+
<slf4j-version>1.5.10</slf4j-version>
5763
<velocity.version>1.7</velocity.version>
5864
<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
5965
</properties>
@@ -83,8 +89,34 @@
8389
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
8490
<!-- - - - - - - - - - - - - - DEPENDENCIES - - - - - - - - - - - -. -->
8591
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
92+
93+
<dependencyManagement>
94+
<dependencies>
95+
<dependency>
96+
<groupId>org.webjars</groupId>
97+
<artifactId>bootstrap</artifactId>
98+
<version>${bootstrap.version}</version>
99+
</dependency>
100+
</dependencies>
101+
</dependencyManagement>
102+
86103
<dependencies>
104+
<dependency>
105+
<groupId>org.webjars</groupId>
106+
<artifactId>font-awesome</artifactId>
107+
<version>4.0.3</version>
108+
</dependency>
87109

110+
<dependency>
111+
<groupId>org.omnifaces</groupId>
112+
<artifactId>omnifaces</artifactId>
113+
<version>${omnifaces.version}</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>javax.servlet</groupId>
117+
<artifactId>jstl</artifactId>
118+
<version>1.2</version>
119+
</dependency>
88120
<dependency>
89121
<groupId>org.apache.velocity</groupId>
90122
<artifactId>velocity</artifactId>
@@ -221,12 +253,53 @@
221253
<artifactId>jsf-impl</artifactId>
222254
<version>${mojarra-version}</version>
223255
</dependency>
256+
<!-- <dependency> -->
257+
<!-- <groupId>org.primefaces</groupId> -->
258+
<!-- <artifactId>primefaces</artifactId> -->
259+
<!-- <version>${primefaces-version}</version> -->
260+
<!-- </dependency> -->
224261
<dependency>
225-
<groupId>org.primefaces</groupId>
226-
<artifactId>primefaces</artifactId>
227-
<version>${primefaces-version}</version>
262+
<groupId>org.primefaces.themes</groupId>
263+
<artifactId>bootstrap</artifactId>
264+
<version>1.0.10</version>
228265
</dependency>
229-
266+
<!-- Add Bootstrap via WebJars -->
267+
<dependency>
268+
<groupId>org.webjars</groupId>
269+
<artifactId>bootstrap</artifactId>
270+
</dependency>
271+
<dependency>
272+
<groupId>org.webjars</groupId>
273+
<artifactId>bootstrap-datepicker</artifactId>
274+
<version>1.3.0</version>
275+
</dependency>
276+
<dependency>
277+
<groupId>org.webjars</groupId>
278+
<artifactId>jquery</artifactId>
279+
<version>${jquery.version}</version>
280+
</dependency>
281+
<dependency>
282+
<groupId>org.webjars</groupId>
283+
<artifactId>bootswatch-spacelab</artifactId>
284+
<version>3.1.0</version>
285+
</dependency>
286+
<dependency>
287+
<groupId>org.webjars</groupId>
288+
<artifactId>bootswatch-flatly</artifactId>
289+
<version>3.1.0</version>
290+
</dependency>
291+
<dependency>
292+
<groupId>org.webjars</groupId>
293+
<artifactId>jquery-cookie</artifactId>
294+
<!-- <version>1.3.1</version> -->
295+
<version>1.4.0</version>
296+
</dependency>
297+
<!-- Downgrade jQuery so it works with HtmlUnit -->
298+
<!-- <dependency> -->
299+
<!-- <groupId>org.webjars</groupId> -->
300+
<!-- <artifactId>jquery</artifactId> -->
301+
<!-- <version>1.8.3</version> -->
302+
<!-- </dependency> -->
230303
<dependency>
231304
<groupId>jasperreports</groupId>
232305
<artifactId>jasperreports</artifactId>
@@ -353,6 +426,12 @@
353426
<!-- - - - - - - - - - - - - - BUILD - - - - - - - - - - - - - - - - -->
354427
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
355428
<build>
429+
<resources>
430+
<resource>
431+
<directory>src/main/resources</directory>
432+
<filtering>true</filtering>
433+
</resource>
434+
</resources>
356435
<finalName>expense-tracker</finalName>
357436
<plugins>
358437
<plugin>
@@ -430,21 +509,21 @@
430509
</goals>
431510
<configuration>
432511
<rules>
433-
<!-- <DependencyConvergence> -->
434-
<!-- <uniqueVersions>false</uniqueVersions> -->
435-
<!-- </DependencyConvergence> -->
512+
<!-- <DependencyConvergence> -->
513+
<!-- <uniqueVersions>false</uniqueVersions> -->
514+
<!-- </DependencyConvergence> -->
436515
<requireMavenVersion>
437-
<!-- <version>3.1.1</version> -->
516+
<!-- <version>3.1.1</version> -->
438517
<version>3.0.1</version>
439518
</requireMavenVersion>
440519
<requireJavaVersion>
441520
<version>1.7</version>
442521
</requireJavaVersion>
443-
<!-- <requireOS> -->
444-
<!-- <family>unix</family> -->
445-
<!-- <family>windows</family> -->
446-
<!-- <family>mac</family> -->
447-
<!-- </requireOS> -->
522+
<!-- <requireOS> -->
523+
<!-- <family>unix</family> -->
524+
<!-- <family>windows</family> -->
525+
<!-- <family>mac</family> -->
526+
<!-- </requireOS> -->
448527
</rules>
449528
</configuration>
450529
</execution>

‎src/main/java/com/exp/tracker/data/entities/ExpenseEntity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import javax.persistence.NamedQuery;
3333
import javax.persistence.OneToMany;
3434
import javax.persistence.Table;
35+
import javax.persistence.Temporal;
36+
import javax.persistence.TemporalType;
3537

3638
@Entity
3739
@Table(name = "et_expense")
@@ -85,6 +87,7 @@ public class ExpenseEntity implements Serializable
8587

8688
private float amount;
8789

90+
@Temporal(TemporalType.TIMESTAMP)
8891
private Date date;
8992

9093
private String description;

‎src/main/java/com/exp/tracker/data/entities/ReportEntity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import javax.persistence.NamedQueries;
2828
import javax.persistence.NamedQuery;
2929
import javax.persistence.Table;
30+
import javax.persistence.Temporal;
31+
import javax.persistence.TemporalType;
3032

3133
@Entity
3234
@Table(name = "et_reports")
@@ -47,6 +49,7 @@ public class ReportEntity implements Serializable
4749
private Long id;
4850

4951
@Column(name = "createddate")
52+
@Temporal(TemporalType.TIMESTAMP)
5053
private Date createdDate;
5154

5255
@Column(name = "reportcontent")

‎src/main/java/com/exp/tracker/data/entities/SettlementEntity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import javax.persistence.NamedQuery;
3131
import javax.persistence.OneToMany;
3232
import javax.persistence.Table;
33+
import javax.persistence.Temporal;
34+
import javax.persistence.TemporalType;
3335

3436
@Entity
3537
@Table(name = "et_settlement")
@@ -83,18 +85,22 @@ public class SettlementEntity implements Serializable
8385
private Long id;
8486

8587
@Column(name = "cyclestartdate")
88+
@Temporal(TemporalType.TIMESTAMP)
8689
private Date startDate;
8790

8891
@Column(name = "cycleenddate")
92+
@Temporal(TemporalType.TIMESTAMP)
8993
private Date endDate;
9094

9195
@Column(name = "volume")
9296
private float volume;
9397

9498
@Column(name = "createddate")
99+
@Temporal(TemporalType.TIMESTAMP)
95100
private Date createdDate;
96101

97102
@Column(name = "closeddate")
103+
@Temporal(TemporalType.TIMESTAMP)
98104
private Date closedDate;
99105

100106
// @Column(name="reportpdf")

‎src/main/java/com/exp/tracker/data/entities/UserEntity.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import javax.persistence.NamedQuery;
3131
import javax.persistence.OneToMany;
3232
import javax.persistence.Table;
33+
import javax.persistence.Temporal;
34+
import javax.persistence.TemporalType;
3335

3436
@Entity
3537
@Table(name = "users")
@@ -78,11 +80,16 @@ public class UserEntity extends EncryptionHelper implements Serializable
7880
private String middleInit;
7981

8082
@Column(name = "createddate")
83+
@Temporal(TemporalType.TIMESTAMP)
8184
private Date createdDate;
8285

8386
@Column(name = "lastupdateddate")
87+
@Temporal(TemporalType.TIMESTAMP)
8488
private Date lastUpdatedDate;
8589

90+
@Column(name = "phonenumber")
91+
private String phoneNumber;
92+
8693
private String creditCardNumber;
8794

8895
@OneToMany(targetEntity = AuthEntity.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "user")
@@ -198,7 +205,15 @@ public void setLastUpdatedDate(Date lastUpdatedDate)
198205
this.lastUpdatedDate = lastUpdatedDate;
199206
}
200207

201-
public int getPasswordChangeNeeded()
208+
public String getPhoneNumber() {
209+
return phoneNumber;
210+
}
211+
212+
public void setPhoneNumber(String phoneNumber) {
213+
this.phoneNumber = phoneNumber;
214+
}
215+
216+
public int getPasswordChangeNeeded()
202217
{
203218
return passwordChangeNeeded;
204219
}

‎src/main/java/com/exp/tracker/data/entities/UserSettlementEntity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import javax.persistence.NamedQueries;
3030
import javax.persistence.NamedQuery;
3131
import javax.persistence.Table;
32+
import javax.persistence.Temporal;
33+
import javax.persistence.TemporalType;
3234

3335
@Entity
3436
@Table(name = "et_user_settlement")
@@ -61,6 +63,7 @@ public class UserSettlementEntity implements Serializable
6163
private String userName;
6264

6365
@Column(name = "setteleddate")
66+
@Temporal(TemporalType.TIMESTAMP)
6467
private Date settledDate;
6568

6669
@Column(name = "usershare")

‎src/main/java/com/exp/tracker/data/model/ExpenseDetail.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.io.Serializable;
1919
import java.util.ArrayList;
20-
import java.util.Calendar;
2120
import java.util.Date;
2221
import java.util.List;
2322

@@ -39,8 +38,8 @@ public class ExpenseDetail implements Serializable
3938
private static final long serialVersionUID = 1L;
4039

4140
public ExpenseDetail() {
42-
Calendar calendar = Calendar.getInstance();
43-
setDate(calendar.getTime());
41+
//Calendar calendar = Calendar.getInstance();
42+
// setDate(calendar.getTime());
4443
setUserShares(new ArrayList<UserShare>());
4544
}
4645

‎src/main/java/com/exp/tracker/data/model/ExpenseSearchCriteria.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void validateEnterExpenseSearchCriteria(ValidationContext context)
7373
if (getStartDate().after(getEndDate())) {
7474
MessageContext messages = context.getMessageContext();
7575
messages.addMessage(new MessageBuilder().error()
76-
.code("startdate.lessthan.enddate").build());
76+
.code("enddate.lessthan.startdate").build());
7777
}
7878
}
7979

‎src/main/java/com/exp/tracker/data/model/SettlementBean.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,20 @@ public class SettlementBean implements Serializable
4646
private List<UserSettlementBean> userSettlementList;
4747

4848
public SettlementBean() {
49-
49+
// setEndDate(null);
50+
// setStartDate(null);
51+
}
52+
53+
public void clear() {
54+
this.setSettlementFlag(0);
55+
this.setId(null);
56+
this.setStartDate(null);
57+
this.setEndDate(null);
58+
this.setCreatedDate(null);
59+
this.setClosedDate(null);
60+
this.setVolume(0.0f);
61+
this.setAccountManager(null);
5062
}
51-
5263
public SettlementBean(SettlementEntity se) {
5364
setId(se.getId());
5465
setEndDate(se.getEndDate());

0 commit comments

Comments
 (0)