Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r0f6fefcd6c8a98859a9d673514968eabeed70348 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0f6fefcd6c8a98859a9d673514968eabeed70348) +++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -6,7 +6,7 @@ #=================== labels for ShareResources =================# -activity.description =Sharing resources with others. +activity.description =Gallery to share images with others. label.authoring.basic.resource.instructions =Instructions label.authoring.heading.instructions =Instructions label.authoring.heading.instructions.desc =Please input online and offline instructions @@ -15,19 +15,19 @@ label.authoring.online.instruction =Online Instructions label.authoring.offline.instruction =Offline Instructions error.resource.item.desc.blank =Comment/Instruction can not be blank -activity.helptext =Uploading your resources to share with others. -tool.display.name =Share Resources Tool -tool.description =Tool for sharing resources. -appName =Share Resources +activity.helptext =Uploading your images to share with others. +tool.display.name =Image Gallery Tool +tool.description =Tool for sharing images. +appName =Image Gallery errorPage.title =Error page errorPage.heading =Some error occurs when handling your request -label.authoring.heading =Share Resources -label.author.title =Share Resources Authoring +label.authoring.heading =Image Gallery +label.author.title =Image Gallery Authoring label.authoring.heading.basic =Basic label.next.instruction =Next Instruction -label.authoring.heading.basic.desc =Basic input information for shared resources +label.authoring.heading.basic.desc =Basic input information for image gallery msg.no.instruction =No instruction available. -label.authoring.heading.advance.desc =Please input advance options for shared resources +label.authoring.heading.advance.desc =Please input advance options for image gallery label.authoring.basic.title =Title label.authoring.basic.add.url =Add URL label.authoring.basic.add.image =Add Image @@ -64,13 +64,13 @@ label.authoring.up =Move Up label.authoring.down =Move down label.authoring.image =Image -authoring.exception =There is a problem in shared resources authoring page, the reason is {0} +authoring.exception =There is a problem in image gallery authoring page, the reason is {0} authoring.msg.cancel.save =Do you want to close this window without saving? label.learning.comment.or.instruction =Comment/Instruction label.learning.add.new.image =Add new image -label.learning.title =Share Resource Learning -label.learning.heading =Share Resources -label.resoruce.to.review =Resources to view +label.learning.title =Image Gallery Learning +label.learning.heading =Image Gallery +label.resoruce.to.review =Image to view label.learning.minimum.review =You must view at least {0} of the resources. label.check.for.new =Check for new label.suggest.new =Suggest a new @@ -101,14 +101,33 @@ monitoring.label.user.loginname =Login name monitoring.label.user.name =Name monitoring.label.hidden =Hidden +label.monitoring.title =Image Gallery Monitor +label.monitoring.number.rated =Number of rated +label.monitoring.average.rating =Average rating +label.monitoring.number.votes =Number of votes +label.monitoring.by = By label.monitoring.edit.activity.cancel =Cancel label.monitoring.edit.activity.update =Update label.monitoring.edit.activity.edit =Edit +label.monitoring.summary.overall.summary =Overall Summary +label.monitoring.summary.title.reflection =Notebook Entry +label.monitoring.imagesummary.image.summary =Image Summary +label.monitoring.imagesummary.save =Save +label.monitoring.imagesummary.user =Learner +label.monitoring.imagesummary.comments =Comments +label.monitoring.imagesummary.rating =Rating +label.monitoring.imagesummary.voted.for.this.image =Voted for this image? +label.monitoring.imagesummary.image =Image +label.monitoring.updatecomment.update.comment =Update Comment +label.monitoring.updatecomment.comment =Comment +label.monitoring.updatecomment.save =Save +label.monitoring.updatecomment.posted.by =Posted by +label.monitoring.updatecomment.posted.on =Posted on message.monitoring.edit.activity.not.editable =This Activity is no longer editable label.description =Description: export.label.resource =Resource export.label.no.learning.object =No offline package available -export.title =Export portfolio of Share Resource +export.title =Export portfolio of Image Gallery export.init.resource =Initial Resources error.resource.item.title.blank =Title can not be blank. error.resource.image.not.alowed.format =Allowed file formats: gif, png, jpg @@ -186,15 +205,15 @@ monitoring.label.attachments =Attachments message.activityLocked =The instructor has set this activity not to allow you to view or share any more resources after you have finished it. label.export.reflection =Notebook Entries -message.warnLockOnFinish =Note: After you click on \u201cNext Activity\u201d, if you come back to this Share Resource, you won\u2019t be able to share new resources. +message.warnLockOnFinish =Note: After you click on \u201cNext Activity\u201d, if you come back to this Image Gallery, you won\u2019t be able to share new resources. monitoring.label.instructions =Instructions label.on =On label.off =Off monitor.summary.th.advancedSettings =Advanced Settings monitor.summary.td.addNotebook =Add Notebook at end of Image Gallery monitor.summary.td.notebookInstructions =Notebook instructions -event.assigment.submit.subject=LAMS: A learner submitted an assigment in a Shared Resources tool -event.assigment.submit.body=The learner {0} submitted an assigment in a Shared Resources tool.\n\nThis message was send automatically, following tool's advanced settings. +event.assigment.submit.subject=LAMS: A learner submitted an assigment in a Image Gallery tool +event.assigment.submit.body=The learner {0} submitted an assigment in a Image Gallery tool.\n\nThis message was send automatically, following tool's advanced settings. admin.page.title =Image Gallery Settings error.required.fields.missing =Missing values, please make sure all required fields are entered. error.entered.values.not.integers =Entered values should be integers Index: lams_tool_images/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -228,6 +228,39 @@ parameter="summary" > + + + + + + + + + + + + + Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== diff -u -r652111fe350d40bff43cee483baef22d8b3b27ae -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision 652111fe350d40bff43cee483baef22d8b3b27ae) +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -37,7 +37,6 @@ allow_comment_images tinyint, allow_share_images tinyint, allow_vote tinyint, - voted_image_uid bigint DEFAULT 0, reflect_instructions varchar(255), reflect_on_activity smallint, allow_rank tinyint, @@ -107,6 +106,7 @@ session_finished smallint, session_uid bigint, imageGallery_uid bigint, + voted_image_uid bigint DEFAULT 0, primary key (uid) )type=innodb; create table tl_laimag10_configuration ( Index: lams_tool_images/db/sql/table-schema.sql =================================================================== diff -u -r652111fe350d40bff43cee483baef22d8b3b27ae -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision 652111fe350d40bff43cee483baef22d8b3b27ae) +++ lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -23,12 +23,12 @@ drop table if exists tl_laimag10_configuration; create table tl_laimag10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, imageGallery_uid bigint, primary key (uid)); create table tl_laimag10_item_log (uid bigint not null auto_increment, access_date datetime, imageGallery_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid)); -create table tl_laimag10_imageGallery (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, next_image_title bigint, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_comment_images bit, allow_share_images bit, allow_vote bit, voted_image_uid bigint DEFAULT 0, reflect_instructions varchar(255), reflect_on_activity bit,allow_rank tinyint DEFAULT 0, primary key (uid)); +create table tl_laimag10_imageGallery (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, next_image_title bigint, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_comment_images bit, allow_share_images bit, allow_vote bit, reflect_instructions varchar(255), reflect_on_activity bit,allow_rank tinyint DEFAULT 0, primary key (uid)); create table tl_laimag10_imageGallery_item (uid bigint not null auto_increment, description text, title varchar(255), create_by bigint, create_date datetime, create_by_author bit, sequence_id integer, is_hide bit, imageGallery_uid bigint, session_uid bigint, original_file_uuid bigint, medium_file_uuid bigint, thumbnail_file_uuid bigint, file_version_id bigint, file_type varchar(255), file_name varchar(255), average_rating FLOAT(7,1) DEFAULT 0, number_ratings integer DEFAULT 0, primary key (uid)); create table tl_laimag10_image_comment (uid bigint not null auto_increment, comment text, imageGallery_item_uid bigint, create_by bigint, create_date datetime, primary key (uid)); create table tl_laimag10_image_rating (uid bigint not null auto_increment, rating integer, imageGallery_item_uid bigint, create_by bigint, primary key (uid)); create table tl_laimag10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, imageGallery_uid bigint, session_id bigint, session_name varchar(250), primary key (uid)); -create table tl_laimag10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, imageGallery_uid bigint, session_finished bit, primary key (uid)); +create table tl_laimag10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, imageGallery_uid bigint, session_finished bit, voted_image_uid bigint DEFAULT 0, primary key (uid)); create table tl_laimag10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid)); alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid); alter table tl_laimag10_item_log add index FK_NEW_1821149711_63195BC938BF8DFE (imageGallery_item_uid), add constraint FK_NEW_1821149711_63195BC938BF8DFE foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -r3bc514681593b0694c54d0c77da015388362c196 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 3bc514681593b0694c54d0c77da015388362c196) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -61,9 +61,11 @@ public static final String ATT_LEARNING_OBJECT = "cpPackage"; public static final String ATTR_RESOURCE_REVIEW_URL = "imageGalleryItemReviewUrl"; public static final String ATTR_RESOURCE = "imageGallery"; + public static final String ATTR_IMAGE = "image"; public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_SUMMARY_LIST = "summaryList"; + public static final String ATTR_IMAGE_SUMMARY = "imageSummary"; public static final String ATTR_USER_LIST = "userList"; public static final String ATTR_RESOURCE_INSTRUCTION = "instructions"; public static final String ATTR_FINISH_LOCK = "finishedLock"; @@ -75,6 +77,7 @@ public static final String ATTR_TITLE = "title"; public static final String ATTR_INSTRUCTIONS = "instructions"; public static final String ATTR_USER_FINISHED = "userFinished"; + public static final String ATTR_COMMENT_UID = "commentUid"; public static final String ATTR_COMMENT = "comment"; public static final String ATTR_CURRENT_IMAGE_UID = "currentImageUid"; public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID"; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageCommentDAO.java =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageCommentDAO.java (.../ImageCommentDAO.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageCommentDAO.java (.../ImageCommentDAO.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -18,11 +18,16 @@ * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** - */ - -/* $Id$ */ -package org.lamsfoundation.lams.tool.imageGallery.dao; + */ +/* $Id$ */ +package org.lamsfoundation.lams.tool.imageGallery.dao; + +import java.util.List; + +import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment; +import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating; + /** * DAO interface for ImageComment. * @@ -31,5 +36,13 @@ */ public interface ImageCommentDAO extends DAO { + /** + * Return imageComment by the given commentUid. + * + * @param commentUid + * @param userId + * @return + */ + public ImageComment getCommentByUid(Long commentUid); + } - \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryUserDAO.java =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryUserDAO.java (.../ImageGalleryUserDAO.java) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryUserDAO.java (.../ImageGalleryUserDAO.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -34,4 +34,6 @@ ImageGalleryUser getUserByUserIDAndContentID(Long userId, Long contentId); List getBySessionID(Long sessionId); + + int getNumberOfVotes(Long votedImageUid, Long sessionId); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java (.../ImageRatingDAO.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java (.../ImageRatingDAO.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -34,7 +34,7 @@ public interface ImageRatingDAO extends DAO { /** - * Return imageRating by the given imageUid. + * Return imageRating by the given imageUid and userId. * @param imageUid * @param userId * @return Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java (.../ImageCommentDAOHibernate.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java (.../ImageCommentDAOHibernate.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -18,21 +18,33 @@ * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** - */ - -/* $Id$ */ -package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; + */ +/* $Id$ */ +package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; + +import java.util.List; + import org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO; +import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment; +import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating; /** * Hibernate implementation of ImageCommentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO */ -public class ImageCommentDAOHibernate extends BaseDAOHibernate implements ImageCommentDAO{ +public class ImageCommentDAOHibernate extends BaseDAOHibernate implements ImageCommentDAO { + private static final String FIND_BY_UID = "from " + ImageComment.class.getName() + + " as r where r.uid = ?"; + public ImageComment getCommentByUid(Long commentUid) { + List list = getHibernateTemplate().find(FIND_BY_UID, commentUid); + if (list == null || list.size() == 0) + return null; + return (ImageComment) list.get(0); + } + } - \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -48,7 +48,7 @@ + ImageGallery.class.getName() + " as r " + " where v.sessionId = s.sessionId " + " and s.imageGallery.uid = r.uid " + " and r.contentId =? " + " group by v.sessionId, v.imageGalleryItem.uid "; - + public ImageGalleryItemVisitLog getImageGalleryItemLog(Long itemUid, Long userId) { List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid }); if (list == null || list.size() == 0) Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java (.../ImageGalleryUserDAOHibernate.java) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java (.../ImageGalleryUserDAOHibernate.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -28,30 +28,40 @@ import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryUserDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; +public class ImageGalleryUserDAOHibernate extends BaseDAOHibernate implements ImageGalleryUserDAO { -public class ImageGalleryUserDAOHibernate extends BaseDAOHibernate implements ImageGalleryUserDAO{ - - private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ImageGalleryUser.class.getName() + " as u where u.userId =? and u.imageGallery.contentId=?"; - private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ImageGalleryUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?"; - private static final String FIND_BY_SESSION_ID = "from " + ImageGalleryUser.class.getName() + " as u where u.session.sessionId=?"; + private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ImageGalleryUser.class.getName() + + " as u where u.userId =? and u.imageGallery.contentId=?"; + private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ImageGalleryUser.class.getName() + + " as u where u.userId =? and u.session.sessionId=?"; + private static final String FIND_BY_SESSION_ID = "from " + ImageGalleryUser.class.getName() + + " as u where u.session.sessionId=?"; + private static final String FIND_COUNT_OF_VOTES = "select count(*) from " + + ImageGalleryUser.class.getName() + " as u where u.votedImageUid =? and u.session.sessionId=?"; - public ImageGalleryUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId}); - if(list == null || list.size() == 0) - return null; - return (ImageGalleryUser) list.get(0); - } + public ImageGalleryUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { + List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + if (list == null || list.size() == 0) + return null; + return (ImageGalleryUser) list.get(0); + } - public ImageGalleryUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId}); - if(list == null || list.size() == 0) - return null; - return (ImageGalleryUser) list.get(0); - } + public ImageGalleryUser getUserByUserIDAndContentID(Long userId, Long contentId) { + List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + if (list == null || list.size() == 0) + return null; + return (ImageGalleryUser) list.get(0); + } - public List getBySessionID(Long sessionId) { - return this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); - } + public List getBySessionID(Long sessionId) { + return this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId); + } + + public int getNumberOfVotes(Long votedImageUid, Long sessionId) { + List list = getHibernateTemplate().find(FIND_COUNT_OF_VOTES, new Object[] {votedImageUid, sessionId}); + if (list == null || list.size() == 0) + return 0; + return ((Number) list.get(0)).intValue(); + } - } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -39,7 +39,7 @@ *
  • User.login_name
    • *
  • count(imageGallery_item_uid)
    • * - * @author Steve.Ni + * @author Andrey Balan * * @version $Revision$ */ @@ -48,11 +48,13 @@ private Long sessionId; private String sessionName; private Long itemUid; + private ImageGalleryItem item; private boolean itemCreateByAuthor; private boolean itemHide; private String itemTitle; private String username; private int viewNumber; + private int numberOfVotes; // following is used for export portfolio programs: private Long fileUuid; @@ -80,6 +82,7 @@ this.sessionName = sessionName; if (item != null) { this.itemUid = item.getUid(); + this.item = item; this.itemCreateByAuthor = item.isCreateByAuthor(); this.itemHide = item.isHide(); this.itemTitle = item.getTitle(); @@ -106,6 +109,7 @@ this.sessionName = sessionName; if (item != null) { this.itemUid = item.getUid(); + this.item = item; this.itemCreateByAuthor = item.isCreateByAuthor(); this.itemHide = item.isHide(); this.itemTitle = item.getTitle(); @@ -151,7 +155,15 @@ public void setItemUid(Long itemUid) { this.itemUid = itemUid; } + + public ImageGalleryItem getItem() { + return item; + } + public void setItem(ImageGalleryItem item) { + this.item = item; + } + public Long getSessionId() { return sessionId; } @@ -183,7 +195,15 @@ public void setViewNumber(int viewNumber) { this.viewNumber = viewNumber; } + + public int getNumberOfVotes() { + return numberOfVotes; + } + public void setNumberOfVotes(int numberOfVotes) { + this.numberOfVotes = numberOfVotes; + } + public Long getFileUuid() { return fileUuid; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -0,0 +1,111 @@ +/**************************************************************** + * 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.imageGallery.dto; + +import java.util.Set; + +import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment; +import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; +import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; + +/** + * List contains following element:
    + * + *
  • session_name
    • + *
  • user
    • + *
  • ImageGalleryItem.rating
    • + *
  • isVotedForThisImage
    • + *
  • ImageGalleryItem.comments
    • + * + * @author Andrey Balan + * + */ +public class UserImageContributionDTO { + + private String sessionName; + + private ImageGalleryUser user; + private int rating; + private boolean isVotedForThisImage; + + private Set comments; + + public UserImageContributionDTO() { + } + + /** + * Contruction method for monitoring summary function. + * + * @param sessionName + * @param item + * @param isInitGroup + */ + public UserImageContributionDTO(String sessionName, ImageGalleryUser user) { + this.sessionName = sessionName; + this.user = user; + } + + public String getSessionName() { + return sessionName; + } + + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } + + public ImageGalleryUser getUser() { + return user; + } + + public void setUser(ImageGalleryUser user) { + this.user = user; + } + + public int getRating() { + return rating; + } + + public void setRating(int rating) { + this.rating = rating; + } + + public boolean isVotedForThisImage() { + return isVotedForThisImage; + } + + public void setVotedForThisImage(boolean isVotedForThisImage) { + this.isVotedForThisImage = isVotedForThisImage; + } + + public Set getComments() { + return comments; + } + + public void setComments(Set comments) { + this.comments = comments; + } + +} + + \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml =================================================================== diff -u -rea01084a256b16e755ba6953267255776d63fb27 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml (.../ImageGallery.hbm.xml) (revision ea01084a256b16e755ba6953267255776d63fb27) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml (.../ImageGallery.hbm.xml) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -197,14 +197,6 @@ /> - - getOfflineFileList() { return offlineFileList; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml (.../ImageGalleryUser.hbm.xml) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml (.../ImageGalleryUser.hbm.xml) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -88,6 +88,14 @@ column="session_finished" /> + + -
    - +
    + + + <%@ include file="/common/messages.jsp"%> + + + + + + + - <%@ include file="/common/messages.jsp"%> + + + + + + + + + + + + + + + + + <%-- Default value + cancelButtonLabelKey="label.authoring.cancel.button" + saveButtonLabelKey="label.authoring.save.button" + cancelConfirmMsgKey="authoring.msg.cancel.save" + accessMode="author" + --%> + + + +
    + + - - - - - - + +
    - - - - - - - - - - - - - - - - - <%-- Default value - cancelButtonLabelKey="label.authoring.cancel.button" - saveButtonLabelKey="label.authoring.save.button" - cancelConfirmMsgKey="authoring.msg.cancel.save" - accessMode="author" - --%> - - - - - - - - - Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp =================================================================== diff -u --- lams_tool_images/web/pages/monitoring/imagesummary.jsp (revision 0) +++ lams_tool_images/web/pages/monitoring/imagesummary.jsp (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -0,0 +1,145 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + <fmt:message key="label.monitoring.title" /> + + + + + + + <%@ include file="/common/header.jsp"%> + + + +
    + + + + + +
    + +
    + + ${image.mediumFileUuid}&preferDownload=false + + ${image.title} + +
    + +
    + + +
    + +
    + +
    + +
    +     +
    + + +

    ${groupSummary[0].sessionName}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + +
    + ${userImageContribution.user.loginName} + + + + + + + + + + + + + + +
      + +
    • + + + + ?toolContentID=${toolContentID}&sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300 + + + " /> + +
      • +       +
    + +
    + +     +
    + + + + + +
    + + + + + + +     Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -6,52 +6,64 @@ - <%@ include file="/common/tabbedheader.jsp" %> - + + + + + - -
    -

    - -

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

    + +

    + +
    + + + + + + +
    + + +
    Index: lams_tool_images/web/pages/monitoring/parts/editcomment.jsp =================================================================== diff -u --- lams_tool_images/web/pages/monitoring/parts/editcomment.jsp (revision 0) +++ lams_tool_images/web/pages/monitoring/parts/editcomment.jsp (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -0,0 +1,70 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + + <fmt:message key="label.monitoring.title" /> + + + <%@ include file="/common/headerWithoutPrototype.jsp"%> + + + + +
    +
    + + <%@ include file="/common/messages.jsp"%> + + + + + +

    + +

    + +
    + + : + + ${comment.createBy.loginName} +
    + +
    + + : + + ${comment.createDate} +
    + +
    + +
    + +     + +

    + + + + + + + + + + +
    + + + + + +
    + +     Index: lams_tool_images/web/pages/monitoring/start.jsp =================================================================== diff -u --- lams_tool_images/web/pages/monitoring/start.jsp (revision 0) +++ lams_tool_images/web/pages/monitoring/start.jsp (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -0,0 +1,16 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + Index: lams_tool_images/web/pages/monitoring/statistic.jsp =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -22,9 +22,6 @@ - - - @@ -48,22 +45,6 @@ - - - - - - - - - - - - - - - - ${item.itemTitle} Index: lams_tool_images/web/pages/monitoring/summary.jsp =================================================================== diff -u -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 -ree0608cfdaec0a5cc246ac316091712268491fc6 --- lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) +++ lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision ee0608cfdaec0a5cc246ac316091712268491fc6) @@ -1,7 +1,27 @@ <%@ include file="/common/taglibs.jsp"%> + +

    @@ -13,178 +33,172 @@
    - - -
    - - - - - <%-- display group name on first row--%> - - - - - - + + + + + + + + + + + + + +
    - ${item.sessionName} - - - - - -
    - + + +

    + ${group[0].sessionName} +

    +

    + +

    + + + + + + + + + - - - - - - <%-- End group title display --%> - - + + + + + <%-- End group title display --%> + + + + + - + - - - - + + + + + + + + - - - <%-- Reflection list --%> - - - - - - - - - - - - - - - - - - - - - +
    + + + + + + + - + + + + - - - - - -
    + +
    @@ -193,100 +207,105 @@
    - - - - - - - - - - - - - - + + + + ${image.thumbnailFileUuid}&preferDownload=false + + + ?toolContentID=${toolContentID}&sessionMapID=${sessionMapID}&imageUid=${image.uid}&resizeIframe=true&TB_iframe=true&height=640&width=740 + + + ${image.title} + - ${item.itemTitle} + + + + ${image.title} + + [ ${summary.username}] + + + + ${title} + - - ${item.username} - - + + + + + ${image.numberRatings} + + ${image.averageRating} + + ${summary.numberOfVotes} + - - - - - ${item.viewNumber} + + - 0 + - - - - - - - - -
    -

    -
    - - - - - -
    - ${user.fullName} - - ${user.loginName} - - - - - - - -
    + + <%-- Reflection list --%> + + +

    + +

    + + - -
    +
    + + + + + +
    + ${user.fullName} + + ${user.loginName} + + + + + + + +
    + + +