Renamed StructuredAnswer => MadmpFragment & StructuredDataSchema => MadmpSchema

Merged DMP OPIDOR V2.3.0

Merge branch 'dmpopidor-dev' into dmpopidor-master

Started tests implementation

Added structured schema/answers models and tables

Merged DMP Roadmap V2.1.4

Added Stats chart for org template usage

fixed issue with progress bar totals ...

updated logic to allow for phase sepcific progress or total progress

updated plan

Refactored num_answrered_questions

empty token is changed to nil when removing_token

fix some discrepancies api token tests

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 issues with plan spec (#2142)

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

Feature/reviewer role

fix error with test refactor

remove unneeded comments, remove further references to reviewer role from tests, dry up refactored tests

updated tests

updated factories to allow basic specification of template_components

capture changes

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.

updated organisational plans query to only include completed plans to match logic of plan export (#2004) ...

refactored plan.visibility_allowed? to call underlying method on phases

refactored plan.visibility_allowed? to call underlying method on phases

fixed tests

Further changes for Text field should be mandatory for option based questions. ...

Fix for issue #1725

The question_options field on the Customisable Phase template has the
following changes:
- the 'Text' label has the asterick for required.
- the error message for missing question option now reads
 "You must have at least one option with accompanying text."
- Corrected some Rubocop errors on the files added.

finished up changes to controllers

Merge branch 'development' into issue1663

updated Role, Plan logic and fixed tests

refactor plan/role functionality to use flagshihtzu properly

updated deactivate logic

Updated JS for requiredField to allow for dynamically loaded DOM elements (#1996) ...

* IssueID #1725 - Updated messages Question text and option presence messages.

* updated requiredField.js to allow for dynamically loaded DOM elements

* fixed broken tests

moved deactivate logic to Role model and added specs

1. stat_created_plan.to_csv with option for details by template. ...

2. details attribute for stats table #1679
3. create_created_plan_service extended with details by template
4. create_last_month_created_plan_service extended with details by
template.
5. create_or_update strategy for generating stats
6. StatCreatedPlanByTemplateController#index for graphs usage
7. month_start_date and month_end_date for OrgDateRangeable class

[RD-1679] Usage view including date input for plans by template

[#1679] monthly_range query updated

[#1679] client-side chart for plans by template

[#1679] Time picker for plans by template chart

[#1679] Download plans by template action.

deleted spec

merge conflicts fixed

[#1679] Removed JS linter warnings

[#1679] Rubocop conforming code. Drying out stat services

Fix for ensuring that Questions that are option based must have atleast one non-blank text entry. ...

- Validation added for option based questions to ensure text field non-blank.
    - Validation message OPTION_PRESENCE_MESSAGE added to app/models/concerns/validation_messages.rb.
    - Added ':allow_nil => true' to
            delegate :option_based?, to: :question_format, :allow_nil => true
     in Question model to prevent NoMethodError if question_format is nil.

    Fix for #1725