add internal descriptions to worktimes (63818)

app/controllers/concerns/worktimes_csv.rb

@@ -20,7 +20,7 @@ def send_worktimes_csv(worktimes, filename)
   def worktimes_csv(worktimes)
     CSV.generate do |csv|
       csv << ['Datum', 'Stunden', 'Von Zeit', 'Bis Zeit', 'Stundenansatz CHF', 'Reporttyp',
-              'Verrechenbar', 'Member', 'Position', 'Ticket', 'Bemerkungen']
+              'Verrechenbar', 'Member', 'Position', 'Ticket', 'Bemerkungen', 'Interne Bemerkungen']
       worktimes.each do |time|
         csv << [I18n.l(time.work_date),
                 time.hours,
@@ -32,7 +32,8 @@ def worktimes_csv(worktimes)
                 time.employee.label,
                 time.account.label_verbose,
                 time.ticket,
-                time.description]
+                time.description,
+                time.internal_description]
       end
     end
   end

app/controllers/ordertimes_controller.rb

@@ -7,7 +7,7 @@
 
 class OrdertimesController < WorktimesController
   self.permitted_attrs = %i[account_id report_type work_date hours meal_compensation
-                            from_start_time to_end_time description billable ticket]
+                            from_start_time to_end_time description internal_description billable ticket]
 
   after_destroy :send_email_notification
 

app/controllers/worktimes_controller.rb

@@ -40,6 +40,7 @@ def new
     @worktime.account_id = template.account_id
     @worktime.ticket = template.ticket
     @worktime.description = template.description
+    @worktime.internal_description = template.internal_description
     @worktime.billable = template.billable
     @worktime.meal_compensation = template.meal_compensation
   end

app/helpers/order_services_helper.rb

@@ -30,6 +30,9 @@ def checkable_worktimes_table(entries, options)
       t.attr(:description, nil, class: 'truncated', style: 'max-width: 250px;') do |w|
         content_tag(:span, w.description.to_s, title: w.description)
       end
+      t.attr(:internal_description, nil, class: 'truncated', style: 'max-width: 150px;') do |w|
+        content_tag(:span, w.internal_description.to_s, title: w.internal_description)
+      end
       t.attrs(:billable, :meal_compensation, :invoice_id)
       t.foot { options[:footer] } if options[:footer]
     end

app/views/ordertimes/_form.html.haml

@@ -27,6 +27,7 @@
                          url: search_work_items_path })
   = f.labeled_input_field(:ticket, span: 2)
   = f.labeled_text_area(:description)
+  = f.labeled_text_area(:internal_description, html_options = {title: "Wird innerhalb von PuzzleTime und im CSV-Export angezeigt, ist im Zeitrapport jedoch nicht enthalten", data: {toggle: :tooltip}})
   = f.labeled_date_field(:work_date,
                          data: { remote: true,
                                  url: url_for(action: 'existing'),

config/locales/models.de-CH.yml

@@ -424,6 +424,7 @@ de-CH:
         from_start_time: Von
         to_end_time: Bis
         description: Bemerkungen
+        internal_description: Interne Bemerkungen
         billable: Verrechenbar
         meal_compensation: Verpflegungsentschädigung
         ticket: Ticket

config/locales/models.de-DE.yml

@@ -387,6 +387,7 @@ de-DE:
         from_start_time: Von
         to_end_time: Bis
         description: Bemerkungen
+        internal_description: Interne Bemerkungen
         billable: Verrechenbar
         meal_compensation: Verpflegungsentschädigung
         ticket: Ticket

db/migrate/20250219080518_add_internal_description_to_worktimes.rb

@@ -0,0 +1,5 @@
+class AddInternalDescriptionToWorktimes < ActiveRecord::Migration[7.1]
+  def change
+    add_column :worktimes, :internal_description, :text
+  end
+end