sambal-cle 0.1.4 → 0.1.5

data/lib/sambal-cle/data_objects/resource.rb

@@ -19,8 +19,8 @@ class FileObject
   end
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
     on Resources do |file|
       file.upload_file_to_folder @target_folder
     end
@@ -55,8 +55,8 @@ class FolderObject
   end
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
     on_page Resources do |page|
       page.create_subfolders_in @parent_folder
     end
@@ -117,8 +117,8 @@ class HTMLPageObject
   alias :content :html
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
     on_page Resources do |page|
       page.create_html_page_in @folder
     end
@@ -138,8 +138,8 @@ class HTMLPageObject
   end
 
   def edit_content(html_source)
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
     on Resources do |fileslist|
       fileslist.open_folder @folder unless fileslist.item(@name).present? || @folder==nil
       fileslist.edit_content @name
@@ -170,8 +170,8 @@ class TextDocumentObject
   end
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
   end
 
 end
@@ -193,8 +193,8 @@ class CitationListObject
   end
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    resources unless @browser.title=~/Resources$/
+    open_my_site_by_name @site
+    resources
   end
 
 end

data/lib/sambal-cle/data_objects/syllabus.rb

@@ -22,8 +22,8 @@ class SyllabusObject
   alias :name :title
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    syllabus unless @browser.title=~/Syllabus$/
+    open_my_site_by_name @site
+    syllabus
     on Syllabus do |add|
       add.create_edit
       add.add
@@ -36,8 +36,8 @@ class SyllabusObject
   end
 
   def edit opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    syllabus unless @browser.title=~/Syllabus$/
+    open_my_site_by_name @site
+    syllabus
     on Syllabus do |syllabus|
       reset
       syllabus.create_edit
@@ -46,15 +46,15 @@ class SyllabusObject
       edit.open_item @title
     end
     on AddEditSyllabusItem do |item|
-      item.title.set opts[:title] unless opts[:title]==nil
+      item.title.fit opts[:title]
       item.enter_source_text(item.editor, opts[:content]) unless opts[:content]==nil
     end
     set_options(opts)
   end
 
   def get_properties
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    syllabus unless @browser.title=~/Syllabus$/
+    open_my_site_by_name @site
+    syllabus
     on Syllabus do |syllabus|
       reset
       syllabus.create_edit

data/lib/sambal-cle/data_objects/web_content_tool.rb

@@ -21,8 +21,8 @@ class WebContentObject
   end
 
   def create
-    my_workspace unless @browser.title=~/My Workspace/
-    site_setup unless @browser.title=~/Site Setup$/
+    my_workspace
+    site_setup
     on_page SiteSetup do |page|
       page.edit @site
     end

data/lib/sambal-cle/data_objects/wiki.rb

@@ -23,8 +23,8 @@ class WikiObject
   alias :name :title
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    wiki unless @browser.title=~/Wiki$/
+    open_my_site_by_name @site
+    wiki
     on Rwiki do |home|
       home.edit
       @current_content = home.content.value
@@ -40,8 +40,8 @@ class WikiObject
   end
 
   def edit opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    wiki unless @browser.title=~/Wiki$/
+    open_my_site_by_name @site
+    wiki
     on Rwiki do |edit|
       edit.open_wiki @title
       edit.edit
@@ -51,8 +51,8 @@ class WikiObject
   end
 
   def get_content
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    wiki unless @browser.title=~/Wiki$/
+    open_my_site_by_name @site
+    wiki
     on Rwiki do |edit|
       edit.open_wiki @title
       edit.edit

data/lib/sambal-cle/page_objects/assessments.rb

@@ -84,11 +84,11 @@ class AssessmentsList < AssessmentsBase
   # Opens the selected test for scoring
   # then instantiates the AssessmentTotalScores class.
   # @param test_title [String] the title of the test to be clicked.
-  pgmd(:score_test) { |test_title, b| b.frm.tbody(:id=>"authorIndexForm:_id88:tbody_element").row(:text=>/#{Regexp.escape(test_title)}/).link(:id=>/authorIndexToScore/).click }
+  action(:score_test) { |test_title, b| b.frm.tbody(:id=>"authorIndexForm:_id88:tbody_element").row(:text=>/#{Regexp.escape(test_title)}/).link(:id=>/authorIndexToScore/).click }
 
-  pgmd(:publish) { |test_title, b| b.pending_table.tr(:text=>/#{Regexp.escape(test_title)}/).select(:name=>/Select/).select "Publish" }
+  action(:publish) { |test_title, b| b.pending_table.tr(:text=>/#{Regexp.escape(test_title)}/).select(:name=>/Select/).select "Publish" }
 
-  pgmd(:edit) { |test_title, b| b.form(:id=>"authorIndexForm").tr(:text=>/#{Regexp.escape(test_title)}/).select(:name=>/Select/).select "Edit" }
+  action(:edit) { |test_title, b| b.frm.form(:id=>"authorIndexForm").tr(:text=>/#{Regexp.escape(test_title)}/).select(:name=>/Select/).select "Edit" }
 
   element(:title) { |b| b.frm.text_field(:id=>"authorIndexForm:title") }
   element(:pending_table) { |b| b.frm.table(:id=>"authorIndexForm:coreAssessments") }
@@ -101,6 +101,62 @@ class AssessmentsList < AssessmentsBase
 
 end
 
+# Page of Assessments accessible to a student user
+#
+# It may be that we want to deprecate this class and simply use
+# the AssessmentsList class alone.
+class StudentAssessmentsList < AssessmentsBase
+
+  # Returns an array containing the assessment names that appear on the page.
+  def available_assessments
+    list = []
+    table = available_assessments_table.to_a
+    table.delete_at(0)
+    table.each { |row| list<<row[0].gsub(/\s+$/, "") unless row[0]=="" }
+    list
+  end
+
+  # Method to get the titles of assessments that
+  # the student user has submitted. The titles are
+  # returned in an Array object.
+  def submitted_assessments
+    table_array = @browser.frame(:index=>1).table(:id=>"selectIndexForm:reviewTable").to_a
+    table_array.delete_at(0)
+    titles = []
+    table_array.each { |row|
+      unless row[0] == ""
+        titles << row[0]
+      end
+    }
+
+    return titles
+
+  end
+
+  # Clicks the specified assessment
+  # @param name [String] the name of the assessment you want to take
+  def take_assessment(name)
+    begin
+      frm.link(:text=>name).click
+    rescue Watir::Exception::UnknownObjectException
+      frm.link(:text=>CGI::escapeHTML(name)).click
+    end
+  end
+
+  # TODO This method is in need of improvement to make it more generalized for finding the correct test.
+  #
+  def feedback(test_name)
+    test_table = submitted_assessments_table.to_a
+    test_table.delete_if { |row| row[3] != "Immediate" }
+    index_value = test_table.index { |row| row[0] == test_name }
+    frm.link(:text=>"Feedback", :index=>index_value).click
+  end
+
+  element(:available_assessments_table) { |b| b.frm.table(:id=>"selectIndexForm:selectTable") }
+  element(:submitted_assessments_table) { |b| b.frm.table(:id=>"selectIndexForm:reviewTable") }
+
+end
+
 # Page that appears when previewing an assessment.
 # It shows the basic information about the assessment.
 class PreviewOverview < BasePage
@@ -159,8 +215,8 @@ class AssessmentSettings < AssessmentsBase
   element(:due_date) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:endDate") }
   element(:retract_date) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:retractDate") }
   # Assessment Released To
-  element(:released_to_anonymous) { |b| b.frm.radio(:name=>"assessmentSettingsAction:_id117") }
-  element(:released_to_site) { |b| b.frm.radio(:name=>"assessmentSettingsAction:_id117") }
+  element(:released_to_anonymous) { |b| b.frm.radio(:value=>"Anonymous Users") }
+  element(:released_to_site) { |b| b.frm.radio(:name=>"assessmentSettingsAction:_id117", :index=>1) }
   element(:specified_ips) { |b| b.frm.text_field(:name=>"assessmentSettingsAction:_id132") }
   # High Security
   element(:secondary_id) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:username") }
@@ -170,52 +226,55 @@ class AssessmentSettings < AssessmentsBase
   element(:limit_hour) { |b| b.frm.select(:id=>"assessmentSettingsAction:timedHours") }
   element(:limit_mins) { |b| b.frm.select(:id=>"assessmentSettingsAction:timedMinutes") }
   # Assessment Organization
-  element(:linear_access) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNavigation") }
-  element(:random_access) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNavigation") }
-  element(:question_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat") }
-  element(:part_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat") }
-  element(:assessment_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat") }
-  element(:continuous_numbering) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNumbering") }
-  element(:restart_per_part) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNumbering") }
+  element(:linear_access) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNavigation", :value=>"1") }
+  element(:random_access) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNavigation", :value=>"2") }
+  element(:question_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat", :value=>"1") }
+  element(:part_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat", :value=>"2") }
+  element(:assessment_per_page) { |b| b.frm.radio(:name=>"assessmentSettingsAction:assessmentFormat", :value=>"3") }
+  element(:continuous_numbering) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNumbering", :value=>"1") }
+  element(:restart_per_part) { |b| b.frm.radio(:name=>"assessmentSettingsAction:itemNumbering", :value=>"2") }
   # Mark for review
   element(:add_mark_for_review) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:markForReview1") }
-  element(:unlimited_submissions) { |b| b.frm.radio(:name=>"assessmentSettingsAction:unlimitedSubmissions") }
-  element(:only_x_submissions) { |b| b.frm.radio(:name=>"assessmentSettingsAction:unlimitedSubmissions") }
+  element(:unlimited_submissions) { |b| b.frm.radio(:name=>"assessmentSettingsAction:unlimitedSubmissions", :value=>"1") }
+  element(:only_x_submissions) { |b| b.frm.radio(:name=>"assessmentSettingsAction:unlimitedSubmissions", :value=>"0") }
   element(:allowed_submissions) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:submissions_Allowed") }
-  element(:late_submissions_not_accepted) { |b| b.frm.radio(:name=>"assessmentSettingsAction:lateHandling") }
-  element(:late_submissions_accepted) { |b| b.frm.radio(:name=>"assessmentSettingsAction:lateHandling") }
+  element(:late_submissions_not_accepted) { |b| b.frm.radio(:name=>"assessmentSettingsAction:lateHandling", :value=>"2") }
+  element(:late_submissions_accepted) { |b| b.frm.radio(:name=>"assessmentSettingsAction:lateHandling", :value=>"1") }
   # Submission Message
   element(:submission_message) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:_id250_textinput") }
   element(:final_page_url) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:finalPageUrl") }
   # Feedback
-  element(:question_level_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring") }
-  element(:selection_level_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring") }
-  element(:both_feedback_levels) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring") }
-  element(:immediate_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery") }
-  element(:feedback_on_submission) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery") }
-  element(:no_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery") }
-  element(:feedback_on_date) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery") }
+  element(:question_level_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring", :value=>"1") }
+  element(:selection_level_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring", :value=>"2") }
+  element(:both_feedback_levels) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackAuthoring", :value=>"3") }
+  element(:immediate_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery", :value=>"1") }
+  element(:feedback_on_submission) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery", :value=>"4") }
+  element(:no_feedback) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery", :value=>"3") }
+  element(:feedback_on_date) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackDelivery", :value=>"2") }
   element(:feedback_date) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackDate") }
-  element(:only_release_scores) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackComponentOption") }
-  element(:release_questions_and) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackComponentOption") }
-  element(:release_student_response) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox1") }
-  element(:release_correct_response) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox3") }
-  element(:release_students_assessment_scores) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox5") }
-  element(:release_students_question_and_part_scores) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox7") }
-  element(:release_question_level_feedback) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox2") }
-  element(:release_selection_level_feedback) { |b| b.frm.text_field(:id=>"assessmentSettingsAction:feedbackCheckbox4") }
+  element(:only_release_scores) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackComponentOption", :value=>"1") }
+  element(:release_questions_and) { |b| b.frm.radio(:name=>"assessmentSettingsAction:feedbackComponentOption", :value=>"2") }
+  element(:release_student_response) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox1") }
+  element(:release_correct_response) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox3") }
+  element(:release_students_assessment_scores) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox5") }
+  element(:release_students_question_and_part_scores) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox7") }
+  element(:release_question_level_feedback) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox2") }
+  element(:release_selection_level_feedback) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox4") }
   element(:release_graders_comments) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox6") }
   element(:release_statistics) { |b| b.frm.checkbox(:id=>"assessmentSettingsAction:feedbackCheckbox8") }
-  element(:student_ids_seen) { |b| b.frm.radio(:name=>"assessmentSettingsAction:anonymousGrading1") }
-  element(:anonymous_grading) { |b| b.frm.radio(:name=>"assessmentSettingsAction:anonymousGrading1") }
+  # Grading
+  element(:student_ids_seen) { |b| b.frm.radio(:name=>"assessmentSettingsAction:anonymousGrading1", :value=>"2") }
+  element(:anonymous_grading) { |b| b.frm.radio(:name=>"assessmentSettingsAction:anonymousGrading1", :value=>"1") }
     #radio_button(:no_gradebook_options) { |b| b.frm.radio(:name=>"") }
     #radio_button(:grades_sent_to_gradebook) { |b| b.frm.radio(:name=>"") }
+  # Graphics
     #radio_button(:record_highest_score) { |b| b.frm.radio(:name=>"") }
     #radio_button(:record_last_score) { |b| b.frm.radio(:name=>"") }
     #radio_button(:background_color) { |b| b.frm.radio(:name=>"") }
     #text_field(:color_value, :id=>"") }
     #radio_button(:background_image) { |b| b.frm.radio(:name=>"") }
     #text_field(:image_name, :=>"") }
+  # Metadata
     #text_field(:keywords, :=>"") }
     #text_field(:objectives, :=>"") }
     #text_field(:rubrics, :=>"") }
@@ -254,7 +313,7 @@ class AssessmentTotalScores < BasePage
   # selecting the appropriate comment box.
   # @param student_id [String] the target student id
   # @param comment [String] the text of the comment being made to the student
-  pgmd(:comment_for_student) { |student_id, comment, b|
+  action(:comment_for_student) { |student_id, comment, b|
     index_val = b.student_ids.index(student_id)
     b.frm.text_field(:name=>"editTotalResults:totalScoreTable:#{index_val}:_id345").value=comment
   }
@@ -281,7 +340,7 @@ class AssessmentTotalScores < BasePage
   end
 
   # Clicks the Assessments link on the page
-  # then instantiates the AssessmentsList class.
+  # then instantiates the AssessmentsList class.                                          action(:
   def assessments
     frm.link(:text=>"Assessments").click
     AssessmentsList.new(@browser)
@@ -332,7 +391,7 @@ class EditAssessment < AssessmentsBase
   # Allows removing a specified
   # Assessment part number.
   # @param part_num [String] the part number of the assessment you want
-  pgmd(:remove_part) { |part_num, b| b.frm.link(:xpath, "//a[contains(@onclick, 'assesssmentForm:parts:#{part_num.to_i-1}:copyToPool')]").click }
+  action(:remove_part) { |part_num, b| b.frm.link(:xpath, "//a[contains(@onclick, 'assesssmentForm:parts:#{part_num.to_i-1}:copyToPool')]").click }
 
   # Clicks the Add Part button, then
   # instantiates the AddEditAssessmentPart page class.
@@ -340,7 +399,7 @@ class EditAssessment < AssessmentsBase
 
   # Selects the desired question type from the
   # drop down list at the top of the page.
-  pgmd(:question_type) { |qtype, b| b.frm.select(:id=>"assesssmentForm:changeQType").select(qtype) }
+  action(:question_type) { |qtype, b| b.frm.select(:id=>"assesssmentForm:changeQType").select(qtype) }
 
   # Clicks the Preview button,
   # then instantiates the PreviewOverview page class.
@@ -358,12 +417,13 @@ class EditAssessment < AssessmentsBase
   # text, by part and question number.
   # @param part_num [String] the Part number containing the question you want
   # @param question_num [String] the number of the question you want
-  pgmd(:get_question_text) { |part_number, question_number, b|  b.frm.table(:id=>"assesssmentForm:parts:#{part_number.to_i-1}:parts").div(:class=>"tier3", :index=>question_number.to_i-1).text }
+  action(:get_question_text) { |part_number, question_number, b|  b.frm.table(:id=>"assesssmentForm:parts:#{part_number.to_i-1}:parts").div(:class=>"tier3", :index=>question_number.to_i-1).text }
 
   action(:print) { |b| b.frm.button(:text=>"Print").click }
   action(:update_points) { |b| b.frm.button(:id=>"assesssmentForm:pointsUpdate").click }
 
-  pgmd(:add_question_to_part) { |part, p| p.assessment_form.row(:text=>/#{Regexp.escape(part)}/).select(:id=>/changeQType/) }
+  # TODO: Fix this method. It doesn't work for some reason...
+  action(:add_question_to_part) { |part, p| p.assessment_form.row(:text=>/#{Regexp.escape(part)}/).select(:id=>/changeQType/) }
 
   element(:assessment_form) { |b| b.table(:id=>"assesssmentForm:parts") }
 
@@ -434,34 +494,16 @@ class MultipleChoice < AssessmentsBase
   element(:multi_single) { |b| b.frm.radio(:name=>"itemForm:chooseAnswerTypeForMC", :index=>1) }
   element(:multi_multi) { |b| b.frm.radio(:name=>"itemForm:chooseAnswerTypeForMC", :index=>2) }
 
-  element(:answer_a) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:0:_id140_textinput") }
-  action(:remove_a) { |b| b.frm.link(:id=>"itemForm:mcchoices:0:removelinkSingle").click }
-  element(:answer_b) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:1:_id140_textinput") }
-  action(:remove_b) { |b| b.frm.link(:id=>"itemForm:mcchoices:1:removelinkSingle").click }
-  element(:answer_c) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:2:_id140_textinput") }
-  action(:remove_c) { |b| b.frm.link(:id=>"itemForm:mcchoices:2:removelinkSingle").click }
-  element(:answer_d) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:3:_id140_textinput") }
-  action(:remove_d) { |b| b.frm.link(:id=>"itemForm:mcchoices:3:removelinkSingle").click }
-
-    # Radio buttons that appear when "single correct" is selected
-  element(:a_correct) { |b| b.frm.radio(:name=>"itemForm:mcchoices:0:mcradiobtn") }
-  element(:b_correct) { |b| b.frm.radio(:name=>"itemForm:mcchoices:1:mcradiobtn") }
-  element(:c_correct) { |b| b.frm.radio(:name=>"itemForm:mcchoices:2:mcradiobtn") }
-  element(:d_correct) { |b| b.frm.radio(:name=>"itemForm:mcchoices:3:mcradiobtn") }
-
-    # % Value fields that appear when "single correct" and "partial credit" selected
-  element(:a_value) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:0:partialCredit") }
-  element(:b_value) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:1:partialCredit") }
-  element(:c_value) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:2:partialCredit") }
-  element(:d_value) { |b| b.frm.text_field(:id=>"itemForm:mcchoices:3:partialCredit") }
+  action(:correct_answer) { |answer, b| b.frm.radio(:value=>answer) }
+  action(:answer_text) { |answer, b| b.frm.text_field(:name=>"itemForm:mcchoices:#{answer.ord-65}:_id140_textinput") }
+  action(:answer_feedback_text) { |answer, b| b.frm.text_field(:name=>"itemForm:mcchoices:#{answer.ord-65}:_id143_textinput") }
+
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id186_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id190_textinput") }
 
   action(:reset_score_values) { |b| b.frm.link(:text=>"Reset Score Values").click }
 
-    # Checkboxes that appear when "multiple correct" is selected
-  element(:check_a_correct) { |b| b.frm.checkbox(:name=>"itemForm:mcchoices:0:mccheckboxes") }
-  element(:check_b_correct) { |b| b.frm.checkbox(:name=>"itemForm:mcchoices:1:mccheckboxes") }
-  element(:check_c_correct) { |b| b.frm.checkbox(:name=>"itemForm:mcchoices:2:mccheckboxes") }
-  element(:check_d_correct) { |b| b.frm.checkbox(:name=>"itemForm:mcchoices:3:mccheckboxes") }
+  action(:remove_last_answer) { |b| b.frm.link(:text=>"Remove", :index=>-1).click }
 
   element(:insert_additional_answers) { |b| b.frm.select(:id=>"itemForm:insertAdditionalAnswerSelectMenu") }
   element(:randomize_answers_yes) { |b| b.frm.radio(:index=>0, :name=>"itemForm:_id162") }
@@ -485,6 +527,7 @@ class Survey < AssessmentsBase
   element(:unacceptable_excellent) { |b| b.frm.radio(:index=>5, :name=>"itemForm:selectscale") }
   element(:one_to_five) { |b| b.frm.radio(:index=>6, :name=>"itemForm:selectscale") }
   element(:one_to_ten) { |b| b.frm.radio(:index=>7, :name=>"itemForm:selectscale") }
+  element(:feedback) { |b| b.frm.text_field(:id=>"itemForm:_id140_textinput") }
 
 end
 
@@ -495,6 +538,7 @@ class ShortAnswer < AssessmentsBase
   question_page_elements
 
   element(:model_short_answer) { |b| b.frm.text_field(:id=>"itemForm:_id129_textinput") }
+  element(:feedback) { |b| b.frm.text_field(:id=>"itemForm:_id133_textinput") }
 
 end
 
@@ -506,6 +550,8 @@ class FillInBlank < AssessmentsBase
 
   element(:case_sensitive) { |b| b.frm.checkbox(:name=>"itemForm:_id76") }
   element(:mutually_exclusive) { |b| b.frm.checkbox(:name=>"itemForm:_id78") }
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id144_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id147_textinput") }
 
 end
 
@@ -515,6 +561,9 @@ class NumericResponse < AssessmentsBase
   menu_bar_elements
   question_page_elements
 
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id141_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id143_textinput") }
+
 end
 
 #  The page for setting up a matching question
@@ -525,6 +574,12 @@ class Matching < AssessmentsBase
 
   element(:choice) { |b| b.frm.text_field(:id=>"itemForm:_id147_textinput") }
   element(:match) { |b| b.frm.text_field(:id=>"itemForm:_id151_textinput") }
+  element(:correct_match_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id155_textinput") }
+  element(:incorrect_match_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id160_textinput") }
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id184_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id189_textinput") }
+
+  action(:distractor) { |b| b.frm.select(:id=>"itemForm:controllingSequence").select "*distractor*" }
   action(:save_pairing) { |b| b.frm.button(:name=>"itemForm:_id164").click }
 
 end
@@ -536,10 +591,11 @@ class TrueFalse < AssessmentsBase
   question_page_elements
 
   element(:negative_point_value) { |b| b.frm.text_field(:id=>"itemForm:answerdsc") }
-  element(:answer_true) { |b| b.frm.radio(:index=>0, :name=>"itemForm:TF") }
-  element(:answer_false) { |b| b.frm.radio(:index=>1, :name=>"itemForm:TF") }
+  action(:answer) { |answer, b| b.frm.radio(:value=>answer, :name=>"itemForm:TF") }
   element(:required_rationale_yes) { |b| b.frm.radio(:index=>0, :name=>"itemForm:rational") }
   element(:required_rationale_no) { |b| b.frm.radio(:index=>1, :name=>"itemForm:rational") }
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id148_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id152_textinput") }
 
 end
 
@@ -551,6 +607,7 @@ class AudioRecording < AssessmentsBase
 
   element(:time_allowed) { |b| b.frm.text_field(:id=>"itemForm:timeallowed") }
   element(:number_of_attempts) { |b| b.frm.select(:id=>"itemForm:noattempts") }
+  element(:feedback) { |b| b.frm.text_field(:id=>"itemForm:_id146_textinput") }
 
 end
 
@@ -560,6 +617,29 @@ class FileUpload < AssessmentsBase
 
   menu_bar_elements
   question_page_elements
+  element(:feedback) { |b| b.frm.text_field(:id=>"itemForm:_id130_textinput") }
+
+end
+
+#  The page for setting up a calculated question
+class CalculatedQuestions < AssessmentsBase
+
+  menu_bar_elements
+  question_page_elements
+
+  action(:extract_vs_and_fs) { |b| b.frm.button(:value=>"Extract Variables and Formulas").click; b.variables_table.wait_until_present }
+
+  action(:min_value) { |variable_name, p| p.variables_table.td(:text=>variable_name).parent.text_field(:name=>/itemForm:pairs:.:_id167/) }
+  action(:max_value) { |variable_name, p| p.variables_table.td(:text=>variable_name).parent.text_field(:name=>/_id170/) }
+  action(:var_decimals) { |variable_name, p| p.variables_table.td(:text=>variable_name).parent.select(:name=>/_id173/) }
+  action(:formula) { |formula_name, p| p.formulas_table.td(:text=>formula_name).parent.text_field(:name=>/_id186/) }
+  action(:tolerance) { |formula_name, p| p.formulas_table.td(:text=>formula_name).parent.text_field(:name=>/_id189/) }
+  action(:form_decimals) { |formula_name, p| p.formulas_table.td(:text=>formula_name).parent.select(:name=>/assignToPart/) }
+  element(:variables_table) { |b| b.frm.table(:id=>"itemForm:pairs") }
+  element(:formulas_table) { |b| b.frm.table(:id=>"itemForm:formulas") }
+
+  element(:correct_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id207_textinput") }
+  element(:incorrect_answer_feedback) { |b| b.frm.text_field(:id=>"itemForm:_id211_textinput") }
 
 end
 
@@ -686,91 +766,31 @@ class SelectQuestionType < AssessmentsBase
 
 end
 
-# Page of Assessments accessible to a student user
-#
-# It may be that we want to deprecate this class and simply use
-# the AssessmentsList class alone.
-class TakeAssessmentList < AssessmentsBase
 
-  # Returns an array containing the assessment names that appear on the page.
-  def available_assessments
-    # define this later
-  end
+# The student view of the overview/intro page of an Assessment
+class BeginAssessment < BasePage
 
-  # Method to get the titles of assessments that
-  # the student user has submitted. The titles are
-  # returned in an Array object.
-  def submitted_assessments
-    table_array = @browser.frame(:index=>1).table(:id=>"selectIndexForm:reviewTable").to_a
-    table_array.delete_at(0)
-    titles = []
-    table_array.each { |row|
-      unless row[0] == ""
-        titles << row[0]
-      end
-    }
+  frame_element
 
-    return titles
+  action(:begin_assessment) { |b| b.frm.button(:value=>"Begin Assessment").click }
 
-  end
+  value(:assessment_introduction) { |b| b.frm.div(:class=>"assessmentIntroduction").text }
 
-  # Clicks the specified assessment
-  # then instantiates the BeginAssessment
-  # page class.
-  # @param name [String] the name of the assessment you want to take
-  def take_assessment(name)
-    begin
-      frm.link(:text=>name).click
-    rescue Watir::Exception::UnknownObjectException
-      frm.link(:text=>CGI::escapeHTML(name)).click
-    end
-    BeginAssessment.new(@browser)
-  end
+  element(:info_table) { |b| b.frm.table(:index=>0) }
 
-  # TODO This method is in need of improvement to make it more generalized for finding the correct test.
-  #
-  def feedback(test_name)
-    test_table = frm.table(:id=>"selectIndexForm:reviewTable").to_a
-    test_table.delete_if { |row| row[3] != "Immediate" }
-    index_value = test_table.index { |row| row[0] == test_name }
-    frm.link(:text=>"Feedback", :index=>index_value).click
-    # Need to add a call to a New class here, when it's written
-  end
+  #TODO: Write methods to extract pertinent info from the info table.
 
 end
 
-# The student view of the overview page of an Assessment
-class BeginAssessment < AssessmentsBase
+# Pages student sees when taking an assessment
+# Note that this class will only work when the Assessment being taken
+# is set up to only display one question per page.
+class TakeAssessment < AssessmentsBase
 
-  # Clicks the Begin Assessment button.
-  def begin_assessment
-    frm.button(:value=>"Begin Assessment").click
-  end
-
-  # Clicks the Cancel button and instantiates the X Class.
-  def cancel
-    # Define this later
-  end
+  action(:multiple_choice_answer) { |answer_text, b| b.frm }
 
-  # Selects the specified radio button answer
-  def multiple_choice_answer(letter)
-    # TODO: Convert this to a hash instead of case statement
-    index = case(letter.upcase)
-              when "A" then "0"
-              when "B" then "1"
-              when "C" then "2"
-              when "D" then "3"
-              when "E" then "4"
-            end
-    frm.radio(:name=>/takeAssessmentForm.+:deliverMultipleChoice.+:_id.+:#{index}/).click
-  end
-
-  # Enters the answer into the specified blank number (1-based).
-  # @param answer [String]
-  def fill_in_blank_answer(answer, blank_number)
-    index = blank_number.to_i-1
-    frm.text_field(:name=>/deliverFillInTheBlank:_id.+:#{index}/).value=answer
-  end
+  action(:fill_in_blank_answer) { |box, b| b.frm.text_field(:name=>/deliverFillInTheBlank:_id.+:#{box.to_i}/) }
+  action(:numeric_answer) { |box, b| b.frm.text_field(:name=>/deliverFillInNumeric:_id.+:#{box.to_i}/) }
 
   # Clicks either the True or the False radio button, as specified.
   def true_false_answer(answer)
@@ -783,16 +803,9 @@ class BeginAssessment < AssessmentsBase
     frm.text_field(:name=>/:deliverTrueFalse:rationale/).value=text
   end
 
-  # Enters the specified text into the "Short Answer" field.
-  def short_answer(answer)
-    frm.text_field(:name=>/deliverShortAnswer/).value=answer
-  end
+  element(:short_answer) { |b| b.frm.text_field(:name=>/deliverShortAnswer/) }
 
-  # Selects the specified matching value, at the spot specified by the number (1-based counting).
-  def match_answer(answer, number)
-    index = number.to_i-1
-    frm.select(:name=>/deliverMatching/, :index=>index).select(answer)
-  end
+  action(:match_answer) { |match_text, b| b.frm.td(:text=>/#{Regexp.escape(match_text)}/).parent.select(:index=>0) }
 
   # Enters the specified file name in the file field. You can include the path to the file
   # as an optional second parameter.
@@ -802,16 +815,11 @@ class BeginAssessment < AssessmentsBase
   end
 
   # Clicks the Next button and instantiates the BeginAssessment Class.
-  def next
-    frm.button(:value=>"Next").click
-    BeginAssessment.new(@browser)
-  end
+  action(:next) { |b| b.frm.button(:value=>"Next").click }
 
   # Clicks the Submit for Grading button and instantiates the ConfirmSubmission Class.
-  def submit_for_grading
-    frm.button(:value=>"Submit for Grading").click
-    ConfirmSubmission.new(@browser)
-  end
+  action(:submit_for_grading){ |b| b.frm.button(:value=>"Submit for Grading").click }
+
 end
 
 # The confirmation page that appears when submitting an Assessment.