Merge pull request #36 from mgrachev/feature/add-time-estimate

Add time estimate to tasks

.env.development

@@ -6,3 +6,5 @@ WEB_SESSIONS_SECRET="c75d4d5429eb6e076b629ca1106c8cdd7f4ba9f91b7e0c37b6c106ecd13
 ADMIN_SESSIONS_SECRET="c75d4d5429eb6e076b629ca1106c8cdd7f4ba9f91b7e0c37b6c106ecd1312b90"
 AUTH_SESSIONS_SECRET="c75d4d5429eb6e076b629ca1106c8cdd7f4ba9f91b7e0c37b6c106ecd1312b90"
 API_SESSIONS_SECRET="bdba67c5d3956e89798b6ceac28fdf7de6e84cc551347d17f13fdc4c4cc26e6c"
+GITHUB_KEY=
+GITHUB_SECRET=

.gitignore

@@ -3,3 +3,4 @@
 /node_modules
 /coverage
 /log
+/.env.local

apps/admin/controllers/tasks/update.rb

@@ -12,6 +12,7 @@ class Update
         required(:lang).filled
         required(:status).filled
         required(:complexity).filled
+        required(:time_estimate).filled
         optional(:issue_url).maybe(:str?)
         optional(:repository_name).maybe(:str?)
       end

apps/admin/templates/tasks/index.html.slim

@@ -7,6 +7,7 @@ table.table.pure-table.pure-table-horizontal
       th.table__title Title
       th.table__repository Repository
       th.table__lang Language
+      th.table__time_estimate Time estimate
       th.table__status Status
       th.table__status Approved
       th.table__created-at Created at
@@ -17,6 +18,7 @@ table.table.pure-table.pure-table-horizontal
         td = link_to_task(task)
         td = repository_name(task)
         td = task.lang
+        td = task.time_estimate
         td = status_label(task)
         td = task_label(task)
         td = task.created_at

apps/admin/templates/tasks/show.html.slim

@@ -26,6 +26,10 @@
       .pure-u-1-8 Complexity
       .pure-u-7-8 = task_complexity
 
+    .pure-g
+      .pure-u-1-8 Time estimate
+      .pure-u-7-8 = task_time_estimate
+
     .pure-g
       .pure-u-1-8 Language
       .pure-u-7-8 = task.lang

apps/admin/views/application_layout.rb

@@ -11,6 +11,10 @@ def complexity_options_list
         COMPLEXITY_OPTIONS_HASH
       end
 
+      def time_estimate_options_list
+        TIME_ESTIMATE_OPTIONS_HASH
+      end
+
     private
 
       LANGUAGES_HASH = {
@@ -34,6 +38,13 @@ def complexity_options_list
         'Medium' => 'medium',
         'Hard' => 'hard',
       }.freeze
+
+      TIME_ESTIMATE_OPTIONS_HASH = {
+        'Few days' => 'few days',
+        'More than a week' => 'more than a week',
+        'More than two weeks' => 'more than two weeks',
+        'More than month' => 'more than month'
+      }.freeze
     end
   end
 end

apps/admin/views/tasks/edit.rb

@@ -25,6 +25,11 @@ def form
             select :complexity, complexity_options_list
           end
 
+          div class: 'input' do
+            label  :time_estimate
+            select :time_estimate, time_estimate_options_list
+          end
+
           div class: 'input task-form__field pure-control-group' do
             label     :md_body
             text_area :md_body, task.md_body

apps/admin/views/tasks/show.rb

@@ -33,5 +33,9 @@ def task_label
     def task_complexity
       complexity_options_list.key(task.complexity)
     end
+
+    def task_time_estimate
+      time_estimate_options_list.key(task.time_estimate)
+    end
   end
 end

apps/web/controllers/tasks/create.rb

@@ -10,6 +10,7 @@ class Create
         required(:md_body).filled(:str?)
         required(:lang).filled(:str?)
         required(:complexity).filled(:str?)
+        required(:time_estimate).filled(:str?)
         required(:user_id).filled
         optional(:issue_url).maybe(:str?)
         optional(:repository_name).maybe(:str?)

apps/web/templates/tasks/show.html.slim

@@ -17,6 +17,9 @@
   .task__complexity
     | Complexity: #{task.complexity}
 
+  .task__time_estimate
+    | Time estimate: #{task.time_estimate}
+
   .task__body
     = task_body
 

apps/web/views/application_layout.rb

@@ -15,6 +15,10 @@ def complexity_options_list
         COMPLEXITY_OPTIONS_HASH
       end
 
+      def time_estimate_options_list
+        TIME_ESTIMATE_OPTIONS_HASH
+      end
+
       def title
         'OSSBoard'
       end
@@ -42,6 +46,13 @@ def title
         'Medium' => 'medium',
         'Hard' => 'hard',
       }.freeze
+
+      TIME_ESTIMATE_OPTIONS_HASH = {
+        'Few days' => 'few days',
+        'More than a week' => 'more than a week',
+        'More than two weeks' => 'more than two weeks',
+        'More than month' => 'more than month'
+      }.freeze
     end
   end
 end

apps/web/views/tasks/new.rb

@@ -26,6 +26,10 @@ def form
           select :complexity, complexity_options_list
         end
 
+        div class: 'input' do
+          select :time_estimate, time_estimate_options_list
+        end
+
         div class: 'input task-body', id: "task-body" do
           div class: 'pure-menu pure-menu-horizontal pure-menu-scrollable is-center task-body__actions' do
 

db/migrations/20170112163614_add_time_estimate_to_tasks.rb

@@ -0,0 +1,5 @@
+Hanami::Model.migration do
+  change do
+    add_column :tasks, :time_estimate, String, default: 'few days'
+  end
+end

spec/admin/controllers/tasks/update_spec.rb

@@ -17,6 +17,7 @@
         md_body: 'This is *bongos*, indeed.',
         lang: 'ruby',
         complexity: 'medium',
+        time_estimate: 'more than month',
         issue_url: 'github.com/issue/1',
         approved: '1',
         status: 'done'
@@ -35,6 +36,7 @@
       expect(task.approved).to eq true
       expect(task.lang).to eq 'ruby'
       expect(task.complexity).to eq 'medium'
+      expect(task.time_estimate).to eq 'more than month'
       expect(task.issue_url).to eq 'github.com/issue/1'
       expect(task.status).to eq 'done'
     end
@@ -47,6 +49,7 @@
           md_body: 'This is *bongos*, indeed.',
           lang: 'ruby',
           complexity: 'medium',
+          time_estimate: 'more than month',
           issue_url: '',
           approved: '1',
           status: 'done'
@@ -64,7 +67,8 @@
         expect(task.body).to eq "<p>This is <em>bongos</em>, indeed.</p>\n"
         expect(task.approved).to eq true
         expect(task.lang).to eq 'ruby'
-      expect(task.complexity).to eq 'medium'
+        expect(task.complexity).to eq 'medium'
+        expect(task.time_estimate).to eq 'more than month'
         expect(task.issue_url).to eq nil
       end
     end

spec/fabricators/task_fabricator.rb

@@ -7,6 +7,7 @@
   issue_url       { Faker::Internet.url('github.com', "/davydovanton/ossboard/issues/#{Faker::Number.number(2)}") }
   approved        false
   lang            :ruby
-  complexity :easy
+  complexity      :easy
   status          'in progress'
+  status          'few days'
 end

spec/web/controllers/tasks/create_spec.rb

@@ -27,6 +27,7 @@
         md_body: 'This is *bongos*, indeed.',
         lang: 'test',
         complexity: 'easy',
+        time_estimate: 'few days',
         user_id: user.id,
         issue_url: 'github.com/issue/1'
       }
@@ -66,7 +67,8 @@
           repository_name: '',
           md_body: 'This is *bongos*, indeed.',
           lang: 'test',
-        complexity: 'easy',
+          complexity: 'easy',
+          time_estimate: 'few days',
           user_id: user.id,
           issue_url: ''
         }
@@ -82,6 +84,7 @@
         expect(task.body).to eq "<p>This is <em>bongos</em>, indeed.</p>\n"
         expect(task.issue_url).to eq nil
         expect(task.complexity).to eq 'easy'
+        expect(task.time_estimate).to eq 'few days'
         expect(task.status).to eq 'in progress'
       end
     end