Merge branch 'master' into feature/64086-reminders-for-not-billed-times

Author: Kagemaru

.rubocop_todo.yml

@@ -149,6 +149,7 @@ Naming/MemoizedInstanceVariableName:
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
+    - 'app/domain/billing/report/csv.rb'
     - 'app/domain/invoicing/small_invoice/invoice_sync.rb'
     - 'app/domain/invoice/report/csv.rb'
     - 'app/domain/order/controlling.rb'

app/assets/javascripts/application.js.coffee

@@ -43,6 +43,7 @@
 #= require accounting_posts
 #= require reports_orders
 #= require reports_invoices
+#= require reports_billing
 #= require expenses
 #= require expense_reviews
 #= require meal_compensations

app/assets/javascripts/reports_billing.js.coffee

@@ -0,0 +1,24 @@
+#  Copyright (c) 2006-2017, Puzzle ITC GmbH. This file is part of
+#  PuzzleTime and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/puzzle/puzzletime.
+
+
+app = window.App ||= {}
+
+app.reportsBilling = new class
+  init: ->
+    @dateFilterChanged()
+
+  dateFilterChanged: ->
+    $('.billing_reports form[role="filter"]').find('#start_date,#end_date')
+      .datepicker('option', 'disabled', $('#period_shortcut').val())
+    if $('#period_shortcut').val()
+      $('.billing_reports form[role="filter"]').find('#start_date,#end_date').val("")
+
+$(document).on('ajax:success', '.billing_reports form[role="filter"]', ->
+  app.reportsBilling.init()
+)
+
+$(document).on 'turbolinks:load', ->
+  app.reportsBilling.init()

app/assets/stylesheets/_orders.scss

@@ -3,7 +3,6 @@
 //  or later. See the COPYING file at the top-level directory or at
 //  https://github.com/puzzle/puzzletime.
 
-
 .orders-header {
   padding: 15px $grid-gutter-width 0 $grid-gutter-width;
   background-color: $gray-lighter;
@@ -53,7 +52,6 @@ h1.top {
 }
 
 .orders-cockpit {
-  
   .cockpit-header {
     @include clearfix;
     margin: 0 auto;
@@ -87,7 +85,9 @@ h1.top {
     }
   }
 
-  .title, .figure, .unit {
+  .title,
+  .figure,
+  .unit {
     color: $gray-darker;
   }
 
@@ -111,7 +111,8 @@ h1.top {
     }
   }
 
-  .figure-label, .unit {
+  .figure-label,
+  .unit {
     font-size: 12px;
     font-weight: 400;
   }
@@ -138,19 +139,21 @@ h1.top {
         border-bottom: 1px solid $gray-light;
       }
 
-      [class^="icon-"], [class*=" icon-"] {
+      [class^='icon-'],
+      [class*=' icon-'] {
         color: $brand-primary;
       }
     }
-    td, th {
+    td,
+    th {
       width: 170px;
       min-width: 170px;
       padding: $cell-padding;
       @include ellipsis(true);
     }
 
     td {
-      height: ($row-line-height*3) + ($cell-padding*3);
+      height: ($row-line-height * 3) + ($cell-padding * 3);
       vertical-align: top;
     }
 
@@ -173,7 +176,8 @@ h1.top {
     width: $static-width;
     @include box-shadow(10px 0 5px -2px rgba(208, 208, 208, 0.4));
 
-    .title, .subtitle {
+    .title,
+    .subtitle {
       height: $row-line-height;
 
       .small {
@@ -196,7 +200,9 @@ h1.top {
 
     table {
       width: 100%;
-      th, td, td .data-item {
+      th,
+      td,
+      td .data-item {
         text-align: right;
       }
 
@@ -218,7 +224,8 @@ h1.top {
   }
 }
 
-.orders-report {
+.orders-report,
+.billing-report {
   > thead {
     position: sticky;
     top: 0;
@@ -244,10 +251,10 @@ h1.top {
       font-weight: 400;
     }
 
-    .figure, .unit {
+    .figure,
+    .unit {
       color: $gray-darker;
     }
-
   }
 }
 

app/controllers/billing_reports_controller.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2006-2025, Puzzle ITC GmbH. This file is part of
+#  PuzzleTime and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/puzzle/puzzletime.
+
+class BillingReportsController < ApplicationController
+  include DryCrud::Rememberable
+  include WithPeriod
+
+  self.remember_params = %w[start_date end_date period_shortcut department_id
+                            client_work_item_id category_work_item_id kind_id
+                            status_id responsible_id]
+
+  before_action :authorize_class
+
+  def index
+    respond_to do |format|
+      set_period
+      @report = Billing::Report.new(@period, params)
+      format.html do
+        set_filter_values
+        unless @report.filters_defined?
+          params[:department_id] ||= @user.department_id
+          params[:responsible_id] ||= @user.id
+          params.reverse_merge!(period_shortcut: '0m')
+          set_period
+          @report = Billing::Report.new(@period, params)
+        end
+      end
+      format.js do
+        set_filter_values
+      end
+      format.csv do
+        send_data(Billing::Report::Csv.new(@report).generate,
+                  type: 'text/csv; charset=utf-8; header=present')
+      end
+    end
+  end
+
+  private
+
+  def set_filter_values
+    @departments = Department.list
+    @clients = WorkItem.joins(:client).list
+    @categories = params[:client_work_item_id].present? ? WorkItem.find(params[:client_work_item_id]).categories.list : []
+    @order_kinds = OrderKind.list
+    @order_status = OrderStatus.list
+    @order_responsibles = Employee.joins(:managed_orders).distinct.list
+    @target_scopes = TargetScope.list
+  end
+
+  def authorize_class
+    authorize!(:reports, Order)
+  end
+end

app/controllers/order_reports_controller.rb

@@ -24,6 +24,7 @@ def index
         set_filter_values
         unless @report.filters_defined?
           params[:department_id] ||= @user.department_id
+          params[:responsible_id] ||= @user.id
           case params[:status_preselection]
           when nil, ''
             params.reverse_merge!(period_shortcut: '0m')