Skip to content

Commit

Permalink
Merge pull request #167 from TACC-Cloud/feature/questionnaire
Browse files Browse the repository at this point in the history
* task/WG-96 add assets to original questionnaire code (#144)

* Do not show _hazmapper properties

* Add ng-bootstrap to use carousel

* Add carasol to show questionnaire assets

* User correct version of npm so lock file doesn't change

* Switch CI to match our container's version of node

* Refactor into a component

* Remove bootstrap

* Use own-carousel for image asset carousel

* Fix linting

* Remove unintended blank line

* Revert "Switch CI to match our container's version of node"

This reverts commit 357027a.

* Fix weird formatting issues

* Revert "Revert "Switch CI to match our container's version of node""

This reverts commit 4077c5a.

* task/WG-173:show asset image alongside question in the questionnaire (#165)

* Show asset images with questions

* Fix prettier errors

* Remove reduntant types from JSDoc strings

* task/WG-167: Overhaul questionnaire style (#169)

* Initial commit to get the Questionnaire redesign rolling. Initial resize of the modal window to begin improving layout and styles.

* Added comment to evolving styles.

* Initial pass removing all font-sizes and color form the questionnaire modal. Next is to prune out the margins and spacing. Need clean, unstyled text in the UI to build new CSS back up on.

* Removed all font weighting, font type assignments and font size assignments from selectors in questionnaire modal.

* Commented out most of the styling in the questionnaire at this point.

* Have now commented out all styles that are not required for basic structure. Purging unused code next.

* Removed all unused selectors from the .styl document for questionnaire viewer. Ready to rebuild the style back up now.

* Completed the initial rebuild of the Questionnaire viewer styles to integrate with the Hazmapper design aesthetic. Still working on a few question types - ranged options specifically - but otherwise clean layout now.

* Added styling for the rangeAnswer elements. None of the questionnaire content indicates a selected state so I set a value anyway in case we update the view code to include that attribute.

* Changes the scope of image selectors in the questionnaire to only style images embedded within the questionnaire modal. Added support for both rangeSelect question and matrixTable question styling. Adjusted overall font sizes and layout for better legibility and use of white-space.

* Ran linting on the css.

* Cleaned up a mistake in css. Linting seems to regenerate unused style code locally. Investigating, but this commit is clean.

* task/wg-166-questionnaire-preview-title (#171)

* task/wg-166-questionnaire-preview-title

* Added padding for detail header for long titles

* Linting

* Prettier linting

* Revert style linting

* Remove event emitters, select node event and
selected tree node property, and use the activeFeature subscription
instead to pull the file name. Added a function to extract file name from
activeFeature display_path.

* Remove unused import

* Take file naming out of try block

* Remove diff

* A quick tweak to the Sub-question styling to clean it up a little and add some padding. (#174)

* Fix z-index of asset-detail so its below modal (#173)

* Task/wg 174 & 175 improve right panel questionnaire pic scroll and metadata (#176)

* task/WG-174-Improve-right-panel-questionnaire-metadata

* Used FeatureType() function to get find
questionnaire assets and consolidated logic

* task/WG-188: fix questionnaire detail panel (#177)

* Fix questionnaire-detail so it updates when feature changes

Also handle the cae where there are no properites._hazmapper.questionnaire.asset
because it is a questionnaire without assets

* Handle case when no feature is active

* Fix linting

* Rework layout of questionnaire to take all space (#178)

* Rework layout of questionnaire to take all space

* Fix linting

* Disable custom analytics-related headers (#179)

* Task/WG-171: Fix location question on questionnaire map (#186)

* Make map fill up the map container

* Add marker on location map

---------

Co-authored-by: John Gentle <[email protected]>
Co-authored-by: sophia-massie <[email protected]>
  • Loading branch information
3 people authored Dec 18, 2023
2 parents e2b7ce6 + 33ffb29 commit 58f7724
Show file tree
Hide file tree
Showing 19 changed files with 705 additions and 1,482 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node.js for use with actions
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 14.x

- uses: actions/cache@v1
with:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Setup Node.js for use with actions
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 14.x

- uses: actions/cache@v1
with:
Expand Down
Loading

0 comments on commit 58f7724

Please sign in to comment.