+ * + *
java.lang.Object
+ */
+ public Object clone() {
+
+ ScratchieUser user = null;
+ try {
+ user = (ScratchieUser) super.clone();
+ user.setUid(null);
+ // never clone session
+ user.setSession(null);
+ } catch (CloneNotSupportedException e) {
+ log.error("When clone " + ScratchieUser.class + " failed");
+ }
+
+ return user;
+ }
+
+ // **********************************************************
+ // Get/Set methods
+ // **********************************************************
+ /**
+ * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+ * @return Returns the uid.
+ */
+ public Long getUid() {
+ return uid;
+ }
+
+ /**
+ * @param uid
+ * The uid to set.
+ */
+ public void setUid(Long userID) {
+ this.uid = userID;
+ }
+
+ /**
+ * @hibernate.property column="user_id" length="20"
+ * @return Returns the userId.
+ */
+ public Long getUserId() {
+ return userId;
+ }
+
+ /**
+ * @param userId
+ * The userId to set.
+ */
+ public void setUserId(Long userID) {
+ this.userId = userID;
+ }
+
+ /**
+ * @hibernate.property length="255" column="last_name"
+ * @return
+ */
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ /**
+ * @hibernate.property length="255" column="first_name"
+ * @return
+ */
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ /**
+ * @hibernate.property column="login_name"
+ * @return
+ */
+ public String getLoginName() {
+ return loginName;
+ }
+
+ public void setLoginName(String loginName) {
+ this.loginName = loginName;
+ }
+
+ /**
+ * @hibernate.many-to-one column="session_uid" cascade="none"
+ * @return
+ */
+ public ScratchieSession getSession() {
+ return session;
+ }
+
+ public void setSession(ScratchieSession session) {
+ this.session = session;
+ }
+
+ /**
+ * @hibernate.many-to-one column="scratchie_uid" cascade="none"
+ * @return
+ */
+ public Scratchie getScratchie() {
+ return scratchie;
+ }
+
+ public void setScratchie(Scratchie content) {
+ this.scratchie = content;
+ }
+
+ /**
+ * @hibernate.property column="session_finished"
+ * @return
+ */
+ public boolean isSessionFinished() {
+ return sessionFinished;
+ }
+
+ public void setSessionFinished(boolean sessionFinished) {
+ this.sessionFinished = sessionFinished;
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (!(obj instanceof ScratchieUser))
+ return false;
+
+ final ScratchieUser user = (ScratchieUser) obj;
+
+ return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName)
+ .append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals();
+
+ }
+
+ public int hashCode() {
+ return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode();
+ }
+
+ public int getMark() {
+ return mark;
+ }
+
+ public void setMark(int mark) {
+ this.mark = mark;
+ }
+
+ public int getTotalAttempts() {
+ return totalAttempts;
+ }
+
+ public void setTotalAttempts(int totalAttempts) {
+ this.totalAttempts = totalAttempts;
+ }
+
+ public int getAttemptNumber() {
+ return attemptNumber;
+ }
+
+ public void setAttemptNumber(int attemptNumber) {
+ this.attemptNumber = attemptNumber;
+ }
+
+}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
@@ -0,0 +1,140 @@
+
+
+
+Scratchie by toolContentID.
+ *
+ * @param contentId
+ * @return
+ */
+ Scratchie getScratchieByContentId(Long contentId);
+
+ /**
+ * Get a cloned copy of tool default tool content (Scratchie) and assign the toolContentId of that copy as the given
+ * contentId
+ *
+ * @param contentId
+ * @return
+ * @throws ScratchieApplicationException
+ */
+ Scratchie getDefaultContent(Long contentId) throws ScratchieApplicationException;
+
+ /**
+ * Get list of scratchie items by given scratchieUid. These scratchie items must be created by author.
+ *
+ * @param scratchieUid
+ * @return
+ */
+ List getAuthoredItems(Long scratchieUid);
+
+ /**
+ * Upload instruciton file into repository.
+ *
+ * @param file
+ * @param type
+ * @return
+ * @throws UploadScratchieFileException
+ */
+ ScratchieAttachment uploadInstructionFile(FormFile file, String type) throws UploadScratchieFileException;
+
+ // ********** for user methods *************
+ /**
+ * Create a new user in database.
+ */
+ void createUser(ScratchieUser scratchieUser);
+
+ /**
+ * Get user by given userID and toolContentID.
+ *
+ * @param long1
+ * @return
+ */
+ ScratchieUser getUserByIDAndContent(Long userID, Long contentId);
+
+ /**
+ * Get user by sessionID and UserID
+ *
+ * @param long1
+ * @param sessionId
+ * @return
+ */
+ ScratchieUser getUserByIDAndSession(Long long1, Long sessionId);
+
+ // ********** Repository methods ***********************
+ /**
+ * Delete file from repository.
+ */
+ void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ScratchieApplicationException;
+
+ /**
+ * Save or update scratchie into database.
+ *
+ * @param Scratchie
+ */
+ void saveOrUpdateScratchie(Scratchie Scratchie);
+
+ /**
+ * Delete reource attachment(i.e., offline/online instruction file) from database. This method does not delete the
+ * file from repository.
+ *
+ * @param attachmentUid
+ */
+ void deleteScratchieAttachment(Long attachmentUid);
+
+ /**
+ * Delete resoruce item from database.
+ *
+ * @param uid
+ */
+ void deleteScratchieItem(Long uid);
+
+ /**
+ * Get scratchie which is relative with the special toolSession.
+ *
+ * @param sessionId
+ * @return
+ */
+ Scratchie getScratchieBySessionId(Long sessionId);
+
+ /**
+ * Get scratchie toolSession by toolSessionId
+ *
+ * @param sessionId
+ * @return
+ */
+ ScratchieSession getScratchieSessionBySessionId(Long sessionId);
+
+ /**
+ * Save or update scratchie session.
+ *
+ * @param resSession
+ */
+ void saveOrUpdateScratchieSession(ScratchieSession resSession);
+
+ void retrieveScratched(CollectionSummary list according to sessionId and skipHide flag.
+ *
+ * @param sessionId
+ * @param skipHide
+ * true, don't get scratchie item if its isHide flag is true. Otherwise, get all
+ * scratchie item
+ * @return
+ */
+ public ListTicket to login and
+ * access the Content Repository.
+ *
+ * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
+ * the tool needs to upload/download files from the content repository.
+ *
+ * @return ITicket The ticket for repostory access
+ * @throws ScratchieApplicationException
+ */
+ private ITicket getRepositoryLoginTicket() throws ScratchieApplicationException {
+ ICredentials credentials = new SimpleCredentials(scratchieToolContentHandler.getRepositoryUser(),
+ scratchieToolContentHandler.getRepositoryId());
+ try {
+ ITicket ticket = repositoryService.login(credentials,
+ scratchieToolContentHandler.getRepositoryWorkspaceName());
+ return ticket;
+ } catch (AccessDeniedException ae) {
+ throw new ScratchieApplicationException("Access Denied to repository." + ae.getMessage());
+ } catch (WorkspaceNotFoundException we) {
+ throw new ScratchieApplicationException("Workspace not found." + we.getMessage());
+ } catch (LoginException e) {
+ throw new ScratchieApplicationException("Login failed." + e.getMessage());
+ }
+ }
+
+ public Scratchie getScratchieByContentId(Long contentId) {
+ Scratchie rs = scratchieDao.getByContentId(contentId);
+ if (rs == null) {
+ ScratchieServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
+ }
+ return rs;
+ }
+
+ public Scratchie getDefaultContent(Long contentId) throws ScratchieApplicationException {
+ if (contentId == null) {
+ String error = messageService.getMessage("error.msg.default.content.not.find");
+ ScratchieServiceImpl.log.error(error);
+ throw new ScratchieApplicationException(error);
+ }
+
+ Scratchie defaultContent = getDefaultScratchie();
+ // save default content by given ID.
+ Scratchie content = new Scratchie();
+ content = Scratchie.newInstance(defaultContent, contentId, scratchieToolContentHandler);
+ return content;
+ }
+
+ public List getAuthoredItems(Long scratchieUid) {
+ return scratchieItemDao.getAuthoringItems(scratchieUid);
+ }
+
+ public ScratchieAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
+ throws UploadScratchieFileException {
+ if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
+ throw new UploadScratchieFileException(messageService.getMessage("error.msg.upload.file.not.found",
+ new Object[] { uploadFile }));
+ }
+
+ // upload file to repository
+ NodeKey nodeKey = processFile(uploadFile, fileType);
+
+ // create new attachement
+ ScratchieAttachment file = new ScratchieAttachment();
+ file.setFileType(fileType);
+ file.setFileUuid(nodeKey.getUuid());
+ file.setFileVersionId(nodeKey.getVersion());
+ file.setFileName(uploadFile.getFileName());
+ file.setCreated(new Date());
+
+ return file;
+ }
+
+ public void createUser(ScratchieUser scratchieUser) {
+ scratchieUserDao.saveObject(scratchieUser);
+ }
+
+ public ScratchieUser getUserByIDAndContent(Long userId, Long contentId) {
+
+ return scratchieUserDao.getUserByUserIDAndContentID(userId, contentId);
+
+ }
+
+ public ScratchieUser getUserByIDAndSession(Long userId, Long sessionId) {
+
+ return scratchieUserDao.getUserByUserIDAndSessionID(userId, sessionId);
+
+ }
+
+ public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ScratchieApplicationException {
+ ITicket ticket = getRepositoryLoginTicket();
+ try {
+ repositoryService.deleteVersion(ticket, fileUuid, fileVersionId);
+ } catch (Exception e) {
+ throw new ScratchieApplicationException("Exception occured while deleting files from" + " the repository "
+ + e.getMessage());
+ }
+ }
+
+ public void saveOrUpdateScratchie(Scratchie scratchie) {
+ scratchieDao.saveObject(scratchie);
+ }
+
+ public void deleteScratchieAttachment(Long attachmentUid) {
+ scratchieAttachmentDao.removeObject(ScratchieAttachment.class, attachmentUid);
+
+ }
+
+ public void saveOrUpdateScratchieItem(ScratchieItem item) {
+ scratchieItemDao.saveObject(item);
+ }
+
+ public void deleteScratchieItem(Long uid) {
+ scratchieItemDao.removeObject(ScratchieItem.class, uid);
+ }
+
+ public List+ * This class act as the proxy between web layer and service layer. It is designed to decouple the presentation logic + * and business logic completely. In this way, the presentation tier will no longer be aware of the changes in service + * layer. Therefore we can feel free to switch the business logic implementation. + *
+ * + * @author Andrey Balan + */ +public class ScratchieServiceProxy { + /** + * Return the domain service object. It will delegate to the Spring helper method to retrieve the proper bean from + * Spring bean factory. + * + * @param servletContext + * the servletContext for current application + * @return Shared scratchie service object. + */ + public static final IScratchieService getScratchieService(ServletContext servletContext) { + return (IScratchieService) getScratchieDomainService(servletContext); + } + + public static final ToolSessionManager getSessionManager(ServletContext servletContext) { + return (ToolSessionManager) getScratchieDomainService(servletContext); + } + + public static final ToolContentManager getContentManager(ServletContext servletContext) { + return (ToolContentManager) getScratchieDomainService(servletContext); + } + + private static Object getScratchieDomainService(ServletContext servletContext) { + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); + return wac.getBean(ScratchieConstants.RESOURCE_SERVICE); + } + +} Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/UploadScratchieFileException.java =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/UploadScratchieFileException.java (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/UploadScratchieFileException.java (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) @@ -0,0 +1,44 @@ +/**************************************************************** + * 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 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.service; + +public class UploadScratchieFileException extends Exception { + + public UploadScratchieFileException() { + super(); + } + + public UploadScratchieFileException(String message, Throwable cause) { + super(message, cause); + } + + public UploadScratchieFileException(String message) { + super(message); + } + + public UploadScratchieFileException(Throwable cause) { + super(cause); + } + +} Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ReflectDTOComparator.java =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ReflectDTOComparator.java (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ReflectDTOComparator.java (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) @@ -0,0 +1,38 @@ +/**************************************************************** + * 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 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 + * **************************************************************** + */ +package org.lamsfoundation.lams.tool.scratchie.util; + +import java.util.Comparator; + +import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; + +public class ReflectDTOComparator implements Comparatorjava.util.List from HttpSession by given name.
+ *
+ * @param request
+ * @param name
+ * @return
+ */
+ private List getListFromSession(SessionMap sessionMap, String name) {
+ List list = (List) sessionMap.get(name);
+ if (list == null) {
+ list = new ArrayList();
+ sessionMap.put(name, list);
+ }
+ return list;
+ }
+
+ /**
+ * Get answer options from HttpRequest
+ *
+ * @param request
+ * @param isForSaving whether the blank options will be preserved or not
+ *
+ */
+ private TreeSetHttpRequest
+ *
+ * @param request
+ * @param parameterName parameterName
+ */
+ private Mapjava.util.List from HttpSession by given name.
+ *
+ * @param request
+ * @param name
+ * @return
+ */
+ private List getListFromSession(SessionMap sessionMap, String name) {
+ List list = (List) sessionMap.get(name);
+ if (list == null) {
+ list = new ArrayList();
+ sessionMap.put(name, list);
+ }
+ return list;
+ }
+
+ private ScratchieUser getCurrentUser(IScratchieService service, Long sessionId) {
+ // try to get form system session
+ HttpSession ss = SessionManager.getSession();
+ // get back login user DTO
+ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ ScratchieUser scratchieUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
+
+ if (scratchieUser == null) {
+ ScratchieSession session = service.getScratchieSessionBySessionId(sessionId);
+ scratchieUser = new ScratchieUser(user, session);
+ service.createUser(scratchieUser);
+ }
+ return scratchieUser;
+ }
+
+ private ScratchieUser getSpecifiedUser(IScratchieService service, Long sessionId, Integer userId) {
+ ScratchieUser scratchieUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId);
+ if (scratchieUser == null) {
+ LearningAction.log
+ .error("Unable to find specified user for scratchie activity. Screens are likely to fail. SessionId="
+ + sessionId + " UserId=" + userId);
+ }
+ return scratchieUser;
+ }
+
+}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
@@ -0,0 +1,175 @@
+/****************************************************************
+ * 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.web.action;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
+import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
+import org.lamsfoundation.lams.tool.scratchie.model.GroupSummary;
+import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItemVisitLog;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
+import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class MonitoringAction extends Action {
+ public static Logger log = Logger.getLogger(MonitoringAction.class);
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ String param = mapping.getParameter();
+
+ request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
+
+ if (param.equals("summary")) {
+ return summary(mapping, form, request, response);
+ }
+ if (param.equals("userMasterDetail")) {
+ return userMasterDetail(mapping, form, request, response);
+ }
+ if (param.equals("itemSummary")) {
+ return itemSummary(mapping, form, request, response);
+ }
+ if (param.equals("viewReflection")) {
+ return viewReflection(mapping, form, request, response);
+ }
+
+ return mapping.findForward(ScratchieConstants.ERROR);
+ }
+
+ private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
+ // initialize Session Map
+ SessionMap sessionMap = new SessionMap();
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+ Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+ IScratchieService service = getScratchieService();
+ List
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_scratchie/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/TabName.tag (revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/TabName.tag (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
@@ -0,0 +1,59 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ * Author: Mitchell Seaton
+ * Description: Shortens name that are too long to fit inside a tab
+ */
+
+ %>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+Index: lams_tool_scratchie/web/common/header.jsp =================================================================== diff -u --- lams_tool_scratchie/web/common/header.jsp (revision 0) +++ lams_tool_scratchie/web/common/header.jsp (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) @@ -0,0 +1,17 @@ +<%@ include file="/common/taglibs.jsp"%> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/common/messages.jsp"%>
+
+
+
+
+
+
+
+
+|
+
+
+ |
+
|
+
+
+ |
+
+
Index: lams_tool_scratchie/web/pages/authoring/definelater.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/authoring/definelater.jsp (revision 0)
+++ lams_tool_scratchie/web/pages/authoring/definelater.jsp (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
@@ -0,0 +1,83 @@
+
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="java.util.HashSet"%>
+<%@ page import="org.lamsfoundation.lams.tool.scratchie.ScratchieConstants"%>
+<%@ page import="java.util.Set"%>
+<%Set tabs = new HashSet();
+ tabs.add("label.authoring.heading.basic");
+ pageContext.setAttribute("tabs", tabs);
+
+ %>
+
+ <%@ include file="parts/itemlist.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/common/messages.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
|
+
+ <%@ include file="parts/instructionfilelist.jsp"%>
+
+ |
+
|
+
+
+ |
+
|
+
+ + |
+
|
+
+
+ |
+
|
+
+ <%@ include file="parts/instructionfilelist.jsp"%>
+
+ |
+
|
+
+
+ |
+
-
+
-
+
+
|
+
+
+  "
+ onclick="upItem(${status.index})">
+  ">
+  ">
+  "
+ onclick="downItem(${status.index})">
+ |
+
+
+  "
+ onclick="removeItem(${status.index})" />
+ |
+
+
+
+
+
+
+
+
+
+
+
+
++ ${sessionMap.scratchie.title} +
+ +
+ ${sessionMap.scratchie.instructions}
+
+
+ |
+ ${item.title}
+ + ${item.description} + |
+
+ 
+ 
+ 
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++ ${sessionMap.scratchie.title} +
+ +
+ ${sessionMap.scratchie.instructions}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++ ${scratchie.title} +
+ ++ ${scratchie.instructions} +
+ + <%@ include file="/common/messages.jsp"%> + +
+ 
+ 
+ 
+
+
+ |
+
+ + ${item.description} + | +
+
+
+
+
+
+
+
+
+
+
+
+
+ + ${sessionMap.reflectInstructions} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + ${sessionMap.title} +
+ + <%@ include file="/common/messages.jsp"%> + +
+
+
+
+
+
+
+
+
+
+
+
+
+
++ ${sessionMap.title} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + ${sessionMap.reflectInstructions} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
+ |
+
+ |
+
|
+ |
+
+ |
+
|
+ |
+ |
|
+
+
+
+
+ |
+ ||
|
+ |
+ ||
|
+ |
+
+
+ |
+
+
+ |
+
|
+ + |
+ ||
|
+
+
+
+
+ |
+ ||
|
+ |
+ ||
|
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
++ + \ No newline at end of file Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp =================================================================== diff -u --- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (revision 0) +++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) @@ -0,0 +1,133 @@ + + +<%@ include file="/common/taglibs.jsp"%> + +
+
+
+
+
+ <%@ include file="/common/messages.jsp"%> + +
+ ${item.description}
+
+
+
+ ${item.description}
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${item.description}
+
+
+ + <%@ include file="/common/messages.jsp"%> + +
+ ${item.description}
+
+
+
+ 
' border='0'>
+
+
+
+ ${item.description}
+
+ ' border='0'>
+
+ +
+ +
+
+
+
+
+
+ |
+ |
+ |||
| + # + | +
+ |
+
+ |
+ |
|---|---|---|---|
| + ${status.index + 1} + | ++ ${user.firstName} ${user.lastName} + | ++ ${user.mark} + | +|
+
+
+
+
+
+
+
+
+
+ <%@ include file="parts/masterDetailLoadUp.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+