Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -191,7 +191,7 @@ label.authoring.advanced.burning.questions =Option for burning questions label.continue.burning.questions =Continue with burning questions -label.raise.burning.question =Raise burning question label.burning.questions =Burning questions +label.burning.question =Burning question #======= End labels: Exported 182 labels for en AU ===== Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -204,7 +204,10 @@ + name="reflectionForm" + validate="false" + parameter="saveBurningQuestions" + scope="request"> Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -146,6 +146,8 @@ public static final String ATTR_REFLECTION_ENTRY = "reflectEntry"; public static final String ATTR_REFLECTIONS = "reflections"; + + public static final String ATTR_BURNING_QUESTIONS_DTOS = "burningQuestionDtos"; public static final String ATTR_USER_UID = "userUid"; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java (.../ScratchieBurningQuestionDAO.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java (.../ScratchieBurningQuestionDAO.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -29,9 +29,7 @@ public interface ScratchieBurningQuestionDAO extends DAO { - ScratchieBurningQuestion getBurningQuestion(Long answerUid, Long sessionId); - - int getBurningQuestionCountTotal(Long sessionId); + List getBurningQuestionsByItemUid(Long itemUid); ScratchieBurningQuestion getBurningQuestionBySessionAndItem(Long sessionId, Long itemUid); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java (.../ScratchieBurningQuestionDAOHibernate.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java (.../ScratchieBurningQuestionDAOHibernate.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -29,33 +29,19 @@ import org.lamsfoundation.lams.tool.scratchie.model.ScratchieBurningQuestion; public class ScratchieBurningQuestionDAOHibernate extends BaseDAOHibernate implements ScratchieBurningQuestionDAO { - - private static final String FIND_BY_SESSION_AND_ANSWER = "from " + ScratchieBurningQuestion.class.getName() - + " as r where r.sessionId = ? and r.scratchieItem.uid=?"; private static final String FIND_BY_SESSION_AND_ITEM = "from " + ScratchieBurningQuestion.class.getName() + " as r where r.sessionId=? and r.scratchieItem.uid = ?"; private static final String FIND_BY_SESSION = "from " + ScratchieBurningQuestion.class.getName() + " as r where r.sessionId=? order by r.scratchieItem.orderId asc"; - private static final String FIND_VIEW_COUNT_BY_SESSION = "select count(*) from " - + ScratchieBurningQuestion.class.getName() + " as r where r.sessionId=?"; - - @Override - public ScratchieBurningQuestion getBurningQuestion(Long answerUid, Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_AND_ANSWER, new Object[] { sessionId, answerUid }); - if (list == null || list.size() == 0) - return null; - return (ScratchieBurningQuestion) list.get(0); - } + private static final String FIND_BY_ITEM_UID = "from " + ScratchieBurningQuestion.class.getName() + + " as r where r.scratchieItem.uid=? order by r.sessionId asc"; @Override - public int getBurningQuestionCountTotal(Long sessionId) { - List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_SESSION, new Object[] { sessionId}); - if (list == null || list.size() == 0) - return 0; - return ((Number) list.get(0)).intValue(); + public List getBurningQuestionsByItemUid(Long itemUid) { + return getHibernateTemplate().find(FIND_BY_ITEM_UID, new Object[] { itemUid}); } @Override Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -0,0 +1,51 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.tool.scratchie.dto; + +import java.util.Map; + +import org.lamsfoundation.lams.tool.scratchie.model.ScratchieBurningQuestion; +import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; + +public class BurningQuestionDTO { + private ScratchieItem item; + + private Map groupNameToBurningQuestion; + + public ScratchieItem getItem() { + return item; + } + + public void setItem(ScratchieItem item) { + this.item = item; + } + + public Map getGroupNameToBurningQuestion() { + return groupNameToBurningQuestion; + } + + public void setGroupNameToBurningQuestion(Map leaderNameToBurningQuestion) { + this.groupNameToBurningQuestion = leaderNameToBurningQuestion; + } +} Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -264,11 +264,11 @@ * * @return */ - public Set getScratchieItems() { + public Set getScratchieItems() { return scratchieItems; } - public void setScratchieItems(Set scratchieItems) { + public void setScratchieItems(Set scratchieItems) { this.scratchieItems = scratchieItems; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -30,6 +30,7 @@ import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO; import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary; import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; @@ -170,15 +171,24 @@ * @param user */ void getScratchesOrder(Collection items, Long toolSessionId); - + /** * Fill in scratchieItems with information about whether they were unraveled; and answers with information on their scratched. * * @param scratchieItemList + * @param item item parameter is optional. In case it's provided - these item collection is used instead of quering DB */ - Set getItemsWithIndicatedScratches(Long toolSessionId); + Collection getItemsWithIndicatedScratches(Long toolSessionId); /** + * The same as getItemsWithIndicatedScratches(Long toolSessionId), but items are provided as parameter and not queried from DB. + * + * @param scratchieItemList + * @param item this item collection is used instead of quering DB + */ + Collection getItemsWithIndicatedScratches(Long toolSessionId, Collection items); + + /** * Leader has scratched the specified answer. Will store this scratch for all users in his group. It will also * update all the marks. */ @@ -214,6 +224,14 @@ List getQuestionSummary(Long contentId, Long itemUid); /** + * Get BurningQuestionDtos used for summary tab + * + * @param scratchie + * @return + */ + List getBurningQuestionDtos(Scratchie scratchie); + + /** * Export excel spreadheet * * @param scratchie Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -70,6 +70,7 @@ import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieItemDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieSessionDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieUserDAO; +import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO; import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary; import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; @@ -438,6 +439,7 @@ burningQuestion.setSessionId(sessionId); burningQuestion.setAccessDate(new Date()); } + burningQuestion.setQuestion(question); scratchieBurningQuestionDao.saveObject(burningQuestion); } @@ -558,13 +560,19 @@ } @Override - public Set getItemsWithIndicatedScratches(Long toolSessionId) { - List userLogs = scratchieAnswerVisitDao.getLogsBySession(toolSessionId); + public Collection getItemsWithIndicatedScratches(Long toolSessionId) { Scratchie scratchie = this.getScratchieBySessionId(toolSessionId); Set items = new TreeSet(new ScratchieItemComparator()); items.addAll(scratchie.getScratchieItems()); + return getItemsWithIndicatedScratches(toolSessionId, items); + } + + @Override + public Collection getItemsWithIndicatedScratches(Long toolSessionId, Collection items) { + List userLogs = scratchieAnswerVisitDao.getLogsBySession(toolSessionId); + for (ScratchieItem item : items) { for (ScratchieAnswer answer : (Set) item.getAnswers()) { @@ -587,6 +595,7 @@ boolean isItemUnraveled = this.isItemUnraveled(item, userLogs); item.setUnraveled(isItemUnraveled); } + return items; } @@ -749,7 +758,48 @@ return groupSummaryList; } + + @Override + public List getBurningQuestionDtos(Scratchie scratchie) { + + Set items = new TreeSet(new ScratchieItemComparator()); + items.addAll(scratchie.getScratchieItems()); + // get all available leaders associated with this content as only leaders have reflections + List sessionList = scratchieSessionDao.getByContentId(scratchie.getContentId()); + + List burningQuestionDtos = new LinkedList(); + for (ScratchieItem item : items) { + BurningQuestionDTO burningQuestionDTO = new BurningQuestionDTO(); + burningQuestionDTO.setItem(item); + + List burningQuestions = scratchieBurningQuestionDao + .getBurningQuestionsByItemUid(item.getUid()); + + Map groupNameToBurningQuestion = new LinkedHashMap(); + for (ScratchieBurningQuestion burningQuestion : burningQuestions) { + + //find corresponding session + ScratchieSession session = null; + for (ScratchieSession sessionIter : sessionList) { + if (burningQuestion.getSessionId().equals(sessionIter.getSessionId())) { + session = sessionIter; + break; + } + } + + String groupName = StringEscapeUtils.escapeJavaScript(session.getSessionName()); + String burningQuestionText = StringEscapeUtils.escapeJavaScript(burningQuestion.getQuestion()); + groupNameToBurningQuestion.put(groupName, burningQuestionText); + } + burningQuestionDTO.setGroupNameToBurningQuestion(groupNameToBurningQuestion); + + burningQuestionDtos.add(burningQuestionDTO); + } + + return burningQuestionDtos; + } + @Override public List getReflectionList(Long contentId) { ArrayList reflections = new ArrayList(); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -195,7 +195,7 @@ notebookEntry = LearningAction.service.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL, ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue()); } - String entryText = (notebookEntry == null) ? new String() : notebookEntry.getEntry(); + String entryText = (notebookEntry == null) ? null : notebookEntry.getEntry(); // basic information sessionMap.put(ScratchieConstants.ATTR_TITLE, scratchie.getTitle()); @@ -262,9 +262,10 @@ } // populate items with the existing burning questions for displaying purposes + List burningQuestions = null; if (scratchie.isBurningQuestionsEnabled()) { - List burningQuestions = LearningAction.service + burningQuestions = LearningAction.service .getBurningQuestionsBySession(toolSessionId); for (ScratchieItem item : items) { @@ -311,6 +312,11 @@ //show learning.jsp page } else { + + //make non leaders also wait for burning questions submit + isWaitingForLeaderToSubmitNotebook |= scratchie.isBurningQuestionsEnabled() + && (burningQuestions == null || burningQuestions.isEmpty()); + sessionMap.put(ScratchieConstants.ATTR_IS_SCRATCHING_FINISHED, (Boolean) isScratchingFinished); sessionMap.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK, (Boolean) isWaitingForLeaderToSubmitNotebook); @@ -335,7 +341,7 @@ ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(toolSessionId); // set scratched flag for display purpose - Set items = LearningAction.service.getItemsWithIndicatedScratches(toolSessionId); + Collection items = LearningAction.service.getItemsWithIndicatedScratches(toolSessionId); sessionMap.put(ScratchieConstants.ATTR_ITEM_LIST, items); // refresh leadership status @@ -361,6 +367,7 @@ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute( sessionMapID); boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON); + boolean isBurningQuestionsEnabled = (Boolean) sessionMap.get(ScratchieConstants.ATTR_IS_BURNING_QUESTIONS_ENABLED); Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId); @@ -373,6 +380,14 @@ ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue()); } boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null); + + // make non leaders also wait for burning questions submit + List burningQuestions = null; + if (isBurningQuestionsEnabled) { + burningQuestions = LearningAction.service.getBurningQuestionsBySession(toolSessionId); + } + isWaitingForLeaderToSubmitNotebook |= isBurningQuestionsEnabled + && (burningQuestions == null || burningQuestions.isEmpty()); JSONObject JSONObject = new JSONObject(); JSONObject.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK, isWaitingForLeaderToSubmitNotebook); @@ -464,7 +479,6 @@ sessionMapID); request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID); boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON); - boolean isBurningQuestionsEnabled = (Boolean) sessionMap.get(ScratchieConstants.ATTR_IS_BURNING_QUESTIONS_ENABLED); final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(toolSessionId); @@ -486,11 +500,6 @@ int maxScore = (Integer) sessionMap.get(ScratchieConstants.ATTR_MAX_SCORE); double percentage = (maxScore == 0) ? 0 : ((score * 100) / maxScore); request.setAttribute(ScratchieConstants.ATTR_SCORE, (int) percentage); - - // show burning questions page if it's enabled - if (isBurningQuestionsEnabled) { - - } // display other groups' notebooks if (isReflectOnActivity) { @@ -515,6 +524,7 @@ request.setAttribute(ScratchieConstants.ATTR_REFLECTIONS, reflections); } + return mapping.findForward(ScratchieConstants.SUCCESS); } @@ -574,6 +584,10 @@ request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID); final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); Long userUid = (Long) sessionMap.get(ScratchieConstants.ATTR_USER_UID); + + // set scratched flag for display purpose + Collection items = (Collection) sessionMap.get(ScratchieConstants.ATTR_ITEM_LIST); + LearningAction.service.getItemsWithIndicatedScratches(toolSessionId, items); // in case of the leader we should let all other learners see Next Activity button ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(toolSessionId); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java =================================================================== diff -u -r4428202881c5551dd3973c9011d7a70e0a517060 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 4428202881c5551dd3973c9011d7a70e0a517060) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -45,6 +45,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants; +import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO; import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary; import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; @@ -130,6 +131,12 @@ sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID)); sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ON, scratchie.isReflectOnActivity()); + + // Create BurningQuestionsDtos if BurningQuestions is enabled. + if (scratchie.isBurningQuestionsEnabled()) { + List burningQuestionDtos = service.getBurningQuestionDtos(scratchie); + sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTIONS_DTOS, burningQuestionDtos); + } // Create reflectList if reflection is enabled. if (scratchie.isReflectOnActivity()) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java (.../ScratchieForm.java) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java (.../ScratchieForm.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -71,7 +71,7 @@ scratchie.setDefineLater(false); scratchie.setReflectOnActivity(false); scratchie.setExtraPoint(false); - scratchie.setBurningQuestionsEnabled(true); + scratchie.setBurningQuestionsEnabled(false); } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java =================================================================== diff -u -r4428202881c5551dd3973c9011d7a70e0a517060 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 4428202881c5551dd3973c9011d7a70e0a517060) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.scratchie.web.servlet; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Set; @@ -134,7 +135,7 @@ } // set complete flag for display purpose - Set items = service.getItemsWithIndicatedScratches(toolSessionID); + Collection items = service.getItemsWithIndicatedScratches(toolSessionID); sessionMap.put(ScratchieConstants.ATTR_ITEM_LIST, items); // Add flag to indicate whether to render user notebook entries Index: lams_tool_scratchie/web/pages/learning/burningQuestions.jsp =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/web/pages/learning/burningQuestions.jsp (.../burningQuestions.jsp) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/web/pages/learning/burningQuestions.jsp (.../burningQuestions.jsp) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -16,6 +16,10 @@ <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -37,18 +41,42 @@

-

:

- - + +

+
-

- - + + + + + + + + +
+ + + + + + + + + + + + + ${answer.description} +
- +

+ + +


+
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp =================================================================== diff -u -r4f28fc22200faa617609984b6478f093b18d6d72 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/web/pages/learning/questionlist.jsp (.../questionlist.jsp) (revision 4f28fc22200faa617609984b6478f093b18d6d72) +++ lams_tool_scratchie/web/pages/learning/questionlist.jsp (.../questionlist.jsp) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -32,7 +32,7 @@ //query for leader status (only in case there is notebook at the end of activity and leader hasn't answered it yet) var checkLeaderIntervalId = null; if (${!isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook && mode != "teacher"}) { - checkLeaderIntervalId = setInterval("checkLeaderSubmittedNotebook();",20000);// ask for leader status every 20 seconds + checkLeaderIntervalId = setInterval("checkLeaderSubmittedNotebook();",2000);// ask for leader status every 20 seconds } //check Leader Submitted Notebook and if true show finishButton Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== diff -u -r33930bf7e6bfcea95a0edddd72f2adb5eaad5b62 -r2adb14cdb105f3e0e72bd3c052e9dc254949049b --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 33930bf7e6bfcea95a0edddd72f2adb5eaad5b62) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) @@ -14,6 +14,11 @@ vertical-align:text-top; padding-top:2px; } + .burning-question-dto { + padding-left: 30px; + padding-bottom: 5px; + width:96%; + }

-
- +
+
+
+
@@ -264,11 +300,26 @@
- + + +
+

+ +

+
+ + +
+
+
+ + + + -
+

@@ -284,7 +335,6 @@
-