Merge branch 'dev' of github.com:cvazquezlos/BREMS-Library-App into dev

cvazquezlos · Apr 22, 2017 · 70b0bea · 70b0bea
2 parents d98c0fb + a7be246
commit 70b0bea
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/backend/src/main/java/appSpring/model/Action.java b/backend/src/main/java/appSpring/model/Action.java
@@ -58,8 +58,6 @@ protected Action() {
 
 	public Action(Date dateLoanInit) {
 		this.dateLoanInit = dateLoanInit;
-		dateLoanReturn = new Date(0);
-		dateLoanGiven = new Date(0);
 	}
 
 	public Integer getID() {

diff --git a/backend/src/main/java/appSpring/service/LogicService.java b/backend/src/main/java/appSpring/service/LogicService.java
@@ -55,7 +55,7 @@ private boolean hasEnoughCopies(Resource resource) {
 	private boolean hasAnActiveAction(User user, Resource resource) {
 		List<Action> actions = user.getActions();
 		for (Action action : actions) {
-			if (action.getResource().getResource() == resource && action.getDateLoanReturn() == new Date(0)) {
+			if (action.getResource().getResource() == resource && action.getDateLoanReturn() == null) {
 				return true;
 			}
 		}
@@ -105,7 +105,7 @@ public Action getAction() {
 	}
 
 	private boolean deleteLoanAvaible(Action loan) {
-		return (loan.getDateLoanReturn() == new Date(0));
+		return (loan.getDateLoanReturn() == null);
 	}
 
 	public int deleteALoan(Action loan) {
@@ -143,11 +143,11 @@ public int createAnUser(User user) {
 	}
 
 	private boolean itIsPossibleToReturn(Action action) {
-		return ((action.getDateLoanGiven() != new Date(0)) && (action.getDateLoanReturn() == new Date(0)));
+		return ((action.getDateLoanGiven() != null) && (action.getDateLoanReturn() == null));
 	}
 
 	private boolean itIsPossibleToGive(Action action) {
-		return ((action.getDateLoanGiven() == new Date(0)) && (action.getDateLoanReturn() == new Date(0)));
+		return ((action.getDateLoanGiven() == null) && (action.getDateLoanReturn() == null));
 	}
 
 	public int addGiveDate(Action action, Date date) {
@@ -184,10 +184,10 @@ public int addReturnDate(Action action, Date date) {
 		List<Action> currentActions = actionService.findByUser(action.getUser());
 		for (Action currentAction : currentActions) {
 			Date date1 = currentAction.getDateLoanGiven();
-			if (date1 == new Date(0))
+			if (date1 == null)
 				continue;
 			Date date3 = currentAction.getDateLoanReturn();
-			if (date3 != new Date(0))
+			if (date3 != null)
 				continue;
 			date1.setMinutes(date1.getMinutes() + 1);
 			Date date2 = new Date();

diff --git a/backend/target/appSpring-0.0.1.jar b/backend/target/appSpring-0.0.1.jar
diff --git a/backend/target/appSpring-0.0.1.jar.original b/backend/target/appSpring-0.0.1.jar.original
diff --git a/backend/target/classes/appSpring/model/Action.class b/backend/target/classes/appSpring/model/Action.class
diff --git a/backend/target/classes/appSpring/service/LogicService.class b/backend/target/classes/appSpring/service/LogicService.class