 Xavier Haurie | 3a3791ecd54 | Merge branch '3.1.0' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into 3.1.0 | | |
Xavier Haurie | c71b095a9fb | code review feedback from Marc-Danie | | |
 marc-danie | ccb3df1bbfb | added condition for no overlap in the getOneDayDurationTest method | | |
Xavier Haurie | 8435e8a302f | Merge branch '3.1.0' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into 3.1.0 | | |
Xavier Haurie | 46f85801707 | factored out code used to initialize Date UI's | | |
marc-danie | a825145c0be | refactored and added junit tests for the updateUser method | | |
marc-danie | 879fcd4ea88 | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0
# Conflicts:
# core/src/test/java/edu/harvard/catalyst/schedu... | | |
marc-danie | f72401469e2 | refactored and added junit tests for the updateUser method | | |
Xavier Haurie | ea2b20ce27c | Created regression unit test before refactoring | | |
 Jill Singer | c521655356e | now using header.html | | |
Jill Singer | 4a8a215073a | css tweaks for header | | |
Jill Singer | b6a174e5d97 | making progress on header | | |
 brian | 1436f07409c | Added templatized footer to appointment list, calendar and timeline. I also fixed the font difference between appoint... | | |
Xavier Haurie | c191b05bf69 | Created regression unit test before refactoring | | |
 Carl | 96f95957083 | cleanup after basic auth merge | | |
Carl | 83bc8bf6a97 | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0
Conflicts:
core/src/main/java/edu/harvard/catalyst/scheduler... | | |
Carl | 34845041b55 | Basic auth from develop
Merge remote-tracking branch 'remotes/origin/develop' into 3.1.0
Conflicts:
core/src/test/... | | |
Carl | 979d96b2ad1 | correct version in the README | | |
Carl | 843d870c7fb | correct version in the poms | | |
Jill Singer | 33d06202310 | Merge branch '3.1.0' into templatizing | | |
Carl | c8d28d7a62a | Merge remote-tracking branch 'remotes/origin/develop' into basic-authentication | | |
Carl | c8781bba225 | clean up properties | | |
Carl | 4c6eee1937a | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
Carl | 66347437600 | 14sepBA | | |
Xavier Haurie | f434b6727d8 | fixed bug where the same StudySubject entity was returned 3 times by a criteria query, by changing the query to HQL. ... | | |
marc-danie | 5167525acef | added junit test testGetUserData | | |
marc-danie | f6867a65fdc | updated junit test testGetUserData | | |
Jill Singer | 2a89eeb7009 | adjusting minimum height of white space in the subjects pane; now it is 700 px (much larger than before) | | |
marc-danie | e33fbc77ad2 | added junit test testGetUsers | | |
marc-danie | 710c86de2d1 | updated junit test testGetUsers | | |
marc-danie | d2080cbc975 | added junit test testGetUsers | | |
marc-danie | 69b96da0b9d | added junit test testDetermineAnnotationsString | | |
marc-danie | 65d9b78651f | added junit test testDetermineAnnotationsString | | |
Jill Singer | 938f9a5f949 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | 8eea4d8c64c | updating test | | |
Carl | 282831efc7f | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
Carl | bd4b0e4ab5c | unit-tests for curate-file-loader | | |
marc-danie | 48eb8451f49 | added junit test testResourceOverlapsDayOffset | | |
marc-danie | b686311a930 | added junit test testResourceOverlapsDayOffset | | |
Jill Singer | 16aecbbda69 | worked on empi curation e2e test; now passing; and code is MUCH cleaner with:
comments re merge vs. save in hibernate | | |
Xavier Haurie | d47f8a1faa9 | added warnings that the cleaner program must be ron once before the merger or deleter (the reason being that the clea... | | |
Xavier Haurie | 30b76ca613a | added properties files needed to be able to run tests from maven | | |
marc-danie | 2b93ec960d1 | added junit test testOccursInOneDay | | |
marc-danie | 9e50870005d | updated junit test testOccursInOneDay | | |
marc-danie | 43588986c83 | updated junit test testOccursInOneDay | | |
marc-danie | ee2fb7a8571 | added junit test testOccursInOneDay | | |
marc-danie | 584a35c8dfc | added junit test testExportToExcelReports | | |
marc-danie | 7f27030145f | added junit test testExportToExcelReports | | |
marc-danie | 1b53f41d7e6 | added junit test testGetReport | | |
marc-danie | ae9c7213c48 | added junit test testGetReport | | |
Jill Singer | 2cd353a5a62 | added comment to the test | | |
marc-danie | 11412606f22 | added junit test testGetReports | | |
marc-danie | 8df9bc244a5 | added junit test testGetReports | | |
Xavier Haurie | 827a13ad29b | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 1c782f90daf | added more steps to existing integration test | | |
Xavier Haurie | d5b93939481 | removed unused DAO method; added service-level end-to-end test for skipped subjects; | | |
Jill Singer | 588381a7a99 | unit test for #2: make sure that subjects with archival status of merged or deleted do not get returned by the curato... | | |
Jill Singer | 1ffe936438a | adding unit tests for #1: on back end:
before setting teh site to an mrn; need to make sure it's unique (no other sub... | | |
marc-danie | 2796edbf6e6 | added junit test testGetReportData | | |
marc-danie | 97444b1f540 | added junit test testGetReportData | | |
marc-danie | fb08ce4af55 | added junit test testLogViewReport | | |
marc-danie | c3f78219a3d | added junit test testLogViewReport | | |
marc-danie | 5140274f875 | added junit tests testLoadResourceTypes and testLoadSublocations | | |
marc-danie | 74d750a9bf9 | added junit test testLoadSublocations | | |
marc-danie | 1d269d41b88 | added junit test testLoadResourceTypes | | |
marc-danie | f471a013866 | added junit test testGetOverbookedVisitsData and testSaveComment | | |
marc-danie | d287bcb0577 | added junit test testMarkAsMergedOrDeleted | | |
marc-danie | 6911340084a | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | d2606608349 | added junit test testMarkAsMergedOrDeleted | | |
Jill Singer | d56374fa898 | user can re-curate and switch the subject mrn site if needed (manually) | | |
Xavier Haurie | fa979dfd27b | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 83fe930b849 | resource-, service-, and DAO-level tests for skipped subject functionality | | |
marc-danie | 7832c8c9953 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | 262980a8607 | added new mergedOrDeleted status to EmpiStatusCurationType | | |
Jill Singer | c6e51648b1c | making the removeLocks be synchronous if needed | | |
Jill Singer | 41b3bca916d | changed labels on the matching stats, and also blanking out the search mrn input field when a search is done/or autom... | | |
Carl | 5ee98fbd65c | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
Carl | eddace01948 | Loader standalone now looks for just one column | | |
marc-danie | e08814b39d5 | added junit test testGetOverbookedVisitsData | | |
Jill Singer | 5cf66f2a044 | locks: locks being removed for current user when 'stop searching' is pressed, and when the page is unloaded | | |
Xavier Haurie | a7a9290015c | fixed skipped functionality. When no more subjects are returned as next subject to curate, all the skipped flags for ... | | |
marc-danie | 303ac8f3941 | HCCRCSCHEDULING-5393 - New user registration form- Required fields when kept unpopulated and "Save" is clicked, there... | | |
marc-danie | 6ebf024e934 | HCCRCSCHEDULING-5393 - New user registration form- Required fields when kept unpopulated and "Save" is clicked, there... | | |
marc-danie | bec96d5b512 | added junit test testSaveComment | | |
Xavier Haurie | b2221933a01 | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | d7569b7bf5b | fixed typo; ensure subjects get locked and unlocked wherever appropriate; | | |
marc-danie | fd6927bcf07 | HCCRCSCHEDULING-5379 - Regression: Bug > Resources > Add resource > Error in console upon clicking on add resource bu... | | |
marc-danie | dd25881d8e0 | HCCRCSCHEDULING-5379 - Regression: Bug > Resources > Add resource > Error in console upon clicking on add resource bu... | | |
marc-danie | 2d65b02064f | updated fix so that the value is set to the mrn and not the institution in the mrninfodto | | |
marc-danie | 7849125a2dc | fixed so that the value is set to the mrn and not the institution in the mrninfodto | | |
marc-danie | 1c20a1768b5 | fixed so that the value is set to the mrn and not the institution in the mrninfodto | | |
marc-danie | f0c77630806 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | 8723edf0f0f | modified to user select mrn for matching when potential subejct match has multiple mrns available | | |
Xavier Haurie | 69243f55b62 | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 980efec7c75 | Looks like skipped-subject implementation is complete, but needs hand-testing and also unit/integration testing. Also... | | |
Jill Singer | 14f62ee875d | redoing the stats; now showing # matched, skipped, and unmatched; plus the total so the user can easily see their pro... | | |
Xavier Haurie | 28cebca77c5 | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | ca9c64b2412 | minor regression fix | | |
Jill Singer | 59d72d9c579 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | b8f08e79338 | checking that the subject is not merged or deleted before curating; for both auto and manual modes. no tests added y... | | |
marc-danie | c79511b5145 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | 41923cb67d6 | changed to use the mrn institution as the value in the drop down | | |
Jill Singer | f080b855a1e | empi curator subject matcher: before setting the site to an mrn; need to make sure it's unique (no other subject has ... | | |
Carl | 14060b4452e | Provide a README | | |
Carl | 70ccab2e25c | Adjust example properties to ask for epic mode. Add more detail to FileLoader output | | |
Carl | c6249d07fae | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
Carl | dc172229014 | Correct the assembly parameters. Add config for logging | | |
Jill Singer | c708a4651d6 | adding rest endpoint for releasing all locks for a given user | | |
Xavier Haurie | 2d622ba8ada | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 55ff6b4f896 | EmpiCurationSubject locks set and cleared automatically, and applied to queries to next subject to curate | | |
Carl | 6c33e8581a0 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
Carl | 3c7bb3bb804 | Add some coverage for the case where no subjects are found to curate. | | |
Jill Singer | 860b40bb5f9 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | 1a36715e61c | added skip button | | |
brian | 5382601ceac | Last bit of unit tests for more StudyService now mainly focusing on creating and updating visits. | | |
marc-danie | 1f25d818d24 | HCCRCSCHEDULING-5387 - Assign Subject, Switch Subject and Remove Subject actions on a Hold visit gives a super quick ... | | |
marc-danie | 82a338cf34e | HCCRCSCHEDULING-5387 - Assign Subject, Switch Subject and Remove Subject actions on a Hold visit gives a super quick ... | | |
Xavier Haurie | 6896cf7e9d9 | EmpiCurationSubject lock resetting from UI activity. locks need to be created manually in the database in this state ... | | |
Xavier Haurie | fb16ef59b25 | oops. missing assembly.xml | | |
Jill Singer | 690d1510ee4 | working on combobox for multiple mrn matches
the combobox is rendering, but at this point you cannot select anything... | | |
Jill Singer | d9fe03e7081 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | 8bb9931524c | first draft: after a manual search, not going to next subject; blanking out the search results instead; and the serv... | | |
brian | 61fd70a802d | Merge branch '3.1.0' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into 3.1.0 | | |
brian | 4ec8972ddf4 | Added unit tests for more StudyService methods. | | |
marc-danie | 0afb8141140 | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0 | | |
marc-danie | d50a8f66071 | HCCRCSCHEDULING-5349 - Regression:Bug: EPIC + Standalone: Home & Appointment Calendar view > Appointment pop up > 404... | | |
marc-danie | c2c75d697df | HCCRCSCHEDULING-5349 - Regression:Bug: EPIC + Standalone: Home & Appointment Calendar view > Appointment pop up > 404... | | |
Carl | 3ce114f8563 | Adjust pom's and README to use 3.0.0-basic-auth-SNAPSHOT | | |
Xavier Haurie | 8addaafc94c | EmpiCurationSubject lock resetting from UI activity. locks need to be created manually in the database in this state ... | | |
marc-danie | 8988cfcf0ca | fixed alignment of the Start Matching and Search Manually buttons | | |
marc-danie | 4bd2901e9f9 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | 2e37b9f169f | added error message for when match is done with mrn that already has a site | | |
Jill Singer | b0a5a99c8d2 | cleaning up code | | |
Jill Singer | 44a5c472fe2 | the match link is now a button, much more obvious | | |
brian | 71b10182d32 | Added more tests to StudyService and removed redundant code. | | |
marc-danie | 71491f937ec | modified to catch errors when doing manual search and send back to client | | |
Jill Singer | a6a5b9c813d | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | e49252a6f96 | adding comment column to the empicurator subject table. the comment in the option is now not connected to the subje... | | |
marc-danie | 4a727bb2fd0 | Fixed NPE when manual search is done with mrn that is not in scheduler | | |
brian | 3b8486befa8 | Added a couple of tests for StudyService and added a clarify comment to a previous comment. | | |
Xavier Haurie | ea0102c711f | persist MRN status on a match | | |
Jill Singer | 2d6d098b4a2 | adding comment saving to the match | | |
Xavier Haurie | ed262d56be7 | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 61acba1e0c0 | added FakeSubjects program option to insert subjectMrns instead of updating existing ones | | |
Jill Singer | 9a15f8605df | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Carl | e32606499db | don't bother setting sslSocketFactory. less is more | | |
Jill Singer | bcacfcd2fd0 | changed text to 'match' and removed an unused method argument | | |
marc-danie | 0fcb880d036 | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | 9b70f8f1389 | added testMatchNotFound | | |
Xavier Haurie | 4c60f5a723f | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 51dde0207b9 | decrypt subject and mrn data before serving it to the client | | |
Carl | aae776028ef | logging and sending to front end (logMessage) more detail about exceptions | | |
Jill Singer | 32342f23782 | updated stats template | | |
brian | e62b133eefa | Added a few tests for StudyService and cleaned up the class a little bit. | | |
Jill Singer | ffcf5532576 | now put real code in the manual matcher | | |
Jill Singer | e6ed5fdc5cd | cleaning up code | | |
Jill Singer | 68a306e7064 | only using the one page now | | |
Xavier Haurie | 08dc652ba87 | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 3aa03e36793 | added rest call to fetch a subject to curate by a MRN | | |
marc-danie | 7c399034fdf | updated testGetNextSubjectToCurate | | |
Xavier Haurie | 6b65638520f | added fetching and returning counts of real database EMPI curation subject | | |
Xavier Haurie | 288973b8b7c | Merge branch 'feature/subject-partial-match-import-MRNs' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/sch... | | |
Xavier Haurie | 7fca7e1b2db | fixed failing test | | |
marc-danie | f12b33221aa | Merge remote-tracking branch 'origin/feature/subject-partial-match-import-MRNs' into feature/subject-partial-match-im... | | |
marc-danie | b7970891cf5 | added testGetNextSubjectToCurate | | |
Carl | 73594b1a9d6 | Merge branch 'develop' into basic-authentication | | |
Carl | a0af3b1341d | adjust unit tests for header-less importMrn csv's | | |
Jill Singer | 4e23fd44d88 | the mrn id is now included in the subject detail response | | |
Carl | 0495c5606b0 | Merge branch 'develop' into basic-authentication | | |
Carl | 04e3b141837 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 3fcf23100c7 | import mrns now uses every row of the csv, just like clean/merge/delete | | |
Carl | d571612dd28 | this version sent to Dimo | | |
Jill Singer | c5073342fc4 | cleaning up code to get matched mrn, and only sending data to the matchFound rest point; not saving it anymore first | | |
Jill Singer | 332fa354acf | for the display, the mrn is read only; next: and also read only on the details page. | | |
Jill Singer | afb81d67411 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
marc-danie | da4c133679b | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0 | | |
marc-danie | 6462a1eb046 | HCCRCSCHEDULING-5386 - Bug:Reports>>Error in console upon clicking on Display reports button of the reprots listed be... | | |
marc-danie | f54192c9c46 | HCCRCSCHEDULING-5386 - Bug:Reports>>Error in console upon clicking on Display reports button of the reprots listed be... | | |
Xavier Haurie | 2bb38dd6411 | added sample JSON data for making rest calls | | |
brian | d7c3aecfb0b | Added a test for UpdateStudy method in StudyService. | | |
Jill Singer | 8b8671051b2 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Xavier Haurie | d62f34fe1da | fixed bug due to null Integer from the database wanting to be cast to an int entity attribute | | |
Jill Singer | d7f1a385121 | Merge branch 'feature/subject-partial-match-import-MRNs' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into f... | | |
Jill Singer | ae97b57139d | working on removing stuff from subject_details | | |
Xavier Haurie | b66accd51b1 | modified service-layer test for getNextSubjectToCurate() to verify that it passes the MRN back in the DTO | | |
Xavier Haurie | 29f4901d059 | added service-layer test for getNextSubjectToCurate() | | |
Xavier Haurie | f15622e10aa | added curated_by and number-of-matches fields to EmpiCurationSubject and populate in services, etc | | |
marc-danie | 4e88e468fae | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0 | | |
| Next → |
