bookyt_projects 0.19.6 → 0.19.7

data/app/assets/stylesheets/bookyt_projects.sass

@@ -14,7 +14,3 @@ tr
     background-color: #FDDFDE // block-message error
   &.free, &.future
     color: #BFBFBF // subtitle
-
-tr.future
-  td.overtime, td.overall-overtime
-    color: transparent

data/app/controllers/activities_controller.rb

@@ -13,11 +13,11 @@ class ActivitiesController < AuthorizedController
     end
 
     # Educated guessing of person
-    @activity.person = current_user.person if current_user
+    @activity.person ||= current_user.person if current_user
 
     # Educated guessing of project
     @activity.project_id ||= params[:project_id] if params[:project_id]
-    @activity.project_id ||= @activity.person.activities.order(:date).last
+    @activity.project_id ||= @activity.person.latest_project.id
 
     new!
   end

data/app/views/timesheets/_show.html.haml

@@ -11,7 +11,11 @@
     - tr_params = {:class => work_day_classes(day)}
     - tr_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/activities_popover', :activities => day.activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless day.activities.empty?
     %tr{tr_params}
-      %td= link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(@employee, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
+      %td
+        - if day.activities.empty?
+          = link_to l(day.date, :format => '%a, %d.%m.%Y'), new_activity_path(:activity => {:person_id => @employee.id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
+        - else
+          = link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(@employee, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
       %td.right
         %span.strong= "%0.2f" % day.hours_worked
         = "(%0.2f)" % day.hours_due

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.19.6'
+  VERSION = '0.19.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 19
-  - 6
-  version: 0.19.6
+  - 7
+  version: 0.19.7
 platform: ruby
 authors: 
 - Roman Simecek (CyT)