Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.38 -r1.39
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	1 Mar 2006 04:38:29 -0000	1.38
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	4 Apr 2006 02:14:18 -0000	1.39
@@ -80,6 +80,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
 import org.springframework.dao.DataAccessException;
+import org.lamsfoundation.lams.util.DateUtil;
 
 /**
  * @author Manpreet Minhas
@@ -471,7 +472,9 @@
 			SubmissionDetails details = new SubmissionDetails();
 			details.setFileDescription(fileDescription);
 			details.setFilePath(uploadFile.getFileName());
-			details.setDateOfSubmission(new Date());
+			Date now = Calendar.getInstance().getTime();
+			now = DateUtil.convertToUTC(now);
+			details.setDateOfSubmission(now);
 			
 			Learner learner = learnerDAO.getLearner(sessionID,userID);
 			if(learner == null)
@@ -538,6 +541,7 @@
 			SubmitFilesReport report = submissionDetails.getReport();
 			UserDTO user = getUserDetails(userID);
 			FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails,report, user);
+			detailDto.setDateOfSubmission(DateUtil.convertFromUTCToLocal(Calendar.getInstance().getTimeZone(), detailDto.getDateOfSubmission()));
 			details.add(detailDto);
 		}
 		return details;
@@ -564,6 +568,7 @@
 				UserDTO user = getUserDetails(learner.getUserID());
 				
 				FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails,report,user);
+				detailDto.setDateOfSubmission(DateUtil.convertFromUTCToLocal(Calendar.getInstance().getTimeZone(), detailDto.getDateOfSubmission()));
 				userFileList = (List) map.get(user);
 				//if it is first time to this user, creating a new ArrayList for this user.
 				if(userFileList == null)
@@ -578,6 +583,7 @@
 	}
 	public FileDetailsDTO getFileDetails(Long detailID){
 			SubmissionDetails details = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
+			details.setDateOfSubmission(DateUtil.convertFromUTCToLocal(Calendar.getInstance().getTimeZone(), details.getDateOfSubmission()));
 			return new FileDetailsDTO(details);			
 	}
 	/**
@@ -637,11 +643,11 @@
 		Iterator iter = list.iterator();
 		SubmissionDetails details;
 		SubmitFilesReport report;
-		Date now = Calendar.getInstance().getTime();
+		
 		while(iter.hasNext()){
 			details = (SubmissionDetails) iter.next();
 			report = details.getReport();
-			report.setDateMarksReleased(now);
+			report.setDateMarksReleased(DateUtil.convertToUTC(Calendar.getInstance().getTime()));
 			submitFilesReportDAO.updateReport(report);
 		}
 		//current there is no false return