Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java,v
diff -u -r1.1.10.3 -r1.1.10.4
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java	24 Nov 2016 11:26:37 -0000	1.1.10.3
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java	24 Jan 2017 12:06:02 -0000	1.1.10.4
@@ -26,13 +26,15 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.lamsfoundation.lams.dao.IBaseDAO;
+
 /**
  * Data Access Object (DAO) interface. This is an interface used to tag our DAO classes and to provide common methods to
  * all DAOs.
  *
  * @author Andrey Balan
  */
-public interface DAO {
+public interface DAO extends IBaseDAO {
 
     /**
      * Generic method used to get all objects of a particular type. This is the same as lookup up all rows in a table.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.48.2.41 -r1.48.2.42
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	11 Jan 2017 08:57:32 -0000	1.48.2.41
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	24 Jan 2017 12:06:02 -0000	1.48.2.42
@@ -477,7 +477,7 @@
 	    }
 	}
 
-	assessmentResultDao.saveObject(result);
+	assessmentResultDao.insert(result);
     }
 
     /*
@@ -572,7 +572,7 @@
 	    result.setMaximumGrade(maximumGrade);
 	    result.setGrade(grade);
 	    result.setFinishDate(new Timestamp(new Date().getTime()));
-	    assessmentResultDao.saveObject(result);
+	    assessmentResultDao.update(result);
 	}
 
 	return true;
@@ -2373,22 +2373,23 @@
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	AssessmentUser learner = getUserByIDAndSession(learnerId, toolSessionId);
-	if ( learner == null ) {
+	if (learner == null) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
-	} 
-	
+	}
+
 	Assessment assessment = getAssessmentBySessionId(toolSessionId);
-	List<AssessmentResult> results = assessmentResultDao.getAssessmentResults(assessment.getUid(), learner.getUserId());
+	List<AssessmentResult> results = assessmentResultDao.getAssessmentResults(assessment.getUid(),
+		learner.getUserId());
 	Date startDate = null;
 	Date finishDate = null;
-	for ( AssessmentResult result: results ) {
-	    if ( startDate == null || ( result.getStartDate()  != null && result.getStartDate().before(startDate)) )
+	for (AssessmentResult result : results) {
+	    if (startDate == null || (result.getStartDate() != null && result.getStartDate().before(startDate)))
 		startDate = result.getStartDate();
-	    if ( finishDate == null || ( result.getFinishDate()  != null && result.getFinishDate().after(finishDate)) )
+	    if (finishDate == null || (result.getFinishDate() != null && result.getFinishDate().after(finishDate)))
 		finishDate = result.getFinishDate();
 	}
 
-	if ( learner.isSessionFinished()  )
+	if (learner.isSessionFinished())
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, finishDate);
 	else
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);