Updated deep_copy on PLan model to set feedback_requested to false

update to cleaner access of the role flag values

added helper function to role, move pagination to after filtering

fixed bug with the api templates controller

fixed issue with archiving users (#2286)

Merge pull request #2244 from DMPRoadmap/issue2095 ...

Updated logic in Plan.num_answered_questions to allow for Phase context

fixed issue with progress bar totals ...

updated logic to allow for phase sepcific progress or total progress

updated plan

Refactored num_answrered_questions

Fix for improving search functionality of plans in Admin area. ...

Changes:
Allow search based on Owner/Principal investigator (based on principal_investigator or principal_investigator_identifier.

Fix for #2236

add confirmation dialog and fix merge logic

capture status

store new token in a local variable

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Fix for humanizing the attribute name for feedback_email_msg in error messages. ...

Updated Org model by overriding the ActiveRecord::Base class method self.human_attribute_name.

Fix for #1743.

Fix for foreign key violation error when a department is deleted ...

after some users have added its department_id.

Solution based on blog "Set Foreign keys to null"
https://til.hashrocket.com/posts/jqilnp3d0h--set-foreign-keys-to-null

Fix for issue #2088

Merge pull request #2149 from DigitalCurationCentre/bug/plan_ownership ...

Bug/plan ownership

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

fix issue where displayed plan owner was not the creator

rework logic around answer_text for CSV export

fix issue with declaring is_blank?

updated logic so nil answer.text dosent cause errors

updated reviewer to be under can_org_admin? and fixed table of plans to show owner instead of random user (#2140)

fix issues with plan spec (#2142)

Merge pull request #2128 from DMPRoadmap/feature/research-grant-id ...

Add typeahead field for Research Grant ID

Merge pull request #2129 from DigitalCurationCentre/feature/reviewer_role ...

Feature/reviewer role

Merge branch 'development' into feature/research-grant-id

Merge pull request #2127 from DMPRoadmap/issue2090 ...

Allow org admins to view 'share plan' page.

Add typeahead field for Grant ID

The "No. plans by template" statistics and visualisation changes: ...

(1) The headers for the CSV for the Number of Plans by Template
             - the date column have dates in the format  'Jan 2018'
             - the template headers now display the Title of the templates
             - the Date and Count headers are capitalized.

        (2) The chart has been re-styled.
            The aspect ratio (width/height) of image is now dynamically
            set according to the selection of the month range.

        (3) Fixed broken rspec tests and rubocop errors/warnings.

        Fix for #1679.

Added the missing information in CSV export plans. ...

The answers with question options was not including the answer.text, but overwriting the variable answer_text that held the value.

    Further, we removed line breaks and carriage returns in the answer text and replaced them by spaces making the answer text a single line for the csv.

    Fix for Issue #2058.

fixed pagination issues (#2045) ...

fixed issue with public plans template sort