diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb index 3893048..c677fab 100644 --- a/app/controllers/jobs_controller.rb +++ b/app/controllers/jobs_controller.rb @@ -26,10 +26,12 @@ class JobsController < ApplicationController end def create - if @job = Job.create(job_params) + @job = Job.new(job_params) + if @job.save redirect_to project_job_path(@job.project, @job) else - render :edit + @project = @job.project + render :new end end diff --git a/app/views/jobs/_form.html.erb b/app/views/jobs/_form.html.erb index f07d65a..c5e219f 100644 --- a/app/views/jobs/_form.html.erb +++ b/app/views/jobs/_form.html.erb @@ -24,7 +24,7 @@ <%= f.hidden_field :project_id, value: @job.project.id %>
- Budget + Budget (hours) <%= f.fields_for :time_budgets do |ff| %>

<%= ff.label :hours, ff.object.category&.name || "Unassigned" %> diff --git a/app/views/jobs/_job.html.erb b/app/views/jobs/_job.html.erb index a27480e..c06c535 100644 --- a/app/views/jobs/_job.html.erb +++ b/app/views/jobs/_job.html.erb @@ -3,10 +3,6 @@ <%= job.category&.name || "Unassigned" %> <%= format_date(job.starts_on) %> <%= format_date(job.ends_on) %> - <%= job.project_id %> - - <%= l_hours_short(job.total_time_budget) %> - <%= total_progress_bar(job) %> diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb index f0b3969..17784de 100644 --- a/app/views/jobs/index.html.erb +++ b/app/views/jobs/index.html.erb @@ -15,8 +15,6 @@ Category Starts on Ends on - Project - External project Progress diff --git a/app/views/jobs/show.html.erb b/app/views/jobs/show.html.erb index 3d526b4..e70c161 100644 --- a/app/views/jobs/show.html.erb +++ b/app/views/jobs/show.html.erb @@ -19,7 +19,7 @@

Starts on:
<%= format_date(@job.starts_on) %>
Ends on:
-
<%= format_date(@job.starts_on) %>
+
<%= format_date(@job.ends_on) %>