Merge branch 'release/0.4.1'

HISTORY.md

@@ -1,3 +1,8 @@
+## 0.4.1 (2011-06-14)
+
+* Allowed negative scores on tests
+* Fixed bug on questions syncronization
+
 ## 0.4 (2011-06-13)
 
 * Added tests module

SWADroid/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="es.ugr.swad.swadroid"
-      android:installLocation="auto" android:versionCode="17" android:versionName="0.4">
+      android:installLocation="auto" android:versionName="0.4.1" android:versionCode="18">
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
          <activity android:name=".SWADMain"
                    android:label="@string/app_name"

SWADroid/src/es/ugr/swad/swadroid/model/Test.java

@@ -474,10 +474,6 @@ public class Test extends Model {
 				}
 			}
 			
-			if(score < 0) {
-				score = new Float(0);
-			}
-			
 			questionsScore.set(i, score*CORRECT_ANSWER_SCORE);
 			totalScore += score*CORRECT_ANSWER_SCORE;
 		}

SWADroid/src/es/ugr/swad/swadroid/model/TestAnswer.java

@@ -202,8 +202,6 @@ public class TestAnswer extends Model {
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
-		if (!super.equals(obj))
-			return false;
 		if (getClass() != obj.getClass())
 			return false;
 		TestAnswer other = (TestAnswer) obj;

SWADroid/src/es/ugr/swad/swadroid/model/TestQuestion.java

@@ -214,13 +214,26 @@ public class TestQuestion extends Model {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((answerType == null) ? 0 : answerType.hashCode());
-		result = prime * result + ((answers == null) ? 0 : answers.hashCode());
+		result = prime * result
+				+ ((answerType == null) ? 0 : answerType.hashCode());
+		result = prime * result + (int) (crsCod ^ (crsCod >>> 32));
 		result = prime * result + (shuffle ? 1231 : 1237);
 		result = prime * result + ((stem == null) ? 0 : stem.hashCode());
 		return result;
 	}
 
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		return true;
+	}
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */

SWADroid/src/es/ugr/swad/swadroid/model/TestTag.java

@@ -136,6 +136,20 @@ public class TestTag extends Model {
 		return result;
 	}
 
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		return true;
+	}
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */