added hourly and money budgets to activity, project and customer (#843)

config/packages/kimai.yaml

@@ -77,9 +77,9 @@ kimai:
     permissions:
         # mapping complex rule sets of single permissions to named "sets" ("set name" = [array of "permissions and sets"])
         sets:
-            ACTIVITIES: ['view_activity','create_activity','edit_activity','delete_activity']
-            PROJECTS: ['view_project','create_project','edit_project','delete_project']
-            CUSTOMERS: ['view_customer','create_customer','edit_customer','delete_customer']
+            ACTIVITIES: ['view_activity','create_activity','edit_activity','budget_activity','delete_activity']
+            PROJECTS: ['view_project','create_project','edit_project','budget_project','delete_project']
+            CUSTOMERS: ['view_customer','create_customer','edit_customer','budget_customer','delete_customer']
             INVOICE: ['view_invoice','create_invoice']
             INVOICE_TEMPLATE: ['view_invoice_template','create_invoice_template','edit_invoice_template','delete_invoice_template']
             TIMESHEET: ['view_own_timesheet','start_own_timesheet','stop_own_timesheet','create_own_timesheet','edit_own_timesheet','export_own_timesheet','delete_own_timesheet']
@@ -173,7 +173,7 @@ kimai:
         user_rates:
             title: ~
             order: 20
-            permission: ROLE_USER
+            permission: view_rate_own_timesheet
             widgets: [userAmountToday, userAmountWeek, userAmountMonth, userAmountYear]
         duration:
             title: dashboard.all
@@ -188,7 +188,7 @@ kimai:
         rates:
             title: ~
             order: 50
-            permission: ROLE_ADMIN
+            permission: view_rate_other_timesheet
             widgets: [amountToday, amountWeek, amountMonth, amountYear]
 
     widgets:

config/packages/nelmio_api_doc.yaml

@@ -22,29 +22,23 @@ nelmio_api_doc:
         path_patterns:
             - ^/api(?!/doc)
     documentation:
-#        host: '{{hostname}}'
-        schemes: [http, https]
+        #host: '{{hostname}}'
+        host: '%router.request_context.host%'
+        basePath: '%router.request_context.base_url%'
+        schemes: ['%router.request_context.scheme%']
         info:
             title: Kimai 2 - API Docs
             description: |
-                REST API for the Kimai 2 time-tracking software. It is not yet considered stable and BC breaks might happen, even though I try to avoid them as much as possible.
-                - Collections return less data than explicit entity calls
-                - DateTime formats are explained in detail at https://www.kimai.org/documentation/rest-api.html
+                REST API for the Kimai 2 time-tracking software. Read more about its usage in the [API documentation](https://www.kimai.org/documentation/rest-api.html) and then download a [Swagger file](doc.json) for import e.g. in Postman.
+                Be aware: it is not yet considered stable and BC breaks might happen, but we try to avoid them.
             version: 0.3
-#        parameters:
-#            hostname:
-#                name: hostname
-#                in: url
-#                description: the hostname where your api runs
-#                required: true
-#                type: string
         securityDefinitions:
-            X-AUTH-USER:
+            apiUser:
                 type: apiKey
                 description: 'Value: {Username}'
                 name: X-AUTH-USER
                 in: header
-            X-AUTH-TOKEN:
+            apiToken:
                 type: apiKey
                 description: 'Value: {API Token}'
                 name: X-AUTH-TOKEN

config/serializer/App/Entity.Activity.yml

@@ -1,6 +1,6 @@
 App\Entity\Activity:
     exclusion_policy: All
-    custom_accessor_order: [id, name, comment, visible, project, fixedRate, hourlyRate, color]
+    custom_accessor_order: [id, name, comment, visible, project, fixedRate, hourlyRate, color, budget, timeBudget]
     properties:
         id:
             include: true
@@ -14,6 +14,12 @@ App\Entity\Activity:
         visible:
             include: true
             groups: [Default]
+        budget:
+            include: true
+            groups: [Entity]
+        timeBudget:
+            include: true
+            groups: [Entity]
         fixedRate:
             include: true
             groups: [Activity]

config/serializer/App/Entity.Customer.yml

@@ -1,6 +1,6 @@
 App\Entity\Customer:
     exclusion_policy: All
-    custom_accessor_order: [id, name, number, comment, visible, company, contact, address, country, currency, phone, fax, mobile, email, homepage, timezone, fixedRate, hourlyRate, color]
+    custom_accessor_order: [id, name, number, comment, visible, company, contact, address, country, currency, phone, fax, mobile, email, homepage, timezone, fixedRate, hourlyRate, color, budget, timeBudget]
     properties:
         id:
             include: true
@@ -14,6 +14,12 @@ App\Entity\Customer:
             groups: [Entity]
         visible:
             include: true
+        budget:
+            include: true
+            groups: [Entity]
+        timeBudget:
+            include: true
+            groups: [Entity]
         company:
             include: true
             groups: [Entity]

config/serializer/App/Entity.Project.yml

@@ -1,6 +1,6 @@
 App\Entity\Project:
     exclusion_policy: All
-    custom_accessor_order: [id, name, comment, visible, budget, orderNumber, customer, fixedRate, hourlyRate, color]
+    custom_accessor_order: [id, name, comment, visible, orderNumber, customer, fixedRate, hourlyRate, color, budget, timeBudget]
     properties:
         id:
             include: true
@@ -14,6 +14,9 @@ App\Entity\Project:
         budget:
             include: true
             groups: [Entity]
+        timeBudget:
+            include: true
+            groups: [Entity]
         orderNumber:
             include: true
             groups: [Entity]