Index: lams_tool_sbmt/build.properties
===================================================================
diff -u -rd5c86099c21b0fda847318cb1515fe09bcdf74b4 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/build.properties (.../build.properties) (revision d5c86099c21b0fda847318cb1515fe09bcdf74b4)
+++ lams_tool_sbmt/build.properties (.../build.properties) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -8,7 +8,7 @@
signature=lasbmt11
#project version
-tool.version=20070524
+tool.version=20080509
# Minimum compatible version
min.server.version.number=2.0.3
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml (.../SubmitFilesReport.hbm.xml) (revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml (.../SubmitFilesReport.hbm.xml) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -36,11 +36,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -r6603efa89f1b12ec24d88500d2cca192c9d30d6b -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision 6603efa89f1b12ec24d88500d2cca192c9d30d6b)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -50,7 +50,7 @@
create table tl_lasbmt11_report (
report_id bigint not null auto_increment,
comments varchar(250),
- marks bigint,
+ marks float,
date_marks_released datetime,
primary key (report_id)
)TYPE=InnoDB;
Index: lams_tool_sbmt/db/sql/updatescripts/updateTo20080509.sql
===================================================================
diff -u
--- lams_tool_sbmt/db/sql/updatescripts/updateTo20080509.sql (revision 0)
+++ lams_tool_sbmt/db/sql/updatescripts/updateTo20080509.sql (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -0,0 +1,4 @@
+-- Update the File Submit tables to 20080509
+-- This is for the LAMS 2.1 release.
+
+UPDATE TABLE tl_lasbmt11_report MODIFY COLUMN marks float;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml (.../SubmitFilesReport.hbm.xml) (revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml (.../SubmitFilesReport.hbm.xml) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -36,11 +36,10 @@
session_id to be looked up
* @return List The list of required objects.
*/
- public List getFilesUploadedByUser(Integer userID, Long sessionID);
+ public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale);
/**
* This method returns a SortedMap of all files that were submitted users within a
* given sessionID.
*
* @param sessionID The session_id to be looked up
* @return SortedMap, the key is UserDTO, the value is a List of FileDetailsDTO objects
*/
- public SortedMap getFilesUploadedBySession(Long sessionID);
+ public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale);
- public void updateMarks(Long reportID, Long marks, String comments);
+ public void updateMarks(Long reportID, Float marks, String comments);
- public FileDetailsDTO getFileDetails(Long detailID);
+ public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale);
/**
* Get SubmitFilesSession instance according to the given session id.
* @param sessionID
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r97612142f4697066beb66064e83ff31fef1712b9 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 97612142f4697066beb66064e83ff31fef1712b9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -27,12 +27,14 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
import java.util.SortedMap;
import java.util.SortedSet;
@@ -655,14 +657,15 @@
* (non-Javadoc)
* @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getFilesUploadedByUserForContent(java.lang.Long, java.lang.Long)
*/
- public List getFilesUploadedByUser(Integer userID, Long sessionID){
+ public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale){
List list = submissionDetailsDAO.getBySessionAndLearner(sessionID, userID);
SortedSet details = new TreeSet(this.new FileDtoComparator());
if(list ==null)
return new ArrayList(details);
+ NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
for(SubmissionDetails submissionDetails : list){
- FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails);
+ FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
details.add(detailDto);
}
return new ArrayList(details);
@@ -672,12 +675,13 @@
* value is a list container, which contains all FileDetailsDTO object belong to
* this user.
*/
- public SortedMap getFilesUploadedBySession(Long sessionID) {
+ public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) {
List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
if(list!=null){
SortedMap map = new TreeMap(new LastNameAlphabeticComparator());
Iterator iterator = list.iterator();
List userFileList;
+ NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
while(iterator.hasNext()){
SubmissionDetails submissionDetails = (SubmissionDetails)iterator.next();
SubmitUser learner = submissionDetails.getLearner();
@@ -686,7 +690,7 @@
return null;
}
- FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails);
+ FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
userFileList = (List) map.get(learner);
//if it is first time to this user, creating a new ArrayList for this user.
if(userFileList == null)
@@ -699,9 +703,10 @@
else
return null;
}
- public FileDetailsDTO getFileDetails(Long detailID){
+
+ public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale){
SubmissionDetails details = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
- return new FileDetailsDTO(details);
+ return new FileDetailsDTO(details, currentLocale != null ? NumberFormat.getInstance(currentLocale) : null);
}
/**
* (non-Javadoc)
@@ -711,7 +716,7 @@
return submitUserDAO.getUsersBySession(sessionID);
}
- public void updateMarks(Long reportID, Long marks, String comments){
+ public void updateMarks(Long reportID, Float marks, String comments){
SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
if(report!=null){
report.setComments(comments);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java
===================================================================
diff -u -re7046600ee8bfa53d053e0aee33a16b52ad0e8e2 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java (.../ExportServlet.java) (revision e7046600ee8bfa53d053e0aee33a16b52ad0e8e2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java (.../ExportServlet.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -272,7 +272,7 @@
throw new SubmitFilesException(error);
}
- List fileList = sbmtService.getFilesUploadedByUser(new Integer(userID.intValue()),toolSessionID);
+ List fileList = sbmtService.getFilesUploadedByUser(new Integer(userID.intValue()),toolSessionID,request.getLocale());
//if mark not release, then set these message as null.
Iterator iter = fileList.iterator();
while(iter.hasNext()){
@@ -320,7 +320,7 @@
for (SubmitFilesSession session : sessionList) {
SortedMap userFilesMap = new TreeMap(new LastNameAlphabeticComparator());
userFilesMap.putAll(sbmtService.getFilesUploadedBySession(session
- .getSessionID()));
+ .getSessionID(),request.getLocale()));
allFileMap.putAll(userFilesMap);
report.put(session.getSessionName(), userFilesMap);
}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r4b73d76add981e24250409835fa9d3718c090110 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 4b73d76add981e24250409835fa9d3718c090110)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -140,7 +140,7 @@
//this must before getFileUploadByUser() method becuase getCurrentLearner()
// will create session user if it does not exist.
SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
- List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
+ List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
// check whehter finish lock is on/off
boolean lock = content.isLockOnFinished() && learner.isFinished();
@@ -208,7 +208,7 @@
Integer userID = user.getUserID();
ISubmitFilesService submitFilesService = getService();
- List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
+ List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -232,7 +232,7 @@
ISubmitFilesService submitFilesService = getService();
submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
- List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
+ List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
setLearnerDTO(request,sessionMap, learner, filesUploaded, mode);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -rf7be1eafe7ab283753711c4d5ecb867c5ed48897 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision f7be1eafe7ab283753711c4d5ecb867c5ed48897)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -29,10 +29,12 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.text.NumberFormat;
+import java.text.ParsePosition;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
@@ -68,6 +70,7 @@
import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.NumberUtil;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -213,7 +216,7 @@
Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
submitFilesService = getSubmitFilesService();
//return FileDetailsDTO list according to the given sessionID
- Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+ Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
//construct Excel file format and download
String errors = null;
try {
@@ -273,19 +276,10 @@
cell.setCellValue(dto.getFileDescription());
cell = row.createCell((short) count++);
-
- if(dto.getMarks() != null){
- String marks = "";
- try {
- NumberFormat format = NumberFormat.getInstance();
- format.setMaximumFractionDigits(1);
- marks = format.format(NumberUtils.createFloat(dto.getMarks()));
- } catch (Exception e) {
- }
- cell.setCellValue(marks);
- }else
- cell.setCellValue("");
-
+
+ String marks = dto.getMarks();
+ cell.setCellValue(marks!=null?marks:"");
+
cell = row.createCell((short) count++);
cell.setEncoding(HSSFCell.ENCODING_UTF_16);
cell.setCellValue(dto.getComments());
@@ -341,7 +335,7 @@
submitFilesService = getSubmitFilesService();
//return FileDetailsDTO list according to the given userID and sessionID
- List files = submitFilesService.getFilesUploadedByUser(userID,sessionID);
+ List files = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
request.setAttribute("report",files);
@@ -367,7 +361,7 @@
submitFilesService = getSubmitFilesService();
List report = new ArrayList();
- report.add(submitFilesService.getFileDetails(detailID));
+ report.add(submitFilesService.getFileDetails(detailID,request.getLocale()));
request.setAttribute("report",report);
request.setAttribute("updateMode", updateMode);
@@ -397,11 +391,11 @@
Long reportID= new Long(WebUtil.readLongParam(request,"reportID"));
ActionMessages errors = new ActionMessages();
- //check whether the mark is validate
+ // Check whether the mark is valid.
+ Float marks = null;
String markStr = request.getParameter("marks");
- Long marks = null;
try {
- marks = Long.parseLong(markStr);
+ marks = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
} catch (Exception e) {
errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.mark.invalid.number"));
}
@@ -410,7 +404,7 @@
if(!errors.isEmpty()){
submitFilesService = getSubmitFilesService();
List report = new ArrayList();
- FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID);
+ FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID,request.getLocale());
//echo back the input, even they are wrong.
fileDetail.setComments(comments);
fileDetail.setMarks(markStr);
@@ -432,11 +426,11 @@
request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
if(StringUtils.equals(updateMode, "listMark")){
- List report = submitFilesService.getFilesUploadedByUser(userID,sessionID);
+ List report = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
request.setAttribute("report",report);
return mapping.findForward("listMark");
}else{
- Map report = submitFilesService.getFilesUploadedBySession(sessionID);
+ Map report = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
request.setAttribute("reports",report);
return mapping.findForward("listAllMarks");
}
@@ -457,7 +451,7 @@
Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
submitFilesService = getSubmitFilesService();
//return FileDetailsDTO list according to the given sessionID
- Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+ Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
// request.setAttribute("user",submitFilesService.getUserDetails(userID));
request.setAttribute("reports",userFilesMap);
@@ -511,7 +505,7 @@
String sessionName = sfs.getSessionName();
//return FileDetailsDTO list according to the given sessionID
- Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+ Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
Iterator iter = userFilesMap.values().iterator();
Iterator dtoIter;
int notMarkedCount = 0;
@@ -558,7 +552,7 @@
sessionDto.setSessionName(sfs.getSessionName());
boolean hasReflect = sfs.getContent().isReflectOnActivity();
- Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+ Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
//construct LearnerDTO list
List userList = submitFilesService.getUsersBySession(sessionID);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java
===================================================================
diff -u -rd07409f014674f056d1bd67d865ba77f0f8298e9 -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java (.../ReflectAction.java) (revision d07409f014674f056d1bd67d865ba77f0f8298e9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java (.../ReflectAction.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -148,7 +148,7 @@
UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
Integer userID = user.getUserID();
- List list = submitFilesService.getFilesUploadedByUser(userID, sessionId);
+ List list = submitFilesService.getFilesUploadedByUser(userID, sessionId,request.getLocale());
int minUpload= (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD);
if(minUpload > 0){
errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.learning.minimum.upload.number.less"));
Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/dao/TestModel.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/dao/TestModel.java (.../TestModel.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/dao/TestModel.java (.../TestModel.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -43,14 +43,14 @@
public class TestModel extends TestCase {
//report data
private static String commA ="commA";
- private static Long markA = new Long(100);
+ private static Float markA = new Float(100);
private static Long repA = new Long(100);
private static int dayA = 10;
private static int mthA = 9;
private static int yearA = 2003;
private static String commB ="commB";
- private static Long markB = new Long(201);
+ private static Float markB = new Float(201);
private static Long repB = new Long(201);
private static int dayB = 11;
private static int mthB = 8;
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
@@ -34,7 +34,7 @@
- >
+
|