Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -39,7 +39,7 @@
content_id bigint unique,
allow_add_files bit,
allow_add_urls bit,
- min_view_resource_number integer,
+ mini_view_resource_number integer,
allow_auto_run bit,
primary key (uid)
);
@@ -105,6 +105,6 @@
-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`, `min_view_resource_number`, `allow_auto_run`) VALUES
+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);
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -48,7 +48,7 @@
content_id bigint unique,
allow_add_files bit,
allow_add_urls bit,
- min_view_resource_number integer,
+ mini_view_resource_number integer,
allow_auto_run bit,
primary key (uid)
);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceSessionDAO.java
===================================================================
diff -u -rf623eebadfbc3c47bda69461ebcd98de16c3401c -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceSessionDAO.java (.../ResourceSessionDAO.java) (revision f623eebadfbc3c47bda69461ebcd98de16c3401c)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceSessionDAO.java (.../ResourceSessionDAO.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -37,4 +37,5 @@
void deleteBySessionId(Long toolSessionId);
+
}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -30,9 +30,9 @@
public class ResourceItemVisitDAOHibernate extends BaseDAOHibernate implements ResourceItemVisitDAO{
- private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName() + " where user.userId = ? and resourceItem.uid=?";
+ private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.resourceItem.uid=?";
private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + ResourceItemVisitLog.class.getName()
- + " where user.uid = ?";
+ + " as r where r.user.userId =?";
public ResourceItemVisitLog getResourceItemLog(Long itemUid,Long userId){
List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid});
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -57,7 +57,7 @@
//advance
private boolean runOffline;
private boolean runAuto;
- private int minViewResourceNumber;
+ private int miniViewResourceNumber;
private boolean allowAddFiles;
private boolean allowAddUrls;
@@ -80,7 +80,7 @@
//*************** NON Persist Fields ********************
private IToolContentHandler toolContentHandler;
- private String minViewNumber;
+ private String miniViewNumberStr;
/**
* Default contruction method.
*
@@ -461,14 +461,14 @@
this.allowAddUrls = allowAddUrls;
}
/**
- * @hibernate.property column="min_view_resource_number"
+ * @hibernate.property column="mini_view_resource_number"
* @return
*/
- public int getMinViewResourceNumber() {
- return minViewResourceNumber;
+ public int getMiniViewResourceNumber() {
+ return miniViewResourceNumber;
}
- public void setMinViewResourceNumber(int minViewResourceNumber) {
- this.minViewResourceNumber = minViewResourceNumber;
+ public void setMiniViewResourceNumber(int minViewResourceNumber) {
+ this.miniViewResourceNumber = minViewResourceNumber;
}
/**
* @hibernate.property column="allow_auto_run"
@@ -484,11 +484,11 @@
* For display use
* @return
*/
- public String getMinViewNumber() {
- return minViewNumber;
+ public String getMiniViewNumberStr() {
+ return miniViewNumberStr;
}
- public void setMinViewNumber(String minViewNumber) {
- this.minViewNumber = minViewNumber;
+ public void setMiniViewNumberStr(String minViewNumber) {
+ this.miniViewNumberStr = minViewNumber;
}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -35,7 +35,7 @@
* @hibernate.class table="tl_larsrc11_session"
*
*/
-public class ResourceSession implements Cloneable{
+public class ResourceSession{
private static Logger log = Logger.getLogger(ResourceSession.class);
@@ -49,20 +49,6 @@
private int status;
//resource Items
private Set resourceItems;
-// **********************************************************
- // Function method for ForumToolSession
-// **********************************************************
- public Object clone(){
-
- ResourceSession session = null;
- try{
- session = (ResourceSession) super.clone();
- //TODO: need clone ResourceItems
- } catch (CloneNotSupportedException e) {
- log.error("When clone " + ResourceSession.class + " failed");
- }
- return session;
- }
// **********************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java
===================================================================
diff -u -r57a8fd80863308a6aae133850dbe2de4acd15abf -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision 57a8fd80863308a6aae133850dbe2de4acd15abf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -55,24 +55,7 @@
this.session = session;
}
-// **********************************************************
- // Function method for ForumUser
-// **********************************************************
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone() {
-
- Object obj = null;
- try {
- obj = super.clone();
- } catch (CloneNotSupportedException e) {
- log.error("When clone " + ResourceUser.class + " failed");
- }
- return obj;
- }
-
// **********************************************************
// Get/Set methods
// **********************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -296,10 +296,12 @@
public Resource getResourceBySessionId(Long sessionId){
ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId);
- //construct dto fields;
+ //to skip GCLib problem
Resource res = session.getResource();
- res.setMinViewNumber(messageService.getMessage("label.learning.minimum.review"
- ,new Object[new Integer(res.getMinViewResourceNumber())]));
+ log.debug("Resource Uid:"+res.getUid()+"-Resource miniView:"+res.getMiniViewResourceNumber());
+ //construct dto fields;
+ res.setMiniViewNumberStr(messageService.getMessage("label.learning.minimum.review"
+ ,new Object[new Integer(res.getMiniViewResourceNumber())]));
return res;
}
public ResourceSession getResourceSessionBySessionId(Long sessionId) {
@@ -377,7 +379,7 @@
log.error("Failed get session by ID [" + toolSessionId + "]");
return 0;
}
- int reqView = session.getResource().getMinViewResourceNumber();
+ int reqView = session.getResource().getMiniViewResourceNumber();
return (reqView - miniView);
}
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -20,7 +20,7 @@
|
-
+
1
2
3
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -rc8f42df13810316bf19cfe3239ad45fe881b886e
--- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision c8f42df13810316bf19cfe3239ad45fe881b886e)
@@ -87,7 +87,7 @@
|
-
+
|
|