-
Notifications
You must be signed in to change notification settings - Fork 174
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.
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
[Instrument] Rename Data_entry_completion_status & move to its own column in flag #6876
Merged
driusan
merged 60 commits into
aces:main
from
CamilleBeau:2020_07_29_Data_entry_completion_status_flag_column
Oct 29, 2021
+11,348
−11,108
Merged
Changes from 58 commits
Commits
Show all changes
60 commits
Select commit
Hold shift + click to select a range
bb42927
Move Data_entry_completion_status to its own column in flag
CamilleBeau be188ef
Code convention
CamilleBeau 5b291f9
Fix order
CamilleBeau 721652e
Changelog
CamilleBeau 87ea93f
Reforming
CamilleBeau bed3b12
bugfix
CamilleBeau 80042c9
Address dave's comment & phpcbf
CamilleBeau e7b1cdb
Fixing, add remode column script, adding rb changes
CamilleBeau b2ba6c4
Accidental RB changes
CamilleBeau 788dd13
Test + imaging_qc query
CamilleBeau 59acb48
testtest remove column
CamilleBeau d8742b5
Test + null Data values
CamilleBeau 1372d93
travis fail 'Equals sign not aligned correctly'
CamilleBeau 24ce9ef
fix unit test
kongtiaowang a3c7188
Nonstatic instrument data
CamilleBeau c99ccd4
phpcs fixes
CamilleBeau 21b0b4d
travis fix expected values
CamilleBeau 92df8c7
Remove field from test data
CamilleBeau aa15811
Spacing
CamilleBeau b3d2f40
Adding back data_entry_completion_status to array
CamilleBeau ba4d3e6
Addressing Ridas comments. Still todo: conflict resolver tables
CamilleBeau b13cdf1
rm print statement + edit query imaging_qc
CamilleBeau 1f8d469
delete from conflict resolver tables
CamilleBeau 41fcee8
call to db typo
CamilleBeau 4d41456
rename column
CamilleBeau ac1fc21
Add RB changes + replace functions
CamilleBeau 7dfaf85
code convention changes
CamilleBeau 3dfddea
Typo in default val
CamilleBeau 814ba4d
Update php/libraries/NDB_BVL_Instrument.class.inc
CamilleBeau b6a4de5
Fix expected val
CamilleBeau 722a930
Update test/unittests/NDB_BVL_Instrument_Test.php
CamilleBeau c0c0060
Merge branch 'main' into 2020_07_29_Data_entry_completion_status_flag…
ridz1208 0d746c2
Update NDB_BVL_Instrument.class.inc
ridz1208 3b3b27c
Update php/libraries/NDB_BVL_Instrument.class.inc
CamilleBeau 6c0d6f4
Update php/libraries/NDB_BVL_Instrument.class.inc
CamilleBeau 1d5154a
Update php/libraries/NDB_BVL_InstrumentStatus_ControlPanel.class.inc
CamilleBeau 3cff0d2
Update tools/single_use/Set_Required_elements_completed_flag.php
CamilleBeau 3c3b19d
rm rb file & changes to scripts
CamilleBeau a54e6cf
Merge branch '2020_07_29_Data_entry_completion_status_flag_column' of…
CamilleBeau 1e916f0
Fix changelog, instrument library, set required elements script
CamilleBeau 2ee22a3
Merge branch 'main' into 2020_07_29_Data_entry_completion_status_flag…
CamilleBeau cdea9da
phpcs
CamilleBeau 423581f
Merge branch '2020_07_29_Data_entry_completion_status_flag_column' of…
CamilleBeau 56a379d
Update raisinbread/RB_files/RB_consent.sql
CamilleBeau b976453
Update tools/single_use/Set_Required_elements_completed_flag.php
CamilleBeau 7bac7a7
Merge branch 'main' of https://github.com/aces/Loris into 2020_07_29_…
CamilleBeau 1d131c2
Fix single use toold
CamilleBeau 00fd233
Fix set script
CamilleBeau e91665b
Merge branch '2020_07_29_Data_entry_completion_status_flag_column' of…
CamilleBeau d4a6d49
phpcs
CamilleBeau e5f69ef
Merge branch 'main' of https://github.com/aces/Loris into 2020_07_29_…
CamilleBeau 715cbf0
update pt 1
CamilleBeau bdcbe5c
Add confirm argument to script
CamilleBeau 42964ee
Fix fn name
CamilleBeau 738f26c
Rm printout for each data point
CamilleBeau 64e7f2b
Set instrDECS to null
CamilleBeau 3c110ce
Consider null as incomplete
CamilleBeau d58a856
More specific script doc
CamilleBeau fe6a0c3
Update tools/single_use/Remove_Data_entry_completion_status_instr_col…
CamilleBeau be1144a
Clearer note
CamilleBeau File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
SQL/Cleanup_patches/2020-12-08-remove_dataEntryCompletionStatus_conflict_resolver.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
DELETE FROM conflicts_resolved WHERE FieldName='Data_entry_completion_status'; | ||
CamilleBeau marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
DELETE FROM conflicts_unresolved WHERE FieldName='Data_entry_completion_status'; |
2 changes: 2 additions & 0 deletions
2
SQL/New_patches/2020-07-29_Required_elements_completed_flag_column.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ALTER TABLE flag | ||
ADD COLUMN `Required_elements_completed` enum('Y','N') NOT NULL default 'N'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand this. Replace them where?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is meant to be a note for projects to replace these functions in case they are calling them in any overrides
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I re-worded it to be more clear