Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131009.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131009.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131009.sql (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +----------------------Put all sql statements below here------------------------- + +-- LKC-35 Be able import learning design with Scratchie tool exported from another server +ALTER TABLE tl_lascrt11_scratchie_item DROP FOREIGN KEY FK_NEW_610529188_F52D1F93758092FB; +ALTER TABLE tl_lascrt11_scratchie_item DROP COLUMN create_by; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java =================================================================== diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java (.../Summary.java) (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java (.../Summary.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -44,10 +44,8 @@ private String sessionName; private Long itemUid; private short itemType; - private boolean itemCreateByAuthor; private String itemTitle; private List itemInstructions = new ArrayList(); - private String username; private int viewNumber; // following is used for export portfolio programs: @@ -64,27 +62,6 @@ } /** - * Contruction method for monitoring summary function. - * - * Don't not set isInitGroup and viewNumber fields - * - * @param sessionName - * @param item - * @param isInitGroup - */ - public Summary(Long sessionId, String sessionName, ScratchieItem item) { - this.sessionId = sessionId; - this.sessionName = sessionName; - if (item != null) { - this.itemUid = item.getUid(); - this.itemCreateByAuthor = item.isCreateByAuthor(); - this.itemTitle = item.getDescription(); - this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName(); - } else - this.itemUid = new Long(-1); - } - - /** * Contruction method for export profolio function. * * Don't not set sessionId and viewNumber fields @@ -98,23 +75,13 @@ this.sessionName = sessionName; if (item != null) { this.itemUid = item.getUid(); - this.itemCreateByAuthor = item.isCreateByAuthor(); // TODO maybe a,b,c,d ? this.itemTitle = item.getDescription(); - this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName(); } else this.itemUid = new Long(-1); this.isInitGroup = isInitGroup; } - public boolean isItemCreateByAuthor() { - return itemCreateByAuthor; - } - - public void setItemCreateByAuthor(boolean itemCreateByAuthor) { - this.itemCreateByAuthor = itemCreateByAuthor; - } - public String getItemTitle() { return itemTitle; } @@ -155,14 +122,6 @@ this.sessionName = sessionName; } - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - public int getViewNumber() { return viewNumber; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java =================================================================== diff -u -r537b1cb3333b17ffb5b53577dc3b610a2ab0f085 -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 537b1cb3333b17ffb5b53577dc3b610a2ab0f085) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -120,10 +120,6 @@ // reset user info as well if (toContent.getCreatedBy() != null) { toContent.getCreatedBy().setScratchie(toContent); - Set items = toContent.getScratchieItems(); - for (ScratchieItem item : items) { - item.setCreateBy(toContent.getCreatedBy()); - } } return toContent; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java =================================================================== diff -u -rcc5ac6445941cdeeb5fd2440621630496e9f81e1 -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java (.../ScratchieItem.java) (revision cc5ac6445941cdeeb5fd2440621630496e9f81e1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java (.../ScratchieItem.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -52,7 +52,6 @@ private boolean isCreateByAuthor; private Date createDate; - private ScratchieUser createBy; // scratchie Items private Set answers; @@ -92,10 +91,6 @@ } item.answers = set; } - - // clone ReourceUser as well - if (this.createBy != null) - ((ScratchieItem) item).setCreateBy((ScratchieUser) this.createBy.clone()); } catch (CloneNotSupportedException e) { log.error("When clone " + ScratchieItem.class + " failed"); @@ -148,19 +143,6 @@ } /** - * @hibernate.many-to-one cascade="none" column="create_by" - * - * @return - */ - public ScratchieUser getCreateBy() { - return createBy; - } - - public void setCreateBy(ScratchieUser createBy) { - this.createBy = createBy; - } - - /** * @hibernate.property column="create_date" * @return */ Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r8a54fe0a58501da756e245edb3529d69275623ad -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 8a54fe0a58501da756e245edb3529d69275623ad) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -1743,11 +1743,6 @@ } toolContentObj.setCreatedBy(user); - // reset all scratchieItem createBy user - Set items = toolContentObj.getScratchieItems(); - for (ScratchieItem item : items) { - item.setCreateBy(user); - } scratchieDao.saveObject(toolContentObj); } catch (ImportToolContentException e) { throw new ToolException(e); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java =================================================================== diff -u -rfc1a34815de226b286ef1adfaf83eef4f96d049b -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision fc1a34815de226b286ef1adfaf83eef4f96d049b) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -253,16 +253,6 @@ TreeSet answerList = new TreeSet(new ScratchieAnswerComparator()); answerList.addAll(item.getAnswers()); item.setAnswers(answerList); - - if (item.getCreateBy() == null) { - if (scratchieUser == null) { - // get back login user DTO - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - scratchieUser = new ScratchieUser(user, scratchie); - } - item.setCreateBy(scratchieUser); - } } } // init scratchie item list @@ -409,8 +399,6 @@ while (iter.hasNext()) { ScratchieItem item = (ScratchieItem) iter.next(); if (item != null) { - // This flushs user UID info to message if this user is a new user. - item.setCreateBy(scratchieUser); removeNewLineCharacters(item); itemList.add(item); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -r537b1cb3333b17ffb5b53577dc3b610a2ab0f085 -r98d6135d78b975d3d7487470795b4a9e5bbf2bc6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 537b1cb3333b17ffb5b53577dc3b610a2ab0f085) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 98d6135d78b975d3d7487470795b4a9e5bbf2bc6) @@ -237,13 +237,6 @@ // set scratched flag for display purpose Collection items = service.getItemsWithIndicatedScratches(toolSessionId, user); - // becuase webpage will use login name here is just initialize it to avoid session close error in proxy object. - for (ScratchieItem item : items) { - if (item.getCreateBy() != null) { - item.getCreateBy().getLoginName(); - } - } - // for teacher in monitoring display the number of attempt. if (mode.isTeacher()) { service.retrieveScratchesOrder(items, user);