made recommended adjustments

removed debug statements

finished up changes to controllers

Merge branch 'development' into issue1663

updated Role, Plan logic and fixed tests

Updated api stats controller to use Org model's method (#1995) ...

* updated api stats controller to use Org model's  method

* updated org.plans to check role.active flag

* updated other api stats endpoints to use org.plans

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

Refactor validation checking to exclude non-ARs ...

Check for class type to make sure we're only validating on objects
that inherit from ActiveRecord::Base.

Merge pull request #1948 from DMPRoadmap/issue-1936 ...

Update CSV downloads with consistent date format

Update CSV downloads with consistent date format ...

Fixes #1936

Added I18n formats date.formats.csv to allow for regional customisation

removed unecessary validator from orgidentifier

added scope to org_identifier uniqueness check

Merge branch 'development' into issue-1853

Fixed Rubocop violations on changed files

Fix bug when upgrading Template with new Sections ...

Section presence validation was preventing Question from being saved. This was preventing
new Sections from being saved.

Fix how section number is set

Fix how section number is set

added annotations to models for stat objects

merged development additions to data_cleanup into working branch

Fix bug in upgrade customization when new section ...

Adding a new section to the customized template was conflicting with the number value
on the corresponding funder template section.

Simplify logic around Template customization

themes only required on published guidance

updated section_sorter to respond to the model_name method so it can be excluded from the datacleanup checks

removed splash_log.rb as this model has been removed from the DB

Added callback to Org model to handle missing logos ...

removed catch for Dragonfly error that can no longer be thrown