diff --git a/pom.xml b/pom.xml
index d810a16..6b1748a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,10 @@
spring-boot-starter-tomcat
provided
+
+ org.springframework.boot
+ spring-boot-devtools
+
org.springframework.boot
spring-boot-starter-security
diff --git a/src/main/java/fr/plil/sio/web/mvc/Dette.java b/src/main/java/fr/plil/sio/web/mvc/Dette.java
index ac2ea28..268e7d0 100644
--- a/src/main/java/fr/plil/sio/web/mvc/Dette.java
+++ b/src/main/java/fr/plil/sio/web/mvc/Dette.java
@@ -16,42 +16,17 @@ public class Dette {
@ManyToOne(optional = false)
- private User dueToUser;
+ private User creditor;
@ManyToOne(optional = false)
- private User holderOfDebt;
-
- public Double getSommeDette() {
- return sommeDette;
- }
-
- public void setSommeDette(Double sommeDette) {
- this.sommeDette = sommeDette;
- }
-
+ private User borrower;
- public User getDueToUser() {
- return dueToUser;
- }
-
- public void setDueToUser(User dueToUser) {
- this.dueToUser = dueToUser;
- }
-
- public User getHolderOfDebt() {
- return holderOfDebt;
- }
-
- public void setHolderOfDebt(User holderOfDebt) {
- this.holderOfDebt = holderOfDebt;
- }
-
-
-
@Override
public int hashCode() {
- int hash = 5;
- hash = 71 * hash + Objects.hashCode(this.sommeDette);
+ int hash = 7;
+ hash = 97 * hash + Objects.hashCode(this.sommeDette);
+ hash = 97 * hash + Objects.hashCode(this.creditor);
+ hash = 97 * hash + Objects.hashCode(this.borrower);
return hash;
}
@@ -64,18 +39,45 @@ public class Dette {
return false;
}
final Dette other = (Dette) obj;
+ if (!Objects.equals(this.id, other.id)) {
+ return false;
+ }
if (!Objects.equals(this.sommeDette, other.sommeDette)) {
return false;
}
- if (!Objects.equals(this.dueToUser, other.dueToUser)) {
+ if (!Objects.equals(this.creditor, other.creditor)) {
return false;
}
- if (!Objects.equals(this.holderOfDebt, other.holderOfDebt)) {
+ if (!Objects.equals(this.borrower, other.borrower)) {
return false;
}
return true;
}
+ public User getCreditor() {
+ return creditor;
+ }
+
+ public void setCreditor(User creditor) {
+ this.creditor = creditor;
+ }
+
+ public User getBorrower() {
+ return borrower;
+ }
+
+ public void setBorrower(User borrower) {
+ this.borrower = borrower;
+ }
+
+ public Double getSommeDette() {
+ return sommeDette;
+ }
+
+ public void setSommeDette(Double sommeDette) {
+ this.sommeDette = sommeDette;
+ }
+
diff --git a/src/main/java/fr/plil/sio/web/mvc/UserRestController.java b/src/main/java/fr/plil/sio/web/mvc/UserRestController.java
index b4df38f..9eaccfa 100644
--- a/src/main/java/fr/plil/sio/web/mvc/UserRestController.java
+++ b/src/main/java/fr/plil/sio/web/mvc/UserRestController.java
@@ -25,13 +25,13 @@ public class UserRestController {
return userService.findByUsername(username);
}
- @RequestMapping(value = "/api/debts/{username}/", method = RequestMethod.GET)
- public List listDettes(@PathVariable String username) {
- return userService.findDettesByUsername(username);
+ @RequestMapping(value = "/api/debts/", method = RequestMethod.GET)
+ public List listDettes() {
+ return userService.findDettes();
}
@RequestMapping(value = "/api/addDette/", method = RequestMethod.POST)
- public boolean addDette(@RequestParam(value="username",required=false) String username,@RequestParam(value="sommeDette",required=false) String sommeDette) {
+ public Dette addDette(@RequestParam(value="username",required=false) String username,@RequestParam(value="sommeDette",required=false) String sommeDette) {
return userService.addDette(username,sommeDette);
}
diff --git a/src/main/java/fr/plil/sio/web/mvc/UserService.java b/src/main/java/fr/plil/sio/web/mvc/UserService.java
index 756c762..0fb17a3 100644
--- a/src/main/java/fr/plil/sio/web/mvc/UserService.java
+++ b/src/main/java/fr/plil/sio/web/mvc/UserService.java
@@ -9,9 +9,9 @@ public interface UserService {
User findByUsername(String username);
- List findDettesByUsername(String username);
+ List findDettes();
List findAll();
- boolean addDette(String username,String sommeDette);
+ Dette addDette(String username,String sommeDette);
}
diff --git a/src/main/webapp/WEB-INF/pages/viewUsers.jsp b/src/main/webapp/WEB-INF/pages/viewUsers.jsp
index f436446..103ed2e 100644
--- a/src/main/webapp/WEB-INF/pages/viewUsers.jsp
+++ b/src/main/webapp/WEB-INF/pages/viewUsers.jsp
@@ -7,13 +7,17 @@
+
+
+
+
+
diff --git a/src/main/webapp/js/kawafile.js b/src/main/webapp/js/kawafile.js
index a70d6b1..d2e48a9 100644
--- a/src/main/webapp/js/kawafile.js
+++ b/src/main/webapp/js/kawafile.js
@@ -1,11 +1,16 @@
var debtsOfUser = [];
-function getDebtsOfUser(username){
- var url = "/api/userDebts"+username;
-
- $.getJson(url,function(d){
- debtsOfUser = d;
+function getDebtsOfUser(){
+ var url = "/api/debts/";
+ var html ="";
+ $.getJSON(url,function(d){
+ html+="";
+ $.each(d,function(index,item){
+ html+="- "+item.holderOfDebt.username+"
";
+ html+="- "+item.sommeDette+"
";
+ });
});
+ $("#dettes").html(html);
}
function updateDebtOfUser(){
@@ -36,13 +41,17 @@ function updateDebtOfUser(){
$.ajax({
url:url,
method:"POST",
- data:requestData
+ data:requestData,
+ async:false,
}).done(function(d){
alert("Ok");
+ getDebtsOfUser();
}).success(function(d){
- console.log(d);
+ getDebtsOfUser();
+ }).fail(function(d){
+ alert("Erreur");
});
-//
+ getDebtsOfUser();
}
@@ -50,7 +59,7 @@ function updateDebtOfUser(){
'use strict';
-
+ getDebtsOfUser();
})();
--
libgit2 0.21.2