Skip to content

Client #30

Merged
merged 14 commits into from Mar 24, 2017
Merged

Client #30

merged 14 commits into from Mar 24, 2017

Commits on Feb 14, 2017

  1. Imporoved the look of the order info popup

    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
    arc12012 committed Feb 14, 2017
    Copy the full SHA
    c5330f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Shop.jsp can now communicate with the dataabase! Yay!

    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.
    arc12012 committed Feb 23, 2017
    Copy the full SHA
    8448e1c View commit details
    Browse the repository at this point in the history
  2. Refactoring

    Hopefully won't mess with what anyone else is doing
    arc12012 committed Feb 23, 2017
    Copy the full SHA
    0a35b90 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Copy the full SHA
    8a971dd View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. nonfunctional commit because last time I changed branches without com…

    …miting I messed up with stashing and lost my work :p
    arc12012 committed Mar 3, 2017
    Copy the full SHA
    20d27ab View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. New text fields for address. Ticket generation is very close to worki…

    …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.
    arc12012 committed Mar 15, 2017
    Copy the full SHA
    b7bddb4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Copy the full SHA
    8b3cc0b View commit details
    Browse the repository at this point in the history
  2. Added calendar selector-that was easier than I thought.

    Needs some css love, and a way to include data from the new fields when generating tickets.
    arc12012 committed Mar 17, 2017
    Copy the full SHA
    58f881b View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2017

  1. Should now be generating a new location if needed-database needs adju…

    …stment though.
    
    I'm storing dates as milliseconds, which don't fit as varchars. Also need to add user ID column to location table
    arc12012 committed Mar 18, 2017
    Copy the full SHA
    9847360 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Database changes

    Uses pivotal instead of local db, and also connections are closed when finished
    Adam Claxton authored and Adam Claxton committed Mar 22, 2017
    Copy the full SHA
    2b31f6a View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. New location from order form now 'works'

    I haven't included a way to name the new location, yet. But the feature does work. Also ordering multiple devices works
    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    14a49ee View commit details
    Browse the repository at this point in the history
  2. Ticket generation incorporates return date

    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
    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    d9b7509 View commit details
    Browse the repository at this point in the history
  3. I dunno why this wasn't committed

    Adam Claxton authored and Adam Claxton committed Mar 23, 2017
    Copy the full SHA
    0d0c471 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. Large conflict resolved

    clj13001 committed Mar 24, 2017
    Copy the full SHA
    4c816e1 View commit details
    Browse the repository at this point in the history