Code

Ampers - Sara S - Hotel#32

Code

Open

CheerOnMars wants to merge 43 commits intoAda-C9:masterAda-C9/hotel:masterfrom CheerOnMars:masterCheerOnMars/hotel:masterCopy head branch name to clipboard

+578

Commits

Commits on Mar 5, 2018

• add reservation class and test methods

  CheerOnMars

  committed
  cdcf55f

  Copy full SHA for cdcf55f

• updated length method to ensure output is an integer

  CheerOnMars

  committed
  8587c1f

  Copy full SHA for 8587c1f

• created room class, method, and test file

  CheerOnMars

  committed
  f5f634c

  Copy full SHA for f5f634c

• create spec helper

  CheerOnMars

  committed
  c547e7b

  Copy full SHA for c547e7b

Commits on Mar 7, 2018

• created hotel_admin method and tests to return array of reservations for a date

  CheerOnMars

  committed
  a3fdcdd

  Copy full SHA for a3fdcdd

• updated filed names so they could be read by rake

  CheerOnMars

  committed
  45907e8

  Copy full SHA for 45907e8

• created Rakefile

  CheerOnMars

  committed
  f1e264e

  Copy full SHA for f1e264e

• changed name of local variage in initialize method in Room class

  CheerOnMars

  committed
  a7db229

  Copy full SHA for a7db229

• deleted room_specs.rb and replaced it with room_spec.rb

  CheerOnMars

  committed
  4dd8d16

  Copy full SHA for 4dd8d16

• deleted reservation_specs.rb and replaced it with reservation_spec.rb so that it'd be uniform for rake

  CheerOnMars

  committed
  f99f765

  Copy full SHA for f99f765

• add room to initialize method in reservation class, add self method for start and end dates

  CheerOnMars

  committed
  509fef8

  Copy full SHA for 509fef8

Commits on Mar 8, 2018

• corrected method to access reservations for a certain day

  CheerOnMars

  committed
  3821f9e

  Copy full SHA for 3821f9e

• changed start_date and end_date to checkin_date and checkout_date

  CheerOnMars

  committed
  66170d4

  Copy full SHA for 66170d4

• adjusted variable names in lib/hotel_admin.rb for added clarity

  CheerOnMars

  committed
  de77f64

  Copy full SHA for de77f64

• updated tests for HotelAdmin's method of returning rooms

  CheerOnMars

  committed
  daddef4

  Copy full SHA for daddef4

• adjusted variable names in lib/room.rb for added clarity

  CheerOnMars

  committed
  3680efe

  Copy full SHA for 3680efe

• adjusted method names in lib/reservation.rb for added clarity

  CheerOnMars

  committed
  883b1a1

  Copy full SHA for 883b1a1

• updated tests to account for adjusted method names in lib/reservation.rb for added clarity

  CheerOnMars

  committed
  ca4ff0d

  Copy full SHA for ca4ff0d

• rearranged order of hotel_admin tests

  CheerOnMars

  committed
  44b474c

  Copy full SHA for 44b474c

• rearrange order of methods

  CheerOnMars

  committed
  ee581ee

  Copy full SHA for ee581ee

Commits on Mar 9, 2018

• removed room class and specs, added room to HotelAdmin class. updated classes and tests as a result

  CheerOnMars

  committed
  3aee111

  Copy full SHA for 3aee111

Commits on Mar 12, 2018

• updated reservation class to grey out lines that parsed the date into seconds

  CheerOnMars

  committed
  32815d1

  Copy full SHA for 32815d1

• add test to HotelAdmin class to check that returns a list of all the rooms and views a list of rooms that aren't reserved for a given range

  CheerOnMars

  committed
  c633a11

  Copy full SHA for c633a11

• In HotelAdmin class, added method to view available rooms, and changed access_reservation method to remove strftime(%Y-%m-%d) functionality

  CheerOnMars

  committed
  de23dda

  Copy full SHA for de23dda

• removed unnecessary comments

  CheerOnMars

  committed
  9fef03e

  Copy full SHA for 9fef03e

• removed unnecessary comments and added reserve_available_room method lib/hotel_admin.rb

  CheerOnMars

  committed
  779da5c

  Copy full SHA for 779da5c

• removed unnecessary comments and added tests for reserve_available_room method in hotel class.rb

  CheerOnMars

  committed
  a217f7e

  Copy full SHA for a217f7e

• trimmed down the tests for the HotelAdmin class's methods

  CheerOnMars

  committed
  21fbb57

  Copy full SHA for 21fbb57

• add block class lib and spec files

  CheerOnMars

  committed
  5982f91

  Copy full SHA for 5982f91

• added lib/block and removed lib/room as required relatives

  CheerOnMars

  committed
  474e97d

  Copy full SHA for 474e97d

• removed lib/room as required relative

  CheerOnMars

  committed
  428a5a9

  Copy full SHA for 428a5a9

• holding off on making block its own class for now

  CheerOnMars

  committed
  edb3810

  Copy full SHA for edb3810

• holding off on making block its own class for now

  CheerOnMars

  committed
  a0042c2

  Copy full SHA for a0042c2

• small format change

  CheerOnMars

  committed
  ba3c378

  Copy full SHA for ba3c378

• updated HotelAdmin class and its tests to include block functionality

  CheerOnMars

  committed
  9c6e3e4

  Copy full SHA for 9c6e3e4

• add status to reservation class

  CheerOnMars

  committed
  60231d0

  Copy full SHA for 60231d0

• update method for room holds, add appropriate tests

  CheerOnMars

  committed
  74b830f

  Copy full SHA for 74b830f

Commits on Mar 14, 2018

• removed unncessary status and price_night methods

  CheerOnMars

  committed
  d217828

  Copy full SHA for d217828

• added missing comma

  CheerOnMars

  committed
  d2e68c9

  Copy full SHA for d2e68c9

• added party_name to reservations class

  CheerOnMars

  committed
  f728d7d

  Copy full SHA for f728d7d

• tried to update status

  CheerOnMars

  committed
  f8ac9ef

  Copy full SHA for f8ac9ef

• tried to update method and tests to reserve a room in a block

  CheerOnMars

  committed
  6c512e0

  Copy full SHA for 6c512e0

Commits on Apr 2, 2018

• corrected design-activity

  CheerOnMars

  committed
  256953b

  Copy full SHA for 256953b