 Carl | aa07fe516c1 | pw reset, first pass | | |
 brian | 10b938c158f | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 13c47bd4112 | I set site to default to "nss"(no site specified) in fake subjects when only number of subjects is specified. | | |
Carl | 140dc069826 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 5186d24b02d | subtle widespread changes to support access_denied page. could revert some of them if nav-tabs are allowed in the acc... | | |
 Jill Singer | add44db872e | HCCRCSCHEDULING-5421 fix | | |
Jill Singer | c56a8e2c25a | adding tableControls class | | |
Jill Singer | 3f3594377ee | fixing styling for the go button in the tableControls | | |
Jill Singer | a677443c568 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 2a1555681f7 | alternate resource: fixed stylings | | |
Carl | 433e230b998 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 4d73107e27f | rogue onLoad()'s moved to done() | | |
 marc-danie | 4ad15eccdd8 | Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# web/src/main/webapp/css/style-minus-header... | | |
marc-danie | e7c46f3eb52 | Updated styling for the dialogs on the home and appointments page and also migration most of the styling in appt.css ... | | |
Jill Singer | 5c7f82ff9dc | tweaked css; removed coloring text when a column is being sorted, aligned top left of study_detail#StudyDetail | | |
Jill Singer | 4bcf69ea673 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
 Xavier Haurie | 3ec7e6cee6b | More success with mocha this time. | | |
Carl | c161b390764 | assimilated three sub-pages of resource tab, and tweaked the resource page | | |
Xavier Haurie | ecbe67fd318 | More success with jasmine: load all js files for scheduler, run an assertion of the existence of jQuery in the global... | | |
Xavier Haurie | 294bcd585dd | More success with jasmine: load all js files for scheduler, run an assertion of the existence of jQuery in the global... | | |
Xavier Haurie | 9448fae86e8 | More success with jasmine: load all js files for scheduler, run an assertion of the existence of jQuery in the global... | | |
Jill Singer | e0b0e02b0a0 | changed table header to be blue; and changed arrows too | | |
Xavier Haurie | dd17f491265 | A simple test harness which includes the jquery lib file from the main source code, and successfully sees the jQuery ... | | |
Jill Singer | 85d0eec2564 | playing with tab colors; adjusting table controls | | |
Carl | efa305aac12 | Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
data/src/main/sql/update.sql | | |
Carl | ab8743042ab | empty out update, archival status shouldn't need update if populate fake does its job right | | |
brian | 7e03d362410 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 78acf136e37 | Fixed archival_status from A to null. | | |
Jill Singer | 1af7b8ec552 | Revert "removed alerts when saving a study (or creating one)"
This reverts commit 62885470aff77cb66dd25a9cde1b25afb5... | | |
Jill Singer | c1b7117f4f1 | working on temporary adjustment resources page | | |
Jill Singer | 62885470aff | removed alerts when saving a study (or creating one) | | |
Jill Singer | abea38477b8 | the statusBlock is now colored differently by status | | |
Jill Singer | 66e879b64c8 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 305597da61d | made go button in the pagination look better, now the subtabs have the correct font size | | |
Jill Singer | 70b79cd80f5 | removing widths | | |
marc-danie | 0549ff72ef9 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 107f53af027 | HCCRCSCHEDULING-2986 - Home and Appointments: Sublocation filter buttons are not highlighted when selected and also a... | | |
Carl | d2db5d1f3dc | more new skin for management 'sub pages' | | |
Xavier Haurie | 0e2f5303e85 | fixed pom file to actually run mocha test | | |
Xavier Haurie | 67fd3030984 | Run mocha test suite from Maven. | | |
Carl | 9eed539d176 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 410d0a5903f | Oops, remove redundant ready() | | |
Xavier Haurie | fa988bca4da | set up minimal Mocha test framework + harness. Runs from the web directory with the command 'npm test'.
Does not run... | | |
Jill Singer | c028b8cf89c | fixing more resource css problems; round 2 : removing fixed widths and making the resource subtab content fit properl... | | |
Jill Singer | 701ca6e3e8d | fixing resource css problems; round 1 | | |
Carl | 3630f6d8252 | Remove dev note. | | |
Carl | 49930b4175d | FIrst step for reskin of management tab.
Change any bogus archival-statuses of 'A' to null. | | |
Jill Singer | e749961759f | moved roboto font import to top to fix header, made table striping more subtle, and fixed some colors on the gantt ch... | | |
marc-danie | 912013af92f | added sourceUrl for debugging purposes | | |
marc-danie | 11b854b42ae | updated to new skin | | |
marc-danie | ddf276dc46a | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 7162a2b09eb | updated to new skin | | |
Jill Singer | 0112eaca1cc | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 5c398593fe9 | style tweaks; adjusting colors and font sizes | | |
marc-danie | 304f24a2b54 | added createCombobox function | | |
marc-danie | c8cd1031c35 | edited styling of the resource detail page | | |
marc-danie | 578e7d9f733 | updated to new skin | | |
marc-danie | 4508285fec9 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | f2ae889328d | fixed css for sublocations tab headers | | |
Jill Singer | 6e8fa09851c | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 60cc5e418b9 | adjusting the table; the sorted column now has the font color changed; is not underlined anymore | | |
marc-danie | e0e5e9ac3c1 | updated Query UI Theme | | |
Jill Singer | 7ef9fa33074 | added the new qunit files to the license exclude list, cleaned up the css table generator left border, fixed the down... | | |
Jill Singer | 6eb498e4463 | added class to the resource table controls too; the code adjusted some licenses as well | | |
Jill Singer | 383d0dd2245 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | e3e53812eed | templatized visit_details.html; merged the two new style sheets (new-skin and style-minus-header) into style-minus-he... | | |
Xavier Haurie | 7cc194e95c0 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 307e5648fb5 | fix bugs in refactored resource details pages | | |
brian | 1d3e19cb0e4 | Quick formatting fix to realign pages. | | |
marc-danie | 381c815c7b0 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 9c708ef76d8 | initial qunit tests | | |
Jill Singer | 6837af929a8 | Merge branch 'templatizing' into develop | | |
Jill Singer | f3c5d6cd10c | Merge branch 'templatizing' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into templatizing | | |
Xavier Haurie | 010565eaecf | re-factored resource details page to use new templates and bootstrapping | | |
Xavier Haurie | e60651d3268 | moved call to app_runIdleTimer | | |
Xavier Haurie | 68ccb93a18c | re-factored resources main page to use new templates and bootstrapping | | |
Xavier Haurie | c5a92bf0c7a | Revert "made a note of code review comments to be implemented later"
This reverts commit 2306823aace07fca64510ef0619... | | |
Jill Singer | 98fdedfe5fd | now loading extra headers (javascript files) as well for create visit | | |
Jill Singer | 640b65cadb7 | Merge branch 'templatizing' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into templatizing | | |
Jill Singer | 90968b86290 | create_visit reskinning; first pass | | |
brian | 85d8be43767 | Added header and footer to home and appointment batch. Also condensed the appointment module a meta headers. | | |
Xavier Haurie | fc259b67129 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 2306823aace | made a note of code review comments to be implemented later | | |
Jill Singer | 0ec1ec040cb | reskinning on study_detail.html | | |
Jill Singer | a886481e1df | reskinning/restyling create_study.html | | |
Jill Singer | 9e88da14df8 | re-skinning study_screen.html; will affect other pages that use this same css (re-skinned pages) | | |
marc-danie | 41ef1f18526 | refactored some code in displaySubjectOverview into generateSubjectDetailHtml function | | |
 Ansible Deploy | 40de1e1bdf6 | Merge release branch hotfix/3.0.1 into master. | | |
Ansible Deploy | 0ed41d4c48d | Update POMs with release version 3.0.1. | | |
Xavier Haurie | 46b8e43b929 | rewrote breadcrumbs to be a data-driven function with its own closure. | | |
Xavier Haurie | f2e222ccca7 | factored out the success and error callbacks for the ajax call in apptDoSearch() | | |
Xavier Haurie | 0ec4bf4f438 | factor out the code for making the list of calendat events | | |
Jill Singer | 518b13320f3 | put header and footer on visit_approval.html | | |
Xavier Haurie | d4cc5ca85d0 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 55f4470d4e7 | factored callbacks out of call to create the calendar | | |
Jill Singer | 39418b47102 | re-orged the java classes and stylesheets for visit_detail.html | | |
marc-danie | 3fcf6cb21c4 | more changes to displaySubjectOverview to reduce complexity | | |
Jill Singer | 087e8b9a042 | starting to templatize visit_details | | |
marc-danie | 3897632d25b | more refactoring of handleReloadPreviousSearch function | | |
marc-danie | d2578d8d19a | removed typo | | |
marc-danie | 9c7677438a4 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 633c9ba110b | reduced complexity in the handleReloadPreviousSearch | | |
Jill Singer | 2b57dc886d7 | fixing typo | | |
 Ankit Panchamia | 05e1419dbdf | fix for HCCRCSCHEDULING-5403 - Appointments-Listview: For a study staff, the filter for "Subject Last name" and "MRN"... | | |
Ankit Panchamia | 097cff132f2 | fix for HCCRCSCHEDULING-5403 - Appointments-Listview: For a study staff, the filter for "Subject Last name" and "MRN"... | | |
Ankit Panchamia | ef495fe7b32 | fix for HCCRCSCHEDULING-5403 - Appointments-Listview: For a study staff, the filter for "Subject Last name" and "MRN"... | | |
Ankit Panchamia | 7caf2ac2777 | fix for HCCRCSCHEDULING-5403 - Appointments-Listview: For a study staff, the filter for "Subject Last name" and "MRN"... | | |
Jill Singer | 660ebd51a2d | Merge branch 'develop' into templatizing | | |
Jill Singer | a3797c35808 | playing with templatizing...visit details | | |
Jill Singer | f56ca492956 | working on study_member; and refactoring out common init code | | |
marc-danie | ab0c0e05ea6 | refactored by creating displayBadNewsDiv and also some code cleanup | | |
Ankit Panchamia | 64338d8ae1c | updated version to 3.0.1-SNAPSHOT | | |
Ankit Panchamia | f8338175ce2 | updated pom.xml to 3.0.1-SNAPSHOT | | |
Jill Singer | 34784b604c6 | starting to templatize study_member.html; added feedback handling to study_detail.html | | |
marc-danie | 1f253a8cd57 | extract some code into a SubjectData class and added junit test | | |
Jill Singer | f9609e715da | refactored; changed method name to be more accurate; now setting footers and headers(including meta) in the study de... | | |
brian | 6697dc6530e | Put in meta headers and extracted common javascript files to extra_headers. | | |
marc-danie | c77e2dae552 | changed == to === | | |
marc-danie | 8126f3843ec | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | e58ca85607c | refactored code in processSubject and for reloading previous search results into displaySubjectOverview and handleRel... | | |
Carl | 4b7c9ac08d7 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | db562f20665 | data *further* migrated up to 3.1, by folding old update into base, and by following https://open.med.harvard.edu/wik... | | |
Jill Singer | ea775e58808 | create_study.html: footer and header | | |
Xavier Haurie | b6660cea6e7 | renamed method to follow traditional camelCase | | |
Xavier Haurie | f881ba26715 | added comment with reason for no refactoring | | |
marc-danie | 317fec4ec36 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | d188af7e0b5 | moved global variables to global2.js and some consolidated if conditions | | |
Carl | 18ba0da5b29 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | c937d301712 | data migrated up to 3.1, by folding old update into base, and by following https://open.med.harvard.edu/wiki/display/... | | |
Ankit Panchamia | 8fcb0626878 | remove redundant windowResize property from appt calendar. | | |
Jill Singer | 49cd1834170 | 3 commits squashed together:
1. working on extracting out javascript files; first pass on create_study.html and stud... | | |
Carl | 6732cf15a5a | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 4dc77eaf41d | Merge from 3.1.0 branch | | |
Ankit Panchamia | cc01491f1d8 | updated pom to 3.1.0-SNAPSHOT | | |
Carl | a3250049147 | Merge remote-tracking branch 'remotes/origin/develop' into 3.1.0 | | |
Carl | 640bd6639e0 | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0 | | |
Ansible Deploy | db9280d42b2 | Merge release branch release/3.0.0-SNAPSHOT into master. | | |
Ansible Deploy | c080c48296b | Update POMs with release version 3.0.0. | | |
Carl | 13d2fb20c29 | interface for enums, for unit tests | | |
brian | 75c5a001c98 | Added header to appointment list, calendar and timeline. Modified Stylesheet to reflect changes made in style-minus-h... | | |
Xavier Haurie | 179be4e42fa | Merge branch '3.1.0' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into 3.1.0 | | |
Xavier Haurie | 3e0dc39eed7 | code review feedback from Marc-Danie | | |
marc-danie | 5191ae063e8 | added condition for no overlap in the getOneDayDurationTest method | | |
Xavier Haurie | 309abe1df4a | Merge branch '3.1.0' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into 3.1.0 | | |
Xavier Haurie | 5126d9b09fe | factored out code used to initialize Date UI's | | |
marc-danie | f4aadea967c | refactored and added junit tests for the updateUser method | | |
marc-danie | 51efaf6ac9e | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0
# Conflicts:
# core/src/test/java/edu/harvard/catalyst/schedu... | | |
marc-danie | 7e073bb1684 | refactored and added junit tests for the updateUser method | | |
Xavier Haurie | 5b48b572455 | Created regression unit test before refactoring | | |
Jill Singer | c5ade3fbf08 | now using header.html | | |
Jill Singer | 1cbd4f01d9e | css tweaks for header | | |
Jill Singer | 5f06937291f | making progress on header | | |
brian | 5c6f35f6c7a | Added templatized footer to appointment list, calendar and timeline. I also fixed the font difference between appoint... | | |
Xavier Haurie | 78a8ca05bfa | Created regression unit test before refactoring | | |
Carl | 5c27637cb94 | cleanup after basic auth merge | | |
Carl | e4c78b25c79 | Merge remote-tracking branch 'origin/3.1.0' into 3.1.0
Conflicts:
core/src/main/java/edu/harvard/catalyst/scheduler... | | |
Carl | e24717884ea | Basic auth from develop
Merge remote-tracking branch 'remotes/origin/develop' into 3.1.0
Conflicts:
core/src/test/... | | |
Carl | ccd3e46e8bc | correct version in the README | | |
Carl | 92a0bb1a7a9 | correct version in the poms | | |
Jill Singer | abcbe509e6b | Merge branch '3.1.0' into templatizing | | |
Carl | d93b6836087 | Merge remote-tracking branch 'remotes/origin/develop' into basic-authentication | | |
Carl | 3774ca0a24f | clean up properties | | |
marc-danie | 999522e34e0 | added junit test testGetUserData | | |
marc-danie | 9683e5ff532 | updated junit test testGetUserData | | |
marc-danie | d8e0e3a7feb | added junit test testGetUsers | | |
marc-danie | 777aa269d13 | updated junit test testGetUsers | | |
marc-danie | 172f8593450 | added junit test testGetUsers | | |
marc-danie | 4c16320696c | added junit test testDetermineAnnotationsString | | |
marc-danie | f4ad8887c3f | added junit test testDetermineAnnotationsString | | |
marc-danie | b9e5fdfb41e | added junit test testResourceOverlapsDayOffset | | |
marc-danie | fa9b5f7721d | added junit test testResourceOverlapsDayOffset | | |
marc-danie | 5d5ebd4e0cd | added junit test testOccursInOneDay | | |
marc-danie | 4ff0d53bf2b | updated junit test testOccursInOneDay | | |
marc-danie | 7c16457a458 | updated junit test testOccursInOneDay | | |
marc-danie | 9344a8d7288 | added junit test testOccursInOneDay | | |
marc-danie | 84486241fab | added junit test testExportToExcelReports | | |
marc-danie | 2aec8d7ec56 | added junit test testExportToExcelReports | | |
marc-danie | 6d3feddd80c | added junit test testGetReport | | |
marc-danie | 88cc8722fcb | added junit test testGetReport | | |
marc-danie | 3e78910708e | added junit test testGetReports | | |
marc-danie | 8c8407fd785 | added junit test testGetReports | | |
marc-danie | abff9eed16b | added junit test testGetReportData | | |
marc-danie | fcbe854a418 | added junit test testGetReportData | | |
marc-danie | 19a8ad2f1a8 | added junit test testLogViewReport | | |
marc-danie | 7ed9d35a693 | added junit test testLogViewReport | | |
marc-danie | 8bd56e4123a | added junit tests testLoadResourceTypes and testLoadSublocations | | |
marc-danie | a30f0b7a116 | added junit test testLoadSublocations | | |
marc-danie | 4bd5cd00d5f | added junit test testLoadResourceTypes | | |
| Next → |
