Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Asl/4495 keeping animal alive #927

Merged
merged 56 commits into from
Aug 1, 2024
Merged

Asl/4495 keeping animal alive #927

merged 56 commits into from
Aug 1, 2024

Conversation

farrukhishaq
Copy link
Contributor

the protocol had a refactored previously. Protocols are rendered as VIEWABLE and EDITABLE.
Introduced a check of editable so the NTSFateOfAnimalFields are rendered appropriately for each view.

edemirbag and others added 30 commits June 14, 2024 18:28
@edemirbag
Content updates for NTS fate of animals question (ref 1 in copy deck)…
86da5c8 
… and protocol fate of animals question (ref 2 in copy deck)
@farrukhishaq
conditional render and hyperlink done.
98ee741
@farrukhishaq
conditional render on protocols and mapped nts - protocols correctly.
79311de
@farrukhishaq
reverting change made in error.
8609ecf
@farrukhishaq
applied eslint.
182eda4
@farrukhishaq
existing modal using it has no CSS.
6181fcf
@farrukhishaq
dynaic checkbox text in the modal.
2002b47
@farrukhishaq
css styling applied, cancel button is dif from design. Clear function…
7562e13 
…ality on subquestion todo.
@edemirbag @farrukhishaq
Content updates for NTS fate of animals question (ref 1 in copy deck)…
445ad7d 
… and protocol fate of animals question (ref 2 in copy deck)
@farrukhishaq
conditional render and hyperlink done.
e7496ea
@farrukhishaq
conditional render on protocols and mapped nts - protocols correctly.
1debdf3
@farrukhishaq
reverting change made in error.
4852e55
@farrukhishaq
applied eslint.
3cb9f37
@farrukhishaq
existing modal using it has no CSS.
e664e17
@farrukhishaq
dynaic checkbox text in the modal.
13e4538
@farrukhishaq
css styling applied, cancel button is dif from design. Clear function…
c029042 
…ality on subquestion todo.
@farrukhishaq
apply css from stylesheet.
7670c53
@farrukhishaq
Merge branch 'refs/heads/master' into nts-modal
ffed63e
@farrukhishaq
Merge remote-tracking branch 'origin/nts-modal' into nts-modal
9aadda6 
# Conflicts:
#	client/helpers/nts-modal.js
@farrukhishaq
match design.
e5474a8
@farrukhishaq
nts-modal work: successfully wrapped Checkbox component.
27d19f5
@farrukhishaq
complete refactor of checkbox and modal to appear in NTS with CSS. Re…
ec7e4cc 
…act comp done.
@farrukhishaq
eslint fix, existing test passing.
a4cad5e
@farrukhishaq
ASL-4495 complete.
65bea53
@farrukhishaq
ASL-4495 complete
38f4e61
@edemirbag @farrukhishaq
Content updates for NTS fate of animals question (ref 1 in copy deck)…
129ef65 
… and protocol fate of animals question (ref 2 in copy deck)
@farrukhishaq
conditional render and hyperlink done.
a209326
@farrukhishaq
conditional render on protocols and mapped nts - protocols correctly.
7d76a22
@farrukhishaq
reverting change made in error.
d215a56
@farrukhishaq
applied eslint.
c227432
@farrukhishaq
package-lock commit
1c64adc
@farrukhishaq
cancel button CSS matched.
e3aea78
@farrukhishaq
Merge remote-tracking branch 'refs/remotes/origin/master' into ASL/44…
60d0e8a 
…95-keeping-animal-alive
@farrukhishaq
adding href to elimate WAG2.2 issue.
cd467a5
@farrukhishaq
crawl over all avilable protocols and handle changes based on checkbo…
9718341 
…x selection.
@farrukhishaq
Merge branch 'refs/heads/master' into ASL/4495-keeping-animal-alive
092a945
@farrukhishaq
nts checkboxes to use special field set.
9f5a380
@farrukhishaq
nts checkboxes to use special field set.
3022fa2
@farrukhishaq
refactor method to be less expressive.
9266e88
@farrukhishaq
lint applied
5cf645a
@farrukhishaq
use map over foreach as it safer approach.
31c3854
@farrukhishaq
version update in package.json
5196d86
@farrukhishaq
lock file commited so the pipleline reads the changes.
be23e45
@farrukhishaq
Merge remote-tracking branch 'refs/remotes/origin/master' into ASL/44…
179f79b 
…95-keeping-animal-alive

# Conflicts:
#	package-lock.json
@farrukhishaq
merge master
bddf404
@farrukhishaq
Merge remote-tracking branch 'origin' into ASL/4495-keeping-animal-alive
d185df7
@farrukhishaq
kept alive use not covered in checks.
8d9748c
@farrukhishaq
fixed issue with protocol
b7dfa17
@farrukhishaq
Merge remote-tracking branch 'origin' into ASL/4495-keeping-animal-alive
c312d44
@farrukhishaq
bug fix on protocol review, fate-of-animal undefined.
1c01958
@farrukhishaq farrukhishaq added the bug Something isn't working label Jul 31, 2024
jeff-horton-ho-sas
jeff-horton-ho-sas reviewed Jul 31, 2024
View reviewed changes
Copy link
Contributor

@jeff-horton-ho-sas jeff-horton-ho-sas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment with some refactorings I think will help, but looks good

@farrukhishaq farrukhishaq merged commit 6d581e7 into master Aug 1, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@parvinba parvinba parvinba approved these changes

@jeff-horton-ho-sas jeff-horton-ho-sas jeff-horton-ho-sas approved these changes

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@farrukhishaq @jeff-horton-ho-sas @parvinba @edemirbag