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.

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

Replace DoB/EDC with 'Derived Age'/'EDC Age' #8990

Open
wants to merge 33 commits into
base: main
Choose a base branch
from

Conversation

GeorgeMurad
Copy link
Contributor

Brief summary of changes

  • Have you updated related documentation?

Testing instructions (if applicable)

Link(s) to related issue(s)

  • Resolves # (Reference the issue this fixes, if any.)

@GeorgeMurad GeorgeMurad added the Needs Work PR awaiting additional changes by the author or contains issues that the author needs to fix label Nov 30, 2023
@kongtiaowang
Copy link
Contributor

@GeorgeMurad please try to replace '90000' to '300001' in /test/test_instrument/test_instrumentTest.php.

@kongtiaowang
Copy link
Contributor

@kongtiaowang
Copy link
Contributor

@GeorgeMurad please revert all change '90000' to '300001' in /test/test_instrument/test_instrumentTest.php.

@GeorgeMurad
Copy link
Contributor Author

@kongtiaowang I did replace all 900000 to 300001 in /test/test_instrument/test_instrumentTest.php.

@kongtiaowang
Copy link
Contributor

@GeorgeMurad
modify these two files
modules/candidate_profile/test/candidate_profileTest.php
modules/instrument_list/php/instrument_list.class.inc
from this PR
kongtiaowang#380

@kongtiaowang
Copy link
Contributor

[client 192.168.122.1:47966] [CRITICAL] /var/www/loris/modules/instrument_list/php/instrument_list.class.inc:307: Uncaught TypeError: strtotime(): Argument #1 ($datetime) must be of type string, null given in /var/www/loris/modules/instrument_list/php/instrument_list.class.inc:307\nStack trace:\n#0 /var/www/loris/modules/instrument_list/php/instrument_list.class.inc(307): strtotime()\n#1 /var/www/loris/php/libraries/NDB_Page.class.inc(741): LORIS\instrument_list\Instrument_List->setup()\n#2 /var/www/loris/src/Middleware/UserPageDecorationMiddleware.php(247): NDB_Page->handle()\n#3 /var/www/loris/src/Middleware/PageDecorationMiddleware.php(58): LORIS\Middleware\UserPageDecorationMiddleware->process()\n#4 /var/www/loris/php/libraries/NDB_Page.class.inc(725): LORIS\Middleware\PageDecorationMiddleware->process()\n#5 /var/www/loris/modules/instrument_list/php/instrument_list.class.inc(154): NDB_Page->process()\n#6 /var/www/loris/php/libraries/Module.class.inc(321): LORIS\instrument_list\Instrument_List->process()\n#7 /var/www/loris/modules/instrument_list/php/module.class.inc(46): Module->handle()\n#8 /var/www/loris/src/Middleware/ResponseGenerator.php(50): LORIS\instrument_list\Module->handle()\n#9 /var/www/loris/src/Middleware/AuthMiddleware.php(63): LORIS\Middleware\ResponseGenerator->process()\n#10 /var/www/loris/src/Router/ModuleRouter.php(74): LORIS\Middleware\AuthMiddleware->process()\n#11 /var/www/loris/src/Middleware/ExceptionHandlingMiddleware.php(54): LORIS\Router\ModuleRouter->handle()\n#12 /var/www/loris/src/Router/BaseRouter.php(132): LORIS\Middleware\ExceptionHandlingMiddleware->process()\n#13 /var/www/loris/src/Middleware/ResponseGenerator.php(50): LORIS\Router\BaseRouter->handle()\n#14 /var/www/loris/src/Middleware/ContentLength.php(52): LORIS\Middleware\ResponseGenerator->process()\n#15 /var/www/loris/htdocs/index.php(55): LORIS\Middleware\ContentLength->process()\n#16 {main}\n thrown, referer: https://test-dev-250.loris.ca/288206/

@kongtiaowang
Copy link
Contributor

kongtiaowang commented Dec 15, 2023

--- a/test/test_instrument/test_instrumentTest.php
+++ b/test/test_instrument/test_instrumentTest.php
@@ -34,7 +34,9 @@ class TestInstrumentTestIntegrationTest extends LorisIntegrationTest
'Active' => 'Y',
'UserID' => 1,
'Entity_type' => 'Human',
'-' 'Sex' => 'Female'
'+' 'Sex' => 'Female',
'+' 'DoB' => '2003-12-12',
'+' 'EDC' => '2003-12-12'

@GeorgeMurad GeorgeMurad force-pushed the 2023-11-30_DoB_To_Derived_Age branch 2 times, most recently from 81885ce to adcd615 Compare February 29, 2024 15:15
@kongtiaowang kongtiaowang self-requested a review March 26, 2024 17:28
Copy link
Contributor

@kongtiaowang kongtiaowang left a comment

Choose a reason for hiding this comment

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

double 128 in RB config file

@kongtiaowang
Copy link
Contributor

kongtiaowang commented Apr 3, 2024

@GeorgeMurad
modify this file
1 . test/test_instrument/test_instrumentTest.php
from this PR
kongtiaowang#380
2 . raisinbread/test/api/LorisApiInstruments_v0_0_3_Test.php in this file change 900000 to 115788

@GeorgeMurad GeorgeMurad force-pushed the 2023-11-30_DoB_To_Derived_Age branch from cb790e0 to 3131c21 Compare April 9, 2024 13:56
@kongtiaowang kongtiaowang self-requested a review April 16, 2024 17:18
@kongtiaowang
Copy link
Contributor

@GeorgeMurad I have modified the files. Could you please perform the manual test to confirm that the changes are correct?

@kongtiaowang kongtiaowang removed the Needs Work PR awaiting additional changes by the author or contains issues that the author needs to fix label Apr 17, 2024
Copy link
Contributor

@kongtiaowang kongtiaowang left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants