From 3807bc4f7fa2aa8781f2a1e4eae6f8cb08fc3f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 10 Sep 2018 15:12:07 +0200 Subject: [PATCH] [28446] Rename due date to finish date https://community.openproject.com/wp/28446 --- .../attribute_help_text/work_package.rb | 2 +- app/models/project.rb | 2 +- app/models/version.rb | 4 +-- app/models/work_package.rb | 2 +- app/models/work_package/scheduling_rules.rb | 10 +++---- config/locales/crowdin/bg.yml | 2 +- config/locales/en.seeders.yml | 4 +-- config/locales/en.yml | 6 ++-- config/locales/js-en.yml | 4 +-- docs/api/apiv3/endpoints/queries.apib | 20 ++++++------- docs/api/apiv3/endpoints/work-packages.apib | 4 +-- docs/configuration/incoming-emails.md | 2 +- .../timeline/cells/timeline-cell-renderer.ts | 6 ++-- .../cells/timeline-milestone-cell-renderer.ts | 2 +- .../wp-timeline-container.directive.ts | 2 +- .../edit/field-types/date-edit-field.ts | 2 +- .../work_packages/base_contract_spec.rb | 2 +- .../work_packages/table/milestones_spec.rb | 2 +- .../table/queries/filter_spec.rb | 8 +++--- .../timeline/timeline_labels_spec.rb | 2 +- .../specific_work_package_schema_spec.rb | 2 +- .../schema/typed_work_package_schema_spec.rb | 2 +- .../work_package_payload_representer_spec.rb | 4 +-- .../work_package_representer_spec.rb | 4 +-- .../custom_actions/actions/date_spec.rb | 2 +- spec/models/version_spec.rb | 2 +- .../work_package_reschedule_after_spec.rb | 28 +++++++++---------- .../work_package_scheduling_spec.rb | 2 +- spec/models/work_package_spec.rb | 8 +++--- .../api/v3/work_package_resource_spec.rb | 4 +-- .../form/work_package_form_resource_spec.rb | 2 +- .../update_service_integration_spec.rb | 8 +++--- spec_legacy/unit/project_spec.rb | 4 +-- 33 files changed, 80 insertions(+), 80 deletions(-) diff --git a/app/models/attribute_help_text/work_package.rb b/app/models/attribute_help_text/work_package.rb index b856bdf9807..707e33f235b 100644 --- a/app/models/attribute_help_text/work_package.rb +++ b/app/models/attribute_help_text/work_package.rb @@ -30,7 +30,7 @@ class AttributeHelpText::WorkPackage < AttributeHelpText def self.available_attributes attributes = ::Type.translated_work_package_form_attributes - # Start and due dates are joined into a single field for non-milestones + # Start and finish dates are joined into a single field for non-milestones attributes.delete 'start_date' attributes.delete 'due_date' diff --git a/app/models/project.rb b/app/models/project.rb index d30d219bcd7..4d316d945a0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -563,7 +563,7 @@ class Project < ActiveRecord::Base ].flatten.compact.min end - # The latest due date of an issue or version + # The latest finish date of an issue or version def due_date [ work_packages.maximum('due_date'), diff --git a/app/models/version.rb b/app/models/version.rb index 6b23b58ce4e..4e4bc121079 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -107,7 +107,7 @@ class Version < ActiveRecord::Base status == 'open' end - # Returns true if the version is completed: due date reached and no open issues + # Returns true if the version is completed: finish date reached and no open issues def completed? effective_date && (effective_date <= Date.today) && open_issues_count.zero? end @@ -146,7 +146,7 @@ class Version < ActiveRecord::Base end deprecated_alias :closed_pourcent, :closed_percent - # Returns true if the version is overdue: due date reached and some open issues + # Returns true if the version is overdue: finish date reached and some open issues def overdue? effective_date && (effective_date < Date.today) && (open_issues_count > 0) end diff --git a/app/models/work_package.rb b/app/models/work_package.rb index a532f2d1cf4..f85a0b14199 100644 --- a/app/models/work_package.rb +++ b/app/models/work_package.rb @@ -369,7 +369,7 @@ class WorkPackage < ActiveRecord::Base end end - # Is the amount of work done less than it should for the due date + # Is the amount of work done less than it should for the finish date def behind_schedule? return false if start_date.nil? || due_date.nil? done_date = start_date + (duration * done_ratio / 100).floor diff --git a/app/models/work_package/scheduling_rules.rb b/app/models/work_package/scheduling_rules.rb index 40790e278bf..651578e4578 100644 --- a/app/models/work_package/scheduling_rules.rb +++ b/app/models/work_package/scheduling_rules.rb @@ -39,7 +39,7 @@ module WorkPackage::SchedulingRules end # Calculates the minimum date that - # will not violate the precedes relations (max(due date, start date) + delay) + # will not violate the precedes relations (max(finish date, start date) + delay) # of this work package or its ancestors # e.g. # AP(due_date: 2017/07/24, delay: 1)-precedes-A @@ -74,10 +74,10 @@ module WorkPackage::SchedulingRules # Returns the time scheduled for this work package. # # Example: - # Start Date: 2/26/09, Due Date: 3/04/09, duration => 7 - # Start Date: 2/26/09, Due Date: 2/26/09, duration => 1 - # Start Date: 2/26/09, Due Date: - , duration => 1 - # Start Date: - , Due Date: 2/26/09, duration => 1 + # Start Date: 2/26/09, Finish Date: 3/04/09, duration => 7 + # Start Date: 2/26/09, Finish Date: 2/26/09, duration => 1 + # Start Date: 2/26/09, Finish Date: - , duration => 1 + # Start Date: - , Finish Date: 2/26/09, duration => 1 def duration if start_date && due_date due_date - start_date + 1 diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml index 148c62f2a4c..35e00a20bd7 100644 --- a/config/locales/crowdin/bg.yml +++ b/config/locales/crowdin/bg.yml @@ -2710,7 +2710,7 @@ bg: validation: done_ratio: Done ratio cannot be set on parent work packages, when it is inferred by status or when it is disabled. - due_date: Due date cannot be set on parent work packages. + due_date: Finish date cannot be set on parent work packages. estimated_hours: Estimated hours cannot be set on parent work packages. invalid_user_assigned_to_work_package: The chosen user is not allowed to be '%{property}' for this work package. diff --git a/config/locales/en.seeders.yml b/config/locales/en.seeders.yml index dd7f57e976e..3f2ec647b3c 100644 --- a/config/locales/en.seeders.yml +++ b/config/locales/en.seeders.yml @@ -224,7 +224,7 @@ en: **You can:** * create new phases and milestones by simply clicking in the project plan, * change phases and milestones with drag and drop, - * add labels, such as start and due date, title, or assignee, + * add labels, such as start and finish date, title, or assignee, * add dependencies by right clicking on a phase or milestone and choose pre-decessor or follower, * custom columns, group, filter and save timeline reports to have them at your fingertips. @@ -248,7 +248,7 @@ en: * change title or description, * assign it to a team member, * comment on topics or notify team members with @-notifications, - * set status, priority, due dates or other custom fields, + * set status, priority, finish dates or other custom fields, * include documents or screenshots with copy & paste, * add relations to other work packages, * change forms in the Administration settings. diff --git a/config/locales/en.yml b/config/locales/en.yml index afe1cde0d34..c2ca32ce274 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -413,7 +413,7 @@ en: auto_hide_popups: "Auto-hide success notifications" warn_on_leaving_unsaved: "Warn me when leaving a work package with unsaved changes" version: - effective_date: "Due date" + effective_date: "Finish date" sharing: "Sharing" wiki_content: text: "Text" @@ -645,7 +645,7 @@ en: default_columns: "Default columns" description: "Description" display_sums: "Display Sums" - due_date: "Due date" + due_date: "Finish date" estimated_hours: "Estimated time" estimated_time: "Estimated time" firstname: "First name" @@ -2542,7 +2542,7 @@ en: context_object_not_found: "Cannot find the resource given as the context." validation: done_ratio: "Done ratio cannot be set on parent work packages, when it is inferred by status or when it is disabled." - due_date: "Due date cannot be set on parent work packages." + due_date: "Finish date cannot be set on parent work packages." estimated_hours: "Estimated hours cannot be set on parent work packages." invalid_user_assigned_to_work_package: "The chosen user is not allowed to be '%{property}' for this work package." start_date: "Start date cannot be set on parent work packages." diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml index 6097f9bef1d..febf4cca516 100644 --- a/config/locales/js-en.yml +++ b/config/locales/js-en.yml @@ -434,7 +434,7 @@ en: button_deactivate: 'Hide Gantt chart' cancel: Cancel change: "Change in planning" - due_date: "Due date" + due_date: "Finish date" empty: "(empty)" error: "An error has occurred." errors: @@ -569,7 +569,7 @@ en: createdAt: "Created on" description: "Description" date: "Date" - dueDate: "Due date" + dueDate: "Finish date" estimatedTime: "Estimated time" spentTime: "Spent time" category: "Category" diff --git a/docs/api/apiv3/endpoints/queries.apib b/docs/api/apiv3/endpoints/queries.apib index 33e93add0e5..06702026d02 100644 --- a/docs/api/apiv3/endpoints/queries.apib +++ b/docs/api/apiv3/endpoints/queries.apib @@ -56,14 +56,14 @@ The list of values can either consist of a list of links or of a list of strings ``` { "_type": "DueDateQueryFilter", - "name": "Due date", + "name": "Finish date", "values": [ "1" ], "_links": { "filter": { "href": "/api/v3/queries/filters/dueDate", - "title": "Due date" + "title": "Finish date" }, "operator": { "href": "/api/v3/queries/operators/