 Jill Singer | 7b1c8f6859e | fixing testing problems | | |
 Xavier Haurie | ca4ef7c3579 | HCCRCSCHEDULING-5101 : removed comment about code which no longer needs to be run only on production databases | | |
Xavier Haurie | d70bc6589c0 | Merge branch 'feature/HCCRCSCHEDULING-5101-block-visits-prototyping' into develop | | |
Xavier Haurie | 4026be5d346 | HCCRCSCHEDULING-5101 : fixed a bug whereby the resources table would not appear in the scheduling dialog in some cerc... | | |
 marc-danie | ba5cbe2eaed | HCCRCSCHEDULING-5098 - Search Criteria : Last name and First name and also removed institution from the getSearchedSu... | | |
Xavier Haurie | a7dccce5bbc | minor backtracking on home.html - home.html and appt_calendar are similar but cannot be exactly the same because they... | | |
Jill Singer | 3f01ad4bc6a | Merge branch 'develop' into testing-jill | | |
Jill Singer | 8221aed971f | code remediation....ongoing.... | | |
Xavier Haurie | 564ec68138b | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 45aeb460dca | create Subjects with populated mrn column so that the update.sql script will populate the subject_mrn table | | |
marc-danie | ec94ccb4a77 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into feature/HCCRCSCHEDULIN... | | |
marc-danie | 429eb30872c | removed name suffix column from Subject table | | |
marc-danie | 0dcee227628 | HCCRCSCHEDULING- 5098 - Initial changes for combining last and first name fields when sarching | | |
 Carl | 2bc9bdd0fec | omit UK , hoping that eliminates errors | | |
Carl | f9639179480 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 922ec43b4dd | progress on nightly batch subjects, https://open.med.harvard.edu/jira/browse/HCCRCSCHEDULING-4751
unit-tests BatchSu... | | |
Xavier Haurie | 81333797382 | move creation of FK down in the script to avoid FK uniqueness violation | | |
Jill Singer | 55d26b531da | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 390f3f6e8b1 | HCCRCSCHEDULER-5008: removed todo that is now done, removed console.log (cleaning up code, no functional changes | | |
Xavier Haurie | b34ea3bbfda | Merge branch 'develop' into feature/HCCRCSCHEDULING-5101-block-visits-prototyping | | |
Xavier Haurie | 1afa130e680 | Add snippet so that we drop index only if it exists | | |
Xavier Haurie | 9f919ad0e96 | fix the build: remove sutdy-subject unique key because it becomes a problem when the subject column is removed from t... | | |
Carl | 7adbf9d8c33 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | a1bfc53539c | for now, do not insert subject-mrn records, since update.sql does it later | | |
Xavier Haurie | a4771f6f1c8 | Merge branch 'develop' into feature/HCCRCSCHEDULING-5101-block-visits-prototyping | | |
Xavier Haurie | 91b1448a66b | HCCRCSCHEDULING-5101 : fix appt_calendar.html and home.html to be more like each other so the kavascript code can wor... | | |
Marc-Danie Nazaire | ad7eec20300 | Merge pull request #70 in HCCRCSCHEDULER/scheduler from feature/HCCRCSCHEDULING-4950-subjects-module-search to develo... | | |
marc-danie | 024d54d81c5 | HCCRCSCHEDULING-4950 - Added setting of nameSuffix value to createSampeSubjectsDto in SubjectResourceTest | | |
marc-danie | e08b72a10d6 | HCCRCSCHEDULING-4950 - Added suffix field to subject search results and also modified getSearchSubjects in SubjectRes... | | |
Jill Singer | 7ed5b37eba6 | fixing broken test from last commit | | |
Jill Singer | 64ba09808ae | HCCRCSCHEDULER-5008
backend change: creating a new subject service now returns the id in the subjectDTO that is gett... | | |
Jill Singer | d17674d9791 | subjects: now 'birthdate' is used everywhere, instead of 'dob' some places and 'birthdate' in other places | | |
Jill Singer | 7f8cccfefc6 | HCCRCSCHEDULER-5002: integrating into just ONE page; showing view mode after saving from edit mode | | |
Jill Singer | 64e1d71eb17 | HCCRCSCHEDULER-5105
almost done.
now, after doing a save, the view goes back to read-only.
functionality for when ... | | |
Jill Singer | 9c7abcebae2 | HCCRCSCHEDULING-5105
cancel is now going back to the correct page
styling: adding padding... | | |
Jill Singer | a5302ebb840 | HCCRCSCHEDULING-5105: now can edit the user too; the button now shows the edit view for that user | | |
Jill Singer | 847b57d93f3 | HCCRCSCHEDULING-5101
finishing touches;
selecting the proper part of the header (studies)
added subject name to top... | | |
Carl | 88d3b444e91 | progress on nightly batch subjects, https://open.med.harvard.edu/jira/browse/HCCRCSCHEDULING-4751
unit-tests BatchSu... | | |
 Ankit Panchamia | 3e441b087c5 | more work on breadcrumbs for view details on study subjects from studies module. | | |
Ankit Panchamia | 74accc2cb7a | implemented breadcrumbs for view details on study subjects from studies module. | | |
Ankit Panchamia | afab58a4be2 | Safety nullpointer check in bookedvisit-subjectMrn | | |
Jill Singer | ab6c45807f2 | HCCRCSCHEDULER-5105: adding more fields to the read only page, hiding buttons and req'd label | | |
Jill Singer | 2ae1da760d0 | Merge pull request #69 in HCCRCSCHEDULER/scheduler from feature/HCCRCSCHEDULING-5005-subjects-module-edit to develop
... | | |
Ankit Panchamia | 34d13b7ef17 | fixed issue HCCRCSCHEDULING-5035 - Home - Calendar view - monthly and weekly view - On applying filters with sub-loca... | | |
Jill Singer | 7b9bcf444d8 | deleting template file, not using (HCCRCSCHEDULING-5101) | | |
Jill Singer | ae7bba711eb | Merge branch 'develop' into feature/HCCRCSCHEDULING-5005-subjects-module-edit | | |
Jill Singer | 2be28c9874c | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
marc-danie | 72fe70e086f | HCCRCSCHEDULING-5005 - Fixed setting of whether a subject is active in the system | | |
Jill Singer | 19120b281b8 | HCCRCSCHEDULING-5105: adding read only cells | | |
Carl | 745fa23fa98 | omit drop index, as we should get that for free by drop the associated column | | |
Jill Singer | 6373e6001e4 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
Jill Singer | e1f5c83c2f0 | HCCRCSCHEDULING-5105 minor changes; commiting before a merge | | |
marc-danie | a2c8ca5adfd | HCCRCSCHEDULING-5005 - Changes for setting whether a subject is active | | |
marc-danie | e5b8cd958a1 | Merge remote-tracking branch 'origin/feature/HCCRCSCHEDULING-5005-subjects-module-edit' into feature/HCCRCSCHEDULING-... | | |
marc-danie | deb8202c582 | HCCRCSCHEDULING-5005 - Fixed saving of subject to a study to encrypt the mrn and also check if subject is already enr... | | |
marc-danie | b6696e9ecd7 | Set Puid to a string instead of null | | |
Jill Singer | c61cd888747 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
Jill Singer | 6377ffa8338 | making progress; input fields now disappearing, as in the 'required' red asterisk; next: put in the readOnly cells | | |
marc-danie | 641c10fcdde | Modified puid column in the Subjects table to be a String | | |
marc-danie | 9d6fe7d2852 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
marc-danie | 30ccebecc3d | HCCRCSCHEDULING-5005 - added saveStudySubject method to the StudyDAO class | | |
Jill Singer | d02c89b6b49 | starting to add view/read only capability | | |
Xavier Haurie | 1cf23d87cc5 | HCCRCSCHEDULING-5101 : create a #ScheduledVisit hash for when the wizard is open on a scheduled (but not checked-in, ... | | |
Jill Singer | ea29b8467a0 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
marc-danie | 6169b853e8f | Merge remote-tracking branch 'origin/feature/HCCRCSCHEDULING-5005-subjects-module-edit' into feature/HCCRCSCHEDULING-... | | |
marc-danie | a0705ef3c90 | set Puid to null now that is a String | | |
Jill Singer | 1c21859bbc1 | fixing build (type is now a String, not an int) | | |
Jill Singer | e4e3bf96211 | fixing build (type is now a String, not an int) | | |
Jill Singer | 60faa0c8142 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
Jill Singer | d3f6f47bdfd | now; breadcrumbs are back | | |
Jill Singer | fb5b19c35e1 | integrated with new code...finally | | |
marc-danie | b276b4aebfe | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into feature/HCCRCSCHEDULIN... | | |
marc-danie | 6f9ecefbb36 | HCCRCSCHEDULING-5005 - Modified to display error message from server when atempting to save a subject | | |
marc-danie | 9f5ff212932 | HCCRCSCHEDULING-5005 - Updated findStudySubjectBySubject and findStudySubjectBySubjectAndStudy to work with new data ... | | |
Carl | 870fdc2222b | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | aa9a45e5636 | HCCRCSCHEDULING-5005 - fixed display of country in subject details | | |
marc-danie | 908d94d1549 | HCCRCSCHEDULING-5005 - fixed equals check in lookUpIdByName function | | |
Xavier Haurie | 5b3d0d34f3c | Merge branch 'feature/HCCRCSCHEDULING-5101-block-visits-prototyping' into develop | | |
Xavier Haurie | bbf69749d71 | HCCRCSCHEDULING-5101 : search filter works when typing enter, in switch subject mode, on appointments calendar page | | |
Carl | 73aa00fed68 | Merge branch 'develop' into nightly-batch-13-july | | |
Xavier Haurie | f0a17ed572e | HCCRCSCHEDULING-5101 : search filter works when typing enter, in switch subkect mode | | |
Xavier Haurie | 96563c1ad19 | HCCRCSCHEDULING-5101 : search filter works when clicking button. Broken when typing enter | | |
Carl | ed2cabec695 | remove extra "," from subject_mrn create query | | |
Xavier Haurie | e66f0640bab | HCCRCSCHEDULING-5101 : fix subject search filter | | |
Jill Singer | be73dfeb036 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' into feature/HCCRCSCHEDULING-5105 | | |
Jill Singer | 9309b72c11c | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' of ssh://skoll.catalyst:7999/hccrcscheduler/schedule... | | |
marc-danie | 251d63e1407 | HCCRCSCHEDULING-5005 - made changes to the extractSubjectData function to setting of combobox values | | |
Jill Singer | cab8a185bf7 | doing more merging; missed a few spots | | |
Carl | aa86468e26b | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 844096a522e | remove extra "?" | | |
Jill Singer | 01ef48c3a30 | Merge branch 'feature/HCCRCSCHEDULING-5005-subjects-module-edit' into feature/HCCRCSCHEDULING-5105 | | |
Jill Singer | 40c5fae86c5 | Merge branch 'develop' into feature/HCCRCSCHEDULING-5005-subjects-module-edit | | |
Carl | 059adca56a7 | merge from develop | | |
Jill Singer | 0a97bbd1e9b | HCCRCSCHEDULING-5099 fix; simple css change | | |
marc-danie | 2f6d0c26ed5 | Merge from develop | | |
marc-danie | 0565cf4a621 | HCCRCSCHEDULING-5005 - added gender_empi column to the subject table | | |
marc-danie | a7a5dcc1f69 | HCCRCSCHEDULING-5008 - removed institution from the setSomeEntityValuesViaDto method | | |
marc-danie | 271b55e8203 | HCCRCSCHEDULING-5008 - added getter and setter for the genderEmpi field | | |
marc-danie | 5c010abe1f9 | HCCRCSCHEDULING-5008 - modified to handle null values for status in the equals method | | |
marc-danie | ae5c49fb06d | HCCRCSCHEDULING-5008 - added variable names to the findInternalSubjectByMrn method | | |
marc-danie | 7a405f2f40b | HCCRCSCHEDULING-5008 - added check if user is CRC staff to determine whether to display the add to study button and a... | | |
Carl | 26524af9cba | cleanup based on pull request feedback | | |
Carl | d402f0ad3e0 | report builder updates for new data model.
migrate old reports to get mrn from subject-mrn instead of subject
adjust ... | | |
Ankit Panchamia | 0b02bf2d0e4 | fix populate fake subjects | | |
Ankit Panchamia | 49f8308c5c3 | fixing the populate fake subjects to reflect the new data model changes. | | |
Ankit Panchamia | 5063bbb8dc7 | fixing the populate-fake-subjects program to reflect the new data model | | |
Jill Singer | 46a680524b1 | trying to do breadcrumbs.....can get to the study details page but not yet to the study members page | | |
marc-danie | 1ace60c03f1 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into feature/HCCRCSCHEDULIN... | | |
Jill Singer | 14fcffc3a3d | initial page added; just a copy of the existing page for now; will change tho | | |
Xavier Haurie | 15e4baee739 | Merge branch 'feature/HCCRCSCHEDULING-5129-block-visits-study-staff' into develop | | |
Xavier Haurie | c7dbec6c6ef | HCCRCSCHEDULING-5129 : fix broken check-in rest call | | |
marc-danie | 2fc157e996a | HCCRCSCHEDULING-5008 - modified puid to be a string instead of an integer and updated create and save subject to work... | | |
Jill Singer | 48ff7834849 | --starting | | |
Jill Singer | 53dcc6b8a6c | Merge pull request #68 in HCCRCSCHEDULER/scheduler from small-changes to develop
* commit 'c7b492bef53bf3aa52f2ac9bd... | | |
Jill Singer | c7b492bef53 | changing color of the switch subject link to blue | | |
Jill Singer | ff31590ab33 | Merge pull request #66 in HCCRCSCHEDULER/scheduler from small-changes to develop
* commit '50c31c1dd668ad712d7e2086f... | | |
Xavier Haurie | c60d3371cd6 | Merge branch 'develop' into feature/HCCRCSCHEDULING-5129-block-visits-study-staff | | |
Xavier Haurie | 88e37e055c9 | Merge branch 'small-changes' into feature/HCCRCSCHEDULING-5129-block-visits-study-staff | | |
Carl | 926fd66216d | data and code changes for nightly batch update | | |
Xavier Haurie | a22c848230c | put base.sql like it was before I removed Subject.mrn | | |
Xavier Haurie | fe8732dc506 | do not get rid of Subject.mrn in base.sql. Let update.sql do that (or else build fails) | | |
Xavier Haurie | 68283fac09f | got rid of Subject.mrn | | |
Jill Singer | 50c31c1dd66 | adding back ids where there were none/were removed; also adjusting error width | | |
Xavier Haurie | 5821dc8cbc2 | HCCRCSCHEDULING-5129 : fix N/A event class and subject name returned by server | | |
Jill Singer | 3a9f6741d2e | small changes; fixed problems brought up in the code review/demo today | | |
Xavier Haurie | 1a45d7b99da | HCCRCSCHEDULING-5129 : fix N/A subject name returned by server | | |
Jill Singer | 4c784b6ae46 | Merge remote-tracking branch 'origin/develop' into small-changes | | |
Jill Singer | ecd52927180 | minor changes: removed todo comments that are fulfilled, and intellij auto-sorted the imports (alphabetized them); n... | | |
Jill Singer | 383c3a0ce40 | Revert "working on css"
This reverts commit 53293ae9d17bcab00845fd907330c34f53882971. | | |
Jill Singer | 5671e85f44a | removing width setting; was misaligning the table | | |
Jill Singer | 53293ae9d17 | working on css | | |
Jill Singer | cb99406d369 | switch subject change: now when switching the subject, the rest of the dialog hides (the resources section); and whe... | | |
Jill Singer | 9e36b959e60 | css fixes | | |
Ankit Panchamia | 7e6d0eeecc7 | fixed syntax error(replaced let with var in js) to support browsers in strict mode. | | |
Jill Singer | f9fc897cc47 | css tweaking; making tables have the same css and lining button up; no functional changes | | |
Xavier Haurie | 4d455aba34e | HCCRCSCHEDULING-5129 : modify view of hold appointments for Study Staff (non-CRC-Staff, to be accurate) | | |
Xavier Haurie | aee70a902fb | Merge branch 'feature/HCCRCSCHEDULING-5102-block-visits-assign' into develop
# Conflicts:
# web/src/main/webapp/home... | | |
Jill Singer | 2086c9725c8 | put in a proper mrn comparator function | | |
Marc-Danie Nazaire | d272c3e2689 | Merge pull request #65 in HCCRCSCHEDULER/scheduler from feature/HCCRCSCHEDULING-5001-subjects-module-gender to develo... | | |
marc-danie | 0c0edc60e37 | Changed FIXME-MN to TODO-Carl | | |
Jill Singer | bc051f4424b | updating permissions to all() on the html fragments | | |
Jill Singer | 7812445e359 | working on the pick a new study subject table in the scheduled appt wizard:
consolidating styles, cleaning up code... | | |
Jill Singer | b37ca991dbe | fixing the headers and sorting on the study subjects; when switching the subject in the appointment_scheduled wizard;... | | |
marc-danie | 49dfdb290c6 | HCCRCSCHEDULING-5001 - Gender Filter - renamed Undisclosed to Unreported in gender filter | | |
marc-danie | 6beafd51329 | HCCRCSCHEDULING-5005 - added findSubjectInSchedulerByMrn rest call to check if a subject found in EMPI is in the sche... | | |
Xavier Haurie | 9407ba1ad1c | HCCRCSCHEDULING-5102 : notes on ['Scheduled'] vs 'Scheduled' and why they can look the same, or not | | |
Jill Singer | 3b44ce2499e | updating permissions to all() on the html fragments | | |
Xavier Haurie | 4fe74240802 | HCCRCSCHEDULING-5102 : fixed issue with wizard state persisting from one use to another. | | |
Xavier Haurie | 12e09063304 | HCCRCSCHEDULING-5102 : fixed re-opening of dialog box after new subject (or lack thereof) is submitted. Still known b... | | |
Jill Singer | edae65da72d | adding entries to security-app-context.xml | | |
Jill Singer | 6b20bde56a3 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | ad39c2be724 | HCCRCSCHEDULING-5100: removing new cancellation reason; requirements have changed
using Administration Cancel instea... | | |
Ankit Panchamia | 7766596df62 | fixing the typo in update.sql | | |
Jill Singer | b5ea2392847 | HCCRCSCHEDULING-5052: removing new cancellation reason; requirements have changed | | |
Jill Singer | 9d9c4ea14f2 | adjusting comments (removing some); no functional changes | | |
Jill Singer | d8bf6b9f0fc | Merge pull request #64 in HCCRCSCHEDULER/scheduler from hold-appts-backend-plus to develop
* commit '9e262916114bc58... | | |
Xavier Haurie | 4e4cf3f292e | HCCRCSCHEDULING-5102 : first complete implementation | | |
Jill Singer | 9e262916114 | HCCRCSCHEDULING-5052 : adjusted last page; unified two styles (slight difference between the two (bottom margin) adde... | | |
Jill Singer | 0ca9c2a3f61 | Merge branch 'develop' into hold-appts-backend-plus | | |
Jill Singer | 45ff869b8cb | styling changes...removed redundant button too | | |
Xavier Haurie | c957456264f | replace 'let' keyword with 'var' in javascript code | | |
Xavier Haurie | c441b9b0e72 | HCCRCSCHEDULING-5102 : fix == | | |
Jill Singer | a32c7c864e9 | HCCRCSCHEDULING-5052 changed text on the wizard for scheduled appts, no functional change | | |
marc-danie | 88949f911c4 | removed create_subject.html which is no longer used | | |
Xavier Haurie | c1f5ffd3d9f | Merge branch 'feature/HCCRCSCHEDULING-5101-block-visits-prototyping' into develop | | |
Xavier Haurie | b63b522e088 | HCCRCSCHEDULING-5101 : code-review fixes | | |
Jill Singer | 035a4a171f2 | moving appts.css to appts directory, added clause to add cancellation reason te update.sql | | |
marc-danie | 0569a8f3910 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into feature/HCCRCSCHEDULIN... | | |
Marc-Danie Nazaire | 9dd28e65745 | Merge pull request #63 in HCCRCSCHEDULER/scheduler from feature/HCCRCSCHEDULING-5098-subjects-module-search to develo... | | |
marc-danie | d09ba3aa147 | HCCRCSCHEDULING-5098 - Subjects Module: Search Criteria : Last name and First name - split last and first name to sep... | | |
Xavier Haurie | 3cdd691a42d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Jill Singer | f8dde8a2600 | moving common css to appts.css | | |
Xavier Haurie | ec57fc8c01b | HCCRCSCHEDULING-5101 : fix bugs, refactor | | |
Jill Singer | 7de81083cc1 | Merge branch 'develop' into hold-appts-backend-plus | | |
Marc-Danie Nazaire | 276dcd2360d | Merge pull request #62 in HCCRCSCHEDULER/scheduler from feature/HCCRCSCHEDULING-5098-subjects-module-search to develo... | | |
marc-danie | 0d0a2f6d404 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into feature/HCCRCSCHEDULIN... | | |
marc-danie | 3ed170c419b | replaced the old Subjects page with the new Subjects (beta) page | | |
Jill Singer | baaaae30fc5 | HCCRC-HCCRCSCHEDULING-5123
gender block text at the bottom of the home page: fix | | |
Xavier Haurie | 0db6db5ffcf | HCCRCSCHEDULING-5101 : completed the spec | | |
Jill Singer | e65b8622895 | HCCRC-HCCRCSCHEDULING-5123
gender block text at the bottom of the home page: fix | | |
Xavier Haurie | 27a5330ddff | merge develop into HCCRCSCHEDULING-5101 | | |
marc-danie | 5f8200615e3 | modified to perform subject search if user presses enter in one of the search fields | | |
Xavier Haurie | 27052e4280a | fixe update.sql script - don't drop subject.mrn column, it breaks the Subject entity | | |
marc-danie | f3a42fd2998 | HCCRCSCHEDULING-5098 - Subjects Module: Search Criteria : Last name and First name
and also removed some unused funct... | | |
Xavier Haurie | 12977f331af | fixe update.sql script | | |
Xavier Haurie | f182ec27629 | Revert "changes required for code to be in sync with database"
This reverts commit 4d57ef01191007bddc07cd77dbb532dd6... | | |
Jill Singer | 832c8f0c74f | cleaning up css; no change in functionality | | |
Xavier Haurie | 67c1ed5920a | Merge branch 'develop' into feature/HCCRCSCHEDULING-5104-switch-subject
# Conflicts:
# data/src/main/sql/update.sql | | |
| Next → |
