Bastantes arreglos

plutec · Dec 22, 2011 · 7a9c1e1 · 7a9c1e1
1 parent 297ea92
commit 7a9c1e1
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 45 deletions.
diff --git a/MFF/src/java/MFF/Controller/RatingController.java b/MFF/src/java/MFF/Controller/RatingController.java
@@ -21,6 +21,8 @@ public RatingController() {
 	public HashMap<String, Object> call(String action, HashMap parameters) {
 		if (action.equals("rate")) {
 			return this.rate(parameters);
+		} else if(action.equals("delete")) {
+			return this.delete(parameters);
 		} else if(action.equals("getBestRatedFilms")) {
 			return this.getBestRatedFilms(parameters);
 		}
@@ -34,6 +36,13 @@ protected HashMap<String, Object> rate(HashMap<String, Object> parameters) {
 		model.rate(u, f, rate);
 		return toRet;
 	}
+	protected HashMap<String, Object> delete(HashMap<String, Object> parameters) {
+		HashMap<String, Object> toRet=new HashMap<String, Object>();
+		Film f = new Film(Integer.parseInt((String)parameters.get("film")), "", 0);
+		User u = new User((String)parameters.get("sessionUserID"), "", false);
+		model.deleteRating(u, f);
+		return toRet;
+	}
 	protected HashMap<String, Object> getBestRatedFilms(HashMap<String, Object> parameters) {
 		HashMap<String, Object> toRet=new HashMap<String, Object>();
 		int max=10; //Máximo de películas a devolver

diff --git a/MFF/src/java/MFF/Controller/UserController.java b/MFF/src/java/MFF/Controller/UserController.java
@@ -9,8 +9,6 @@
 import MFF.Exceptions.NotLoginUser;
 import MFF.Model.*;
 import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *

diff --git a/MFF/src/java/MFF/Model/DAO/DAOFilm.java b/MFF/src/java/MFF/Model/DAO/DAOFilm.java
@@ -55,21 +55,21 @@ public ArrayList<Film> search(String s) {
 		return null;
 	}
 	public void insert(Film f) {
-	    try {
-		String sql = "INSERT INTO film(title, year) VALUES(?, ?);";
-		PreparedStatement query = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
-		query.setString(1, f.getTitle());
-		query.setInt(2, f.getYear());
-		query.executeUpdate();
-		ResultSet res=query.getGeneratedKeys();
-		int id = -1;
-		while(res.next())
-		    id=res.getInt(1);
-		f.setId(id);
-	    } catch (SQLException ex) {
-		    Logger.getLogger(DAOFilm.class.getName()).log(Level.SEVERE, null, ex);
-	    }
-    }
+		try {
+			String sql = "INSERT INTO film(title, year) VALUES(?, ?);";
+			PreparedStatement query = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+			query.setString(1, f.getTitle());
+			query.setInt(2, f.getYear());
+			query.executeUpdate();
+			ResultSet res=query.getGeneratedKeys();
+			int id = -1;
+			while(res.next())
+				id=res.getInt(1);
+			f.setId(id);
+		} catch (SQLException ex) {
+			Logger.getLogger(DAOFilm.class.getName()).log(Level.SEVERE, null, ex);
+		}
+	}
 	public void update(Film f) {
 		try {
 			String sql = "UPDATE film SET title = ?, year = ? WHERE id=?";

diff --git a/MFF/src/java/MFF/Model/DAO/DAORating.java b/MFF/src/java/MFF/Model/DAO/DAORating.java
@@ -50,6 +50,17 @@ public void update(User u, Film f, Rating r) {
 		}
 
 	}
+	public void delete(User u, Film f) {
+		try {
+			String sql = "DELETE FROM ratings WHERE user_id=? AND film_id=?";
+			PreparedStatement query = connection.prepareStatement(sql);
+			query.setString(1, u.getId());
+			query.setInt(2, f.getId());
+			query.executeUpdate();
+		} catch (SQLException ex) {
+			Logger.getLogger(DAOFilm.class.getName()).log(Level.SEVERE, null, ex);
+		}
+	}
 	public Rating get(User u, Film f) {
 		try {
 			String sql = "SELECT rate, rate_date FROM ratings WHERE user_id=? AND film_id=?";

diff --git a/MFF/src/java/MFF/Model/DAO/DAOUser.java b/MFF/src/java/MFF/Model/DAO/DAOUser.java
@@ -37,10 +37,10 @@ public void insert(User u) throws DuplicateUser {
 			int isAdmin=0;
 			if (u.getIsAdmin()) { isAdmin=1; }
 			query.setInt(3, isAdmin);
-			if (query.executeUpdate() == 0)
-				throw new DuplicateUser(); // TODO: Puede que no se inserte por algún otro motivo que no sea que está duplicado.
+			query.executeUpdate();
 		} catch (SQLException ex) {
 			Logger.getLogger(DAOUser.class.getName()).log(Level.SEVERE, null, ex); // TODO: Puede dar un fallo de SQL, habría que definir alguna excepción para esto.
+			throw new DuplicateUser(); // TODO: Puede que no se inserte por algún otro motivo que no sea que está duplicado.
 		}
 	}
 	public Boolean validate(User u) {

diff --git a/MFF/src/java/MFF/Model/RSManagement.java b/MFF/src/java/MFF/Model/RSManagement.java
@@ -85,6 +85,10 @@ public Rating getRate(User u, Film f) {
 		DAORating dR = new DAORating();
 		return dR.get(u, f);
 	}
+	public void deleteRating(User u, Film f) {
+		DAORating dR = new DAORating();
+		dR.delete(u, f);
+	}
 	public ArrayList<Film> getRecommendations(User u, int n) {
 		return null;
 	}

diff --git a/MFF/src/java/MFF/Model/Similarity.java b/MFF/src/java/MFF/Model/Similarity.java
@@ -11,28 +11,28 @@
  * @date 13-dic-2011
  */
 public class Similarity {
-    float likeness;
-    Film film1;
-    Film film2;
-    public Similarity(Film film1, Film film2, float likeness) {
-	this.likeness=likeness;
-	this.film1=film1;
-	this.film2=film2;
-    }
-    public float getLikeness() {
-	return likeness;
-    }
-    public Film getFilm(int v) {
-	switch(v) {
-	    case 1: return film1;
-	    case 2: return film2;
-	    default: return null;
+	float likeness;
+	Film film1;
+	Film film2;
+	public Similarity(Film film1, Film film2, float likeness) {
+		this.likeness=likeness;
+		this.film1=film1;
+		this.film2=film2;
+	}
+	public float getLikeness() {
+		return likeness;
+	}
+	public Film getFilm(int v) {
+		switch(v) {
+			case 1: return film1;
+			case 2: return film2;
+			default: return null;
+		}
+	}
+	public Film getFilm1() {
+		return film1;
+	}
+	public Film getFilm2() {
+		return film2;
 	}
-    }
-    public Film getFilm1() {
-	return film1;
-    }
-    public Film getFilm2() {
-	return film2;
-    }
 }
diff --git a/MFF/web/css/style.css b/MFF/web/css/style.css
@@ -319,7 +319,7 @@ input.submit {
 	text-shadow:1px 1px 0px #660066;
 }
 
-input.submit:hover {
+input.submit:enabled:hover {
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #660066), color-stop(1, #cc66ff) );
 	background:-moz-linear-gradient( center top, #660066 5%, #cc66ff 100% );
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#660066', endColorstr='#cc66ff');

diff --git a/MFF/web/js/mff.js b/MFF/web/js/mff.js
@@ -58,7 +58,7 @@ $(document).ready(function() {
 		})
 	});
 
-	$('#searchFilmsInput').focusout(function() {
+	$('#searchResults').focusout(function() {
 		$('#searchResults').css("visibility", "hidden");
 	})
 
@@ -175,6 +175,20 @@ $(document).ready(function() {
 
 			}
 		})
-	})
+	});
+
+	$('#removeRateButton').click(function() {
+		$.ajax({
+			url: "index?c=Rating&a=delete&film=" + $('.film').data("id"),
+			success: function() {
+				for (i=1; i<=5; i++) {
+					$('.rateFilm' + i).css('background-position', 'bottom');
+				}
+			},
+			error: function() {
+
+			}
+		})
+	});
 
 });