Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== diff -u -rdb681dba0a5e44ae9f4e4cf6b9bc575d6175212f -r8e512e5f28ad5c247d577c7189e2b7908f506240 --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision db681dba0a5e44ae9f4e4cf6b9bc575d6175212f) +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240) @@ -65,8 +65,6 @@ 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) )type=innodb; create table tl_laimag10_image_comment ( Index: lams_tool_images/db/sql/table-schema.sql =================================================================== diff -u -rdb681dba0a5e44ae9f4e4cf6b9bc575d6175212f -r8e512e5f28ad5c247d577c7189e2b7908f506240 --- lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision db681dba0a5e44ae9f4e4cf6b9bc575d6175212f) +++ lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240) @@ -27,7 +27,7 @@ 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, reflect_instructions varchar(255), reflect_on_activity bit,allow_rank tinyint DEFAULT 0, image_submit_notify 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, original_image_width integer, original_image_height integer, medium_file_uuid bigint, medium_image_width integer, medium_image_height integer, 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_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, original_image_width integer, original_image_height integer, medium_file_uuid bigint, medium_image_width integer, medium_image_height integer, thumbnail_file_uuid bigint, file_version_id bigint, file_type varchar(255), file_name varchar(255), 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_image_vote (uid bigint not null auto_increment, is_voted bit, imageGallery_item_uid bigint, create_by bigint, primary key (uid)); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r8e512e5f28ad5c247d577c7189e2b7908f506240 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240) @@ -47,6 +47,8 @@ public static final String PARAM_CURRENT_IMAGE = "currentImage"; public static final String PARAM_CURRENT_RATING = "currentRating"; public static final String PARAM_IS_VOTED = "isVoted"; + public static final String PARAM_NUMBER_RATINGS = "numberRatings"; + public static final String PARAM_AVERAGE_RATING = "averageRating"; // for request attribute name public static final String ATTR_TOOL_CONTENT_ID = "toolContentID"; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml =================================================================== diff -u -r989e4b47442b99cfcdf170f565a1b0c4c69fb03c -r8e512e5f28ad5c247d577c7189e2b7908f506240 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml (.../ImageGalleryItem.hbm.xml) (revision 989e4b47442b99cfcdf170f565a1b0c4c69fb03c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml (.../ImageGalleryItem.hbm.xml) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240) @@ -184,22 +184,6 @@ - - - -