 Xavier Haurie | 42c0d73034c | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
 Jill Singer | 419d7fde3c1 | working on replacing alerts... | | |
Jill Singer | 8e53b95864b | fixing layout, neatened html (fixed indents) and moved the end of the wrapperSize div to *after* the footer for prop... | | |
Jill Singer | 11dc169471c | setting hover background to visit details navigation buttons | | |
Jill Singer | 7fe228a9563 | create_resource page, putting the wrapperSize div ending so it contains the footer | | |
Xavier Haurie | 47affcc83fa | saves resource -- but not yet resource-sublocation | | |
 brian | 583c2d31aae | Removed trailing comma and extra href parameter to resolve sonar issues. | | |
brian | b340064545b | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
brian | 49503bb9b78 | Added Unit Tests for createResource service call. | | |
Xavier Haurie | f4e0c32ac9e | Merge branch 'feature/resource-management' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into fe... | | |
Xavier Haurie | f4ee8add7cb | form validation complete (exception annotations which are not implemented yet) | | |
brian | 93f19693752 | Added a createResource rest call with corresponding service call and DTOs. | | |
 marc-danie | 82109547fe5 | Merge remote-tracking branch 'origin/feature/resource-management' into feature/resource-management | | |
marc-danie | 195620e2cc8 | now activation and deactivation is working without any validation | | |
Xavier Haurie | 616bea188a2 | wired resource types in resource creation form to static list from server | | |
Xavier Haurie | 9144927e2bf | added resource type to create resource form -- not wired to back end | | |
marc-danie | 11f2e7191bc | changed the contents of the active column to be a switch toggle | | |
Jill Singer | b5270979e54 | fixing bug; needed javascript file wasn't added to the subject_search html page; also adjusting margin so that the da... | | |
marc-danie | f0638332eec | added Active column to the resource_sublocation table; | | |
brian | 77852f3b90e | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 6ea2cfd4fe2 | Fixed rounding and margin on appointments pages. | | |
Jill Singer | 8f6504ab0ce | switched alert to dialog when editing or creating a new user | | |
Jill Singer | 77c4bcfe368 | reskinning: minor tweaks: (no functional changes)
moved the calendar key at the bottom of the calendar to b... | | |
marc-danie | 76459e28ffc | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 8030312ccc9 | added missing css and js imports for EasyUI combobox | | |
Xavier Haurie | 811ab551a92 | removed X_ where X is a number, from test file names | | |
marc-danie | 387ffd0705a | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 87900765304 | Added prompt and empty option to drop downs | | |
Xavier Haurie | d8fd672d4fa | x'ed offending test just so we have a clean build again. Also cleaned-up karma config files | | |
Xavier Haurie | 22855c46d08 | x'ed offending test just so we have a clean build again. Also cleaned-up karma config files | | |
Xavier Haurie | d99321e8d92 | Merge branch 'try-karma' into develop
# Conflicts:
# web/karma.conf.js | | |
Xavier Haurie | bf2b2d582d7 | Merge branch 'try-karma' into develop
# Conflicts:
# web/karma.conf.js | | |
Xavier Haurie | bebf964927e | break the build on purpose -- to make sure front-end test failures cause the build to fail | | |
Xavier Haurie | d5aabe6d3cb | removed js file which seems to break tests (to be investigated) | | |
Xavier Haurie | 30f4bd06b12 | fixed typo (extra .js in filename) | | |
Xavier Haurie | 24a97148648 | removed unused flyway properties file | | |
Xavier Haurie | 008446e4fd0 | Merge branch 'try-karma' into develop | | |
Xavier Haurie | a5e51cdf72e | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 7cd8fa6c06f | tweaked karma.conf.trythings.js and karma.conf.js to be more like each other | | |
Xavier Haurie | d7df168d82d | ajax callback spy works again | | |
Xavier Haurie | 36fda2967ec | AppSpect works again. ALWAYS check that we are including all the required javascript files, such as utils.js in this ... | | |
Xavier Haurie | bc125d0403a | fixed the "__tryThings" spec | | |
marc-danie | f41d627bbba | Merge remote-tracking branch 'origin/develop' into develop | | |
Xavier Haurie | 06663b687eb | found a bug with running on Chrome | | |
Xavier Haurie | b27bdb806c1 | some simplistic testing of appointments page | | |
Xavier Haurie | 256d69bb60c | minimal example of DOM manipulation (loading fixture) and checking | | |
brian | ca442c55849 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 80b3d9cee8d | Fixed Timeline 12 hour view. | | |
Jill Singer | 54959dc3834 | changed the alert dialog on editing or creating a new study to be a jquery ui dialog, and refactored the js and html ... | | |
marc-danie | dd12cfdefea | adding css files for EasyUI combobox | | |
marc-danie | f57aaaf8390 | removed blank option for sublocation and visit type dropdowns | | |
marc-danie | 74c6d7400f0 | made formSelectInput fields hidden when in edit mode | | |
marc-danie | 870dd8f349b | changed sublocation and visit Type drop down to be choose or type ahead | | |
marc-danie | 164a2738644 | updated to only include files needed for the easyUI combobox in order to prevent conflicts with some JQuery UI compon... | | |
marc-danie | f3abdc36724 | required js files for EasyUI combobox | | |
Jill Singer | f0a44081c36 | resource page: moved a method from global2.js to resource_screen.js; since that is the only file that references the... | | |
Jill Singer | 05f27882f76 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 1f544a178e4 | made formatting cleaner in appt wizard; when putting in the date range; no functional changes; just css (plus added a... | | |
 Carl | 2141d08c911 | oops, changing back modifed conf.js | | |
Carl | 7850e526a70 | a pattern / hack for jasmine asynchronous tests | | |
marc-danie | 32e60ebc139 | code cleanup | | |
marc-danie | 3d8df3ef2aa | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 0f460ee0b89 | changed sublocation drop down to be choose or type ahead | | |
brian | dcabdcdcc68 | Fixing table controls for appointment module. | | |
Jill Singer | 59596a11238 | replacing alert with a dialog box | | |
brian | 88e4e4f71e0 | Merge remote-tracking branch 'origin/develop' into develop | | |
brian | 7483845ffab | Fixed the build error that was related to different class names. | | |
marc-danie | 103598f11d0 | removed debugging alert message | | |
brian | 98e17b8e38d | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 01da2c8635c | Fixed Date Picker form appointments form and alignment of buttons. | | |
marc-danie | 92833dab25d | modified all the dropdown fields to be Choose or Type ahead fields and made all the input fields the same height and ... | | |
marc-danie | 8d44bde43a0 | added easyui library | | |
marc-danie | 2ac87eb2372 | fixed bug with Expected Start Date not being displayed when in view mode | | |
marc-danie | 082fcffd246 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | c2d55e5371c | studies page initial jasmine test | | |
brian | 13ac917f729 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
brian | 70b5bb0bbef | Made some changes to fix regressions with appointment wizard. | | |
Jill Singer | ba97ec4ba3b | support/help links now working after clicking the 24 hour button on the timeline page; plus adjusted the divs as well... | | |
Jill Singer | dc4dc996528 | feedback method now only called explicitly, now that the re-skin (header & footers) are done, so do not need to expli... | | |
marc-danie | c94c2300144 | moved table controls closer to the table | | |
marc-danie | 0f845944608 | modified dropdowns on the create_user page to be choose or type ahead | | |
marc-danie | 097f736d847 | modified dropdowns on the create_resource page to be choose or type ahead | | |
marc-danie | f99aec50be8 | initial jasmine test for the resources page | | |
marc-danie | 01b300d399d | removed style attribute from mgmt_user_form_screen | | |
marc-danie | ca00d940a43 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 987c272ca15 | removed display none on mgmt_user_form_screen id | | |
Carl | e1760cf2386 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 79889ea3718 | on the way to 'expecting' jQuery calls | | |
Jill Singer | f15da77d0c7 | fixed feedback link on home page | | |
Carl | bc73981dfbd | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | e5a026baa64 | defensiveCopy() fixed to account for genderEmpi. unused method removed from appt-service | | |
marc-danie | 474d335d827 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | b4dafd14a09 | renamed mrnListItem to comboboxListItem and moved some common css into global.css | | |
Jill Singer | edd440183f2 | moving extra_headers back into subject_search.html; changed bracket style; moved all the init methods into one functi... | | |
Jill Singer | 517eca64a3a | added build full name test | | |
Carl | 21bc26728c8 | tweak conf.js. 'global' folder contains mainly tests, so should be subsumed under 'the rest of these' | | |
Carl | 1b59df3cf79 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | c58fc36cac5 | tweak conf.js. add first onload() test. | | |
Jill Singer | 858f1bf0fac | showValue and yesNoValue tests | | |
Jill Singer | 4ead527350c | added statusValue test; improved method | | |
Jill Singer | 507fdd00f08 | removed carriage return that was breaking the shouldLoadResourceData() method
added unit test for it too. | | |
marc-danie | 725fe55a01a | removed onloadSubjectsPage function | | |
marc-danie | e1f67e9c5e5 | Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# web/karma.conf.for.maven.build.js
# web/ka... | | |
marc-danie | 7357ef203d5 | converted qunit tests into jasmine tests | | |
Xavier Haurie | d7c287de165 | slightly more evolved ajax test | | |
Xavier Haurie | ad4316d9fd4 | re-organize fixture usage in test code, to look a bit like jasmine-jquery's loadFixtures(). It abstracts out the path... | | |
Xavier Haurie | 9058858d0e8 | settling on using html2js across the board. Figured out that html files must be flagged as _included_ in karma.conf.j... | | |
Jill Singer | 5c14de7f90d | minor tweak to appt_batch.css; no functionality change | | |
Jill Singer | 8734dfa2729 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
marc-danie | b5138d94a84 | reorganized tests into separate module files | | |
brian | 0199900942d | Pulled in Changes from Appointment module. | | |
marc-danie | 115c2f76fc0 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 4d891113b21 | modified to make the layout similar to the home page | | |
Jill Singer | 3cca1010f50 | first pass at extracting/fixing styles for appt_batch.css | | |
Jill Singer | 8ce914e3301 | css: grouped all the theme colors together, removed commented lines; no functional changes | | |
marc-danie | bf376341fc8 | adjusted the margins for the standard report page | | |
marc-danie | d492aba4971 | adjusted the margins for the create resource page | | |
marc-danie | 02cedc52b68 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 9e0caf847ea | moved table controls for the management to be closer to the table and also adjusted the margins for the create user page | | |
Jill Singer | f1f3c22d653 | fixing errors/warnings that show up in sonar, adjusting tests accordingly | | |
marc-danie | b90df56aa43 | removed unused css file style.css | | |
marc-danie | 528f8cf5d80 | renamed style-minus-header.css to global.css | | |
marc-danie | 217deb58426 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 1dadb463ddb | moved the registration form to a separate page and also fixed populating of the drop downs on the registration form a... | | |
Carl | 50f6736ff65 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 313917344db | stabilize jasmine tests for home and appt_cal pages | | |
Jill Singer | d583b5a463e | dates.js: cleaning up code; backed up by unit tests now (minor refactoring) | | |
Jill Singer | b60291062f1 | extracted out dates.js and added it the necessary html/header files
made sure to put it near the top, as many other f... | | |
Carl | 15e232e0165 | use 'more intrinsic' jquery selectors for the test, since the aria-related selectors' counters don't reset b/t tests | | |
Carl | 981b96a835d | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | f13bc0b46e1 | move verboseSet* methods from subject to batchSubjects. fix NPE edge case. augment and rename properties file so that... | | |
marc-danie | b7106143913 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | cb3f0b6e1b6 | added mainBody div to login page and adjusted line height of the main text | | |
Jill Singer | 93e671e8e03 | adjusted styles on appt_batch | | |
Jill Singer | 8882e253f54 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | bec56d3ce80 | adding png arrows that should have been added yesterday | | |
marc-danie | 7aa6168bd66 | made the round border of the center screen visible by adjusting some of the margins and removing some set widths | | |
marc-danie | b1bfc84273e | made the round border of the center screen visible by adjusting some of the margins and removing some set widths | | |
marc-danie | fef93a286ff | adjusted padding and also size of the calendar on the appointments page | | |
marc-danie | 4bf9960d28f | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 34e16326eb6 | adjust margin, padding and widths on the home page | | |
Xavier Haurie | df97eeeafe8 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 1db94be074a | wallabyjs is sort of running.. It fails intermittently. Committing so I can move to other tasks if needed. | | |
Xavier Haurie | bba7138e9ef | slight re-write of Spec's to be able to load fixtures either via html2js (in the case where the Karma test runner is ... | | |
marc-danie | d4ba49d2eb7 | Merge remote-tracking branch 'origin/develop' into develop | | |
Jill Singer | e3b6c4a0605 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 48fde85d192 | removing unneeded extra header file; now that the needed javascript has been moved | | |
marc-danie | af563824470 | moved styling for the page scrollbars from reporting.css to style-minus-header.css | | |
 Ankit Panchamia | 307d5576433 | updated Nightly batch update program. | | |
marc-danie | 776f96079c5 | increased margin on the institution_images div | | |
Jill Singer | aaabf807f20 | moved code needed by studies out of subjects; so reducing one dependency | | |
Jill Singer | d09398ebcd6 | changing the navigational pagination arrows to pngs; so they can have transparent backgrounds; now their backgrounds ... | | |
marc-danie | 5b31085839c | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | 3c0449c1c53 | increased margin between header and pagination block and fixed issue with widths being too large for the page | | |
Jill Singer | b5d1506681e | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 04e4fb8a3a4 | replacing arrow images for the pagination | | |
marc-danie | a9769101fc3 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | e2273fac153 | removed styles from reporting.css that already exists in style-minus-header.css | | |
Jill Singer | 174960dcdd2 | another attempt to clean up login form on login page only | | |
Jill Singer | 8f41d68bffa | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
Jill Singer | 9071d15a08a | the text for the dialog that shows up when a user times out is now fixed, as is the login page, which did not always ... | | |
Xavier Haurie | 6734e93458c | removed intermittently failing test (has to do with js code under test loading a new page via window.location | | |
Carl | 659b0135667 | tweak readme for: add 'clobber mrns' option to importMrns | | |
Carl | 8193dc307ef | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 1f165c03014 | add 'clobber mrns' option to importMrns | | |
Xavier Haurie | c2da2208451 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | d693ccc2916 | cleaned up and improved 1_HomePageSpec, created 2_AppointmentPageSpec, testing for clicking back to initially active ... | | |
marc-danie | f05b69f640e | removed unused stylesheet.css file | | |
marc-danie | c892dcef8e6 | Merge remote-tracking branch 'origin/develop' into develop | | |
marc-danie | fcb78ef7fc7 | removed new-skin-partial.css file and all references to it | | |
Carl | c904d0203d9 | another attempt to clean up login form on login page only | | |
Jill Singer | 3b6529395b0 | making go button dimensions smaller; is too big | | |
Jill Singer | f36f217cd81 | minor css fixes | | |
Carl | e8558a9f6f1 | re-removing headerLoginNav . this time let's hope it stays removed | | |
Xavier Haurie | 48b1539a451 | enable code coverage for karm (i.e. javasript) testing | | |
Xavier Haurie | 1158ef98430 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop | | |
Xavier Haurie | 964a52cf5ed | Moved npm install from the general-purpose maven-exec plugin to the frontend maven plugin, as well as javascript test... | | |
Carl | c0212230029 | Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
web/src/main/webapp/common/header.html | | |
Carl | 072c4b0ebaf | make login div occur only on login page | | |
Jill Singer | 2c50f0c02c7 | moved the images dir to be under the css dir; lots of changes to support this restructuring | | |
Xavier Haurie | 4a7ace19cb9 | attempt to fix the build, which is not finding npm | | |
Xavier Haurie | 9ab4277a412 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
# Conflicts:
... | | |
Xavier Haurie | 28025e46697 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
# Conflicts:
... | | |
Xavier Haurie | 29e7f345fb3 | back-track a little bit in my refactoring, because another page includes home_screen.js but does not have the same do... | | |
Xavier Haurie | 85319f0c100 | refactor 'document-ready' javascript code so that it can be used in jasmine tests | | |
Carl | 15087985b49 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl | 73d21e113fc | report-builder reskin. cleanup top bar's display of 'logout' | | |
Jill Singer | cbbf4ec3c37 | Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop | | |
| Next → |
