woople-theme 0.5.3 → 0.5.4

data/app/assets/stylesheets/woople-theme/content-item.css.less

@@ -43,6 +43,10 @@
   padding-top:@contentPadding + 1;
 }
 
+.completed-item {
+  padding-bottom: @contentPadding !important;
+}
+
 .content-item {
   position:relative;
   margin-left:0;
@@ -57,7 +61,7 @@
   -ms-tap-highlight-color: transparent;
   tap-highlight-color: transparent;
 
-  > * { 
+  > * {
     position:relative;
     z-index:2;
   }
@@ -76,6 +80,22 @@
 
   }
 
+  .content-item-spacer {
+    margin-left: 0;
+  }
+  .content-item-date {
+    .content-title();
+    margin-left: 0;
+    a {
+      color:@primaryTextColour;
+    }
+  }
+  .content-item-duration {
+    .content-title();
+    margin-right: 0;
+    text-align: right;
+  }
+
   .content-item-content {
     h2 {
       .content-title();

data/app/assets/stylesheets/woople-theme/dashboard/essentials-section.css.less

@@ -2,7 +2,7 @@
 
 #essentials-section {
 
-  h2 {
+  > h2 {
     padding-left:@contentPadding;
     padding-right:@contentPadding;
     margin-top:0;

data/app/helpers/dashboard_helper.rb

@@ -9,4 +9,13 @@ module DashboardHelper
            object: ThemePresentation.wrap(presenter, WoopleTheme::Dashboard::EssentialsSectionPresenter)
   end
 
+  def completed_essentials(items)
+    collection = ThemePresentation.wrap_collection(items, WoopleTheme::Dashboard::CompletedEssentialPresenter)
+    render partial: 'dashboard/completed_essential', collection: collection
+  end
+
+  def total_courses(total)
+    render partial: 'dashboard/total_courses', locals: {total: total}
+  end
+
 end

data/app/presenters/woople_theme/dashboard/completed_content_item_presenter.rb

@@ -0,0 +1,7 @@
+module WoopleTheme
+  module Dashboard
+    class CompletedContentItemPresenter < ExplicitDelegator
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/completed_essential_presenter.rb

@@ -0,0 +1,16 @@
+require 'duration'
+module WoopleTheme
+  module Dashboard
+    class CompletedEssentialPresenter < CompletedContentItemPresenter
+
+      def date
+        completed_on.strftime('%b %d')
+      end
+
+      def formatted_time_total
+        Duration.format_time(time_total)
+      end
+
+    end
+  end
+end

data/app/presenters/woople_theme/dashboard/essentials_section_presenter.rb

@@ -2,10 +2,29 @@ require 'action_view'
 module WoopleTheme
   module Dashboard
     class EssentialsSectionPresenter < SectionPresenter
-      enforce_definitions :essentials_remaining
+      enforce_definitions :essentials_remaining,
+                          :essentials_completed
 
       def render_remaining
-        yield if section.essentials_remaining.size > 0
+        yield if render?(section.essentials_remaining)
+      end
+
+      def render_completed
+        yield if render?(section.essentials_completed)
+      end
+
+      def total_completed_courses
+        section.essentials_completed.count
+      end
+
+      def total_completed_minutes
+        Duration.format_time(section.essentials_completed.map(&:time_total).inject(0, :+))
+      end
+
+      private
+
+      def render?(tab)
+        tab.count > 0
       end
 
     end

data/app/views/dashboard/_completed_essential.html.erb

@@ -0,0 +1,12 @@
+<div class="content-item completed-item row">
+  <div class="content-item-date span1">
+    <a href="<%= completed_essential.url %>"><%= completed_essential.date %></a>
+  </div>
+  <div class="content-item-content span5">
+    <h2><a href="<%= completed_essential.url %>"><%= completed_essential.name %></a></h2>
+  </div>
+  <div class="content-item-duration span2">
+    <%= completed_essential.formatted_time_total %>
+  </div>
+</div>
+

data/app/views/dashboard/_essentials_section.html.erb

@@ -1,17 +1,34 @@
 <% essentials_section.render do %>
   <section id="<%= essentials_section.css_id %>">
   <h2><%= essentials_section.title %></h2>
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs" id="essentials_tab_nav">
     <% essentials_section.render_remaining do %>
-      <li class="active"><a href="#" data-toggle="tab"><%=t('woople_theme.dashboard.essentials.remaining')%></a></li>
+      <li><a href="#essentials_remaining" data-toggle="tab"><%=t('woople_theme.dashboard.essentials.remaining')%></a></li>
+    <% end %>
+    <% essentials_section.render_completed do %>
+      <li><a href="#essentials_completed" data-toggle="tab"><%=t('woople_theme.dashboard.essentials.completed')%></a></li>
     <% end %>
   </ul>
   <div class="tab-content">
     <% essentials_section.render_remaining do %>
-      <div class="tab-pane active" id="essentials_remaining">
+      <div class="tab-pane" id="essentials_remaining">
       <%= content_items(essentials_section.essentials_remaining) %>
       </div>
     <% end %>
+    <% essentials_section.render_completed do %>
+      <div class="tab-pane" id="essentials_completed">
+        <%= completed_essentials(essentials_section.essentials_completed) %>
+        <div class="content-item row">
+          <div class="span1 content-item-spacer">
+            &nbsp;
+          </div>
+          <%= total_courses(essentials_section.total_completed_courses) %>
+          <div class="content-item-duration span2">
+            <%= I18n.t('woople_theme.dashboard.duration', count: essentials_section.total_completed_minutes) %>
+          </div>
+        </div>
+      </div>
+    <% end %>
   </div>
   </section>
 <% end %>

data/app/views/dashboard/_total_courses.html.erb

@@ -0,0 +1,3 @@
+<div class="content-item-content span5">
+  <h2 class="total"><%= I18n.t('woople_theme.dashboard.courses', count: total) %></h2>
+</div>

data/config/locales/en.yml

@@ -57,6 +57,10 @@ en:
     dashboard:
       essentials:
         remaining: Remaining
+        completed: Completed
+      courses:
+        one: 1 Course
+        other: '%{count} Courses'
     search_results_more: See All >
     logged_in_as: Logged in as
     impersonating: impersonating

data/lib/duration.rb

@@ -0,0 +1,15 @@
+class Duration
+  def self.format_time(milliseconds)
+    return "0:00" if milliseconds <= 0
+
+    hours   = milliseconds.to_i / 3600000
+    minutes = milliseconds.to_i / 60000 % 60
+    seconds = milliseconds/1000.0 % 60
+
+    if hours > 0
+      "%i:%02i:%02i" % [ hours, minutes, seconds ]
+    else
+      "%i:%02i" % [ minutes, seconds ]
+    end
+  end
+end

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,6 +209,8 @@ files:
 - app/presenters/submitted_assessment_form_presenter.rb
 - app/presenters/theme_presentation.rb
 - app/presenters/woople_theme/answer_presenter.rb
+- app/presenters/woople_theme/dashboard/completed_content_item_presenter.rb
+- app/presenters/woople_theme/dashboard/completed_essential_presenter.rb
 - app/presenters/woople_theme/dashboard/essentials_section_presenter.rb
 - app/presenters/woople_theme/dashboard/section_presenter.rb
 - app/presenters/woople_theme/dashboard/status_alert_presenter.rb
@@ -216,8 +218,10 @@ files:
 - app/presenters/woople_theme/submitted_answer_presenter.rb
 - app/presenters/woople_theme/submitted_question_presenter.rb
 - app/presenters/woople_theme/video_presenter.rb
+- app/views/dashboard/_completed_essential.html.erb
 - app/views/dashboard/_essentials_section.html.erb
 - app/views/dashboard/_status_alert.html.erb
+- app/views/dashboard/_total_courses.html.erb
 - app/views/layouts/theme.html.erb
 - app/views/woople-theme/_assessment_form.html.erb
 - app/views/woople-theme/_assessment_form_answer.html.erb
@@ -240,6 +244,7 @@ files:
 - app/views/woople-theme/_video_modal.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- lib/duration.rb
 - lib/explicit_delegator.rb
 - lib/tasks/woople-theme_tasks.rake
 - lib/woople-theme/configuration.rb