Client #30
Merged
Client #30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It also now closes when pressing escape or clicking outside of it. Made shoppingCart.html and shoppingCart.js into shoppnigCart.jsp and shop.jsp respetively; getting ready for database stuff
Submitting the form does not do everything it needs to do with tables yet. There is a good deal of polishing and refactoring to now too.
Hopefully won't mess with what anyone else is doing
…miting I messed up with stashing and lost my work :p
…ng; only the location part of the ticket is ignored. That's what the new text fields are for, and once I get them behaving as desired I'll be able to finish ticket generating. Changed link in navbar to direct to /2017-CSE-Senior-Project-Team-2/html/webpages/ instead of /2017-CSE-Senior-Project-Team-2/html/webpages/index.html. Apache will find the index.* file if it exists there, and I have been using index.jsp.
Needs some css love, and a way to include data from the new fields when generating tickets.
…stment though. I'm storing dates as milliseconds, which don't fit as varchars. Also need to add user ID column to location table
Uses pivotal instead of local db, and also connections are closed when finished
I haven't included a way to name the new location, yet. But the feature does work. Also ordering multiple devices works
Added Return_Date field to the ticket table. Presumably, the corresponding field will be updated in the device table when admin approves request, but for that to happen it will need to be able to read from somewhere. The 'date' selector provides dates as a simple "dd-mm-yyyy" string, so I just stored it that way. Given that it would probably be better if I just store the other dates as simple string; I will probably do that
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.