Ada-C4 · annaleeherrera · Nov 17, 2015 · Nov 17, 2015 · Nov 17, 2015 · Nov 18, 2015
diff --git a/tasklist/app/assets/javascripts/people.coffee b/tasklist/app/assets/javascripts/people.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/tasklist/app/assets/stylesheets/application.css b/tasklist/app/assets/stylesheets/application.css
@@ -97,4 +97,5 @@ li {
   font-size: 20px;
   font-weight: bold;
   padding-bottom: 30px;
+  margin: auto;
 }
diff --git a/tasklist/app/assets/stylesheets/people.scss b/tasklist/app/assets/stylesheets/people.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the people controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/tasklist/app/controllers/people_controller.rb b/tasklist/app/controllers/people_controller.rb
@@ -0,0 +1,15 @@
+class PeopleController < ApplicationController
+  def index
+    @people = Person.all
+  end
+
+  def show
+    id = params[:id]
+    @person = Person.find(id)
+  end
+
+  def tasks
+    id = params[:id]
+    @person = Person.find(id)
+  end
+end
diff --git a/tasklist/app/controllers/tasks_controller.rb b/tasklist/app/controllers/tasks_controller.rb
@@ -44,6 +44,6 @@ def destroy
   private
 
   def task_params
-    params.require(:task).permit(:name, :descript, :date_completed)
+    params.require(:task).permit(:name, :descript, :date_completed, :person_id)
   end
 end
diff --git a/tasklist/app/helpers/people_helper.rb b/tasklist/app/helpers/people_helper.rb
@@ -0,0 +1,2 @@
+module PeopleHelper
+end
diff --git a/tasklist/app/models/person.rb b/tasklist/app/models/person.rb
@@ -0,0 +1,10 @@
+class Person < ActiveRecord::Base
+  has_many :tasks
+
+
+  def incomplete_tasks
+     t = self.tasks
+     incomplete_tasks = t.where(date_completed: nil)
+     incomplete_tasks.count
+  end
+end
diff --git a/tasklist/app/models/task.rb b/tasklist/app/models/task.rb
@@ -1,2 +1,3 @@
 class Task < ActiveRecord::Base
+  belongs_to :person
 end
diff --git a/tasklist/app/models/vendor.rb b/tasklist/app/models/vendor.rb
@@ -0,0 +1,2 @@
+class Vendor < ActiveRecord::Base
+end
diff --git a/tasklist/app/views/people/index.html.erb b/tasklist/app/views/people/index.html.erb
@@ -0,0 +1,11 @@
+<h1> Tasking People </h1>
+
+<ul>
+  <% @people.each do |person| %>
+    <li>
+      <%= link_to person.name, "/people/#{person.id}" %> <br>
+      incomplete tasks:
+      <%= person.incomplete_tasks %>
+    </li>
+    <% end %>
+</ul>
diff --git a/tasklist/app/views/people/show.html.erb b/tasklist/app/views/people/show.html.erb
@@ -0,0 +1,5 @@
+<h1> Info </h1>
+
+<h2>
+  <%= link_to @person.name, "/people/#{@person.id}/tasks" %>
+</h2>
diff --git a/tasklist/app/views/people/tasks.html.erb b/tasklist/app/views/people/tasks.html.erb
@@ -0,0 +1,15 @@
+<h1> Assigned Tasks </h1>
+
+<h2> <%= @person.name %></h2>
+<ul>
+  <% @person.tasks.each do |task| %>
+    <li>
+    <%= task.name %> <br>
+      <% if task.date_completed == nil %>
+     Status: Incomplete
+     <% else %>
+     Status: Complete
+     <% end %>
+    </li>
+  <% end %>
+</ul>
diff --git a/tasklist/app/views/tasks/edit.html.erb b/tasklist/app/views/tasks/edit.html.erb
@@ -1,5 +1,3 @@
-<html>
-  <body>
   <%= form_for @task, url: {action: 'update'}, method: :patch do |f| %>
   <fieldset>
     <legend> Edit Task </legend>
@@ -9,11 +7,12 @@
     <%= f.label :descript %>
     <%= f.text_area :descript %>
     <br>
+    <%= f.label :person_id, "Task For:" %>
+    <%= f.collection_select(:person_id, Person.all, :id, :name, prompt: "Select a Person") %>
+    <br>
     <%= f.label :date_completed %>
     <%= f.date_field :date_completed %>
     <br>
   </fieldset>
     <%= f.submit %>
     <% end %>
-  </body>
-</html>
diff --git a/tasklist/app/views/tasks/index.html.erb b/tasklist/app/views/tasks/index.html.erb
@@ -1,12 +1,14 @@
-<html>
-  <body>
     <h1> What's Da Happs </h1>
     <h2><a class = "new" href="/tasks/new">add a new task</a></h2>
     <div>
     <ul>
       <% @tasks.each do |task| %>
         <li>
           <%= link_to task.name, "/tasks/#{task.id}" %> ✍ <br>
+            <% if !task.person.nil? %>
+            <%= link_to task.person.name, "/people/#{task.person_id}/tasks"  %> ℹ︎
+            <br>
+            <% end %>
           <%= link_to 'DELETE TASK ⌧',  { action: :destroy, id: task.id }, method: :delete, data: { confirm: 'Delete Task, For Real?' } %> <br>
           <% if !task.date_completed.nil? %>
               <div class ="status"> STATUS: COMPLETED </div>
@@ -17,5 +19,3 @@
       <% end %>
     </ul>
   </div>
-  </body>
-</html>
diff --git a/tasklist/app/views/tasks/new.html.erb b/tasklist/app/views/tasks/new.html.erb
@@ -1,5 +1,3 @@
-<html>
-  <body>
 <%= form_for @task do |f| %>
   <fieldset>
     <legend> Add a New Task </legend>
@@ -9,6 +7,9 @@
     <%= f.label :descript %>
     <%= f.text_field :descript %>
     <br>
+    <%= f.label :person_id, "Task For:" %>
+    <%= f.collection_select(:person_id, Person.all, :id, :name, prompt: "Select a Person") %>
+    <br>
     <%= f.label :date_completed %>
     <%= f.date_field :date_completed %>
   </fieldset>

diff --git a/tasklist/app/views/tasks/show.html.erb b/tasklist/app/views/tasks/show.html.erb
@@ -1,10 +1,6 @@
-<html>
-  <body>
     <h1><%= @task.name %></h1>
     <h2><%= @task.descript %></h2>
     <h2>COMPLETED ON:</h2>
     <h2><%= @task.date_completed %> </h2>
     <p><%= link_to "BACK TO TASK LIST", "/tasks/" %> </p>
     <p><%= link_to "EDIT TASK", "/tasks/#{@task.id}/edit" %> </p>
-  </body>
-</html>
diff --git a/tasklist/config/routes.rb b/tasklist/config/routes.rb
@@ -9,6 +9,9 @@
   delete '/tasks/:id' => 'tasks#destroy'
   patch '/tasks/:id/completed' => 'tasks#completed'
   get '/tasks/:id/edit' => 'tasks#edit', as: :task
+  get '/people' => 'people#index'
+  get '/people/:id' => 'people#show'
+  get '/people/:id/tasks' => 'people#tasks'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

diff --git a/tasklist/db/migrate/20151110002236_create_tasks.rb b/tasklist/db/migrate/20151110002236_create_tasks.rb
@@ -4,6 +4,7 @@ def change
       t.string :name
       t.string :descript
       t.datetime :date_completed
+      t.integer :person_id
 
       t.timestamps null: false
     end

diff --git a/tasklist/db/migrate/20151116200652_create_people.rb b/tasklist/db/migrate/20151116200652_create_people.rb
@@ -0,0 +1,9 @@
+class CreatePeople < ActiveRecord::Migration
+  def change
+    create_table :people do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/tasklist/db/migrate/20151116202727_modify.rb b/tasklist/db/migrate/20151116202727_modify.rb
@@ -0,0 +1,7 @@
+class Modify < ActiveRecord::Migration
+  def change
+    # change_table :tasks do |t|
+    #   add_column :tasks, :person_id, :integer
+    # end
+  end
+end
diff --git a/tasklist/db/migrate/20151118005627_create_vendors.rb b/tasklist/db/migrate/20151118005627_create_vendors.rb
@@ -0,0 +1,11 @@
+class CreateVendors < ActiveRecord::Migration
+  def change
+    create_table :vendors do |t|
+      t.string :name
+      t.integer :no._of_employees
+      t.integer :market_id
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/tasklist/db/schema.rb b/tasklist/db/schema.rb
@@ -11,12 +11,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151110002236) do
+ActiveRecord::Schema.define(version: 20151116202727) do
+
+  create_table "people", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "tasks", force: :cascade do |t|
     t.string   "name"
     t.string   "descript"
     t.datetime "date_completed"
+    t.integer  "person_id"
     t.datetime "created_at",     null: false
     t.datetime "updated_at",     null: false
   end

diff --git a/tasklist/db/seeds.rb b/tasklist/db/seeds.rb
@@ -9,17 +9,28 @@ def random_time
   Time.at(rand * Time.now.to_i)
 end
 
+people = [
+  {name: "Annalee"},
+  {name: "Imari"},
+  {name: "Davin"},
+  {name: "Jaxson"}
+]
+
+people.each do |person|
+  Person.create(person)
+end
+
 tasks = [
-  { name: "The First Task", descript: "do this first", date_completed: random_time },
-  { name: "Go to Brunch", descript: "go to Cafe Presse" },
-  { name: "Go to Lunch", descript: "eat", date_completed: random_time },
-  { name: "Go to Second Lunch", descript: "eat more" },
-  { name: "Play Video Games", descript: "Super Mario", date_completed: random_time },
-  { name: "High Five Somebody You Don't Know", descript: "Everyone", date_completed: random_time },
-  { name: "Plant Flowers", descript: "Magnolias!", date_completed: random_time },
-  { name: "Call Mom", descript: "Hi MOM" },
-  { name: "She worries, you know.", descript: "Yup" },
-  { name: "Nap", descript: "ZZZZZZZZ", date_completed: random_time }
+  { name: "The First Task", descript: "do this first", date_completed: random_time, person_id: 1 },
+  { name: "Go to Brunch", descript: "go to Cafe Presse", person_id: 2 },
+  { name: "Go to Lunch", descript: "eat", date_completed: random_time, person_id: 3 },
+  { name: "Go to Second Lunch", descript: "eat more", person_id: 4 },
+  { name: "Play Video Games", descript: "Super Mario", date_completed: random_time, person_id: 1 },
+  { name: "High Five Somebody You Don't Know", descript: "Everyone", date_completed: random_time, person_id: 2 },
+  { name: "Plant Flowers", descript: "Magnolias!", date_completed: random_time, person_id: 3 },
+  { name: "Call Mom", descript: "Hi MOM", person_id: 4 },
+  { name: "She worries, you know.", descript: "Yup", person_id: 1 },
+  { name: "Nap", descript: "ZZZZZZZZ", date_completed: random_time, person_id: 2 }
 ]
 
 tasks.each do |task|