Null Object pattern. This interface is defined to avoid the use of NULL. * The domain object that allows NULL as return value should implement this - * interface. + * interface.
* * @author Ozgur Demirtas * Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -23,8 +23,10 @@ package org.lamsfoundation.lams.tool.vote; /** + *Defines constants used throughout the application
+ * * @author Ozgur Demirtas - * Defines constants used throughout the application + * */ public interface VoteAppConstants { @@ -140,8 +142,7 @@ public static final String CREATION_DATE ="creationDate"; public static final String DEFINE_LATER ="defineLater"; public static final String VIEW_ANSWERS ="viewAnswers"; - public static final String SHOW_AUTHORING_TABS ="showAuthoringTabs"; - + public static final String ON ="ON"; public static final String OFF ="OFF"; public static final String RICHTEXT_FEEDBACK_CORRECT ="richTextFeedbackCorrect"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java (.../VoteAttachmentDTO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAttachmentDTO.java (.../VoteAttachmentDTO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -24,8 +24,7 @@ /** - *DTO that holds file attachment data for jsp purposes - *
+ *DTO that holds file attachment data for jsp purposes
* * @author Ozgur Demirtas */ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java =================================================================== diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -29,8 +29,7 @@ /** - *DTO that holds question/candidate answers data as well as user attempts data for jsp purposes - *
+ *DTO that holds question/candidate answers data as well as user attempts data for jsp purposes
* * @author Ozgur Demirtas */ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java =================================================================== diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -27,8 +27,7 @@ /** - *DTO that holds users attempt history data for jsp purposes - *
+ *DTO that holds users attempt history data for jsp purposes
* * @author Ozgur Demirtas */ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== diff -u -re6fd15100d6bd9a0196f6a086a2df9b6df1aed40 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision e6fd15100d6bd9a0196f6a086a2df9b6df1aed40) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -45,8 +45,9 @@ /** + *Common Voting utility functions live here.
+ * * @author Ozgur Demirtas - * Common Voting utility functions live here. */ public abstract class VoteUtils implements VoteAppConstants { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java (.../IVoteContentDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java (.../IVoteContentDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -27,6 +27,11 @@ import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; +/** + * @author Ozgur Demirtas + * + *Interface that defines the contract for VoteContent access
+ */ public interface IVoteContentDAO { public VoteContent getVoteContentByUID(Long uid); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java =================================================================== diff -u -r53db9379d8fb01523176dd7f71712a5deaaa730b -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java (.../IVoteQueContentDAO.java) (revision 53db9379d8fb01523176dd7f71712a5deaaa730b) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java (.../IVoteQueContentDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -27,10 +27,9 @@ /** - * * @author Ozgur Demirtas - * - * + * + *Interface that defines the contract for VoteQueConten access
*/ public interface IVoteQueContentDAO { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java (.../IVoteSessionDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java (.../IVoteSessionDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -30,8 +30,8 @@ /** * @author Ozgur Demirtas - * * + *Interface that defines the contract for VoteSession access
*/ public interface IVoteSessionDAO { public VoteSession getVoteSessionByUID(Long uid); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java (.../IVoteUploadedFileDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUploadedFileDAO.java (.../IVoteUploadedFileDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -26,10 +26,9 @@ import org.lamsfoundation.lams.tool.vote.pojos.VoteUploadedFile; /** - * * @author Ozgur Demirtas - * - * + * + *Interface that defines the contract for IVoteUploadedFile access
*/ public interface IVoteUploadedFileDAO { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java =================================================================== diff -u -rc8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java (.../IVoteUserDAO.java) (revision c8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java (.../IVoteUserDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -30,7 +30,8 @@ /** * @author Ozgur Demirtas - * + * + *Interface that defines the contract for VoteQueUsr access
*/ public interface IVoteUserDAO { public VoteQueUsr getVoteUserByUID(Long uid); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java =================================================================== diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -30,10 +30,9 @@ /** - * * @author Ozgur Demirtas - * * - * + * + *Interface that defines the contract for VoteUsrAttempt access
*/ public interface IVoteUsrAttemptDAO { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java (.../VoteUploadedFileDAO.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUploadedFileDAO.java (.../VoteUploadedFileDAO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -72,10 +72,6 @@ .load(VoteUploadedFile.class, new Long(submissionId)); } - /** - * - * return null if not found - */ public VoteUploadedFile loadUploadedFileById(long uid) { return (VoteUploadedFile) this.getHibernateTemplate().get(VoteUploadedFile.class, new Long(uid)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java =================================================================== diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision ae28185f07883077586773f760d1bde953e2d9bf) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -35,7 +35,7 @@ /** *Persistent object/bean that defines the question content for the Voting tool. * Provides accessors and mutators to get/set attributes - * It maps to database table: tl_lavote11_que_content + * It maps to database table: tl_lavote11_nomination_content *
* * @author Ozgur Demirtas Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -47,7 +47,7 @@ /** * @author Ozgur Demirtas * - * Interface that defines the contract that all Voting service provider must follow. + * Interface that defines the contract Voting service provider must follow. */ public interface IVoteService { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -77,9 +77,9 @@ * * @author Ozgur Demirtas * - * The POJO implementation of Voting service. All business logics of Voting tool - * are implemented in this class. It translate the request from presentation - * layer and perform appropriate database operation. + * The POJO implementation of Voting service. All business logic of Voting tool + * is implemented in this class. It translates the request from presentation + * layer and performs appropriate database operation. * */ public class VoteServicePOJO implements Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java =================================================================== diff -u -re6fd15100d6bd9a0196f6a086a2df9b6df1aed40 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision e6fd15100d6bd9a0196f6a086a2df9b6df1aed40) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -55,13 +55,19 @@ /** * - * Keeps all operations needed for Authoring mode. + *Keeps all operations needed for Authoring mode.
+ * * @author Ozgur Demirtas * */ public class AuthoringUtil implements VoteAppConstants { static Logger logger = Logger.getLogger(AuthoringUtil.class.getName()); + /** + * checks if there are any duplicate entries + * @param mapOptionsContent + * @returnboolean + */ public static boolean verifyDuplicateNominations(Map mapOptionsContent) { Map originalMapOptionsContent=mapOptionsContent; @@ -94,7 +100,11 @@ return false; } - + /** + * checks if the map is empty or not + * @param map + * @return boolean + */ public static boolean verifyMapNoEmptyString(Map map) { Iterator itMap = map.entrySet().iterator(); @@ -125,27 +135,6 @@ } - public static Map sequenceMap(Map globalMap) - { - logger.debug("globalMap:"+ globalMap); - Map mapTemp= new TreeMap(new VoteComparator()); - - long mapCounter=0; - Iterator itMap = globalMap.entrySet().iterator(); - while (itMap.hasNext()) { - Map.Entry pairs = (Map.Entry)itMap.next(); - logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue()); - Map optionsMap=(Map)pairs.getValue(); - logger.debug("optionsMap:"+ optionsMap); - mapCounter++; - mapTemp.put(new Long(mapCounter).toString(), optionsMap); - } - - logger.debug("final mapTemp:"+ mapTemp); - return mapTemp; - } - - public static Map repopulateMap(HttpServletRequest request, String parameterType) { Map mapTempQuestionsContent= new TreeMap(new VoteComparator()); @@ -174,113 +163,9 @@ return mapTempQuestionsContent; } - - /** - * returns the value of the entry for a given index - * getRequiredWeightEntry(Map mapWeights, String questionIndex) - * - * @param mapWeights - * @param questionIndex - * @return - */ - public static String getRequiredWeightEntry(Map mapWeights, String questionIndex) - { - logger.debug("mapWeights: " + mapWeights); - - Iterator itMap = mapWeights.entrySet().iterator(); - while (itMap.hasNext()) { - Map.Entry pairs = (Map.Entry)itMap.next(); - logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue()); - if (questionIndex.equals(pairs.getKey().toString())) - { - String weight=pairs.getValue().toString(); - logger.debug("required weight:" + weight); - return weight; - } - } - return null; - } - - - - - /** - * removes options from mapGlobalOptionsContent - * removeFromOptionsMap(Map mapGlobalOptionsContent, String questionIndex ) - * - * @param mapGlobalOptionsContent - * @param questionIndex - * @param direction - * @return Map - */ - public static Map removeFromMap(Map mapContent, String index) - { - /* mapGlobalOptionsContent refers to mapGenaralOptionsContent and mapGeneralSelectedlOptionsContent */ - /* map to be returned */ - Map mapTempContent= new TreeMap(new VoteComparator()); - mapTempContent= mapContent; - - mapTempContent.remove(index); - logger.debug("entry at index removed from mapTempContent..."); - - logger.debug("final mapTempContent: " + mapTempContent); - return mapTempContent; - } - - - public static Map mergeMaps(Map map1, Map map2) - { - Map mapMergedMap= new TreeMap(new VoteComparator()); - logger.debug("merging maps now..."); - - Iterator itMap1 = map1.entrySet().iterator(); - while (itMap1.hasNext()) - { - Map.Entry pairs = (Map.Entry)itMap1.next(); - logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue()); - mapMergedMap.put(pairs.getKey(), pairs.getValue()); - } - - logger.debug("adding the other map..."); - Iterator itMap2 = map2.entrySet().iterator(); - while (itMap2.hasNext()) - { - Map.Entry pairs = (Map.Entry)itMap2.next(); - logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue()); - mapMergedMap.put(pairs.getKey(), pairs.getValue()); - } - - logger.debug("final merged map: " + mapMergedMap); - return mapMergedMap; - } - - - - public static boolean isOptionSelected(Map mapGeneralSelectedOptionsContent, String optionText, String questionIndex) - { - Iterator itGSOMap = mapGeneralSelectedOptionsContent.entrySet().iterator(); - logger.debug("questionIndex: " + questionIndex); - logger.debug("optionText: " + optionText); - while (itGSOMap.hasNext()) - { - Map.Entry pairs = (Map.Entry)itGSOMap.next(); - if (pairs.getKey().toString().equals(questionIndex)) - { - Map currentOptionsMap= (Map)pairs.getValue(); - logger.debug("currentOptionsMap: " + currentOptionsMap); - boolean isOptionSelectedInMap=isOptionSelectedInMap(optionText, currentOptionsMap); - logger.debug("isOptionSelectedInMap: " + isOptionSelectedInMap); - return isOptionSelectedInMap; - } - } - return false; - } - - public static Map shiftMap(Map mapOptionsContent, String optIndex , String movableOptionEntry, String direction) { logger.debug("movableOptionEntry: " + movableOptionEntry); - /* map to be returned */ Map mapTempOptionsContent= new TreeMap(new VoteComparator()); String shiftableEntry=null; @@ -334,38 +219,17 @@ return mapTempOptionsContent; } - - public static boolean isOptionSelectedInMap(String optionText, Map currentOptionsMap) - { - logger.debug("optionText: " + optionText); - Iterator itCOMap = currentOptionsMap.entrySet().iterator(); - while (itCOMap.hasNext()) - { - Map.Entry pairs = (Map.Entry)itCOMap.next(); - if (pairs.getValue().toString().equals(optionText)) - { - logger.debug("option text found in the map: " + optionText); - return true; - } - } - return false; - } - - public static void assignStaterMapsToCurrentMaps(HttpServletRequest request) - { - logger.debug("assigning maps.."); - Map mapStartupGeneralOptionsContent=(Map)request.getSession().getAttribute(MAP_STARTUP_GENERAL_OPTIONS_CONTENT); - logger.debug("mapStartupGeneralOptionsContent: " + mapStartupGeneralOptionsContent); - - Map mapStartupGeneralSelectedOptionsContent=(Map) request.getSession().getAttribute(MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT); - logger.debug("mapStartupGeneralSelectedOptionsContent: " + mapStartupGeneralSelectedOptionsContent); - - request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapStartupGeneralOptionsContent); - request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapStartupGeneralSelectedOptionsContent); - } - - + /** + * + * Used in uploading offline and online files + * + * @param request + * @param voteAuthoringForm + * @param isOfflineFile + * @return VoteAttachmentDTO + * @throws RepositoryCheckedException + */ public static VoteAttachmentDTO uploadFile(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm, boolean isOfflineFile) throws RepositoryCheckedException { logger.debug("doing uploadFile..."); @@ -489,7 +353,12 @@ return voteAttachmentDTO; } - + + /** + * returns a list of Vote attachements for listing of online and offline file information + * @param listOfflineFilesMetaData + * @return + */ public static List populateMetaDataAsAttachments(List listOfflineFilesMetaData) { List listAttachments=new LinkedList(); @@ -517,7 +386,10 @@ return listAttachments; } - + /** + * @param listFilesMetaData + * @return + */ public static List populateMetaDataAsFilenames(List listFilesMetaData) { List listFilenames=new LinkedList(); @@ -535,6 +407,12 @@ } + /** + * used in removing a file item listed in the jsp + * @param request + * @param filename + * @param offlineFile + */ public static void removeFileItem(HttpServletRequest request, String filename, String offlineFile) { logger.debug("offlineFile:" + offlineFile); @@ -566,8 +444,6 @@ /** - * findFileNameIndex(List listUploadedFileNames, String filename) - * * @param listUploadedFileNames * @param filename * @return int @@ -591,13 +467,6 @@ } - /** - * removeFileItem(List listFilesMetaData, String uuid) - * - * @param listFilesMetaData - * @param uuid - * @return List - */ public static List removeFileItem(List listFilesMetaData, String uuid) { VoteAttachmentDTO deletableAttachmentDTO=null; @@ -627,8 +496,14 @@ return listFilesMetaData; } + - + /** + * Online and offline files metadata is stored into the database + * @param request + * @param isOfflineFile + * @param voteContent + */ public static void persistFilesMetaData(HttpServletRequest request, boolean isOfflineFile, VoteContent voteContent) { IVoteService voteService =VoteUtils.getToolService(request); @@ -670,13 +545,6 @@ } } - - /** - * extractFileNames(List listFilesMetaData) - * - * @param listFilesMetaData - * @return List - */ public static List extractFileNames(List listFilesMetaData) { Iterator itList = listFilesMetaData.iterator(); @@ -693,7 +561,11 @@ return listFilenames; } - + /** + * used if an offline file item is no more referenced + * @param request + * @param voteContent + */ public static void removeRedundantOfflineFileItems(HttpServletRequest request, VoteContent voteContent) { IVoteService voteService =VoteUtils.getToolService(request); @@ -740,7 +612,11 @@ } } - + /** + * used if an online file item is no more referenced + * @param request + * @param voteContent + */ public static void removeRedundantOnlineFileItems(HttpServletRequest request, VoteContent voteContent) { IVoteService voteService =VoteUtils.getToolService(request); @@ -862,7 +738,6 @@ protected void reconstructOptionContentMapForRemove(Map mapOptionsContent, HttpServletRequest request, VoteAuthoringForm voteAuthoringForm) { logger.debug("doing reconstructOptionContentMapForRemove."); - //String questionIndex =voteAuthoringForm.getQuestionIndex(); String optIndex =voteAuthoringForm.getOptIndex(); logger.debug("pre-delete map content: " + mapOptionsContent); logger.debug("optIndex: " + optIndex); @@ -922,6 +797,11 @@ } } + /** + * + * @param mapOptionsContent + * @param request + */ protected void reconstructOptionsContentMapForSubmit(Map mapOptionsContent, HttpServletRequest request) { logger.debug("pre-submit Map:" + mapOptionsContent); @@ -1026,7 +906,15 @@ } - + /** + * persists the vote content + * + * @param mapOptionsContent + * @param voteService + * @param voteAuthoringForm + * @param request + * @return + */ public VoteContent saveOrUpdateVoteContent(Map mapOptionsContent, IVoteService voteService, VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); @@ -1162,6 +1050,14 @@ return voteContent; } + /** + * creates a new vote content + * + * @param mapOptionsContent + * @param voteService + * @param voteContent + * @return + */ protected VoteContent createOptiosContent(Map mapOptionsContent, IVoteService voteService, VoteContent voteContent) { logger.debug("content uid is: " + voteContent.getUid()); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -35,7 +35,8 @@ import org.lamsfoundation.lams.tool.vote.VoteApplicationException; /** - * Struts action level exception handler + *Struts action level exception handler
+ * * @author Ozgur Demirtas */ public class CustomStrutsExceptionHandler extends ExceptionHandler { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java =================================================================== diff -u -r192e812bc372965e505ea849d55537547fae74bd -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 192e812bc372965e505ea849d55537547fae74bd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -39,6 +39,11 @@ import org.lamsfoundation.lams.tool.vote.service.IVoteService; import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; +/** + *Enables exporting portfolio for teacher and learner modes.
+ * + * @author Ozgur Demirtas + */ public class ExportServlet extends AbstractExportPortfolioServlet implements VoteAppConstants{ static Logger logger = Logger.getLogger(ExportServlet.class.getName()); @@ -150,7 +155,6 @@ logger.debug("teacher uses content id: " + content.getVoteContentId()); MonitoringUtil.prepareChartDataForExportTeacher(request, voteService, null, content.getVoteContentId(), null); logger.debug("post prepareChartDataForExportTeacher"); - logger.debug("ending teacher mode: "); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java =================================================================== diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -42,7 +42,8 @@ /** * - * Keeps all operations needed for Learning mode. + *Keeps all operations needed for Learning mode.
+ * * @author Ozgur Demirtas * */ @@ -72,6 +73,11 @@ } + /** + * determines if a user is already in the tool's tables + * @param request + * @return + */ public static boolean doesUserExists(HttpServletRequest request) { IVoteService voteService =VoteUtils.getToolService(request); @@ -85,6 +91,12 @@ } + /** + * creates a new user for the tool + * + * @param request + * @return + */ public static VoteQueUsr createUser(HttpServletRequest request) { IVoteService voteService =VoteUtils.getToolService(request); @@ -113,7 +125,16 @@ return voteQueUsr; } - + /** + * creates a new vote record in the database + * + * @param request + * @param voteQueUsr + * @param mapGeneralCheckedOptionsContent + * @param userEntry + * @param singleUserEntry + * @param voteSession + */ public static void createAttempt(HttpServletRequest request, VoteQueUsr voteQueUsr, Map mapGeneralCheckedOptionsContent, String userEntry, boolean singleUserEntry, VoteSession voteSession) { logger.debug("doing voteSession: " + voteSession); @@ -163,6 +184,7 @@ } } + public static void createIndividualOptions(HttpServletRequest request, VoteQueContent voteQueContent, VoteQueUsr voteQueUsr, Date attempTime, String timeZone, String userEntry, boolean singleUserEntry, VoteSession voteSession) { logger.debug("doing voteSession: " + voteSession); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -rca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision ca5e8fafb4ef5006a3acbf41c7fa88e94037a9a4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -48,7 +48,8 @@ /** * - * Keeps all operations needed for Monitoring mode. + *Keeps all operations needed for Monitoring mode.
+ * * @author Ozgur Demirtas * */ @@ -79,6 +80,19 @@ return sessionsMap; } + /** + * + * used in presenting user votes data + * + * @param request + * @param voteContent + * @param isUserNamesVisible + * @param isLearnerRequest + * @param currentSessionId + * @param userId + * @param voteService + * @return + */ public static List buildGroupsQuestionData(HttpServletRequest request, VoteContent voteContent, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId, IVoteService voteService) { @@ -120,6 +134,20 @@ } + /** + * groups user's votes + * + * @param request + * @param voteContent + * @param voteQueContent + * @param questionUid + * @param isUserNamesVisible + * @param isLearnerRequest + * @param currentSessionId + * @param userId + * @param voteService + * @return + */ public static Map buildGroupsAttemptData(HttpServletRequest request, VoteContent voteContent, VoteQueContent voteQueContent, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId, IVoteService voteService) { @@ -631,7 +659,15 @@ return map; } - + /** + * generates JFreeChart for the learner module + * + * @param request + * @param voteService + * @param voteMonitoringForm + * @param toolContentId + * @param toolSessionUid + */ public static void prepareChartData(HttpServletRequest request, IVoteService voteService, VoteMonitoringForm voteMonitoringForm, Long toolContentId, Long toolSessionUid) { logger.debug("starting prepareChartData, toolContentId: " + toolContentId); @@ -779,7 +815,15 @@ logger.debug("test2: MAP_STANDARD_USER_COUNT: " + request.getSession().getAttribute(MAP_STANDARD_USER_COUNT)); } - + /** + * generates JFreeChart for the learner export portfolio + * + * @param request + * @param voteService + * @param voteMonitoringForm + * @param toolContentId + * @param toolSessionUid + */ public static void prepareChartDataForExportLearner(HttpServletRequest request, IVoteService voteService, VoteMonitoringForm voteMonitoringForm, Long toolContentId, Long toolSessionUid) { logger.debug("starting prepareChartDataForExportLearner, toolContentId: " + toolContentId); @@ -956,7 +1000,15 @@ } - + /** + * generates JFreeChart for the teacher export portfolio + * + * @param request + * @param voteService + * @param voteMonitoringForm + * @param toolContentId + * @param toolSessionUid + */ public static void prepareChartDataForExportTeacher(HttpServletRequest request, IVoteService voteService, VoteMonitoringForm voteMonitoringForm, Long toolContentId, Long toolSessionUid) { logger.debug("starting prepareChartDataForExportTeacher, toolContentId: " + toolContentId); @@ -1048,6 +1100,5 @@ request.getSession().setAttribute(MAP_STANDARD_USER_COUNT, mapStandardUserCount); logger.debug("test2: MAP_STANDARD_USER_COUNT: " + request.getSession().getAttribute(MAP_STANDARD_USER_COUNT)); } - } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== diff -u -r192e812bc372965e505ea849d55537547fae74bd -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 192e812bc372965e505ea849d55537547fae74bd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) @@ -68,14 +68,11 @@ * Struts action class as all of them are handled in *CustomStrutsExceptionHandler.
*
-
-
*/
public class VoteAction extends LamsDispatchAction implements VoteAppConstants
{
/*
* when to reset define later and synchin monitor etc..
- *
* make sure the tool gets called on:
* setAsForceComplete(Long userId) throws VoteApplicationException
*/
@@ -126,9 +123,9 @@
}
- public boolean isNewOptionAdded(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public boolean isNewNominationAdded(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
{
- logger.debug("doing isNewOptionAdded");
+ logger.debug("doing isNewNominationAdded");
VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
logger.debug("voteAuthoringForm :" +voteAuthoringForm);
voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
@@ -185,12 +182,22 @@
}
- public ActionForward addNewOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ /**
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
+ public ActionForward addNewNomination(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- logger.debug("dispathcing addNewOption");
- boolean isNewOptionAdded=isNewOptionAdded(mapping, form, request, response);
- logger.debug("isNewOptionAdded:" + isNewOptionAdded);
+ logger.debug("dispathcing addNewNomination");
+ boolean isNewNominationAdded=isNewNominationAdded(mapping, form, request, response);
+ logger.debug("isNewNominationAdded:" + isNewNominationAdded);
/* determine whether the request is from Monitoring url Edit Activity*/
String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER);
@@ -202,9 +209,9 @@
}
- public boolean isOptionRemoved(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public boolean isNominationRemoved(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
{
- logger.debug("starting isOptionRemoved ");
+ logger.debug("starting isNominationRemoved");
VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
logger.debug("voteAuthoringForm :" +voteAuthoringForm);
voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
@@ -256,12 +263,12 @@
}
- public ActionForward removeOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public ActionForward removeNomination(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- logger.debug("doing removeOption ");
- boolean isOptionRemoved=isOptionRemoved(mapping, form, request, response);
- logger.debug("isOptionRemoved:" + isOptionRemoved);
+ logger.debug("starting removeNomination ");
+ boolean isNominationRemoved=isNominationRemoved(mapping, form, request, response);
+ logger.debug("isNominationRemoved:" + isNominationRemoved);
/* determine whether the request is from Monitoring url Edit Activity*/
String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER);
@@ -273,6 +280,15 @@
}
+ /**
+ * persists the content into the database
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ */
public boolean submitContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
{
logger.debug("doing submitContent..");
@@ -459,14 +475,13 @@
}
- public boolean isMoveOptionDown(ActionMapping mapping,
+ public boolean isMoveNominationDown(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
{
- logger.debug("starting isMoveOptionDown...");
+ logger.debug("starting isMoveNominationDown...");
VoteUtils.cleanUpUserExceptions(request);
- logger.debug("dispatching moveOptionDown...");
VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
logger.debug("voteAuthoringForm :" +voteAuthoringForm);
voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString());
@@ -479,7 +494,7 @@
logger.debug("mapOptionsContent before move down: " + mapOptionsContent);
logger.debug("mapOptionsContent size move down: " + mapOptionsContent.size());
- //perform a move down if there are at least 2 questions
+ /* perform a move down if there are at least 2 nominations*/
if (mapOptionsContent.size() > 1)
{
String optIndex =voteAuthoringForm.getOptIndex();
@@ -531,7 +546,18 @@
}
- public ActionForward moveOptionDown(ActionMapping mapping,
+ /**
+ * shifts the nominations map for moving down
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
+ public ActionForward moveNominationDown(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws IOException,
@@ -543,19 +569,28 @@
String destination=VoteUtils.getDestination(sourceVoteStarter);
logger.debug("destination: " + destination);
- boolean isMoveOptionDown=isMoveOptionDown(mapping, form, request, response);
- logger.debug("isMoveOptionDown:" + isMoveOptionDown);
+ boolean isMoveNominationDown=isMoveNominationDown(mapping, form, request, response);
+ logger.debug("isMoveNominationDown:" + isMoveNominationDown);
return (mapping.findForward(destination));
}
- public boolean isMoveOptionUp(ActionMapping mapping,
+ /**
+ * shifts the nominations map for moving up
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ */
+ public boolean isMoveNominationUp(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
{
- logger.debug("starting isMoveOptionUp...");
+ logger.debug("starting isMoveNominationUp...");
VoteUtils.cleanUpUserExceptions(request);
VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
@@ -577,7 +612,7 @@
logger.debug("mapOptionsContent before move down: " + mapOptionsContent);
logger.debug("mapOptionsContent size move down: " + mapOptionsContent.size());
- //perform a move down if there are at least 2 questions
+ /* perform a move down if there are at least 2 nominations */
if (mapOptionsContent.size() > 1)
{
String optIndex =voteAuthoringForm.getOptIndex();
@@ -629,7 +664,7 @@
}
- public ActionForward moveOptionUp(ActionMapping mapping,
+ public ActionForward moveNominationUp(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws IOException,
@@ -641,13 +676,20 @@
String destination=VoteUtils.getDestination(sourceVoteStarter);
logger.debug("destination: " + destination);
- boolean isMoveOptionUp=isMoveOptionUp(mapping, form, request, response);
- logger.debug("isMoveOptionUp:" + isMoveOptionUp);
+ boolean isMoveNominationUp=isMoveNominationUp(mapping, form, request, response);
+ logger.debug("isMoveNominationUp:" + isMoveNominationUp);
return (mapping.findForward(destination));
}
+ /**
+ * checks the user entries before submit is performed
+ * @param request
+ * @param errors
+ * @param voteAuthoringForm
+ * @return
+ */
protected ActionMessages validateSubmit(HttpServletRequest request, ActionMessages errors, VoteAuthoringForm voteAuthoringForm)
{
String title = voteAuthoringForm.getTitle();
@@ -686,6 +728,18 @@
}
+ /**
+ * persists offline files
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ * @throws RepositoryCheckedException
+ */
public ActionForward submitOfflineFiles(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -738,6 +792,17 @@
}
+ /**
+ * persists online files
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ * @throws RepositoryCheckedException
+ */
public ActionForward submitOnlineFiles(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -789,6 +854,17 @@
}
+ /**
+ * removes an offline file from the jsp
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
public ActionForward deleteOfflineFile(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -826,7 +902,17 @@
return (mapping.findForward(destination));
}
-
+ /**
+ * deletes an online file from the jsp
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
public ActionForward deleteOnlineFile(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -864,7 +950,18 @@
return (mapping.findForward(destination));
}
-
+ /**
+ * used in define later to switch from view-only to editable mode
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ * @throws ToolException
+ */
public ActionForward editActivityQuestions(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -893,8 +990,6 @@
logger.debug("destination: " + destination);
request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
- request.getSession().setAttribute(SHOW_AUTHORING_TABS,new Boolean(false).toString());
-
String toolContentId=voteAuthoringForm.getToolContentId();
logger.debug("toolContentId: " + toolContentId);
if ((toolContentId== null) || toolContentId.equals(""))
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -26,9 +26,10 @@
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
/**
+ * ActionForm for the Authoring environment
+ *
* @author Ozgur Demirtas
- *
- * ActionForm for the Authoring environment
+ *
*/
public class VoteAuthoringForm extends VoteLearningForm implements VoteAppConstants {
/* form controllers */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
===================================================================
diff -u -ra209f8ccd31fae9a3d1ecce40c02ad0ebb6a3190 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision a209f8ccd31fae9a3d1ecce40c02ad0ebb6a3190)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -42,8 +42,10 @@
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
/**
+ * Enables generation of enerates JFreeCharts
+ *
* @author Ozgur Demirtas
- * generates JFreeCharts
+ *
*/
public class VoteChartGenerator extends HttpServlet implements VoteAppConstants {
static Logger logger = Logger.getLogger(VoteChartGenerator.class.getName());
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java
===================================================================
diff -u -rf9e3bb1e954f24078531d9a9114952f84cad4bb2 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java (.../VoteDLStarterAction.java) (revision f9e3bb1e954f24078531d9a9114952f84cad4bb2)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java (.../VoteDLStarterAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -21,12 +21,13 @@
* ***********************************************************************/
/**
- * @author Ozgur Demirtas
*
- * McDLStarterAction activates the Define Later module.
- * It reuses majority of the functionality from existing authoring module.
+ * Starts up the Define Later module.
+ * It reuses majority of the functionality from existing authoring module.
+ *
*
-
+ * @author Ozgur Demirtas
+ *
*/
package org.lamsfoundation.lams.tool.vote.web;
import java.io.IOException;
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -54,8 +54,6 @@
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
/**
- * * @author Ozgur Demirtas
- *
* Action class that controls the logic of tool behavior.
*
* Note that Struts action class only has the responsibility to navigate
@@ -69,7 +67,7 @@
* Struts action class as all of them are handled in
* CustomStrutsExceptionHandler.
*
-
+ * @author Ozgur Demirtas
*
*/
public class VoteLearningAction extends LamsDispatchAction implements VoteAppConstants
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -26,9 +26,9 @@
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
/**
+ * ActionForm for the Learning environment
+ *
* @author Ozgur Demirtas
- *
- * ActionForm for the Learning environment
*/
public class VoteLearningForm extends ActionForm implements VoteAppConstants {
protected String optionCheckBoxSelected;
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -r192e812bc372965e505ea849d55537547fae74bd -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 192e812bc372965e505ea849d55537547fae74bd)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -54,8 +54,6 @@
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
/**
- * * @author Ozgur Demirtas
- *
* Action class that controls the logic of tool behavior.
*
* Note that Struts action class only has the responsibility to navigate
@@ -69,6 +67,8 @@
* Struts action class as all of them are handled in
* CustomStrutsExceptionHandler.
*
+ * @author Ozgur Demirtas
+ *
*/
public class VoteMonitoringAction extends LamsDispatchAction implements VoteAppConstants
{
@@ -389,7 +389,6 @@
ServletException
{
logger.debug("start initSummaryContent...");
-
logger.debug("dispatching getSummary..." + request);
IVoteService voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE);
@@ -622,6 +621,7 @@
return (mapping.findForward(LOAD_MONITORING));
}
+
public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
logger.debug("dispatching proxy submitAllContent...");
@@ -657,10 +657,10 @@
}
- public ActionForward addNewOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public ActionForward addNewNomination(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- logger.debug("dispatching proxy addNewOption...");
+ logger.debug("dispatching proxy addNewNomination...");
request.setAttribute(SOURCE_VOTE_STARTER, "monitoring");
logger.debug("SOURCE_VOTE_STARTER: monitoring");
@@ -676,16 +676,16 @@
VoteAction voteAction= new VoteAction();
- boolean isNewOptionAdded=voteAction.isNewOptionAdded(mapping, form, request, response);
- logger.debug("isNewOptionAdded:" + isNewOptionAdded);
+ boolean isNewNominationAdded=voteAction.isNewNominationAdded(mapping, form, request, response);
+ logger.debug("isNewNominationAdded:" + isNewNominationAdded);
return (mapping.findForward(destination));
}
- public ActionForward removeOption(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ public ActionForward removeNomination(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- logger.debug("dispatching proxy removeOption...");
+ logger.debug("dispatching proxy removeNomination...");
VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form;
logger.debug("voteMonitoringForm: " + voteMonitoringForm);
String optIndex=voteMonitoringForm.getOptIndex() ;
@@ -703,20 +703,20 @@
String destination=VoteUtils.getDestination(sourceVoteStarter);
logger.debug("destination: " + destination);
- boolean isOptionRemoved=voteAction.isOptionRemoved(mapping, form, request, response);
- logger.debug("isOptionRemoved :" +isOptionRemoved);
+ boolean isNominationRemoved=voteAction.isNominationRemoved(mapping, form, request, response);
+ logger.debug("isNominationRemoved :" +isNominationRemoved);
return (mapping.findForward(destination));
}
- public ActionForward moveOptionDown(ActionMapping mapping,
+ public ActionForward moveNominationDown(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws IOException,
ServletException
{
- logger.debug("dispatching proxy moveOptionDown...");
+ logger.debug("dispatching proxy moveNominationDown...");
request.setAttribute(SOURCE_VOTE_STARTER, "monitoring");
logger.debug("SOURCE_VOTE_STARTER: monitoring");
@@ -729,20 +729,20 @@
String destination=VoteUtils.getDestination(sourceVoteStarter);
logger.debug("destination: " + destination);
- boolean isMoveOptionDown=voteAction.isMoveOptionDown(mapping, form, request, response);
- logger.debug("isMoveOptionDown :" +isMoveOptionDown);
+ boolean isMoveNominationDown=voteAction.isMoveNominationDown(mapping, form, request, response);
+ logger.debug("isMoveNominationDown :" +isMoveNominationDown);
return (mapping.findForward(destination));
}
- public ActionForward moveOptionUp(ActionMapping mapping,
+ public ActionForward moveNominationUp(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws IOException,
ServletException
{
- logger.debug("dispatching proxy moveOptionUp...");
+ logger.debug("dispatching proxy moveNominationUp...");
request.setAttribute(SOURCE_VOTE_STARTER, "monitoring");
logger.debug("SOURCE_VOTE_STARTER: monitoring");
@@ -754,8 +754,8 @@
logger.debug("destination: " + destination);
VoteAction voteAction= new VoteAction();
- boolean isMoveOptionUp=voteAction.isMoveOptionUp(mapping, form, request, response);
- logger.debug("isMoveOptionUp:" + isMoveOptionUp);
+ boolean isMoveNominationUp=voteAction.isMoveNominationUp(mapping, form, request, response);
+ logger.debug("isMoveNominationUp:" + isMoveNominationUp);
return (mapping.findForward(destination));
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java
===================================================================
diff -u -r34394364c9017ea473d58b5b8d0ee3819fc83828 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 34394364c9017ea473d58b5b8d0ee3819fc83828)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -25,9 +25,9 @@
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
/**
+ * ActionForm for the Monitoring environment
+ *
* @author Ozgur Demirtas
- *
- * ActionForm for the Monitoring environment
*/
public class VoteMonitoringForm extends VoteAuthoringForm implements VoteAppConstants {
// controls which method is called by the Lookup map */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -r192e812bc372965e505ea849d55537547fae74bd -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 192e812bc372965e505ea849d55537547fae74bd)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -52,8 +52,9 @@
/**
*
+ * Starts up the monitoring module
+ *
* @author Ozgur Demirtas
- * starts up the monitoring module
*/
public class VoteMonitoringStarterAction extends Action implements VoteAppConstants {
Index: lams_tool_vote/web/VoteErrorBox.jsp
===================================================================
diff -u -r0ec38b0c90a821a6e5732546f5e035b3c223c12f -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
+++ lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -32,10 +32,27 @@
+
+
+ <bean:message key="label.warning"/>
+
+
+ includes/javascript/tabcontroller.js">
+ includes/javascript/common.js">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r3b59f7ff8078fd852f279572927e5ed86bc78286 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 3b59f7ff8078fd852f279572927e5ed86bc78286)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -63,7 +63,7 @@
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r9d3b73b44f51fa4497afbc5a84a74dde79a25503 -r22789974b076931e27e1e37ed7d91bd17f4f9cb6
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 9d3b73b44f51fa4497afbc5a84a74dde79a25503)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
@@ -104,6 +104,12 @@
document.VoteMonitoringForm.optIndex.value=optionIndexValue;
submitMethod(actionMethod);
}
+
+ function submitModifyNomination(optionIndexValue, actionMethod)
+ {
+ document.VoteMonitoringForm.optIndex.value=optionIndexValue;
+ submitMethod(actionMethod);
+ }
function submitOpenVote(currentUid, actionMethod)
{