 Xavier Haurie | 304d05feb53 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 147f3db549f | create combo box for choosing alternate resource;
clean up table pagination controls | | |
 Jill Singer | f4287aeee84 | improving css; adjustments to tables and the wizard for the new font | | |
 Carl | 65adde7ba03 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | fb1f4013833 | another baby step with temp adjustment html | | |
 brian | 57999858034 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | b455944a88e | Added some functions to toggle and untoggle resources. | | |
brian | e31af7d63a3 | Also added in checked boxes and redid how I originally hid columns.
Merge branch 'develop' of https://open.med.harvar... | | |
Carl | d1a4389e28d | baby step with temp adjustment html | | |
Xavier Haurie | dcba894d246 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 5b1f4202947 | display list of all resources in alternate resources section | | |
Carl | 3c56ea37935 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | b13299946a2 | resource 'more action' goes to new-ish resource_form.html | | |
 marc-danie | 43c6aaae56d | added needed widget_util.js and EasyUI combobox js and css files for the resources pages | | |
marc-danie | 93ee8bfac4f | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | f22aae37a17 | added missing widget_util.js file | | |
Xavier Haurie | 8176574f7ec | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 3e3201cb3cd | renamed create_resource.html to resource_form.html | | |
Carl | d7f526bdbea | centralized version of datepicker | | |
Xavier Haurie | 27bc7dfc2b0 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | dc2bba8ab6c | some progress on resources create/edit | | |
brian | 45a5712e9df | Added disappearing and appearing elements for bulk activate. | | |
Jill Singer | d9cc2ef3dad | refactoring setupTable; moved to global2.js, removed unneeded/NOOP lines, and now 2 tables in study_module.js are usi... | | |
marc-danie | 3280c02bef3 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | b3ca1d57fb6 | modified so that the filter button is attached for the filter by subject last name field | | |
Jill Singer | 2790e9ee7b6 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 434d6eb2c38 | reskin-try: adjusting colors of table headers | | |
marc-danie | a8baf9a678e | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | b8f70495bfa | modified to not allow the changeMonth, changeYear, and numberOfMonths to be customizable in the createDatepicker func... | | |
Jill Singer | 64bc8f3d1f7 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | e72fef9d55f | reskin-try: adding a color to the background for table headers (for the appointment wizard and the switch subject), ... | | |
marc-danie | 293348f89c0 | created createDatepicker function in WidgetUtil | | |
marc-danie | f7487db643e | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | ac991a1b178 | fixed bug with the home calendar not rendering correctly when toggling back from list view to calendar view | | |
Carl | 1c0c1e0d599 | Adjust appearance of resource landing page. Tweak DAO code. | | |
Xavier Haurie | fc0824edc2c | minor code cleanup | | |
Xavier Haurie | 39f1774b821 | fixed validation for resource creation: validate shared resource before saving new resource | | |
Xavier Haurie | 6b764160c52 | Merge branch 'feature/resource-management' into develop | | |
Xavier Haurie | ebaa046e8c2 | fixed resource creation form | | |
marc-danie | a2fed1689e0 | moved the Schedule New Appointments button on the appointments page to be before the calender keys | | |
marc-danie | d8d392407b1 | moved the Schedule New Appointments button on the appointments page to be before the calender keys | | |
marc-danie | f3598366a11 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 7b460d095b7 | removed fixed width 400 on all of the select fields | | |
Jill Singer | 367c5ada5c2 | reskin-try: putting back css to align buttons in filters | | |
Jill Singer | 47318ea2040 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 915195598f0 | license headers added by system | | |
Carl | 99251a837d0 | Merge branch 'feature/resource-management' into develop
Conflicts:
web/src/main/webapp/create_resource.html
web/sr... | | |
Jill Singer | 08a9ad9a1a6 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 58cd6d49ce1 | reskin-try: adding back filter css that got removed in a merge by mistake | | |
marc-danie | 415ec9de1fe | added simpleFilterContainer class styles | | |
marc-danie | c24ee3e64fa | added back gradient background on the tabs | | |
Jill Singer | 423d56d7372 | reskin-try: working on simple filter container; all the filters in the wizard now look much better and are controlled... | | |
Jill Singer | c0edfb324e2 | reskin-try: working on filter button in appt wizard (first page) | | |
marc-danie | ea7cc6e603a | changed the default active tab to All Sublocations for the sublocation tabs in the calendar view | | |
Carl | b74827fe87b | Filter for resource-sublocation corrected for resource page. | | |
marc-danie | e01086ac35f | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 028869f3a19 | fixed font of month, week, day color toggle on home and appointments page and increased the font weight on the report... | | |
Xavier Haurie | 1473053d45e | license headers added by system | | |
Xavier Haurie | 52fece16f63 | ignore web module's test output | | |
Xavier Haurie | ad261fa5781 | cleaned up and and added comments to share karma config file | | |
Xavier Haurie | 50b0a1743d3 | put all the test output (unit tests results as well as line coverage info) under test-output directory | | |
Xavier Haurie | 8ef43aaff39 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | d0e3c79545d | added local javascript sonarqube support | | |
marc-danie | 5078f855b03 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 10483d5b165 | modified to hide the calendar key when in list view on the home page | | |
Xavier Haurie | 17de6e7c7fd | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Carl | 2de84cbaa07 | Adjust resource search: no more and/or radio buttons. Active status is RO text.
Merge with develop. | | |
Xavier Haurie | 33efb28699d | better syntax for expressing 2-step karma configuration (shared + maven vs standalone run) | | |
Carl | b70fd514473 | Adjust resource search: no more and/or radio buttons. Active status is RO text.
Merge with develop. | | |
marc-danie | 87e83cf11e4 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 757ba638a73 | moved jquery ui css delta out of global.css into jquery-ui-delta.css | | |
Xavier Haurie | 8bf644217d5 | rationalized karma config files so they share a config file with most of the settings, which reduces chance of differ... | | |
Xavier Haurie | 9b6cfe2bdc9 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 3ace3460240 | cleaned up .gitignore | | |
brian | 1081d2f821f | Fixed some merge issues with resources page. | | |
marc-danie | c915fb072f1 | fixed font color of tabs on the home page | | |
marc-danie | f13bb3a4188 | removing unused css file | | |
marc-danie | 28c65d5d1b5 | fixed the tabs on the appt_timeline and the font sizes and colors | | |
marc-danie | 8d5243dd14f | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 82004b21fc2 | changed tabs and reset button on the appointments and home pages | | |
Carl | da80ce346e3 | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management | | |
Carl | c3ba15835fa | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management
Conflicts:
web/src/main/weba... | | |
Carl | 8540f3e0e49 | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management
Conflicts:
web/src/main/weba... | | |
Jill Singer | 327e65e7639 | fixing error with removing the extra_headers file; the wrong extra_headers was pasted in; correct now | | |
Jill Singer | 7aaff3d42f8 | reskin-try: setting colors for header, footer, primary table header, and navigation menu | | |
Xavier Haurie | f28c4799045 | finished removing YET another instance of loading extra headers (was not completely done) | | |
Xavier Haurie | 41755f6a09e | finished removing another instance of loading extra headers (was not completely done) | | |
Xavier Haurie | f484c0c9809 | unfinished business reformatting HTML? | | |
Xavier Haurie | 7553cb52af0 | put code format file under source control | | |
Jill Singer | 9229915d1a7 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | dc9437c8e6c | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | bba2f3836ed | re-format code, with 2-space indents for HTML | | |
Xavier Haurie | 643696589c5 | re-format code, with 2-space indents for HTML | | |
Jill Singer | df74afe49eb | reskin-try: better aligning date picker, and moved some styles to appt_calendar.css | | |
Xavier Haurie | 5d98984daec | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
# Conflicts:
... | | |
Xavier Haurie | 20ca7db38aa | lots of code clean-up, including removing the "extra_headers.html" and adding the script tags back to the files where... | | |
marc-danie | 365357894a8 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 0094c6ef53a | Modified to use createCombobox function that is in WidgetUtil and created createResourceCombobox function | | |
Jill Singer | 6dda067566f | removing all but one of the red calendar buttons; leaving the one on the search subject page because it is needed for... | | |
Carl | c86a4d8eb9c | refactor search resource, including allowing ANDing or ORing the criteria | | |
marc-danie | ea022f8f1eb | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 6a66d66aaf1 | adding icons for jQuery EasyUI | | |
marc-danie | 5678e6822eb | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 37d1d1d1eed | adding icons for jQuery EasyUI | | |
Jill Singer | db4dc70b165 | got rid of duplicated code, and now using unselectRow for going back (using the previous key) in the appt wizard | | |
Jill Singer | f2aea4aadf2 | changes from today's review; cleaner better code but not change in functionality (to hoverable/selectable tables) | | |
marc-danie | 4c1f682fa5c | Modified subject search and subject details to use createCombobox function that is in WidgetUtil and made the createC... | | |
marc-danie | 74b582962f8 | Modified to use createCombobox function that is in WidgetUtil | | |
marc-danie | 93cccb38a61 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 27bf5972aa2 | Created a createCombobox function that will be used to create all the type ahead drop downs | | |
Jill Singer | a1632f732d8 | table reskin: first round
changed the tables in the create appointment wizard and the switch subject workflow;
at th... | | |
Jill Singer | 54b1a05d6f2 | changed alert to dialog when rescheduling an appt | | |
Xavier Haurie | 93ab4be0633 | refactored resourceModuleRoles() function, testing against the jasmine test committed just before | | |
Xavier Haurie | 323e3fc8f19 | moved "extra_headers" back into the resources html files;
added a jasmine test for the visibility of various controls... | | |
marc-danie | 54baf2836b9 | fixed the comboboxes on the create study page and also fixed errors in the jasmine tests caused by missing javascrip... | | |
Carl | 0e4a80828b7 | stabilize jasmine tests | | |
Xavier Haurie | e313de4abcf | Merge branch 'develop' into feature/resource-management
NOT WORKING -- Asynch.js tests not working for Xav
# Confli... | | |
marc-danie | cff071a287b | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
marc-danie | ccd904f2867 | modified to allow searching on multiple values for resource name, type, or sublocation field | | |
Carl | a35a405a015 | change alert to showMessageDialog | | |
Xavier Haurie | 117b57b7fb4 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | c2e446e64bc | fixed resource creation unit test | | |
marc-danie | 01ea9e16604 | modified search to be triggered on input into the text field | | |
marc-danie | 7fe020cbcb8 | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 5abff4fd622 | modified search to be triggered on input into the text field | | |
Carl | 4cbc1928403 | oops, restore general version of karma.conf | | |
Carl | 7b84c4fd603 | eliminate unused classes related to a matcher and cleaner that are no longer relevant. adjust some one Subject method... | | |
Carl | 1f1bf05ac66 | clean up jasmine test-pattern so that it doesn't need to leave spoor in production code | | |
Carl | 60572740351 | use both site and code to find mrn, instead of (previously) just site | | |
Xavier Haurie | ebe24668733 | make shared resources work in resource creation form | | |
Xavier Haurie | 3d524b304e9 | display resources combobox for shared resource in create resource form | | |
Xavier Haurie | 3a514fc426c | better-displayed annotations | | |
Xavier Haurie | 63f744986e5 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | 4b7514b6aa4 | display annotations list on resource creation form | | |
Carl | c80a4cdfc80 | pattern for testing asynchronous functions with jasmine and sinon | | |
marc-danie | a56dc8c6bbd | added resource search and resource activate and deactivate feature | | |
marc-danie | cd1a5dffea8 | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 3943bcc00dc | jquery easyui searchbox and switchbutton | | |
Xavier Haurie | 0a623aeb46e | add stand-in for annotations list in create resource form; 75% code for listing line level annotations in create reso... | | |
Xavier Haurie | 464592644fd | fixed bugs in resource creation success callback | | |
Jill Singer | 27d9947a643 | switching to dialogs from alerts in editing and creating a resource, and fixed a bug in which a new resource's name w... | | |
Xavier Haurie | 0901d83d9ea | changed DTO variable for resource name so it matches front-end code; also verified that resource-sublocation row is c... | | |
Xavier Haurie | 508de826a2b | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | af38d2b84a8 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Jill Singer | 0252d314b5d | working on replacing alerts... | | |
Jill Singer | bd2d155e1c6 | fixing layout, neatened html (fixed indents) and moved the end of the wrapperSize div to *after* the footer for prop... | | |
Jill Singer | 1c7f551c4aa | setting hover background to visit details navigation buttons | | |
Jill Singer | 74f47ede454 | create_resource page, putting the wrapperSize div ending so it contains the footer | | |
Xavier Haurie | 80f5ddc63a6 | saves resource -- but not yet resource-sublocation | | |
brian | 3b6e98c5977 | Removed trailing comma and extra href parameter to resolve sonar issues. | | |
brian | 69c95cb8773 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
brian | 249c9aad6f5 | Added Unit Tests for createResource service call. | | |
Xavier Haurie | afdd1f24971 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | 7c3b8075beb | form validation complete (exception annotations which are not implemented yet) | | |
brian | 3e7f4f66c3d | Added a createResource rest call with corresponding service call and DTOs. | | |
marc-danie | c82891d0d6f | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 246762ea665 | now activation and deactivation is working without any validation | | |
Xavier Haurie | b4da592aa89 | wired resource types in resource creation form to static list from server | | |
Xavier Haurie | d24a5cf4b8b | added resource type to create resource form -- not wired to back end | | |
marc-danie | 71615c87b14 | changed the contents of the active column to be a switch toggle | | |
Jill Singer | 93eda94c452 | fixing bug; needed javascript file wasn't added to the subject_search html page; also adjusting margin so that the da... | | |
marc-danie | 61d8437987c | added Active column to the resource_sublocation table; | | |
brian | 999e46dfdc4 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | a6770e0a547 | Fixed rounding and margin on appointments pages. | | |
Jill Singer | 37d7f3eb3f4 | switched alert to dialog when editing or creating a new user | | |
Jill Singer | e49c5eeb666 | reskinning: minor tweaks: (no functional changes)
moved the calendar key at the bottom of the calendar to b... | | |
marc-danie | 79692ab12d9 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | a6b2ef9d656 | added missing css and js imports for EasyUI combobox | | |
Xavier Haurie | c71f32dfb51 | removed X_ where X is a number, from test file names | | |
marc-danie | 04c6a535856 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | e3215c27a2b | Added prompt and empty option to drop downs | | |
Xavier Haurie | 597b0995216 | x'ed offending test just so we have a clean build again. Also cleaned-up karma config files | | |
Xavier Haurie | 9b888527522 | x'ed offending test just so we have a clean build again. Also cleaned-up karma config files | | |
Xavier Haurie | 552f4c58bae | Merge branch 'try-karma' into develop
# Conflicts:
# web/karma.conf.js | | |
Xavier Haurie | d59c04a664d | Merge branch 'try-karma' into develop
# Conflicts:
# web/karma.conf.js | | |
Xavier Haurie | 75482272da2 | break the build on purpose -- to make sure front-end test failures cause the build to fail | | |
Xavier Haurie | 2e64b19b869 | removed js file which seems to break tests (to be investigated) | | |
Xavier Haurie | 145df72009b | fixed typo (extra .js in filename) | | |
Xavier Haurie | 7d4f84d3412 | removed unused flyway properties file | | |
Xavier Haurie | 8dfa6cefd8f | Merge branch 'try-karma' into develop | | |
Xavier Haurie | 443404ff85e | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | a272b922b61 | tweaked karma.conf.trythings.js and karma.conf.js to be more like each other | | |
Xavier Haurie | d1e70785269 | ajax callback spy works again | | |
Xavier Haurie | 5a59f0fdd7d | AppSpect works again. ALWAYS check that we are including all the required javascript files, such as utils.js in this ... | | |
Xavier Haurie | 67ba7672c99 | fixed the "__tryThings" spec | | |
marc-danie | 597e12daf12 | Merge remote-tracking branch 'origin/develop' into develop | | |
Xavier Haurie | 19487b8e37a | found a bug with running on Chrome | | |
Xavier Haurie | 525572c2f84 | some simplistic testing of appointments page | | |
| Next → |
