updated models to relfect new name for join table between plans and guidance groups. fixes #198

change docx export to htmltoword. Hopefully fixes: #217

Change notes to work with AJAX calls.

resolve conflicts from merging Roadmap into DCC

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

change question_format to use enum rather than bits

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

first step in reducing page edit sql queries

fixed merge conflicts in schema.rb

ran db:migrate on test

init commit of deep_copy for templates [untested]

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region

added templates history page

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence

resolved merge conflicts

replaced use of fixtures with db/seeds.rb. no point in maintaining both

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

Added checks to migration files that manipulate data to make sure that the model they are attempting to access is defined in the current codebase

added checks in migration code where we try to manipulate data belonging to a table that no longer exists in the current codebase

resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

added in new files for public plans page. added code coverage to .gitignore

extracted plan visibility work out of dev branch for PR to DCC

put validation back in place that ensures a question can only have a single answer within a plan

changed schema to be correct for data migration

updated schema to reflect final set of migrations after going through process from scratch

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.