Index: lams_tool_larsrc/library_licenses.txt =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/Attic/library_licenses.txt,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/library_licenses.txt 17 May 2006 06:55:32 -0000 1.1 @@ -0,0 +1,10 @@ +Tigra Tree Javascript license description: +There is no license fee or royalty fee to be paid at any time for using the Tigra Tree Menu v1.x +You may include the source code or modified source code within your own projects for either personal or commercial use but excluding the restrictions outlined below. The following restrictions apply to all parts of the component, including all source code, samples and documentation. + + * Header block of script file (tree.js) CAN NOT be modified or removed. + * The above items CAN NOT be sold as are, either individually or together. + * The above items CAN NOT be modified and then sold as a library component, either individually or together. + + +For more detail, http://www.softcomplex.com/products/tigra_tree_menu/docs/ \ No newline at end of file Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.19 -r1.20 --- lams_tool_larsrc/conf/language/ApplicationResources.properties 17 May 2006 03:12:18 -0000 1.19 +++ lams_tool_larsrc/conf/language/ApplicationResources.properties 17 May 2006 06:55:32 -0000 1.20 @@ -131,6 +131,7 @@ monitoring.label.user.loginname=Login name monitoring.label.user.name=Name monitoring.label.hidden=Hidden +monitoring.label.access.time=Access time label.monitoring.edit.activity.cancel =Cancel label.monitoring.edit.activity.update =Update Index: lams_tool_larsrc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/activity_insert.sql,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/db/sql/activity_insert.sql 21 Mar 2006 05:14:31 -0000 1.1 +++ lams_tool_larsrc/db/sql/activity_insert.sql 17 May 2006 06:55:32 -0000 1.2 @@ -45,7 +45,7 @@ ( NULL , 'Share Resources' -, 'Share Resoruces' +, 'Share Resources' , 'Put some help text here.' , NULL , NULL Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql,v diff -u -r1.8 -r1.9 --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql 2 May 2006 06:34:01 -0000 1.8 +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql 17 May 2006 06:55:32 -0000 1.9 @@ -106,5 +106,5 @@ INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`) VALUES - (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',1,1,${default_content_id},1,1,1,1); + (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,1,${default_content_id},1,1,1,1); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Attic/Summary.java,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java 4 May 2006 04:24:10 -0000 1.3 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java 17 May 2006 06:55:32 -0000 1.4 @@ -185,6 +185,4 @@ this.isInitGroup = isInitGroup; } - - } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java,v diff -u -r1.9 -r1.10 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java 26 Apr 2006 05:51:41 -0000 1.9 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java 17 May 2006 06:55:32 -0000 1.10 @@ -23,11 +23,14 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.rsrc.model; +import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -81,6 +84,8 @@ private IToolContentHandler toolContentHandler; private String miniViewNumberStr; + private List onlineFileList; + private List offlineFileList; /** * Default contruction method. * @@ -190,6 +195,19 @@ this.setUpdated(new Date(now)); } + public void toDTO(){ + onlineFileList = new ArrayList(); + offlineFileList = new ArrayList(); + Set fileSet = this.getAttachments(); + if(fileSet != null){ + for(ResourceAttachment file:fileSet){ + if(StringUtils.equalsIgnoreCase(file.getFileType(),IToolContentHandler.TYPE_OFFLINE)) + offlineFileList.add(file); + else + onlineFileList.add(file); + } + } + } //********************************************************** // get/set methods //********************************************************** @@ -490,6 +508,18 @@ public void setMiniViewNumberStr(String minViewNumber) { this.miniViewNumberStr = minViewNumber; } + public List getOfflineFileList() { + return offlineFileList; + } + public void setOfflineFileList(List offlineFileList) { + this.offlineFileList = offlineFileList; + } + public List getOnlineFileList() { + return onlineFileList; + } + public void setOnlineFileList(List onlineFileList) { + this.onlineFileList = onlineFileList; + } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java,v diff -u -r1.4 -r1.5 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java 26 Apr 2006 05:51:41 -0000 1.4 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java 17 May 2006 06:55:32 -0000 1.5 @@ -23,6 +23,8 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.rsrc.model; +import java.util.Date; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -45,6 +47,10 @@ private String loginName; private ResourceSession session; + //=============== NON Persisit value: for display use =========== + //the user access some reousrce item date time. Use in monitoring summary page + private Date accessDate; + public ResourceUser(){ } public ResourceUser(UserDTO user, ResourceSession session){ @@ -152,5 +158,11 @@ .append(lastName).append(loginName) .toHashCode(); } + public Date getAccessDate() { + return accessDate; + } + public void setAccessDate(Date accessDate) { + this.accessDate = accessDate; + } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.23 -r1.24 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 17 May 2006 03:12:18 -0000 1.23 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 17 May 2006 06:55:32 -0000 1.24 @@ -503,7 +503,9 @@ List logList = resourceItemVisitDao.getResourceItemLogBySession(sessionId,itemUid); List userList = new ArrayList(logList.size()); for(ResourceItemVisitLog visit : logList){ - userList.add(visit.getUser()); + ResourceUser user = visit.getUser(); + user.setAccessDate(visit.getAccessDate()); + userList.add(user); } return userList; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v diff -u -r1.23 -r1.24 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 11 May 2006 06:00:47 -0000 1.23 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 17 May 2006 06:55:32 -0000 1.24 @@ -511,6 +511,9 @@ service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId()); } + //if miniview number is bigger than available items, then force it to 1 + if(resourcePO.getMiniViewResourceNumber() > topics.size()) + resourcePO.setMiniViewResourceNumber((topics.size()==0?0:1)); //********************************************** //finally persist resourcePO again service.saveOrUpdateResource(resourcePO); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v diff -u -r1.6 -r1.7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 5 May 2006 04:34:56 -0000 1.6 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 17 May 2006 06:55:32 -0000 1.7 @@ -129,6 +129,7 @@ request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList); Resource resource = service.getResourceByContentId(contentId); + resource.toDTO(); request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isResourceEditable(resource))); request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE, resource); request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 8 May 2006 06:52:06 -0000 1.4 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 17 May 2006 06:55:32 -0000 1.5 @@ -94,7 +94,7 @@ //authoring: does not save item yet, so only has ItemList from session and identity by Index List resourceList = getResourceItemList(request); item = resourceList.get(itemIdx); - }else if(mode.isLearner()){ + }else if(mode.isLearner() || mode.isTeacher()){ Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); //save itemUid to HttpSession request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,itemUid); Index: lams_tool_larsrc/web/pages/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/advance.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_larsrc/web/pages/authoring/advance.jsp 26 Apr 2006 05:51:41 -0000 1.5 +++ lams_tool_larsrc/web/pages/authoring/advance.jsp 17 May 2006 06:55:32 -0000 1.6 @@ -20,12 +20,17 @@ - - 1 - 2 - 3 - 4 - 5 + + + + + + + + + + + Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_larsrc/web/pages/authoring/authoring.jsp 17 May 2006 03:12:18 -0000 1.11 +++ lams_tool_larsrc/web/pages/authoring/authoring.jsp 17 May 2006 06:55:32 -0000 1.12 @@ -46,6 +46,10 @@ tag.value = tabId; // end optional tab controller stuff selectTab(tabId); + + //for advanceTab + if(tabId == 2) + changeViewNum(); } function doUploadOnline() { @@ -59,6 +63,34 @@ myForm.submit(); } + function changeViewNum(){ + var tb = document.getElementById("itemTable"); + var num = tb.getElementsByTagName("tr"); + var sel = document.getElementById("viewNumList"); + var newField = sel.options; + var len = sel.length; + var selIdx=-1; + //there is bug in Opera8.5: if add alert before this loop, it will work,weird. + for (var idx=0;idx 0 && selIdx==i){ + opt.selected = true; + }else{ + opt.selected = false; + } + opt.appendChild(optT); + sel.appendChild(opt); + } + } Index: lams_tool_larsrc/web/pages/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_larsrc/web/pages/authoring/basic.jsp 11 Apr 2006 07:25:24 -0000 1.11 +++ lams_tool_larsrc/web/pages/authoring/basic.jsp 17 May 2006 06:55:32 -0000 1.12 @@ -55,6 +55,7 @@ function deleteItemComplete(){ hideBusy(resourceListTargetDiv); } + Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp 1 May 2006 06:30:51 -0000 1.9 +++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp 17 May 2006 06:55:32 -0000 1.10 @@ -3,7 +3,7 @@

-
+
<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%> @@ -85,7 +85,10 @@ <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%> \ No newline at end of file Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/export/exportportfolio.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp 4 May 2006 06:01:09 -0000 1.3 +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp 17 May 2006 06:55:32 -0000 1.4 @@ -109,10 +109,8 @@ Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_larsrc/web/pages/learning/learning.jsp 8 May 2006 06:52:06 -0000 1.11 +++ lams_tool_larsrc/web/pages/learning/learning.jsp 17 May 2006 06:55:32 -0000 1.12 @@ -73,7 +73,11 @@ - + - - <%-- - --%> @@ -61,13 +52,12 @@ - - <%-- - --%> <%-- Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp 5 May 2006 04:34:56 -0000 1.3 +++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp 17 May 2006 06:55:32 -0000 1.4 @@ -20,7 +20,10 @@ selectTab(tabId); } - + function viewItem(itemUid){ + var myUrl = "?itemUid=" + itemUid; + launchPopup(myUrl,"Review"); + } Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_larsrc/web/pages/monitoring/summary.jsp 4 May 2006 04:24:10 -0000 1.6 +++ lams_tool_larsrc/web/pages/monitoring/summary.jsp 17 May 2006 06:55:32 -0000 1.7 @@ -56,7 +56,7 @@ Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/userlist.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/web/pages/monitoring/userlist.jsp 2 May 2006 04:07:37 -0000 1.2 +++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp 17 May 2006 06:55:32 -0000 1.3 @@ -10,6 +10,9 @@ + @@ -19,13 +22,16 @@ ${user.loginName} + -
- - - - + +
${item.title}${item.title} + + [${item.createBy.loginName}] + + Index: lams_tool_larsrc/web/pages/monitoring/instructions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/Attic/instructions.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/web/pages/monitoring/instructions.jsp 5 May 2006 04:34:56 -0000 1.1 +++ lams_tool_larsrc/web/pages/monitoring/instructions.jsp 17 May 2006 06:55:32 -0000 1.2 @@ -13,14 +13,13 @@
+  
- +
  • @@ -36,18 +35,10 @@ -   - - - - - -
    • +  
    - +
  • @@ -82,17 +72,10 @@ - - - - - -
    • - ${item.itemTitle} + ${item.itemTitle} @@ -77,16 +77,14 @@ - - - - - - - - - - + + + + + + + +
    + +
    + + ${user.firstName},${user.lastName}
    - Close + + Close