voluntary 0.5.1 → 0.5.2

data/app/assets/javascripts/voluntary/workflow/user/index.js.coffee

@@ -0,0 +1,11 @@
+$(document).ready ->
+  $.get '/workflow/user/stories', (data) ->
+   $('#stories').html data
+   
+  $('#workflow_user_tabs a').click (e) ->
+    e.preventDefault()
+    
+    $.get $(this).data('url'), (data) =>
+      $($(this).attr('href')).html data
+    
+    $(this).tab 'show'

data/app/controllers/voluntary/api/v1/organizations_controller.rb

@@ -0,0 +1,30 @@
+module Voluntary
+  module Api
+    module V1
+      class OrganizationsController < ActionController::Base
+        include Voluntary::V1::BaseController
+       
+        respond_to :json
+        
+        def index
+          options = {}
+        
+          collection = Organization.order('name')
+          collection = collection.where(user_id: params[:user_id]) if params[:user_id].present?
+          options[:json] = collection.paginate(page: params[:page], per_page: 100)
+          
+          options[:meta] = { 
+            pagination: {
+              total_pages: options[:json].total_pages, current_page: options[:json].current_page,
+              previous_page: options[:json].previous_page, next_page: options[:json].next_page
+            }
+          }
+          
+          respond_with do |format|
+            format.json { render options }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/workflow/user/stories_controller.rb

@@ -0,0 +1,15 @@
+class Workflow::User::StoriesController < ApplicationController
+  def index
+    @stories = Story.where(state: 'active', :users_without_tasks_ids.ne => current_user.id).paginate(page: params[:page], per_page: 20)
+    projects = Project.where(id: @stories.map(&:project_id)).index_by(&:id)
+    products = Product.where(id: projects.values.map(&:product_id)).index_by(&:id)
+    
+    @stories.map! do |story|
+      projects[story.project_id].product = products[projects[story.project_id].product_id]
+      story.project = projects[story.project_id]
+      story
+    end
+    
+    render layout: false if request.xhr?
+  end
+end

data/app/controllers/workflow/user/tasks_controller.rb

@@ -0,0 +1,18 @@
+class Workflow::User::TasksController < ApplicationController
+  before_action :authenticate_user!
+  
+  def assigned
+    @tasks = Task.includes(:story).where(user_id: current_user.id, state: 'assigned')
+    projects = Project.where(id: @tasks.map{|t| t.story.project_id }).index_by(&:id)
+    products = Product.where(id: projects.values.map(&:product_id)).index_by(&:id)
+    
+    @tasks.map! do |task|
+      project = projects[task.story.project_id]
+      project.product = products[project.product_id]
+      task.story.project = project
+      task
+    end
+    
+    render layout: false if request.xhr?
+  end
+end

data/app/controllers/workflow/user_controller.rb

@@ -1,7 +1,7 @@
 class Workflow::UserController < ApplicationController
+  before_action :authenticate_user!
+  
   def index
-    @assigned_tasks = Task.where(user_id: current_user.id, state: 'assigned')
-    @completed_tasks = Task.complete.where(user_id: current_user.id)
-    @sidenav_links_count = 1
+    @hide_sidebar = true
   end
 end

data/app/models/story.rb

@@ -52,7 +52,7 @@ class Story
   def offeror=(value); self.offeror_id = value.id; end
   
   def project; project_id ? Project.find(project_id) : nil; end
-  def project=(value); self.project_id = value.id; end
+  def project=(value); @project = value; self.project_id = value.id; end
   
   def next_task_for_user(user)
     return nil if (users_without_tasks_ids || []).include?(user.id)

data/app/views/layouts/application.html.erb

@@ -28,7 +28,7 @@
       </div>
 <% end %>    
       <div class="row">
-<% if sidenav(@sidenav_links_count).present? || content_for?(:search) || content_for?(:sidebar) %>
+<% if (!@hide_sidebar && sidenav(@sidenav_links_count).present?) || content_for?(:search) || content_for?(:sidebar) %>
         <div class="col-md-9">
   <% if content_for?(:breadcrumbs) %>
           <div class="nav" style="padding-bottom:15px;">

data/app/views/workflow/user/index.html.erb

@@ -1,14 +1,31 @@
+<% content_for :javascript_includes do %>
+  <%= javascript_include_tag 'voluntary/workflow/user/index' %>
+<% end %>
 <div class="container-fluid" style="padding-top:0px;">
   <div class="row">
-    <div class="col-md-6">
-      <h3><%= I18n.t('workflow.index.assigned_tasks') %></h3>
-      
-      <%= render 'tasks', collection: @assigned_tasks, columns: ['name', 'story_id'] %>
-    </div>
-    <div class="col-md-6">
-      <h3><%= I18n.t('workflow.index.completed_tasks') %></h3>
-      
-      <%= render 'tasks', collection: @completed_tasks, columns: ['name', 'story_id'] %>
+    <div class="col-md-12">
+      <div>
+        <ul id="workflow_user_tabs" class="nav nav-tabs" role="tablist">
+          <li role="presentation" class="active">
+            <a href="#stories" aria-controls="stories" role="tab" data-toggle="tab" data-url="<%= stories_workflow_user_index_path %>">
+              <%= t('stories.index.title') %>
+            </a>
+          </li>
+          <li role="presentation">
+            <a href="#assigned_tasks" aria-controls="assigned_tasks" role="tab" data-toggle="tab" data-url="<%= assigned_tasks_workflow_user_index_path %>">
+              <%= t('workflow.index.assigned_tasks') %>
+            </a>
+          </li>
+        </ul>
+        <div class="tab-content">
+          <div role="tabpanel" class="tab-pane active" id="stories" style="padding-top:15px;">
+            Stories
+          </div>
+          <div role="tabpanel" class="tab-pane" id="assigned_tasks" style="padding-top:15px;">
+            Tasks
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>

data/app/views/workflow/user/stories/index.html.erb

@@ -0,0 +1,26 @@
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th><%= t('activerecord.models.story') %></th>
+      <th><%= t('activerecord.models.project') %></th>
+      <th><%= t('activerecord.models.product') %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+<% @stories.each do |story| %>
+    <tr>
+      <td><%= link_to story.name, story_path(story) %></td>
+      <td><%= link_to story.project.name, project_path(story.project) %></td>
+      <td>
+  <% if story.project.product %>
+        <%= link_to story.project.product.name, product_path(story.project.product) %>
+  <% else %>
+        -
+  <% end %>    
+      </td>
+      <td><%= link_to t('workflow.user.next_task'), next_task_workflow_user_index_path(story) %></td>
+    </tr>
+<% end %>
+  </tbody>
+</table>

data/app/views/workflow/user/tasks/assigned.html.erb

@@ -0,0 +1,26 @@
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th><%= t('activerecord.models.task') %></th>
+      <th><%= t('activerecord.models.story') %></th>
+      <th><%= t('activerecord.models.project') %></th>
+      <th><%= t('activerecord.models.product') %></th>
+    </tr>
+  </thead>
+  <tbody>
+<% @tasks.each do |task| %>
+    <tr>
+      <td><%= link_to task.name, edit_task_workflow_user_index_path(task) %></td>
+      <td><%= link_to task.story.name, story_path(task.story) %></td>
+      <td><%= link_to task.story.project.name, project_path(task.story.project) %></td>
+      <td>
+  <% if task.story.project.product %>
+        <%= link_to task.story.project.product.name, product_path(task.story.project.product) %>
+  <% else %>
+        -
+  <% end %>    
+      </td>
+    </tr>
+<% end %>
+  </tbody>
+</table>

data/config/routes/api.rb

@@ -14,6 +14,8 @@ namespace :voluntary, path: 'api', module: 'voluntary/api', defaults: {format: '
     
     get '/things/:left_thing_name/vs/:right_thing_name/arguments', to: 'things/arguments#comparison'
     
-    resources :users
+    resources :users do
+      resources :organizations, only: [:index]
+    end
   end
 end

data/config/routes/workflow.rb

@@ -14,6 +14,8 @@ namespace 'workflow' do
       
       get 'projects/:id' => 'user/projects#show', as: :user_project
       
+      get 'stories' => 'user/stories#index', as: :stories
+      get 'tasks/assigned' => 'user/tasks#assigned', as: :assigned_tasks
       get 'stories/:story_id/tasks' => 'tasks#index', as: :tasks
       get 'stories/:story_id/tasks/next' => 'tasks#next', as: :next_task
       patch 'tasks/:id' => 'tasks#update', as: :update_task

data/db/migrate/20150818151512_create_or_alter_arguments.rb

@@ -4,7 +4,7 @@ class CreateOrAlterArguments < ActiveRecord::Migration
       add_column :arguments, :argumentable_type, :string
       add_column :arguments, :argumentable_id, :integer
       
-      Argument.update_all 'argumentable_type = "Thing", argumentable_id = thing_id'
+      Argument.update_all "argumentable_type = 'Thing', argumentable_id = thing_id"
       
       remove_column :arguments, :thing_id
       add_index :arguments, [:topic_id, :argumentable_id, :argumentable_type], name: 'arguments_index_on_argumentable_topic', unique: true

data/lib/generators/voluntary/product_dummy/templates/features/support/user_cuke_helpers.rb

@@ -4,7 +4,7 @@ module UserCukeHelpers
   # and the given override attributes, adds the standard aspects to it
   # and returns it
   def create_user(overrides={})
-    Factory(
+    FactoryGirl.create(
       :user, {
         password: 'password',
         password_confirmation: 'password'
@@ -16,13 +16,13 @@ module UserCukeHelpers
   def login_as(user)
     fill_in 'Email', with: "#{user}@volontari.at"
     fill_in 'Password', with: 'password'
-    click_button :submit
+    click_button 'Log in'
   end
 
   # create a new @me user, if not present, and log in using the
   # integration_sessions controller (automatic)
   def automatic_login
-    @me ||= Factory(:user)
+    @me ||= FactoryGirl.create(:user)
     page.driver.visit(new_integration_sessions_path(user_id: @me.slug))
     click_button "Login"
   end
@@ -31,7 +31,7 @@ module UserCukeHelpers
   def manual_login
     visit login_page
     login_as @me.name
-    visit user_confirmation_path(confirmation_token: @me.confirmation_token)  
+    #visit user_confirmation_path(confirmation_token: @me.confirmation_token)  
   end
 
   # checks the page content to see, if the login was successful
@@ -75,4 +75,4 @@ module UserCukeHelpers
 
 end
 
-World(UserCukeHelpers)
+World(UserCukeHelpers)

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voluntary
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1130,7 +1130,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-5-1"
+description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-5-2"
 email:
 - gawlista@gmail.com
 executables: []
@@ -1147,9 +1147,11 @@ files:
 - app/assets/javascripts/voluntary/functions.js
 - app/assets/javascripts/voluntary/lib/jquery-competitive_list.js
 - app/assets/javascripts/voluntary/lib/jquery.multisortable.js
+- app/assets/javascripts/voluntary/lib/moment.js
 - app/assets/javascripts/voluntary/lib/sugar.js
 - app/assets/javascripts/voluntary/likes/list.js.coffee
 - app/assets/javascripts/voluntary/users.js.coffee
+- app/assets/javascripts/voluntary/workflow/user/index.js.coffee
 - app/assets/stylesheets/voluntary/application.css
 - app/assets/stylesheets/voluntary/base.css.sass
 - app/assets/stylesheets/voluntary/bootstrap_and_overrides.css.sass
@@ -1173,6 +1175,7 @@ files:
 - app/controllers/voluntary/api/v1/argument_topics_controller.rb
 - app/controllers/voluntary/api/v1/arguments_controller.rb
 - app/controllers/voluntary/api/v1/base_controller.rb
+- app/controllers/voluntary/api/v1/organizations_controller.rb
 - app/controllers/voluntary/api/v1/tasks_controller.rb
 - app/controllers/voluntary/api/v1/things/arguments_controller.rb
 - app/controllers/voluntary/api/v1/users_controller.rb
@@ -1183,6 +1186,8 @@ files:
 - app/controllers/workflow/tasks_controller.rb
 - app/controllers/workflow/user/product/areas_controller.rb
 - app/controllers/workflow/user/projects_controller.rb
+- app/controllers/workflow/user/stories_controller.rb
+- app/controllers/workflow/user/tasks_controller.rb
 - app/controllers/workflow/user_controller.rb
 - app/controllers/workflow_controller.rb
 - app/helpers/voluntary/application_helper.rb
@@ -1334,6 +1339,8 @@ files:
 - app/views/workflow/user/index.html.erb
 - app/views/workflow/user/product/areas/show.html.erb
 - app/views/workflow/user/projects/show.html.erb
+- app/views/workflow/user/stories/index.html.erb
+- app/views/workflow/user/tasks/assigned.html.erb
 - config/initializers/1_initialize_app_config.rb
 - config/initializers/active_model_serializer.rb
 - config/initializers/assets.rb
@@ -1462,24 +1469,15 @@ files:
 - lib/generators/voluntary/product_dummy/templates/dummy/config/initializers/secret_token.rb
 - lib/generators/voluntary/product_dummy/templates/dummy/spec/factories.rb
 - lib/generators/voluntary/product_dummy/templates/dummy/spec/spec_helper.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/area_behaviour_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/area_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/comment_behaviour_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/comment_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/custom_web_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/email_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/factory_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/javascript_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/navigation_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/product_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/project_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/resources_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/session_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/story_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/task_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/user_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/step_definitions/web_steps.rb
-- lib/generators/voluntary/product_dummy/templates/features/step_definitions/wizards/story_steps.rb
 - lib/generators/voluntary/product_dummy/templates/features/support/database_cleaner_patches.rb
 - lib/generators/voluntary/product_dummy/templates/features/support/env.rb
 - lib/generators/voluntary/product_dummy/templates/features/support/integration_sessions_controller.rb

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/area_behaviour_steps.rb

@@ -1,17 +0,0 @@
-Then /^I can't edit areas$/ do
-  steps %{
-    Given an area named "area 1"
-    When I go to the edit area page
-    Then I should see "Access denied"
-  }
-end
-
-Then /^I can't delete areas$/ do
-  steps %{
-    Given an area named "area 1" 
-    When I am on the area page
-    Then I should not see "Actions"
-  }
-end
-
-

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/area_steps.rb

@@ -1,11 +0,0 @@
-Given /^an area named "([^\"]*)"$/ do |name|
-  # WORKAROUND: get rid of area query. Don't know why it doesn't work without (e.g. /roles/2_users/projects.feature)
-  @area = Area.where(name: name).first || Factory(:area, name: name)
-  @area.reload
-end
-
-Then /^I should see the following areas:$/ do |expected_table|
-  rows = find("table").all('tr')
-  table = rows.map { |r| r.all('th,td').map { |c| c.text.strip } }
-  expected_table.diff!(table)
-end

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/comment_behaviour_steps.rb

@@ -1,23 +0,0 @@
-When /^I fill out a comment form$/ do
-  fill_in 'Subject', with: 'Comment 1'
-  fill_in 'Text', with: 'Dummy 1'
-end
-
-When /^I fill out a comment's comment form$/ do
-  fill_in 'Subject', with: 'Comment 2'
-  fill_in 'Text', with: 'Dummy 2'
-end
-
-Then /^I should see the comment$/ do
-  steps %{
-    Then I should see "Comment 1"
-    And I should see "Dummy 1"
-  }
-end
-
-Then /^I should see the comment's comment$/ do
-  page.should have_xpath(
-    '//div[@class="nested_comments"]//div[@class="comment"]//div[@class="content"]//p',
-    text: 'Dummy 2'
-  )
-end

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/comment_steps.rb

@@ -1,25 +0,0 @@
-Given /^a comment$/ do
-  attributes = { commentable: @project }
-  attributes[:user_id] ||= @me.id if @me
-  @comment = Factory(:comment, attributes)
-  @comment.reload
-end
-
-When /^I reply the (\d+)(?:st|nd|rd|th) comment$/ do |pos|
-  find(:xpath, "//a[@class='new_comment'][#{pos.to_i}]").click
-end
-
-When /^I edit the (\d+)(?:st|nd|rd|th) comment$/ do |pos|
-  find(:xpath, "//a[@class='edit_comment'][#{pos.to_i}]").click
-end
-
-When /^I delete the (\d+)(?:st|nd|rd|th) comment$/ do |pos|
-  page.execute_script 'window.confirm = function () { return true }'
-  find(:xpath, "//a[@class='destroy_comment'][#{pos.to_i}]").click
-end
-
-Then /^I should see the following comments:$/ do |expected_table|
-  expected_table.hashes.each do |hash|
-    steps %{Then I should see "#{hash['Name']}"}
-  end  
-end