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

Feature/reviewer role

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

Merge pull request #2126 from DigitalCurationCentre/issue/2115 ...

Issue/2115

removed references to role.reviewer

refactored review access from role to permission

capture progress

updated factories to allow basic specification of template_components

Pre-fill ID on the plan details page. ...

Changes:
  - the default plan :identifier is set to the plan :id on creation in the
    PlanControllers create method.
  - added a method add_identifier to Plan model.

Fix for issue #2089

capture changes

Fix for a bug in the StatCreatedPlan model that was causing the following error ...

File /opt/src/dmponline_dev/app/models/stat_created_plan.rb line 24 in by_template
    Show 9 non-project frames
    File /opt/src/dmponline_dev/app/controllers/stat_created_plans_by_template_controller.rb line 14 in index

Added a check for variable details presence in the by_template method in app/models/stat_created_plan.rb

Complete merge Development -> Master

Added code to make Search functionality case-insensitive. ...

Changes:
   - relevant models with :search scope updated with lower casing  of the column
     values and the search parameters.
   - fixed all rubocop warnings on the changed models except
     "Style/RedundantReturn: Redundant return detected."

   Note: one could not use 'ILIKE' in WHERE clauses changed as it is not supported by MariaDB and MySql.
   Hence we use lower() in changed WHERE clauses.

 Fix for issue #2080

Updated Usage page display to fix several issues. ...

- Moved mouse pointer instruction.
    - Made textual changes to "No. of plans by template"
    - The bar charts for  "No. users joined during last year" and
    "No. plans during last year" months are in ascending order. They were
    in descending order previously. Updated the count statistics methods
    in statistics_controller.rb.
    - The "No. plans by template" bar chart is now  replaced by a stacked bar chart
    as this is visually better for large data.
    - updated the by_template method in the create_or_update.rb with code from @xsrust.
    This now aggregates template counts for a month correctly.

    Fix for issue #1679.

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

Merge branch 'master' into development

added check to feedback_requested (#2012)

fixed query (#2008)

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.

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