woople-theme 0.3.04 → 0.3.5

data/app/assets/stylesheets/woople-theme/assessment.css.less

@@ -56,7 +56,7 @@
     padding-top: 12px;
   }
 
-  .badge {
+  .badge-unanswered {
     background-color: @yellow;
   }
 
@@ -77,6 +77,22 @@
   }
 }
 
+#assessment.results {
+  .span12.return {
+    text-align: right;
+  }
+
+  input {
+    margin-right: 0;
+  }
+}
+
+.assessment_result_status {
+  .alert {
+    margin: 10px;
+  }
+}
+
 @media (max-width: 480px) {
   #assessment {
     .fieldset {
@@ -116,4 +132,10 @@
       margin-right: @assessment-fieldset-padding / 4;
     }
   }
-}
+
+  #assessment.results {
+    .span12.return {
+      text-align: center;
+    }
+  }
+}

data/app/assets/stylesheets/woople-theme/outline.css.less

@@ -83,6 +83,12 @@
       transition: transform .4s ease-in-out;
     }
 
+    .front.completed {
+      background-image:url(/assets/woople-theme/completed-triangle.png);
+      background-position:top right;
+      background-repeat:no-repeat;
+    }
+
     &.flip .back {
       z-index:1000;
       -webkit-transform: rotateY(0deg);
@@ -114,7 +120,6 @@
       -moz-transition: -moz-transform .4s ease-in-out;
       -webkit-transition: -webkit-transform .4s ease-in-out;
       transition: transform .4s ease-in-out;
-
     }
 
     .assessment-pad {

data/app/helpers/assessment_helper.rb

@@ -0,0 +1,7 @@
+module AssessmentHelper
+  def assessment_form(presenter, options = { submitted?: false })
+    form_presenter = options[:submitted?] ? SubmittedAssessmentFormPresenter : AssessmentFormPresenter
+
+    render partial: 'woople-theme/assessment_form', object: ThemePresentation.wrap(presenter, form_presenter)
+  end
+end

data/app/helpers/theme_helper.rb

@@ -48,19 +48,16 @@ module ThemeHelper
     render partial: 'woople-theme/results_header', locals: { title: title, path: path }
   end
 
-  def assessment_form assessment_form
-    render partial: 'woople-theme/assessment_form', object: ThemePresentation.wrap(assessment_form, AssessmentFormPresenter)
-  end
-
   def impersonation_banner
     if !respond_to?(WoopleTheme.configuration.impersonation_banner_helper)
       raise "#{WoopleTheme.configuration.impersonation_banner_helper} helper_method does not exist. WoopleTheme.configuration.impersonation_banner_helper must point to a valid helper_method."
     end
-    
+
     model = ThemePresentation.wrap(send(WoopleTheme.configuration.impersonation_banner_helper))
 
     return unless model.impersonating?
 
     render 'woople-theme/impersonation_banner', impersonation: model
   end
+
 end

data/app/presenters/assessment_form_presenter.rb

@@ -1,19 +1,39 @@
 require 'explicit_delegator'
 
 class AssessmentFormPresenter < ExplicitDelegator
-
   enforce_definitions :description, # Short description of assessment
                       :course_path, # url to go to when assessment cancelled
                       :copyright,   # copyright notice for assessment
                       :submit_path, # path for assessment form to submit to
                       :questions    # set of questions in the assessment
 
-  def render_copyright
-    yield if copyright.present?
+  def title
+    I18n.t('woople_theme.assessment.name')
+  end
+
+  def css_classes
+    nil
   end
 
   def questions
     ThemePresentation.wrap_collection(__getobj__.questions, WoopleTheme::QuestionPresenter)
   end
 
+  def render_result_status
+    nil
+  end
+
+  def render_copyright
+    yield if copyright.present?
+  end
+
+  def footer_partial
+    'woople-theme/assessment_form_submission'
+  end
+
+  private
+
+  def assessment_result
+    __getobj__
+  end
 end

data/app/presenters/outline_assessment_presenter.rb

@@ -3,10 +3,15 @@ require 'delegate'
 require 'action_view'
 require 'active_support/core_ext/object/blank'
 require 'woople_theme_i18n'
+require 'explicit_delegator'
 
-class OutlineAssessmentPresenter < SimpleDelegator
-  include ActionView::Helpers::TagHelper
+class OutlineAssessmentPresenter < ExplicitDelegator
   include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::NumberHelper
+  include ActionView::Helpers::TagHelper
+
+  enforce_definitions :completed?,
+                      :enabled?
 
   def render
     yield if enabled?
@@ -53,12 +58,16 @@ class OutlineAssessmentPresenter < SimpleDelegator
     end
   end
 
+  def completed_class
+    "completed" if completed?
+  end
+
   private
 
   def normalize history_item
     OpenStruct.new(
       date: WoopleThemeI18n.l(history_item.completed_at.to_date),
-      score: "#{history_item.score}%",
+      score: number_to_percentage(history_item.score, :precision => 0),
       result_name: history_item.passed ? I18n.t('woople_theme.assessment.pass') : I18n.t('woople_theme.assessment.fail'),
       url: history_item.url
     )

data/app/presenters/submitted_assessment_form_presenter.rb

@@ -0,0 +1,57 @@
+require 'action_view'
+require 'woople_theme_i18n'
+
+class SubmittedAssessmentFormPresenter < AssessmentFormPresenter
+  include ActionView::Helpers::NumberHelper
+  include ActionView::Helpers::TagHelper
+
+  enforce_definitions :completed_at,
+                      :passed?,
+                      :correct_questions,
+                      :score
+
+  def title
+    I18n.t('woople_theme.assessment.result')
+  end
+
+  def css_classes
+    [:results]
+  end
+
+  def questions
+    ThemePresentation.wrap_collection(__getobj__.questions, WoopleTheme::SubmittedQuestionPresenter)
+  end
+
+  def render_result_status
+    status_message = I18n.t('woople_theme.assessment.result_status', {
+      completed_at: WoopleThemeI18n.l(completed_at.to_date),
+      status: status,
+      correct_questions: correct_questions,
+      total_questions: total_questions,
+      score: number_to_percentage(score, :precision => 0),
+      count: total_questions
+    })
+
+    yield OpenStruct.new(message: status_message, classes: result_status_classes)
+  end
+
+  def footer_partial
+    'woople-theme/assessment_form_return'
+  end
+
+  def result_status_classes
+    classes = [:alert, :fade, :in]
+    classes << 'alert-success' if passed?
+    classes << 'alert-error' if !passed?
+
+    classes
+  end
+
+  def status
+    passed? ? I18n.t('woople_theme.assessment.passed') : I18n.t('woople_theme.assessment.failed')
+  end
+
+  def total_questions
+    questions.length
+  end
+end

data/app/presenters/woople_theme/answer_presenter.rb

@@ -4,6 +4,21 @@ module WoopleTheme
   class AnswerPresenter < ExplicitDelegator
     enforce_definitions :index, # ID of the option to be used in the form
                         :text   # Text of the option/answer
+
+    def correct_badge
+      nil
+    end
+
+    def incorrect_badge
+      nil
+    end
+
+    def radio_disabled
+      nil
+    end
+
+    def radio_checked
+      nil
+    end
   end
 end
-

data/app/presenters/woople_theme/submitted_answer_presenter.rb

@@ -0,0 +1,27 @@
+require 'action_view'
+
+module WoopleTheme
+  class SubmittedAnswerPresenter < WoopleTheme::AnswerPresenter
+    include ActionView::Helpers::TagHelper
+
+    enforce_definitions :correct?,
+                        :incorrect?,
+                        :checked?
+
+    def correct_badge
+      content_tag(:span, I18n.t('woople_theme.assessment.correct'), class: "badge badge-success") if correct?
+    end
+
+    def incorrect_badge
+      content_tag(:span, I18n.t('woople_theme.assessment.incorrect'), class: "badge badge-important") if incorrect?
+    end
+
+    def radio_disabled
+      'disabled="disabled"'
+    end
+
+    def radio_checked
+      'checked="checked"' if checked?
+    end
+  end
+end

data/app/presenters/woople_theme/submitted_question_presenter.rb

@@ -0,0 +1,7 @@
+module WoopleTheme
+  class SubmittedQuestionPresenter < WoopleTheme::QuestionPresenter
+    def answers
+      ThemePresentation.wrap_collection(__getobj__.answers, WoopleTheme::SubmittedAnswerPresenter)
+    end
+  end
+end

data/app/views/woople-theme/_assessment_form.html.erb

@@ -1,20 +1,16 @@
-<%= page_header title: 'Assessment', description: assessment_form.description %>
-
-
-<%= form_tag(assessment_form.submit_path, { id: "assessment", method: :put }) do %>
+<%= page_header title: assessment_form.title, description: assessment_form.description %>
+<% assessment_form.render_result_status do |result| %>
+  <div class="row-fluid assessment_result_status <%= cycle 'odd', 'even' %>">
+    <%= content_tag(:div, result.message, class: result.classes) %>
+  </div>
+<% end %>
 
+<%= form_tag(assessment_form.submit_path, method: :put, id: "assessment", class: assessment_form.css_classes) do %>
   <%= render partial: 'woople-theme/assessment_form_question', collection: assessment_form.questions %>
 
   <div class="fieldset <%= cycle 'odd', 'even' %>">
     <div class="row-fluid">
-      <div class="span4"><span class="badge"><%= t 'woople_theme.assessment_form.unanswered_questions', count: assessment_form.questions.count %></span></div>
-      <div class="span8">
-        <input type="button"
-               value="<%= I18n.t('woople_theme.cancel') %>"
-               class="btn btn-large"
-               data-course-path="<%= assessment_form.course_path %>" />
-        <%= submit_tag(I18n.t('woople_theme.assessment_form.submit_assessment'), {class: "btn btn-primary btn-large", disabled: "disabled"}) %>
-      </div>
+      <%= render partial: assessment_form.footer_partial, locals: { data: assessment_form } %>
     </div>
   </div>
   <% assessment_form.render_copyright do %>

data/app/views/woople-theme/_assessment_form_answer.html.erb

@@ -3,7 +3,11 @@
   <input type="radio"
          id="<%= input_id %>"
          name="response[<%= response_id %>]"
-         value="<%= assessment_form_answer.index %>"/>
+         value="<%= assessment_form_answer.index %>"
+         <%= assessment_form_answer.radio_disabled %>
+         <%= assessment_form_answer.radio_checked %> />
 
+  <%= assessment_form_answer.correct_badge %>
+  <%= assessment_form_answer.incorrect_badge %>
   <%= assessment_form_answer.text %>
-</label>
+</label>

data/app/views/woople-theme/_assessment_form_return.html.erb

@@ -0,0 +1,6 @@
+<div class="span12 return">
+  <input type="button"
+         value="<%= I18n.t('woople_theme.return_to_course') %>"
+         class="btn btn-large"
+         data-course-path="<%= data.course_path %>" />
+</div>

data/app/views/woople-theme/_assessment_form_submission.html.erb

@@ -0,0 +1,8 @@
+<div class="span4"><span class="badge badge-unanswered"><%= t 'woople_theme.assessment_form.unanswered_questions', count: data.questions.count %></span></div>
+<div class="span8">
+  <input type="button"
+         value="<%= I18n.t('woople_theme.cancel') %>"
+         class="btn btn-large"
+         data-course-path="<%= data.course_path %>" />
+  <%= submit_tag(I18n.t('woople_theme.assessment_form.submit_assessment'), {class: "btn btn-primary btn-large", disabled: "disabled"}) %>
+</div>

data/app/views/woople-theme/_outline_assessment.html.erb

@@ -1,6 +1,6 @@
 <% assessment.render do %>
   <div id="assessment-<%= assessment.assessment_id %>" class="assessment">
-    <div class="front">
+    <div class="front <%= assessment.completed_class %>">
       <div class="assessment-pad">
         <div class="flip-action pull-right">
           <%= assessment.history_link_tag %>

data/config/locales/en.yml

@@ -34,12 +34,20 @@ en:
       result_title: Result
       pass: Pass
       fail: Fail
+      passed: passed
+      failed: failed
       pass_alert:
         heading: Passed!
         message: Congratulations, you've passed! You may review your history to see your scores and results. You may also retake the assessment to achieve a better result.
       fail_alert:
         heading: Failed!
         message: Thank you for completing the assessment. You may review your history to see your scores and results. You may also retake the assessment to achieve a better result. You must rewatch the required relearnings below before retaking the assessment.
+      result: Assessment Result
+      result_status:
+        one: On %{completed_at} you %{status} this assessment by answering %{correct_questions}/%{total_questions} question correctly for a %{score} score.
+        other: On %{completed_at} you %{status} this assessment by answering %{correct_questions}/%{total_questions} questions correctly for a %{score} score.
+      correct: Correct
+      incorrect: Incorrect
     assessment_form:
       unanswered_questions:
         one: 1 unanswered question
@@ -49,6 +57,7 @@ en:
     logged_in_as: Logged in as
     impersonating: impersonating
     cancel: Cancel
+    return_to_course: Return to Course
   date:
     formats:
-      default: ! '%b %d %Y'
+      default: ! '%b %d %Y'

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = '0.3.04'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.3.04
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70157500146880 !ruby/object:Gem::Requirement
+  requirement: &70284694912860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70157500146880
+  version_requirements: *70284694912860
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70157500146340 !ruby/object:Gem::Requirement
+  requirement: &70284694912280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70157500146340
+  version_requirements: *70284694912280
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70157500145940 !ruby/object:Gem::Requirement
+  requirement: &70284694911900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157500145940
+  version_requirements: *70284694911900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70157500145180 !ruby/object:Gem::Requirement
+  requirement: &70284694911420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157500145180
+  version_requirements: *70284694911420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70157500144320 !ruby/object:Gem::Requirement
+  requirement: &70284694947240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157500144320
+  version_requirements: *70284694947240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70157500143300 !ruby/object:Gem::Requirement
+  requirement: &70284694946660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70157500143300
+  version_requirements: *70284694946660
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70157500142680 !ruby/object:Gem::Requirement
+  requirement: &70284694946180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157500142680
+  version_requirements: *70284694946180
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -152,6 +152,7 @@ files:
 - app/assets/stylesheets/woople-theme/theme-retina.css
 - app/assets/stylesheets/woople-theme/theme.css
 - app/assets/stylesheets/woople-theme/variables.css.less
+- app/helpers/assessment_helper.rb
 - app/helpers/javascript_helper.rb
 - app/helpers/theme_helper.rb
 - app/presenters/assessment_form_presenter.rb
@@ -166,13 +167,18 @@ files:
 - app/presenters/outline_video_presenter.rb
 - app/presenters/page_header_presenter.rb
 - app/presenters/profile_presenter.rb
+- app/presenters/submitted_assessment_form_presenter.rb
 - app/presenters/theme_presentation.rb
 - app/presenters/woople_theme/answer_presenter.rb
 - app/presenters/woople_theme/question_presenter.rb
+- app/presenters/woople_theme/submitted_answer_presenter.rb
+- app/presenters/woople_theme/submitted_question_presenter.rb
 - app/views/layouts/theme.html.erb
 - app/views/woople-theme/_assessment_form.html.erb
 - app/views/woople-theme/_assessment_form_answer.html.erb
 - app/views/woople-theme/_assessment_form_question.html.erb
+- app/views/woople-theme/_assessment_form_return.html.erb
+- app/views/woople-theme/_assessment_form_submission.html.erb
 - app/views/woople-theme/_content_item.html.erb
 - app/views/woople-theme/_content_item_header.html.erb
 - app/views/woople-theme/_impersonation_banner.html.erb
@@ -225,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Our Front-End CSS Framework/Theme