 marc-danie | ca15932a896 | DialogsUtil.showMessageDialog is now used to display the session timeout message and modified the alert after updatin... | | |
 Xavier Haurie | 247e06f36b5 | progress on Resource creation and edit form | | |
marc-danie | 3459b955924 | code cleanup removed references related to removed file studySubject_grid.html | | |
marc-danie | 21c7bca545d | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 2a90f4be9c7 | changed alert message after approving a visit template to a dialog message and also modified the DialogsUtil.showMess... | | |
 Jill Singer | c3fb2aeeadd | the header row of all tables are now colored: blue background, white text | | |
marc-danie | 6aee11f1a3e | moved dialogs.js to js/util directory | | |
marc-danie | 00a23834ff1 | fixed font color on the dialog title | | |
marc-danie | 2c1a87fad53 | updated Resources page to use the DialogsUtil.showConfirmationDialog function | | |
marc-danie | 6cd92ae26b8 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 3db60899c5a | more updates to Home and Appointments pages to use the DialogsUtil.showConfirmationDialog function and also change cl... | | |
Jill Singer | 323471c85b1 | reskin-try: redoing table css for scrolling; so the tables scroll vertically; but making sure that a horizontal scrol... | | |
marc-danie | 72b7cca0017 | removed Scheduled Appointments header text on the appointment page | | |
marc-danie | 5e1e6fdb137 | updated Home and Appointments pages to use the DialogsUtil.showConfirmationDialog function | | |
marc-danie | 16476885399 | updated Studies pages and Management page to use the DialogsUtil.showConfirmationDialog function and also updated the... | | |
 brian | 0c3d312dc6f | Adding in some placeholder methods for the bulk activate REST calls. | | |
brian | bfc88197ed4 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
marc-danie | 29924a3ea25 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 2c9ae9052ec | created DialogsUtil with showMessageDialog and showConfirmationDialog functions | | |
 Carl | 90ac9f70af4 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | ce34448cb5a | progress on temp adjustment | | |
Jill Singer | 4a5e924818a | reskin-try: minor css changes; including changing the footer and header to the same blue as the zen support tab | | |
Jill Singer | 4c5c8283c64 | reskin-try: cleaning up css | | |
brian | 61267ac9686 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
marc-danie | 16a65fec179 | added background color to the dialog close icon | | |
marc-danie | e566f4157db | replaced newButton class with newItemButton and textLeft class | | |
marc-danie | 928b41b2b3c | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 6a9b0d84560 | added bottom border to the dialog titlebars and removed max height on the loginWrapperSize | | |
brian | 4f0862a078b | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | fe02fcad815 | Fixed the toggling and fixed some style. Start of rest call work. | | |
Xavier Haurie | d12def6662a | got rid of code for setting list of resource names, which is no longer needed. | | |
Xavier Haurie | 35d53427afe | modify alternate resource combo boc to allow multiple selections; to achieve that, modified createResourceCombobox to... | | |
Xavier Haurie | bcbbac17230 | fix UI bugs in resource form | | |
marc-danie | bbcc1a8c716 | added missing semicolon | | |
Xavier Haurie | f2d585fed5b | remove borders from resource form (layout table at top of form);
remove constraint on minimum height for alternate re... | | |
Xavier Haurie | 9c9f54349f4 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | ca859e88edc | in-line adding of alternate resources (one at a time) | | |
marc-danie | 12d37eae220 | added new styling for the message dialogs | | |
marc-danie | 75ab096368e | added missing multipe select javascript file | | |
Xavier Haurie | 2fba6413485 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 7ec0332f929 | cremove code which toggles the visibility of the button for adding an alternate resource; clean up some unneeded HTML... | | |
Carl | 4ab14ecf3bf | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 7fc37bef529 | temp adj is progressing. it seems to be able to display existing TA's, and validation for add seems OK.
haven't yet c... | | |
marc-danie | 151acf32751 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | f6339f83632 | added missing dialogs.js file | | |
Xavier Haurie | f9f018a1f49 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | e3cd55cdfc7 | create combo box for choosing alternate resource;
clean up table pagination controls | | |
Jill Singer | e76bd292ada | improving css; adjustments to tables and the wizard for the new font | | |
Carl | 9e6b49827c4 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 9b940c6bb58 | another baby step with temp adjustment html | | |
brian | b8ec488b37a | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 9d40d86e763 | Added some functions to toggle and untoggle resources. | | |
brian | a4c34891af1 | Also added in checked boxes and redid how I originally hid columns.
Merge branch 'develop' of https://open.med.harvar... | | |
Carl | c4886ccc03b | baby step with temp adjustment html | | |
Xavier Haurie | ffff6b1f717 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | c0fcf228aeb | display list of all resources in alternate resources section | | |
Carl | cd600242c97 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | ab87ab19ce1 | resource 'more action' goes to new-ish resource_form.html | | |
marc-danie | 6f5714f776a | added needed widget_util.js and EasyUI combobox js and css files for the resources pages | | |
marc-danie | abf4961f895 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | c4d96e2dcf1 | added missing widget_util.js file | | |
Xavier Haurie | 2215be61d8d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 8c129d19ce6 | renamed create_resource.html to resource_form.html | | |
Carl | cf43172bbc5 | centralized version of datepicker | | |
Xavier Haurie | 9be4cbba9b2 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | bc226a6e564 | some progress on resources create/edit | | |
brian | da7a210fe9d | Added disappearing and appearing elements for bulk activate. | | |
Jill Singer | b7601835d20 | refactoring setupTable; moved to global2.js, removed unneeded/NOOP lines, and now 2 tables in study_module.js are usi... | | |
marc-danie | efa37deec41 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 04bc6a73763 | modified so that the filter button is attached for the filter by subject last name field | | |
Jill Singer | 9e74496cc65 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | e693e92c73b | reskin-try: adjusting colors of table headers | | |
marc-danie | a14e262bc08 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | c2624cbf4cd | modified to not allow the changeMonth, changeYear, and numberOfMonths to be customizable in the createDatepicker func... | | |
Jill Singer | 956d12e8c65 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | bf35412ca26 | reskin-try: adding a color to the background for table headers (for the appointment wizard and the switch subject), ... | | |
marc-danie | 2c7662ddb1b | created createDatepicker function in WidgetUtil | | |
marc-danie | d25438d8058 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 26f2d7f95cf | fixed bug with the home calendar not rendering correctly when toggling back from list view to calendar view | | |
Carl | c89058df4f3 | Adjust appearance of resource landing page. Tweak DAO code. | | |
Xavier Haurie | 70e72360186 | minor code cleanup | | |
Xavier Haurie | 5dec93a945e | fixed validation for resource creation: validate shared resource before saving new resource | | |
Xavier Haurie | 1f15ff4cbe6 | Merge branch 'feature/resource-management' into develop | | |
Xavier Haurie | f168467893f | fixed resource creation form | | |
marc-danie | bdc5664f952 | moved the Schedule New Appointments button on the appointments page to be before the calender keys | | |
marc-danie | 1d4250e6e5f | moved the Schedule New Appointments button on the appointments page to be before the calender keys | | |
marc-danie | 4afc5d4854a | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 91f806355da | removed fixed width 400 on all of the select fields | | |
Jill Singer | dfd16c4cba8 | reskin-try: putting back css to align buttons in filters | | |
Jill Singer | d15380e87b0 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | b51326ba3d2 | license headers added by system | | |
Carl | 2038a373c5f | Merge branch 'feature/resource-management' into develop
Conflicts:
web/src/main/webapp/create_resource.html
web/sr... | | |
Jill Singer | c3c9f3949ce | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | f9c8f4b501f | reskin-try: adding back filter css that got removed in a merge by mistake | | |
marc-danie | 847742f2c11 | added simpleFilterContainer class styles | | |
marc-danie | b89ffe80140 | added back gradient background on the tabs | | |
Jill Singer | 69a33ecfb2f | reskin-try: working on simple filter container; all the filters in the wizard now look much better and are controlled... | | |
Jill Singer | b46c484761b | reskin-try: working on filter button in appt wizard (first page) | | |
marc-danie | fed05942262 | changed the default active tab to All Sublocations for the sublocation tabs in the calendar view | | |
Carl | bbb3c4dbb57 | Filter for resource-sublocation corrected for resource page. | | |
marc-danie | cbee944d018 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 94dbda406bc | fixed font of month, week, day color toggle on home and appointments page and increased the font weight on the report... | | |
Xavier Haurie | 510d5263436 | license headers added by system | | |
Xavier Haurie | 70a8a647ed6 | ignore web module's test output | | |
Xavier Haurie | b5226a11fe8 | cleaned up and and added comments to share karma config file | | |
Xavier Haurie | a7ae7b478dc | put all the test output (unit tests results as well as line coverage info) under test-output directory | | |
Xavier Haurie | d45e7754547 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 1bfc40dd28c | added local javascript sonarqube support | | |
marc-danie | f4c707fd681 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 27770a6492f | modified to hide the calendar key when in list view on the home page | | |
Xavier Haurie | 813d37acdb8 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Carl | 952fdfbd98a | Adjust resource search: no more and/or radio buttons. Active status is RO text.
Merge with develop. | | |
Xavier Haurie | 0fe746f4528 | better syntax for expressing 2-step karma configuration (shared + maven vs standalone run) | | |
Carl | 16c1bddfcc4 | Adjust resource search: no more and/or radio buttons. Active status is RO text.
Merge with develop. | | |
marc-danie | 8e41660be8e | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 0e3b8d8425c | moved jquery ui css delta out of global.css into jquery-ui-delta.css | | |
Xavier Haurie | ada6b32b5c8 | rationalized karma config files so they share a config file with most of the settings, which reduces chance of differ... | | |
Xavier Haurie | 4b0b5fbe18d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 3b5fe9c7fdf | cleaned up .gitignore | | |
brian | 2717dc21a34 | Fixed some merge issues with resources page. | | |
marc-danie | dc235532640 | fixed font color of tabs on the home page | | |
marc-danie | 1790d0e8076 | removing unused css file | | |
marc-danie | c9bda9350ad | fixed the tabs on the appt_timeline and the font sizes and colors | | |
marc-danie | 068e71b5d36 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | b06b86c3c5e | changed tabs and reset button on the appointments and home pages | | |
Carl | 148c75cd100 | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management | | |
Carl | 79872403dca | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management
Conflicts:
web/src/main/weba... | | |
Carl | 49f9e76af7f | Merge remote-tracking branch 'remotes/origin/develop' into feature/resource-management
Conflicts:
web/src/main/weba... | | |
Jill Singer | 9e569716197 | fixing error with removing the extra_headers file; the wrong extra_headers was pasted in; correct now | | |
Jill Singer | 4060ce450a2 | reskin-try: setting colors for header, footer, primary table header, and navigation menu | | |
Xavier Haurie | e9594253fcf | finished removing YET another instance of loading extra headers (was not completely done) | | |
Xavier Haurie | c7dc91dc538 | finished removing another instance of loading extra headers (was not completely done) | | |
Xavier Haurie | d482c3756d4 | unfinished business reformatting HTML? | | |
Xavier Haurie | ac7ac2d0b33 | put code format file under source control | | |
Jill Singer | 13b31deb6bf | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 09f9723cafa | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | c17103afe8a | re-format code, with 2-space indents for HTML | | |
Xavier Haurie | 5088685cbeb | re-format code, with 2-space indents for HTML | | |
Jill Singer | 978fa0168d5 | reskin-try: better aligning date picker, and moved some styles to appt_calendar.css | | |
Xavier Haurie | e7fad2f5896 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
# Conflicts:
... | | |
Xavier Haurie | b9e607844d7 | lots of code clean-up, including removing the "extra_headers.html" and adding the script tags back to the files where... | | |
marc-danie | 2ab0d3a9180 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 28f5a0e7108 | Modified to use createCombobox function that is in WidgetUtil and created createResourceCombobox function | | |
Jill Singer | 3a1946a105b | removing all but one of the red calendar buttons; leaving the one on the search subject page because it is needed for... | | |
Carl | 5d7eb8d203d | refactor search resource, including allowing ANDing or ORing the criteria | | |
marc-danie | bc32a582afa | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | a5b396b14c6 | adding icons for jQuery EasyUI | | |
marc-danie | 5470c0e3710 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | e22031203f7 | adding icons for jQuery EasyUI | | |
Jill Singer | 1c82ce2c7f4 | got rid of duplicated code, and now using unselectRow for going back (using the previous key) in the appt wizard | | |
Jill Singer | 3c80368549f | changes from today's review; cleaner better code but not change in functionality (to hoverable/selectable tables) | | |
marc-danie | 6b035e328bc | Modified subject search and subject details to use createCombobox function that is in WidgetUtil and made the createC... | | |
marc-danie | 4de1a4a0789 | Modified to use createCombobox function that is in WidgetUtil | | |
marc-danie | a2d9393393c | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 227549fef93 | Created a createCombobox function that will be used to create all the type ahead drop downs | | |
Jill Singer | e5befdddde0 | table reskin: first round
changed the tables in the create appointment wizard and the switch subject workflow;
at th... | | |
Jill Singer | 166c9a1abf4 | changed alert to dialog when rescheduling an appt | | |
Xavier Haurie | de6713a5d99 | refactored resourceModuleRoles() function, testing against the jasmine test committed just before | | |
Xavier Haurie | d6f74faa716 | moved "extra_headers" back into the resources html files;
added a jasmine test for the visibility of various controls... | | |
marc-danie | 8e2761d4e52 | fixed the comboboxes on the create study page and also fixed errors in the jasmine tests caused by missing javascrip... | | |
Carl | e5a2ffbd231 | stabilize jasmine tests | | |
Xavier Haurie | bc0c7074ace | Merge branch 'develop' into feature/resource-management
NOT WORKING -- Asynch.js tests not working for Xav
# Confli... | | |
marc-danie | e57a51f55f9 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
marc-danie | 95c8138b81e | modified to allow searching on multiple values for resource name, type, or sublocation field | | |
Carl | 8a7c36eee16 | change alert to showMessageDialog | | |
Xavier Haurie | 92a6ce3ebf7 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | cb29fcf3284 | fixed resource creation unit test | | |
marc-danie | 19d40df7c25 | modified search to be triggered on input into the text field | | |
marc-danie | 7b42765a8cf | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | c6a4b127df4 | modified search to be triggered on input into the text field | | |
Carl | d315b24692e | oops, restore general version of karma.conf | | |
Carl | 804f08d4c77 | eliminate unused classes related to a matcher and cleaner that are no longer relevant. adjust some one Subject method... | | |
Carl | 523d5be56cc | clean up jasmine test-pattern so that it doesn't need to leave spoor in production code | | |
Carl | 61426064148 | use both site and code to find mrn, instead of (previously) just site | | |
Xavier Haurie | b207ca9c101 | make shared resources work in resource creation form | | |
Xavier Haurie | c762e1087f8 | display resources combobox for shared resource in create resource form | | |
Xavier Haurie | 859939ce705 | better-displayed annotations | | |
Xavier Haurie | 85ca2000d07 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | 3351cdb1989 | display annotations list on resource creation form | | |
Carl | 94b1903dc48 | pattern for testing asynchronous functions with jasmine and sinon | | |
marc-danie | d33ff600479 | added resource search and resource activate and deactivate feature | | |
marc-danie | 0bc427b1397 | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 3f3d0fa1017 | jquery easyui searchbox and switchbutton | | |
Xavier Haurie | 914ac4b6e60 | add stand-in for annotations list in create resource form; 75% code for listing line level annotations in create reso... | | |
Xavier Haurie | a187aef5d03 | fixed bugs in resource creation success callback | | |
Jill Singer | df7a6518c9b | 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 | 20976c4163c | changed DTO variable for resource name so it matches front-end code; also verified that resource-sublocation row is c... | | |
Xavier Haurie | ce30b646220 | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
| Next → |
