Merge branch 'development' into refactor/rspec-specs

Refactored model code for better readability

Add specs for completing a Plan

Merge pull request #1647 from DigitalCurationCentre/issue1409 ...

update to 1409

updated display to not render tab when no guidances available, changed text on question-specific-guidance

Merge branch 'development' into master

reverted changes to buttons <button><a ...></a></button> is invalid HTML5 and does not work in all browsers (#1636)

lookup hash guidance groups by org. DMPRoadmap/roadmap#1409 ...

GuidanceService for addressing an adequate displaying of guidances and annotations for each question from a plan. DMPRoadmap/roadmap#1409

some public methods for GuidanceService. Integration with views. DMPRoadmap/roadmap#1409

any? method for GuidanceService

Fix buttons that do not provide a visual cue indicating that they have focus #1443 (#1600)

Page titles should be unique and descriptive #1441

Template Versioning ...

This commit is a complete refactor of all the pages involved with Template creating/editing. The database, models, controllers, views and JS have all been changed.

------------------------------------------------------------

removed unused template methods from Plan model and removed references to 'Dmptemplate' from tests

started updating model scopes and began creating new unit tests and test_helper methods

Rebased with template customization fixes. updated tests and latest_version queries

Grouping class methods. Grouping scope methods into separate class

removed Template::valid scope method in favour of Template::unarchived

Moved class methods to scope rails flavour.

Removed Template::get_public_published_template_versions method

Model#deep_copy instead of Model::deep_copy. Model#deep_copy without side effects

added customize method to model

updated customize to use new deep_copy and added some tests

fixed test

fixed broken tests after latest PR. DMPRoadmap/roadmap#1341

generate_version with unit test associated

customize with unit test associated

upgrade_customization first attempt

added tests for upgrade_customization

upgrade_customization with several unit test associated

added generate_copy

fixed tests and added test_helper for phase/section/question/annotation/question_option equality for verifying template copy/version/customize

added comments

finished up tests

Removed template.update! in favour of a more re-usable deep_copy with atomic saving.

removed new_copy.save! from templates_controller#copy. Atomic save for upgrade_customization method

renamed to bang notation generate_copy, generate_version, customize and upgrade_customization

question mark methods for generate_version, customize and upgrade_customization

unique indices for template and template customisations. #1341

init functionality for versionable concern

updated errors, added get_new

unique indices for template and template customisations. #1341

new schema dump generated from rails

manually set up the default for org.links

Fix for rake tasks

updated template controller and tests

finished tests for template controller update http verbs for customize and copy methods

updated template versioning intgeration to use new test_helper methods

updated template controller and tests

finished tests for template controller update http verbs for customize and copy methods

updated template versioning intgeration to use new test_helper methods

wired in the new versionable concern

wired in the new versionable concern

updated query structure in template_filter

updated routes and paths

moved phases controller to org_admin namespace

changes to phase model and unit tests

started moving phase views to new org_admin namespace and tests

fixed tests

started fixing up references to moved plan/phase status

started fixing up references to moved plan/phase status

moved js file, fixed tests and manually checked pages

set schema.rb back to sprint2

added in versionable concern and fixed tests

removed unused phase_status method

removed test for phase_status method

fixed issue with template visibility for the default template

fixed issue with default templates and versioning/customization

versionable_test.rb

versionable concern updated

find_or_generate_version! into template, test associated

annotation and question model using has_one through adequately

templates_controller#update action refactored

tweaks to template_test

get_new and get_modifiable test cases for RuntimeError capture

passing parent object ids to children during deep_copy

updated question_option and annotation deep copy

removed old deep_copy method from section model and updated unit tests

removed old deep_copy method from section model and updated unit tests

updates to sections controller, model, routes and tests

fixed broken tests

updated both phases and sections controller to use versionable

fixed tests

started work on new template show/edit

finished up templates UI

fixed tests

consolidated form

consolidated form

fixed history page

removed old view

fixed test

fixed typo in en_US app.po

removed old deep_copy method from section model and updated unit tests

updates to sections controller, model, routes and tests

fixed broken tests

updated both phases and sections controller to use versionable

fixed tests

fixed tests and missing policy

fixed tests

created separate routes for each template index tab

updates to template index page structure

added callback to template model to ensure only one published version

finished up first pass of templates index page

fixed tests

removed current_tab from phase views. DMPRoadmap/roadmap#1407

section#create refactored. DMPRoadmap/roadmap#1407

sections loaded on demand for a phase. DMPRoadmap/roadmap#1407

ExpandAll triggers click instead of using collapse. DMPRoadmap/roadmap#1407

added phase/section/question overview back to template details page

send customizer to show section page

updated button text

updated history controller action

updated controller

updated views

added customization distinction to page title

updates to phase/section to introduce referrer logic and added section-show for customizable

removed old 'edit phase details button

removed edit question partial from section show

tweaks to templates index pages

fixed tests and default scope

added test for default customizations

added namespace to org section of templates index and made autocomplete combobox aware of form namespace

fixed issue with container view

removed old policies

updated statuses of templates

fixed typo in phases/overview view. DMPRoadmap/roadmap#1377

annotations moved to org_admin namespace. DMPRoadmap/roadmap#1377

annotations_controller#(create|update|destroy) with test associated. DMPRoadmap/roadmap#1377

flash notice for successful action carried out. DMPRoadmap/roadmap#1377

flash notice for success actions. create? method for annotation policy. DMPRoadmap/roadmap#1377

started refactor of sections/questions

fixed nil references. DMPRoadmap/roadmap#1462

annotations as fields_for nested attributes. DMPRoadmap/roadmap#1462

commented out version check on template update

removed invalid test

fixed reference to moved partials and family to family_id

fixed question update

updated guidances to work with modified themes form

finished up questions

fixed broken tests

updated preview and customize

fixed issue with sections index

cleaned up remaining issues with template editing and customization

added in check for nil phase to sections create

any user with readable rights should see download tab for a plan. DMPRoadmap/roadmap#1483

updated history to use new template.draft? logic to determine when to show draft icon

added latest check

added check for default option

added checks for historical and customization on preview page

added redirect to show if template is customization

added redirect to show if template is customization

updated ajax success/error for section display

fixed issues with create plan template selection and changing plan visibility

forgot to include model change

reverted schema.rb changes

adding org to chained scope in order to have searchable and sortable templates. DMPRoadmap/roadmap#1495

improved customization template search against all funder templates. DMPRoadmap/roadmap#1499

started work on adding edit/show/new/cancel buttons for questions

added toggle functionality between question show/edit

removed whitespace

made text area the default

updated template statuses

updated class to fix layout

introducing event delegation for sections/questions/annotations. DMPRoadmap/roadmap#1502

removed console.log

fixed JS for section/question

annotation loading tinymce when section show only permits customisation. DMPRoadmap/roadmap#1502

fixed issue with customizating by adding a section/question

removed reload

set focus to first invalid form input

fixed placement of focus for new validation.js

Added joins for customizations table

updated query

fixed initial numbering for new phases/sections

reverted referrer change

made section fields required

added ariatise to new section form

fixed referrer check

fixed inconsistent status message for transfer customization workflow

fixed issue with csv download

fixed csv header

fixed links for customization on history page

updated sections index so new section doesn't show unless its the current template

Added joins for customizations table

added includes to customisable query

fixed issue with paginable history

fixed merge conflicts in templates_controller and questions/_show.html.erb

resolved additional rebase conflict

added base_template_org and updated write plan to show correct org in guidance tab ...

updated example answers logic

added missing code to answers conroller and fixed test

added org abbreviation to 'Guidance' sections and added customized example answers ...

updated locking logic

switched href to data-target

simplified logic for selected templates tab ...

perpetuate edit flag throughout partials

updated preview

updated preview

Pre-fetching plan and current phase respecting order by number for sections and questions

migration to add complete flag to plans. #154 ...

Integrate pre-fetching plan and phase from 25e2669

after_save callback for answer model with tests. #154

rake task to update completed plans. #154

statistics#completed_plans action done. #154

HTML view for completed plans and tweaks to JS file associated. #154

fixed issue with panel placement ...

fixed issues with guidance selection

removed unused function

removed tests for functions that no longer exist

Merge pull request #1123 from CDLUC3/issue1042 ...

Always return to the templates current tab selection

propogate templates page current tab selection ...

fixed tests

removed logic from plans page

make accordion bars clickable ...

fixed swicth for + -

expand/collapse links for template show phases and phases show/edit sections. Introduced panel default for the container that displays these views. DMPRoadmap/roadmap#1081 ...

phase preview content within panel. DMPRoadmap/roadmap#1081

Removed circular tick icon progress indicators from each section in write plan. DMPRoadmap/roadmap#867 ...

Ensure the question text comes before an example answer. DMPRoadmap/roadmap#867

Made the "Answered X mins ago" alert smaller. DMPRoadmap/roadmap#867

drew a line between questions to visually demarcate one from another. DMPRoadmap/roadmap#867

Fixed accordion HTML elements hierarchy and optimised expandCollapseAll. DMPRoadmap/roadmap#867

Reinstate borders around active areas. DMPRoadmap/roadmap#867

Ensure edges are consistent throughout UI - sharp not curved. DMPRoadmap/roadmap#867

Ensure edges are consistent throughout UI - sharp not curved. DMPRoadmap/roadmap#867

example answer for plans tweaked. Answer status html refactored. DMPRoadmap/roadmap#867

fixes problem rendering tinymce when a stale answer is found. DMPRoadmap/roadmap#867

refactored styles into classes. DMPRoadmap/roadmap#867

.

updated guidance div ids

fixed issue with each_with_index

updated guidance accordion identifiers to make them unique

added +/- to section acordions in org-admin view

fixed bug for undefined counter

removed scrollTo top for tabs

Merge pull request #997 from CDLUC3/issue944 ...

Updated functionality of Guidance tab on Write Plan page