Index: lams_tool_survey/build.properties =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/build.properties (.../build.properties) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/build.properties (.../build.properties) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -9,5 +9,4 @@ ### project properties ### signature=lasurv11 -project.displayname = lams share surveys tool -weblib=lib +project.displayname = lams survey tool Index: lams_tool_survey/build.xml =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/build.xml (.../build.xml) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/build.xml (.../build.xml) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -1,5 +1,5 @@ - + @@ -16,9 +16,6 @@ - - - @@ -276,12 +273,6 @@ - - - - - - Index: lams_tool_survey/conf/language/ApplicationResources.properties =================================================================== diff -u --- lams_tool_survey/conf/language/ApplicationResources.properties (revision 0) +++ lams_tool_survey/conf/language/ApplicationResources.properties (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,152 @@ +appName = survey +#language code: en +#locale code: AU + + # CVS ID: $Id$ + +#=================== labels for ShareSurveys =================# + +activity.title =Survey +activity.description =Survey. +activity.helptext =Answer surveys to share with others. +tool.display.name =Survey Tool +tool.description =Tool for survey. +appName =Survey +errorPage.title =Error page +errorPage.heading =Some error occurs when handling your request +label.authoring.heading =Share Surveys +label.author.title =Share Surveys Authoring +label.authoring.heading.basic =Basic +label.authoring.heading.advance =Advanced +label.authoring.heading.instructions =Instructions +label.authoring.heading.basic.desc =Basic input information for shared surveys +label.authoring.heading.instructions.desc =Please input online and offline instructions +label.authoring.heading.advance.desc =Please input advance options for shared surveys +label.authoring.basic.title =Title +label.authoring.basic.instruction =Instruction +label.authoring.basic.add.question =Add Survey +label.authoring.basic.survey.list.title =Survey List +label.authoring.basic.survey.url =URL +label.authoring.basic.survey.file =File +label.authoring.basic.survey.website =Website +label.authoring.basic.survey.verify.url =Verify URL +label.authoring.basic.survey.preview =Preview +label.authoring.basic.survey.edit =Edit +label.authoring.basic.survey.delete =Delete +label.authoring.basic.survey.add.instruction =Add Instruction +label.authoring.basic.survey.instructions =Instructions +label.authoring.basic.survey.title.input =Title +label.authoring.basic.survey.url.input =URL +label.authoring.basic.survey.file.input =File +label.authoring.basic.survey.description.input =Description +label.authoring.basic.survey.zip.file.input =Zip file: +label.authoring.online.instruction =Online Instructions +label.authoring.offline.instruction =Offline Instructions +label.authoring.online.file =Upload online file +label.authoring.offline.file =Upload offline file +label.authoring.choosefile.button =Choose file +label.authoring.upload.online.button =Upload Online +label.authoring.upload.offline.button =Upload Offline +label.authoring.online.filelist =Online file list +label.authoring.offline.filelist =Offline file list +label.authoring.online.delete =Delete +label.authoring.offline.delete =Delete +label.authoring.advance.lock.on.finished =Lock when finished +label.authoring.advance.run.content.auto =Run content automatically (only available if there is exactly one survey) +label.authoring.advance.mini.number.surveys.view =Minimum number of surveys to view +label.authoring.advance.allow.learner.add.urls =Allow learners to add URLs +label.authoring.advance.allow.learner.add.files =Allow learners to add Files +label.next.instruction =Next Instruction +label.authoring.save.button =Save +label.authoring.cancel.button =Cancel +label.description =Description: +authoring.exception =There is a problem in shared surveys authoring page, the reason is {0} +error.survey.item.title.blank =Title can not be blank. +error.survey.item.url.blank =URL can not be blank. +error.survey.item.file.blank =File can not be blank. +error.survey.item.desc.blank =Comment/Instruction can not be blank +error.survey.item.invalid.url =Invalid URL format. +error.upload.failed =Upload file failed: {0} +error.msg.upload.file.not.found =Could not find upload file {0}. +error.msg.zip.file.exception =Could not handle zip file when uploading file. +error.msg.file.not.found =File not found exception occurs when uploading file. +error.msg.ims.package =Invalid IMS package format. +error.msg.ims.application =ImscpApplicationException occurs when uploading survey item file. +error.msg.website.no.initial.file =Website zip can not find out initial file (index.htm/html or default.htm/html). +error.msg.io.exception =IOException occurs when uploading file. +error.msg.invaid.param.upload =InvalidParameterException occured while trying to upload File. +error.msg.repository =Repository occurs exception while trying to upload file. +error.msg.default.content.not.find =Could not retrieve default content record for this tool. +msg.no.instruction =No instruction available. +authoring.msg.cancel.save =Do you want to close this window without saving? +label.learning.title =Share Survey Learning +label.learning.heading =Share Surveys +label.resoruce.to.review =Surveys to view +label.learning.minimum.review =You must view at least {0} of the surveys. +lable.learning.minimum.view.number.less =You at least view another {0} of the surveys. +label.check.for.new =Check for new +label.suggest.new =Suggest a new +label.learning.new.file =New file details: +label.learning.new.url =New URL details: +label.learning.comment.or.instruction =Comment/Instruction +monitoring.tab.summary =Summary +monitoring.tab.statistics =Statistic +monitoring.tab.instructions =Instruction +monitoring.tab.edit.activity =Edit Activity +monitoring.label.group =Group +monitoring.summary.note =Note: number of learners is the number of learners who have viewed the survey. +monitoring.label.type =Type +monitoring.label.title =Title +monitoring.label.suggest =Suggested By +monitoring.label.number.learners =Number of Learners +monitoring.label.hide =Hide +monitoring.label.show =Show +monitoring.label.user.loginname =Login name +monitoring.label.user.name =Name +monitoring.label.hidden =Hidden +label.monitoring.edit.activity.cancel =Cancel +label.monitoring.edit.activity.update =Update +label.monitoring.edit.activity.edit =Edit +message.monitoring.edit.activity.not.editable =This Activity is no longer editable +export.label.survey =Survey +export.label.no.learning.object =No offline package available +export.title =Export portfolio of Survey +error.inputFileTooLarge =Input File size is too large! +error.uploading =error uploading +error.title.empty =Title can not be blank +label.open =Open +label.delete =Delete +label.download =Download +label.view =View +label.edit =Edit +label.finished =Finished +label.completed =Completed +label.finish =Finish +button.upload =Upload +button.add =Add +button.cancel =Cancel +message.monitoring.summary.no.session =No Session Available +label.show =Show +label.hide =Hide +label.save =Save +label.cancel =Cancel +monitoring.label.access.time =Access time +define.later.message =Please wait for the teacher to complete the contents of this activity. +run.offline.message =This activity is not being done on the computer. Please see your instructor for details. +message.monitoring.summary.no.survey.for.group =No survey available for this group. +button.try.again =Try again +open.in.new.window =Open URL in pop-up +label.up =Move Up +label.down =Move down + + +#======= End labels: Exported 141 labels for en AU ===== +label.monitoring.heading.access=Learners list +label.authoring.advanced.reflectOnActivity=Reflect on share surveys +error.reflection.emtpy=Please input reflection +title.reflection=Reflection +label.continue=Continue +monitoring.user.fullname=Name +monitoring.user.reflection=Refection +page.title.monitoring.view.reflection=View Reflection +button.close=Close Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/conf/language/ApplicationSurveys.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/db/model/survey.clay =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/db/model/survey.clay (.../survey.clay) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/db/model/survey.clay (.../survey.clay) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -12,15 +12,15 @@

- +

- + @@ -29,11 +29,11 @@

- +

- + @@ -42,25 +42,11 @@

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

- + @@ -69,17 +55,11 @@

- + - - - - - -

- + @@ -88,41 +68,85 @@

+ + + + + + + + + + + + + + + + + + + +

- +

- + + + + + + + +

- + - + + + + +

- +

+ + + + + + + + + + + + + @@ -131,31 +155,44 @@ - +

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

+ + + + + + + + + + + + + + + + + + + @@ -171,59 +208,34 @@

- +

- + - +

- +

- - - - - - - - - - - - - - - - - - - - - - - - - @@ -232,60 +244,31 @@ - +

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

- + @@ -294,89 +277,41 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- +

- + - + - - - -

- +

- - - - - - - - - - - - - @@ -385,64 +320,18 @@ - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- + @@ -457,23 +346,11 @@

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

- + @@ -482,38 +359,36 @@

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

- + @@ -529,56 +404,45 @@

- +

- + - +

- - - - - - -

- + - - - -

- + - +

- +

- + @@ -587,17 +451,23 @@

- +

- + + + + + + +

- + @@ -606,11 +476,11 @@

- +

- + @@ -619,10 +489,11 @@

- + - - + + + @@ -632,45 +503,34 @@

- +

- + - - - - - - -

- + - + - - - -

- +

- + @@ -679,36 +539,23 @@

- +

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

- + @@ -717,11 +564,60 @@

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

- + @@ -730,48 +626,64 @@

- +

+ + + + + + + + + + + +

- +

- + - + + + + +

- +

- + @@ -783,8 +695,8 @@

- + @@ -814,11 +726,24 @@

- +

+ + + + + + + + + + + + + @@ -827,30 +752,47 @@ + + + + + +

- +

- + + + + + + + +

- + - + + + + +

Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -1,116 +1,113 @@ SET FOREIGN_KEY_CHECKS=0; +drop table if exists tl_lasurv11_answer; drop table if exists tl_lasurv11_attachment; -drop table if exists tl_lasurv11_item_instruction; -drop table if exists tl_lasurv11_survey; -drop table if exists tl_lasurv11_survey_item; -drop table if exists tl_lasurv11_survey_item_visit_log; +drop table if exists tl_lasurv11_option; +drop table if exists tl_lasurv11_question; drop table if exists tl_lasurv11_session; +drop table if exists tl_lasurv11_survey; drop table if exists tl_lasurv11_user; + +create table tl_lasurv11_answer ( +uid bigint not null auto_increment, +survey_item_uid bigint, +user_uid bigint, +session_id bigint, +answer_choices varchar(255), +udpate_date datetime, +answer_text varchar(255), +primary key (uid) +); + create table tl_lasurv11_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, - survey_uid bigint, - primary key (uid) +uid bigint not null auto_increment, +file_version_id bigint, +file_type varchar(255), +file_name varchar(255), +file_uuid bigint, +create_date datetime, +survey_uid bigint, +primary key (uid) ); -create table tl_lasurv11_item_instruction ( - uid bigint not null auto_increment, - description varchar(255), - sequence_id integer, - item_uid bigint, - primary key (uid) + +create table tl_lasurv11_option ( +uid bigint not null auto_increment, +description varchar(255), +sequence_id integer, +answer_uid bigint, +primary key (uid) ); -create table tl_lasurv11_survey ( - uid bigint not null auto_increment, - create_date datetime, - update_date datetime, - create_by bigint, - title varchar(255), - run_offline tinyint, - lock_on_finished tinyint, - instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - allow_add_files tinyint, - allow_add_urls tinyint, - mini_view_survey_number integer, - allow_auto_run tinyint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - primary key (uid) + +create table tl_lasurv11_question ( +uid bigint not null auto_increment, +description varchar(255), +create_by bigint, +create_date datetime, +question_type smallint, +append_text smallint, +compulsory smallint, +max_answers integer, +survey_uid bigint, +primary key (uid) ); -create table tl_lasurv11_survey_item ( - uid bigint not null auto_increment, - file_uuid bigint, - file_version_id bigint, - description varchar(255), - ims_schema varchar(255), - init_item varchar(255), - organization_xml text, - title varchar(255), - url text, - create_by bigint, - create_date datetime, - create_by_author tinyint, - is_hide tinyint, - item_type smallint, - file_type varchar(255), - file_name varchar(255), - open_url_new_window tinyint, - survey_uid bigint, - session_uid bigint, - primary key (uid) -); -create table tl_lasurv11_item_log ( - uid bigint not null auto_increment, - access_date datetime, - survey_item_uid bigint, - user_uid bigint, - complete tinyint, - session_id bigint, - primary key (uid) -); + create table tl_lasurv11_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - survey_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) +uid bigint not null auto_increment, +session_end_date datetime, +session_start_date datetime, +survey_uid bigint, +session_id bigint, +session_name varchar(250), +primary key (uid) ); + +create table tl_lasurv11_survey ( +uid bigint not null auto_increment, +title varchar(255), +run_offline smallint, +lock_on_finished smallint, +instructions text, +online_instructions text, +offline_instructions text, +content_in_use smallint, +define_later smallint, +content_id bigint unique, +reflect_instructions varchar(255), +reflect_on_activity smallint, +show_questions_on_one_page smallint, +create_date datetime, +update_date datetime, +create_by bigint, +primary key (uid) +); + create table tl_lasurv11_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - survey_uid bigint, - primary key (uid) +uid bigint not null auto_increment, +user_id bigint, +last_name varchar(255), +first_name varchar(255), +login_name varchar(255), +session_uid bigint, +survey_uid bigint, +session_finished smallint, +primary key (uid) ); -alter table tl_lasurv11_attachment add index FK1E7009430E79035 (survey_uid), add constraint FK1E7009430E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_lasurv11_survey_item (uid); -alter table tl_lasurv11_survey add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F9330E79035 (survey_uid), add constraint FKF52D1F9330E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_lasurv11_session (uid); -alter table tl_lasurv11_item_log add index FK693580A438BF8DFE (survey_item_uid), add constraint FK693580A438BF8DFE foreign key (survey_item_uid) references tl_lasurv11_survey_item (uid); -alter table tl_lasurv11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_lasurv11_user (uid); -alter table tl_lasurv11_session add index FK24AA78C530E79035 (survey_uid), add constraint FK24AA78C530E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_lasurv11_session (uid); -alter table tl_lasurv11_user add index FK30113BFC309ED320 (survey_uid), add constraint FK30113BFC309ED320 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid); +alter table tl_lasurv11_answer add index FK6DAAFE3BAE4CB69 (survey_item_uid), add constraint FK6DAAFE3BAE4CB69 foreign key (survey_item_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_option add index FK85AB46F282152886 (answer_uid), add constraint FK85AB46F282152886 foreign key (answer_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_question add index FK872D4F23E4C99A5F (create_by), add constraint FK872D4F23E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_session add index FKF08793B9D14146E5 (survey_uid), add constraint FKF08793B9D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_survey add index FK8CC465D7E4C99A5F (create_by), add constraint FK8CC465D7E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_user add index FK633F25884F803F63 (session_uid), add constraint FK633F25884F803F63 foreign key (session_uid) references tl_lasurv11_session (uid); +alter table tl_lasurv11_user add index FK633F2588D14146E5 (survey_uid), add constraint FK633F2588D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); -INSERT INTO `tl_lasurv11_survey` (`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_survey_number`, `allow_auto_run`,`reflect_on_activity`) VALUES - (2,NULL,NULL,NULL,'Shared Surveys','0','0','Instruction','Online instruction','Offline instruction',0,0,${default_content_id},1,1,0,0,0); + +INSERT INTO `tl_lasurv11_survey` (`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`,`show_questions_on_one_page`,`reflect_on_activity`) VALUES + (2,NULL,NULL,NULL,'Survey','0','0','Instruction','Online instruction','Offline instruction',0,0,${default_content_id},1,0); + SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_survey/db/sql/table-schema.sql =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/db/sql/table-schema.sql (.../table-schema.sql) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/db/sql/table-schema.sql (.../table-schema.sql) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -1,36 +1,34 @@ -alter table tl_lasurv11_attachment drop foreign key FK1E7009430E79035; -alter table tl_lasurv11_item_instruction drop foreign key FKA5665013980570ED; -alter table tl_lasurv11_item_log drop foreign key FK63195BC938BF8DFE; -alter table tl_lasurv11_item_log drop foreign key FK63195BC941F9365D; -alter table tl_lasurv11_survey drop foreign key FK89093BF758092FB; -alter table tl_lasurv11_survey_item drop foreign key FKF52D1F9330E79035; -alter table tl_lasurv11_survey_item drop foreign key FKF52D1F93EC0D3147; -alter table tl_lasurv11_survey_item drop foreign key FKF52D1F93758092FB; -alter table tl_lasurv11_session drop foreign key FK24AA78C530E79035; -alter table tl_lasurv11_user drop foreign key FK30113BFC30E79035; -alter table tl_lasurv11_user drop foreign key FK30113BFCEC0D3147; +alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BB1423DC1; +alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BAE4CB69; +alter table tl_lasurv11_attachment drop foreign key FKD92A9120D14146E5; +alter table tl_lasurv11_option drop foreign key FK85AB46F282152886; +alter table tl_lasurv11_question drop foreign key FK872D4F23D14146E5; +alter table tl_lasurv11_question drop foreign key FK872D4F23E4C99A5F; +alter table tl_lasurv11_session drop foreign key FKF08793B9D14146E5; +alter table tl_lasurv11_survey drop foreign key FK8CC465D7E4C99A5F; +alter table tl_lasurv11_user drop foreign key FK633F25884F803F63; +alter table tl_lasurv11_user drop foreign key FK633F2588D14146E5; +drop table if exists tl_lasurv11_answer; drop table if exists tl_lasurv11_attachment; -drop table if exists tl_lasurv11_item_instruction; -drop table if exists tl_lasurv11_item_log; -drop table if exists tl_lasurv11_survey; -drop table if exists tl_lasurv11_survey_item; +drop table if exists tl_lasurv11_option; +drop table if exists tl_lasurv11_question; drop table if exists tl_lasurv11_session; +drop table if exists tl_lasurv11_survey; drop table if exists tl_lasurv11_user; +create table tl_lasurv11_answer (uid bigint not null auto_increment, survey_item_uid bigint, user_uid bigint, session_id bigint, answer_choices varchar(255), udpate_date datetime, answer_text varchar(255), primary key (uid)); create table tl_lasurv11_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, survey_uid bigint, primary key (uid)); -create table tl_lasurv11_item_instruction (uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid)); -create table tl_lasurv11_item_log (uid bigint not null auto_increment, access_date datetime, survey_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid)); -create table tl_lasurv11_survey (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, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_add_files bit, allow_add_urls bit, mini_view_survey_number integer, allow_auto_run bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid)); -create table tl_lasurv11_survey_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), ims_schema varchar(255), init_item varchar(255), organization_xml text, title varchar(255), url text, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, survey_uid bigint, session_uid bigint, primary key (uid)); -create table tl_lasurv11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, survey_uid bigint, session_id bigint, session_name varchar(250), primary key (uid)); +create table tl_lasurv11_option (uid bigint not null auto_increment, description varchar(255), sequence_id integer, option_uid bigint, primary key (uid)); +create table tl_lasurv11_question (uid bigint not null auto_increment, description varchar(255), create_by bigint, create_date datetime, question_type smallint, append_text bit, compulsory bit, max_answers integer, survey_uid bigint, primary key (uid)); +create table tl_lasurv11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, survey_uid bigint, session_id bigint, session_name varchar(250), primary key (uid)); +create table tl_lasurv11_survey (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, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, reflect_instructions varchar(255), reflect_on_activity bit, show_questions_on_one_page bit, primary key (uid)); create table tl_lasurv11_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, survey_uid bigint, session_finished bit, primary key (uid)); -alter table tl_lasurv11_attachment add index FK1E7009430E79035 (survey_uid), add constraint FK1E7009430E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_lasurv11_survey_item (uid); -alter table tl_lasurv11_item_log add index FK63195BC938BF8DFE (survey_item_uid), add constraint FK63195BC938BF8DFE foreign key (survey_item_uid) references tl_lasurv11_survey_item (uid); -alter table tl_lasurv11_item_log add index FK63195BC941F9365D (user_uid), add constraint FK63195BC941F9365D foreign key (user_uid) references tl_lasurv11_user (uid); -alter table tl_lasurv11_survey add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F9330E79035 (survey_uid), add constraint FKF52D1F9330E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_lasurv11_session (uid); -alter table tl_lasurv11_survey_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_session add index FK24AA78C530E79035 (survey_uid), add constraint FK24AA78C530E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_user add index FK30113BFC30E79035 (survey_uid), add constraint FK30113BFC30E79035 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_lasurv11_session (uid); +alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid); +alter table tl_lasurv11_answer add index FK6DAAFE3BAE4CB69 (survey_item_uid), add constraint FK6DAAFE3BAE4CB69 foreign key (survey_item_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_option add index FK85AB46F282152886 (option_uid), add constraint FK85AB46F282152886 foreign key (option_uid) references tl_lasurv11_question (uid); +alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_question add index FK872D4F23E4C99A5F (create_by), add constraint FK872D4F23E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_session add index FKF08793B9D14146E5 (survey_uid), add constraint FKF08793B9D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); +alter table tl_lasurv11_survey add index FK8CC465D7E4C99A5F (create_by), add constraint FK8CC465D7E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); +alter table tl_lasurv11_user add index FK633F25884F803F63 (session_uid), add constraint FK633F25884F803F63 foreign key (session_uid) references tl_lasurv11_session (uid); +alter table tl_lasurv11_user add index FK633F2588D14146E5 (survey_uid), add constraint FK633F2588D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -25,7 +25,7 @@ public class SurveyConstants { public static final String TOOL_SIGNATURE = "lasurv11"; - public static final String RESOURCE_SERVICE = "lasurvSurveyService"; + public static final String SURVEY_SERVICE = "lasurvSurveyService"; public static final int COMPLETED = 1; @@ -64,5 +64,18 @@ public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; public static final String PAGE_EDITABLE = "isPageEditable"; public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag"; + public static final String ATTR_SURVEY_FORM = "surveyForm"; + + public static final String ATTR_INSTRUCTION_LIST = "instructionList"; + public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList"; + public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList"; + public static final String ATTR_QUESTION_LIST = "questionList"; + public static final String ATTR_DELETED_QUESTION_LIST = "deletedQuestionList"; + + public static final String ATTR_TITLE = "title"; + public static final String ATTR_SURVEY_INSTRUCTION = "instructions"; + public static final String ATTR_FINISH_LOCK = "finishedLock"; + public static final String ATTR_SURVEY = "survey"; + public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,5 @@ +package org.lamsfoundation.lams.tool.survey.dao; + +public interface SurveyAnswerDAO extends DAO { + +} Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java (.../SurveyQuestionDAO.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java (.../SurveyQuestionDAO.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -27,6 +27,6 @@ public interface SurveyQuestionDAO extends DAO { - SurveyQuestion getByUid(Long surveyItemUid); + SurveyQuestion getByUid(Long questionUid); } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,7 @@ +package org.lamsfoundation.lams.tool.survey.dao.hibernate; + +import org.lamsfoundation.lams.tool.survey.dao.SurveyAnswerDAO; + +public class SurveyAnswerDAOHibernate extends BaseDAOHibernate implements SurveyAnswerDAO { + +} Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyItemDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,14 @@ +package org.lamsfoundation.lams.tool.survey.dao.hibernate; + +import org.lamsfoundation.lams.tool.survey.dao.SurveyQuestionDAO; +import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion; + +public class SurveyQuestionDAOHibernate extends BaseDAOHibernate implements SurveyQuestionDAO { + + public SurveyQuestion getByUid(Long questionUid) { + + return (SurveyQuestion) this.getObject(SurveyQuestion.class, questionUid); + } + + +} Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml (.../Survey.hbm.xml) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml (.../Survey.hbm.xml) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -120,7 +120,7 @@

@@ -165,53 +165,29 @@ /> - - - - - - + + + + + + + + + + + + + + + + + + + + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.survey.model; import java.util.Date; -import java.util.Set; /** * Survey * @author Dapeng Ni @@ -36,23 +35,18 @@ public class SurveyAnswer { private Long uid; + private Long sessionId; private SurveyUser user; + private SurveyQuestion surveyQuestion; - private Set surveyOptions; - private Date accessDate; + //options choice string: conjunction by &. Such as 2&5&3 + private String answerChoices; + private String answerText; + private Date updateDate; + /** - * @hibernate.property column="access_date" - * @return - */ - public Date getAccessDate() { - return accessDate; - } - public void setAccessDate(Date accessDate) { - this.accessDate = accessDate; - } - /** * @hibernate.many-to-one column="survey_item_uid" * cascade="none" * @return @@ -95,12 +89,37 @@ public void setSessionId(Long sessionId) { this.sessionId = sessionId; } - public Set getSurveyOptions() { - return surveyOptions; + /** + * @hibernate.property column="answer_choices" + * @return + */ + public String getAnswerChoices() { + return answerChoices; } - public void setSurveyOptions(Set surveyOptions) { - this.surveyOptions = surveyOptions; + public void setAnswerChoices(String answers) { + this.answerChoices = answers; } + /** + * @hibernate.property column="udpate_date" + * @return + */ + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + /** + * @hibernate.property column="answer_text" + * @return + */ + public String getAnswerText() { + return answerText; + } + public void setAnswerText(String textEntry) { + this.answerText = textEntry; + } + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -42,11 +42,12 @@ private static final Logger log = Logger.getLogger(SurveyQuestion.class); private Long uid; - //Survey Type:1=Single Choice,2=Multiple Choice,3=Test Entry + //Survey Type:1=Single Choice,2=Multiple Choice,3=Text Entry private short type; private String description; + //option of Question private boolean appendText; private boolean compulsory; private int maxAnswsers; @@ -119,7 +120,7 @@ * cascade="all-delete-orphan" * inverse="false" * order-by="sequence_id asc" - * @hibernate.collection-key column="option_uid" + * @hibernate.collection-key column="answer_uid" * @hibernate.collection-one-to-many * class="org.lamsfoundation.lams.tool.survey.model.SurveyOption" * @return Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml (.../SurveySession.hbm.xml) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml (.../SurveySession.hbm.xml) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -41,14 +41,6 @@ column="session_start_date" /> - - - - - - - - - - - - + - + org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml + org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml + org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml + org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.hbm.xml org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + @@ -110,14 +110,14 @@ - + - + - + false @@ -128,11 +128,9 @@ PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,22 @@ +package org.lamsfoundation.lams.tool.survey.util; + +import java.util.Comparator; + +import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion; +/** + * + * @author steven + * + */ +public class QuestionsComparator implements Comparator { + + public int compare(SurveyQuestion o1, SurveyQuestion o2) { + if(o1 != null && o2 != null & o1.getCreateDate() !=null && o2.getCreateDate() != null){ + return (o1.getCreateDate().getTime() - o2.getCreateDate().getTime()) > 0?1:-1; + }else if(o1 != null) + return 1; + else + return -1; + } + +} Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyItemComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyToolContentHandler.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyToolContentHandler.java (.../SurveyToolContentHandler.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyToolContentHandler.java (.../SurveyToolContentHandler.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -32,10 +32,10 @@ */ public class SurveyToolContentHandler extends ToolContentHandler { - private static String repositoryWorkspaceName = "sharedsurveysworkspace"; - private static String repositoryUser = "sharedsurveys"; + private static String repositoryWorkspaceName = "lasruvSurveyWorkspace"; + private static String repositoryUser = "lasruvSurveys"; //sharedsurveys - private static char[] repositoryId = {'l','a','m','s','-','s','h','a','r','e','d','r','e','s','o','u','r','c','e','s'}; + private static char[] repositoryId = {'l','a','m','s','-','s','u','r','v','e','y'}; /** * Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -67,10 +67,10 @@ import org.lamsfoundation.lams.tool.survey.service.ISurveyService; import org.lamsfoundation.lams.tool.survey.service.SurveyApplicationException; import org.lamsfoundation.lams.tool.survey.service.UploadSurveyFileException; -import org.lamsfoundation.lams.tool.survey.util.SurveyItemComparator; +import org.lamsfoundation.lams.tool.survey.util.QuestionsComparator; import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; import org.lamsfoundation.lams.tool.survey.web.form.SurveyForm; -import org.lamsfoundation.lams.tool.survey.web.form.SurveyItemForm; +import org.lamsfoundation.lams.tool.survey.web.form.QuestionForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -221,10 +221,10 @@ List rList = new ArrayList(surveyList); item = rList.get(itemIdx); if(item != null){ - populateItemToForm(itemIdx, item,(SurveyItemForm) form,request); + populateItemToForm(itemIdx, item,(QuestionForm) form,request); } } - return findForward(item==null?-1:item.getType(),mapping); + return mapping.findForward(SurveyConstants.SUCCESS); } /** * Display empty page for new survey item. @@ -236,15 +236,15 @@ */ private ActionForward newItemlInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID); - ((SurveyItemForm)form).setSessionMapID(sessionMapID); + ((QuestionForm)form).setSessionMapID(sessionMapID); short type = (short) NumberUtils.stringToInt(request.getParameter(ITEM_TYPE)); List instructionList = new ArrayList(INIT_INSTRUCTION_COUNT); for(int idx=0;idx instructionList = getInstructionsFromRequest(request); - SurveyItemForm itemForm = (SurveyItemForm)form; + QuestionForm itemForm = (QuestionForm)form; ActionErrors errors = validateSurveyItem(itemForm); if(!errors.isEmpty()){ this.addErrors(request,errors); // request.setAttribute(SurveyConstants.ATTR_INSTRUCTION_LIST,instructionList); - return findForward(itemForm.getItemType(),mapping); + return mapping.findForward(SurveyConstants.SUCCESS); } try { @@ -294,15 +294,15 @@ * @throws ServletException * */ - private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException { + private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { //save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request,SurveyConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID)); // get back the survey and item list and display them on page ISurveyService service = getSurveyService(); - List items = null; + List questions = null; Survey survey = null; SurveyForm surveyForm = (SurveyForm)form; @@ -315,39 +315,34 @@ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); surveyForm.setSessionMapID(sessionMap.getSessionID()); - try { - survey = service.getSurveyByContentId(contentId); - //if survey does not exist, try to use default content instead. - if(survey == null){ - survey = service.getDefaultContent(contentId); - if(survey.getSurveyItems() != null){ - items = new ArrayList(survey.getSurveyItems()); - }else - items = null; + survey = service.getSurveyByContentId(contentId); + //if survey does not exist, try to use default content instead. + if(survey == null){ + survey = service.getDefaultContent(contentId); + if(survey.getQuestions() != null){ + questions = new ArrayList(survey.getQuestions()); }else - items = service.getAuthoredItems(survey.getUid()); - - surveyForm.setSurvey(survey); + questions = null; + }else + questions = new ArrayList(survey.getQuestions()); + + surveyForm.setSurvey(survey); - //initialize instruction attachment list - List attachmentList = getAttachmentList(sessionMap); - attachmentList.clear(); - attachmentList.addAll(survey.getAttachments()); - } catch (Exception e) { - log.error(e); - throw new ServletException(e); - } + //initialize instruction attachment list + List attachmentList = getAttachmentList(sessionMap); + attachmentList.clear(); + attachmentList.addAll(survey.getAttachments()); //init it to avoid null exception in following handling - if(items == null) - items = new ArrayList(); + if(questions == null) + questions = new ArrayList(); //init survey item list SortedSet surveyItemList = getSurveyItemList(sessionMap); surveyItemList.clear(); - surveyItemList.addAll(items); + surveyItemList.addAll(questions); - sessionMap.put(SurveyConstants.ATTR_RESOURCE_FORM, surveyForm); + sessionMap.put(SurveyConstants.ATTR_SURVEY_FORM, surveyForm); return mapping.findForward(SurveyConstants.SUCCESS); } @@ -365,7 +360,7 @@ HttpServletResponse response) throws ServletException { String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID); - SurveyForm existForm = (SurveyForm) sessionMap.get(SurveyConstants.ATTR_RESOURCE_FORM); + SurveyForm existForm = (SurveyForm) sessionMap.get(SurveyConstants.ATTR_SURVEY_FORM); SurveyForm surveyForm = (SurveyForm )form; try { @@ -487,44 +482,30 @@ //copy back surveyPO.setAttachments(attPOSet); - //************************* Handle survey items ******************* + //************************* Handle survey questions ******************* //Handle survey items - Set itemList = new LinkedHashSet(); + Set questionList = new LinkedHashSet(); SortedSet topics = getSurveyItemList(sessionMap); iter = topics.iterator(); while(iter.hasNext()){ SurveyQuestion item = (SurveyQuestion) iter.next(); if(item != null){ //This flushs user UID info to message if this user is a new user. item.setCreateBy(surveyUser); - itemList.add(item); + questionList.add(item); } } - surveyPO.setSurveyItems(itemList); + surveyPO.setQuestions(questionList); //delete instructino file from database. List delSurveyItemList = getDeletedSurveyItemList(sessionMap); iter = delSurveyItemList.iterator(); while(iter.hasNext()){ SurveyQuestion item = (SurveyQuestion) iter.next(); iter.remove(); if(item.getUid() != null) - service.deleteSurveyItem(item.getUid()); - if(item.getFileUuid() != null && item.getFileVersionId() != null) - service.deleteFromRepository(item.getFileUuid(),item.getFileVersionId()); + service.deleteQuestion(item.getUid()); } - //handle survey item attachment file: - List delItemAttList = getDeletedItemAttachmentList(sessionMap); - iter = delItemAttList.iterator(); - while(iter.hasNext()){ - SurveyQuestion delAtt = (SurveyQuestion) iter.next(); - iter.remove(); - //delete from repository - service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId()); - } - - //if miniview number is bigger than available items, then set it topics size - if(surveyPO.getMiniViewSurveyNumber() > topics.size()) - surveyPO.setMiniViewSurveyNumber((topics.size())); + //********************************************** //finally persist surveyPO again service.saveOrUpdateSurvey(surveyPO); @@ -683,7 +664,7 @@ */ private ISurveyService getSurveyService() { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - return (ISurveyService) wac.getBean(SurveyConstants.RESOURCE_SERVICE); + return (ISurveyService) wac.getBean(SurveyConstants.SURVEY_SERVICE); } /** * @param request @@ -705,10 +686,10 @@ * @return */ private SortedSet getSurveyItemList(SessionMap sessionMap) { - SortedSet list = (SortedSet) sessionMap.get(SurveyConstants.ATTR_RESOURCE_ITEM_LIST); + SortedSet list = (SortedSet) sessionMap.get(SurveyConstants.ATTR_QUESTION_LIST); if(list == null){ - list = new TreeSet(new SurveyItemComparator()); - sessionMap.put(SurveyConstants.ATTR_RESOURCE_ITEM_LIST,list); + list = new TreeSet(new QuestionsComparator()); + sessionMap.put(SurveyConstants.ATTR_QUESTION_LIST,list); } return list; } @@ -718,20 +699,9 @@ * @return */ private List getDeletedSurveyItemList(SessionMap sessionMap) { - return getListFromSession(sessionMap,SurveyConstants.ATTR_DELETED_RESOURCE_ITEM_LIST); + return getListFromSession(sessionMap,SurveyConstants.ATTR_DELETED_QUESTION_LIST); } - /** - * If a survey item has attahment file, and the user edit this item and change the attachment - * to new file, then the old file need be deleted when submitting the whole authoring page. - * Save the file uuid and version id into SurveyItem object for temporarily use. - * @param request - * @return - */ - private List getDeletedItemAttachmentList(SessionMap sessionMap) { - return getListFromSession(sessionMap,SurveyConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST); - } - /** * Get java.util.List from HttpSession by given name. * @@ -779,33 +749,6 @@ } return instructionList; } - /** - * Get back relative ActionForward from request. - * @param type - * @param mapping - * @return - */ - private ActionForward findForward(short type, ActionMapping mapping) { - ActionForward forward; - switch (type) { - case SurveyConstants.RESOURCE_TYPE_URL: - forward = mapping.findForward("url"); - break; - case SurveyConstants.RESOURCE_TYPE_FILE: - forward = mapping.findForward("file"); - break; - case SurveyConstants.RESOURCE_TYPE_WEBSITE: - forward = mapping.findForward("website"); - break; - case SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT: - forward = mapping.findForward("learningobject"); - break; - default: - forward = null; - break; - } - return forward; - } /** @@ -815,11 +758,8 @@ * @param form * @param request */ - private void populateItemToForm(int itemIdx, SurveyQuestion item, SurveyItemForm form, HttpServletRequest request) { + private void populateItemToForm(int itemIdx, SurveyQuestion item, QuestionForm form, HttpServletRequest request) { form.setDescription(item.getDescription()); - form.setTitle(item.getTitle()); - form.setUrl(item.getUrl()); - form.setOpenUrlNewWindow(item.isAppendText()); if(itemIdx >=0) form.setItemIndex(new Integer(itemIdx).toString()); @@ -832,13 +772,6 @@ for(int idx=0;idx instructionList, SurveyItemForm itemForm) + private void extractFormToSurveyItem(HttpServletRequest request, List instructionList, QuestionForm itemForm) throws Exception { /* BE CAREFUL: This method will copy nessary info from request form to a old or new SurveyItem instance. * It gets all info EXCEPT SurveyItem.createDate and SurveyItem.createBy, which need be set when persisting @@ -873,52 +806,7 @@ } short type = itemForm.getItemType(); item.setType(itemForm.getItemType()); - /* Set following fields regards to the type: - item.setFileUuid(); - item.setFileVersionId(); - item.setFileType(); - item.setFileName(); - - item.getInitialItem() - item.setImsSchema() - item.setOrganizationXml() - */ - //if the item is edit (not new add) then the getFile may return null - //it may throw exception, so put it as first, to avoid other invlidate update: - if(itemForm.getFile() != null){ - if(type == SurveyConstants.RESOURCE_TYPE_WEBSITE - ||type == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT - ||type == SurveyConstants.RESOURCE_TYPE_FILE){ - //if it has old file, and upload a new, then save old to deleteList - SurveyQuestion delAttItem = new SurveyQuestion(); - boolean hasOld = false; - if(item.getFileUuid() != null){ - hasOld = true; - //be careful, This new SurveyItem object never be save into database - //just temporarily use for saving fileUuid and versionID use: - delAttItem.setFileUuid(item.getFileUuid()); - delAttItem.setFileVersionId(item.getFileVersionId()); - } - ISurveyService service = getSurveyService(); - try { - service.uploadSurveyItemFile(item, itemForm.getFile()); - } catch (UploadSurveyFileException e) { - //if it is new add , then remove it! - if(itemIdx == -1){ - surveyList.remove(item); - } - throw e; - } - //put it after "upload" to ensure deleted file added into list only no exception happens during upload - if(hasOld){ - List delAtt = getDeletedItemAttachmentList(sessionMap); - delAtt.add(delAttItem); - } - } - } - item.setTitle(itemForm.getTitle()); - item.setCreateByAuthor(true); - item.setHide(false); + //set instrcutions Set instructions = new LinkedHashSet(); int idx=0; @@ -930,14 +818,7 @@ } item.setOptions(instructions); - if(type == SurveyConstants.RESOURCE_TYPE_URL){ - item.setUrl(itemForm.getUrl()); - item.setAppendText(itemForm.isOpenUrlNewWindow()); - } -// if(type == SurveyConstants.RESOURCE_TYPE_WEBSITE -// ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT){ - item.setDescription(itemForm.getDescription()); -// } + item.setDescription(itemForm.getDescription()); } @@ -946,32 +827,10 @@ * @param itemForm * @return */ - private ActionErrors validateSurveyItem(SurveyItemForm itemForm) { + private ActionErrors validateSurveyItem(QuestionForm itemForm) { ActionErrors errors = new ActionErrors(); - if(StringUtils.isBlank(itemForm.getTitle())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_TITLE_BLANK)); - - if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_URL){ - if(StringUtils.isBlank(itemForm.getUrl())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_URL_BLANK)); - //URL validation: Commom URL validate(1.3.0) work not very well: it can not support http://address:port format!!! -// UrlValidator validator = new UrlValidator(); -// if(!validator.isValid(itemForm.getUrl())) -// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_INVALID_URL)); - } -// if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_WEBSITE -// ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT){ -// if(StringUtils.isBlank(itemForm.getDescription())) -// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK)); -// } - if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_WEBSITE - ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT - ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_FILE){ - //for edit validate: file already exist - if(!itemForm.isHasFile() && - (itemForm.getFile() == null || StringUtils.isEmpty(itemForm.getFile().getFileName()))) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_FILE_BLANK)); - } + if(StringUtils.isBlank(itemForm.getDescription())) + errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK)); return errors; } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== diff -u -r32c1faf5b38aebd6468e4a66f8b6c46b9ac84c2d -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 32c1faf5b38aebd6468e4a66f8b6c46b9ac84c2d) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -58,9 +58,9 @@ import org.lamsfoundation.lams.tool.survey.service.ISurveyService; import org.lamsfoundation.lams.tool.survey.service.SurveyApplicationException; import org.lamsfoundation.lams.tool.survey.service.UploadSurveyFileException; -import org.lamsfoundation.lams.tool.survey.util.SurveyItemComparator; +import org.lamsfoundation.lams.tool.survey.util.QuestionsComparator; import org.lamsfoundation.lams.tool.survey.web.form.ReflectionForm; -import org.lamsfoundation.lams.tool.survey.web.form.SurveyItemForm; +import org.lamsfoundation.lams.tool.survey.web.form.QuestionForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -86,22 +86,9 @@ if(param.equals("start")){ return start(mapping, form, request, response); } - if(param.equals("complete")){ - return complete(mapping, form, request, response); - } - if(param.equals("finish")){ return finish(mapping, form, request, response); } - if (param.equals("addfile")) { - return addItem(mapping, form, request, response); - } - if (param.equals("addurl")) { - return addItem(mapping, form, request, response); - } - if (param.equals("saveOrUpdateItem")) { - return saveOrUpdateItem(mapping, form, request, response); - } //================ Reflection ======================= if (param.equals("newReflection")) { @@ -113,21 +100,8 @@ return mapping.findForward(SurveyConstants.ERROR); } + /** - * Initial page for add survey item (single file or URL). - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward addItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - SurveyItemForm itemForm = (SurveyItemForm) form; - itemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE)); - itemForm.setSessionMapID(WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID)); - return mapping.findForward(SurveyConstants.SUCCESS); - } - /** * Read survey data from database and put them into HttpSession. It will redirect to init.do directly after this * method run successfully. * @@ -155,15 +129,15 @@ List items = null; Survey survey; - items = service.getSurveyItemsBySessionId(sessionId); + items = service.getQuestionsBySessionId(sessionId); survey = service.getSurveyBySessionId(sessionId); //check whehter finish lock is on/off boolean lock = survey.getLockWhenFinished() && surveyUser.isSessionFinished(); //basic information sessionMap.put(SurveyConstants.ATTR_TITLE,survey.getTitle()); - sessionMap.put(SurveyConstants.ATTR_RESOURCE_INSTRUCTION,survey.getInstructions()); + sessionMap.put(SurveyConstants.ATTR_SURVEY_INSTRUCTION,survey.getInstructions()); sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK,lock); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId); @@ -198,38 +172,16 @@ //becuase in webpage will use this login name. Here is just //initial it to avoid session close error in proxy object. item.getCreateBy().getLoginName(); - if(!item.isHide()){ - surveyItemList.add(item); - } + surveyItemList.add(item); } } - //set complete flag for display purpose - service.retrieveComplete(surveyItemList, surveyUser); + sessionMap.put(SurveyConstants.ATTR_SURVEY,survey); - sessionMap.put(SurveyConstants.ATTR_RESOURCE,survey); - return mapping.findForward(SurveyConstants.SUCCESS); } + /** - * Mark survey item as complete status. - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - String mode = request.getParameter(AttributeNames.ATTR_MODE); - String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); - - doComplete(request); - - request.setAttribute(AttributeNames.ATTR_MODE,mode); - request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID,sessionMapID); - return mapping.findForward(SurveyConstants.SUCCESS); - } - /** * Finish learning session. * @param mapping * @param form @@ -268,81 +220,8 @@ } + /** - * Save file or url survey item into database. - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - //get back SessionMap - String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - String mode = request.getParameter(AttributeNames.ATTR_MODE); - SurveyItemForm itemForm = (SurveyItemForm)form; - ActionErrors errors = validateSurveyItem(itemForm); - - if(!errors.isEmpty()){ - this.addErrors(request,errors); - return findForward(itemForm.getItemType(),mapping); - } - short type = itemForm.getItemType(); - - //create a new SurveyItem - SurveyQuestion item = new SurveyQuestion(); - ISurveyService service = getSurveyService(); - SurveyUser surveyUser = getCurrentUser(service,sessionId); - item.setType(type); - item.setTitle(itemForm.getTitle()); - item.setDescription(itemForm.getDescription()); - item.setCreateDate(new Timestamp(new Date().getTime())); - item.setCreateByAuthor(false); - item.setCreateBy(surveyUser); - - //special attribute for URL or FILE - if(type == SurveyConstants.RESOURCE_TYPE_FILE){ - try { - service.uploadSurveyItemFile(item, itemForm.getFile()); - } catch (UploadSurveyFileException e) { - log.error("Failed upload Survey File " + e.toString()); - return mapping.findForward(SurveyConstants.ERROR); - } - }else if(type == SurveyConstants.RESOURCE_TYPE_URL){ - item.setUrl(itemForm.getUrl()); - item.setAppendText(itemForm.isOpenUrlNewWindow()); - } - //save and update session - - SurveySession resSession = service.getSurveySessionBySessionId(sessionId); - if(resSession == null){ - log.error("Failed update SurveySession by ID[" + sessionId + "]"); - return mapping.findForward(SurveyConstants.ERROR); - } - Set items = resSession.getSurveyQuestions(); - if(items == null){ - items = new HashSet(); - resSession.setSurveyQuestions(items); - } - items.add(item); - service.saveOrUpdateSurveySession(resSession); - - //update session value - SortedSet surveyItemList = getSurveyItemList(sessionMap); - surveyItemList.add(item); - - //URL or file upload - request.setAttribute(SurveyConstants.ATTR_ADD_RESOURCE_TYPE,new Short(type)); - request.setAttribute(AttributeNames.ATTR_MODE,mode); - return mapping.findForward(SurveyConstants.SUCCESS); - } - /** * Display empty reflection form. * @param mapping * @param form @@ -411,18 +290,18 @@ } private ISurveyService getSurveyService() { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - return (ISurveyService) wac.getBean(SurveyConstants.RESOURCE_SERVICE); + return (ISurveyService) wac.getBean(SurveyConstants.SURVEY_SERVICE); } /** * List save current survey items. * @param request * @return */ private SortedSet getSurveyItemList(SessionMap sessionMap) { - SortedSet list = (SortedSet) sessionMap.get(SurveyConstants.ATTR_RESOURCE_ITEM_LIST); + SortedSet list = (SortedSet) sessionMap.get(SurveyConstants.ATTR_QUESTION_LIST); if(list == null){ - list = new TreeSet(new SurveyItemComparator()); - sessionMap.put(SurveyConstants.ATTR_RESOURCE_ITEM_LIST,list); + list = new TreeSet(new QuestionsComparator()); + sessionMap.put(SurveyConstants.ATTR_QUESTION_LIST,list); } return list; } @@ -457,19 +336,5 @@ } return surveyUser; } - /** - * @param itemForm - * @return - */ - private ActionErrors validateSurveyItem(SurveyItemForm itemForm) { - ActionErrors errors = new ActionErrors(); - if(StringUtils.isBlank(itemForm.getTitle())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_TITLE_BLANK)); - - if(StringUtils.isBlank(itemForm.getDescription())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK)); - return errors; - } - } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java =================================================================== diff -u -r32c1faf5b38aebd6468e4a66f8b6c46b9ac84c2d -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 32c1faf5b38aebd6468e4a66f8b6c46b9ac84c2d) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -149,6 +149,6 @@ private ISurveyService getSurveyService() { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet() .getServletContext()); - return (ISurveyService) wac.getBean(SurveyConstants.RESOURCE_SERVICE); + return (ISurveyService) wac.getBean(SurveyConstants.SURVEY_SERVICE); } } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,74 @@ +/**************************************************************** + * 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +/* $$Id$$ */ +package org.lamsfoundation.lams.tool.survey.web.form; + +import org.apache.struts.action.ActionForm; +/** + * Survey Item Form. + * @struts.form name="surveyItemForm" + * @author Steve.Ni + * + * @version $Revision$ + */ +public class QuestionForm extends ActionForm { + private String itemIndex; + private String sessionMapID; + + //tool access mode; + private String mode; + + private short itemType; + private String description; + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getItemIndex() { + return itemIndex; + } + public void setItemIndex(String itemIndex) { + this.itemIndex = itemIndex; + } + public short getItemType() { + return itemType; + } + public void setItemType(short type) { + this.itemType = type; + } + public String getSessionMapID() { + return sessionMapID; + } + public void setSessionMapID(String sessionMapID) { + this.sessionMapID = sessionMapID; + } + public String getMode() { + return mode; + } + public void setMode(String mode) { + this.mode = mode; + } +} Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java (.../SurveyForm.java) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java (.../SurveyForm.java) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -23,21 +23,14 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.survey.web.form; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.survey.model.Survey; -import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment; /** * @@ -62,7 +55,7 @@ public SurveyForm(){ survey = new Survey(); - survey.setTitle("Shared Survey"); + survey.setTitle("Survey"); currentTab = 1; } @@ -82,6 +75,8 @@ survey.setDefineLater(false); survey.setRunOffline(false); survey.setReflectOnActivity(false); + survey.setShowOnePage(false); + } } Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyItemForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/WEB-INF/tiles-defs.xml =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/web/WEB-INF/tiles-defs.xml (.../tiles-defs.xml) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/web/WEB-INF/tiles-defs.xml (.../tiles-defs.xml) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -32,7 +32,7 @@ - + Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -30,11 +30,11 @@

hibernateFilter

- org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + org.springframework.orm.hibernate3.support.OpenSessionInViewFilter

sessionFactoryBeanName - surveySessionFactory + lasurvSurveySessionFactory

@@ -206,10 +206,10 @@

- - Secure Content + + Secure Content /* - +

LEARNER

TEACHER @@ -221,59 +221,59 @@

- - Authoring Update + + Authoring Update /authoring.do - +

AUTHOR

- - Staff Content + + Staff Content /monitoring.do - +

MONITOR

TEACHER

- - Staff Content + + Staff Content /definelater.do - +

MONITOR

TEACHER

- - Adminstrator Content + + Adminstrator Content /admin.do - +

ADMIN

- - LAMS System Adminstrator Content + + LAMS System Adminstrator Content /sysadmin.do - +

SYSADMIN

- - Download Files + + Download Files /download/ - +

AUTHOR

MONITOR Index: lams_tool_survey/web/common/taglibs.jsp =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/web/common/taglibs.jsp (.../taglibs.jsp) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/web/common/taglibs.jsp (.../taglibs.jsp) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -8,5 +8,5 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-xml" prefix="x" %> <%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="fck-editor" prefix="FCK"%> +<%@ taglib uri="fck-editor" prefix="fck"%> Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/includes/javascript/tree.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/includes/javascript/tree_tpl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/layout/ frame.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/addfile.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/addlearningobject.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/pages/authoring/parts/addsurvey.jsp =================================================================== diff -u --- lams_tool_survey/web/pages/authoring/parts/addsurvey.jsp (revision 0) +++ lams_tool_survey/web/pages/authoring/parts/addsurvey.jsp (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -0,0 +1,95 @@ +<%@ include file="/common/taglibs.jsp"%> + + + <%@ include file="/common/header.jsp"%> + <%-- user for surveysurveyitem.js --%> + + + + + + + + + + + + + + + + + + + + + +

+ <%@ include file="/common/messages.jsp"%> + + + + + + + + + + + + +

+ + + +
+ +	+ + + + + + +

+ +

+ <%@ include file="instructions.jsp"%> +

+ +

+ + Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/addurl.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/addwebsite.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/itemattachment.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/pages/authoring/start.jsp =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 --- lams_tool_survey/web/pages/authoring/start.jsp (.../start.jsp) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/web/pages/authoring/start.jsp (.../start.jsp) (revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064) @@ -2,7 +2,6 @@ - Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/itemreview/initnav.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/itemreview/instructionsnav.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/itemreview/mainframe.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/itemreview/openurl.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learning/addfile.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learning/addurl.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learningobj/defaultcontent.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learningobj/icons/.cvsignore'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/pages/learningobj/icons/base.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/empty.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/folder.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/folderopen.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/join.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/joinbottom.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/line.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/minus.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/minusbottom.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/page.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/plus.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Index: lams_tool_survey/web/pages/learningobj/icons/plusbottom.gif =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 Binary files differ Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learningobj/mainframe.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learningobj/navigatortree.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learningobj/xmltree.xsl'. Fisheye: No comparison available. Pass `N' to diff?