Code

oo-ride-share-maryam-kay#22

Code

Open

kayxn23 wants to merge 53 commits intoAda-C10:masterAda-C10/oo-ride-share:masterfrom kayxn23:masterkayxn23/oo-ride-share:masterCopy head branch name to clipboard

Commits

Commits on Aug 27, 2018

• copy pasted the correct csv data, there was a bug in initial version

  kayxn23

  committed
  4bf1915

  Copy full SHA for 4bf1915

• added Time.parse method to loadtrips method of TripDispatcher

  kayxn23

  committed
  d65c41b

  Copy full SHA for d65c41b

Commits on Aug 28, 2018

• Trip#initialize trying to add check in intialize for date

  marshi23

  committed
  a90385f

  Copy full SHA for a90385f

• matching up any changes with pair

  kayxn23

  committed
  095f0c3

  Copy full SHA for 095f0c3

• preparing for merge with pair's code

  kayxn23

  committed
  c57adc0

  Copy full SHA for c57adc0

• Merge branch 'master' of https://github.com/kayxn23/oo-ride-share

  kayxn23

  committed
  978b78c

  Copy full SHA for 978b78c

• comments added

  marshi23

  committed
  85216bb

  Copy full SHA for 85216bb

• tests if start date is after end date

  marshi23

  committed
  1a14dbc

  Copy full SHA for 1a14dbc

• not sure why this code isn't working, try to pull from pair's code again

  kayxn23

  committed
  98fa0d1

  Copy full SHA for 98fa0d1

• defined the duration method (to find duration of trip in seconds), added 2 tests for it

  kayxn23

  committed
  78f34a7

  Copy full SHA for 78f34a7

Commits on Aug 29, 2018

• defining User#net_expenditures tests not passing yet

  marshi23

  committed
  149c0b0

  Copy full SHA for 149c0b0

• didn't make many changes, preparing this version to pull from my pair's version

  kayxn23

  committed
  7966ef3

  Copy full SHA for 7966ef3

• user#net_expenditure method defined tests created and passing

  marshi23

  committed
  fff085d

  Copy full SHA for fff085d

• added net_expenditures method to my version

  kayxn23

  committed
  e110108

  Copy full SHA for e110108

• defined method total_time_spent to User class

  kayxn23

  committed
  90614f3

  Copy full SHA for 90614f3

• copy/pasted fix to bug in trips_test.csv

  kayxn23

  committed
  cea7f98

  Copy full SHA for cea7f98

• added DRIVER_TEST_FILE param to trip_dispatch_spec, it was a bug

  kayxn23

  committed
  6432068

  Copy full SHA for 6432068

• fixed bugs in driver_spec.rb

  kayxn23

  committed
  bfcf7ac

  Copy full SHA for bfcf7ac

• Clean up and matching two versions

  marshi23

  committed
  c12b427

  Copy full SHA for c12b427

• matching versions

  marshi23

  committed
  75b3dc4

  Copy full SHA for 75b3dc4

• fixing driver errors

  marshi23

  committed
  e339f5f

  Copy full SHA for e339f5f

• added vehicle_id, driven_trips, status to Driver class, and passed tests creating valid Driver, valid VIN, and valid ID

  kayxn23

  committed
  49f3687

  Copy full SHA for 49f3687

• added .driver method to Trip class

  kayxn23

  committed
  2d748bd

  Copy full SHA for 2d748bd

Commits on Aug 30, 2018

• matching versisons

  marshi23

  committed
  6a79172

  Copy full SHA for 6a79172

• load driver method defined

  kayxn23

  committed
  e9ea7f3

  Copy full SHA for e9ea7f3

• Merge branch 'master' of https://github.com/kayxn23/oo-ride-share

  kayxn23

  committed
  14587e7

  Copy full SHA for 14587e7

• all test passing

  marshi23

  committed
  95fb656

  Copy full SHA for 95fb656

• Matching versions

  marshi23

  committed
  a20df14

  Copy full SHA for a20df14

• added find_driver method to TripDispatcher Class, successfuly passed tests

  kayxn23

  committed
  1d270f7

  Copy full SHA for 1d270f7

• TripDispatcher#load_trips method modified

  marshi23

  committed
  d8892a8

  Copy full SHA for d8892a8

• adding Driver#add_trip

  marshi23

  committed
  eba9dee

  Copy full SHA for eba9dee

• Driver#add_driven_trip method added

  marshi23

  committed
  cf7b2c9

  Copy full SHA for cf7b2c9

• created add_average_rating method for Driver class, passes all tests

  kayxn23

  committed
  e0c2611

  Copy full SHA for e0c2611

• Driver#total_revenue method defined, test created and passed

  marshi23

  committed
  f86b5d9

  Copy full SHA for f86b5d9

Commits on Aug 31, 2018

• created net_expenditures method for Driver Class, and tests which are not passing yet

  kayxn23

  committed
  439a32f

  Copy full SHA for 439a32f

• Driver#net_expenditure added with one test

  marshi23

  committed
  6fa040e

  Copy full SHA for 6fa040e

• driver test bug fix

  marshi23

  committed
  6a71e68

  Copy full SHA for 6a71e68

• added request_trip(user_id) method to Trip_Dispatcher, still need to create tests

  kayxn23

  committed
  18e0747

  Copy full SHA for 18e0747

• Trip#request_trip() two tests created and passing helper method for driver add_driven_trip()modified

  marshi23

  committed
  bd72b5c

  Copy full SHA for bd72b5c

• passenger trips modified using helper method add_trip

  marshi23

  committed
  d4a931f

  Copy full SHA for d4a931f

• odified request_trip()

  marshi23

  committed
  bab24d3

  Copy full SHA for bab24d3

• syncing up

  kayxn23

  committed
  6ff76cd

  Copy full SHA for 6ff76cd

• resolving merge conflict

  kayxn23

  committed
  edf7a34

  Copy full SHA for edf7a34

• added new test to test if driver returned is available, and included exception in find_driver_by_availability method

  kayxn23

  committed
  b5a96c7

  Copy full SHA for b5a96c7

• just adding this change but will rever to b5a96c7 soon

  marshi23

  committed
  2047598

  Copy full SHA for 2047598

• commiting so that pair can be updated

  marshi23

  committed
  cdf15cd

  Copy full SHA for cdf15cd

Commits on Sep 1, 2018

• making two more tests left

  marshi23

  committed
  f8f496e

  Copy full SHA for f8f496e

• added tests for find_driver_by_availability, and edited test for request_trip(id)

  kayxn23

  committed
  5e95afc

  Copy full SHA for 5e95afc

• uncommendted test in Trips to test if Trip stores an instance of driver, test failing

  kayxn23

  committed
  591ee9f

  Copy full SHA for 591ee9f

• making tests for driven trips and user trips

  marshi23

  committed
  3d0c936

  Copy full SHA for 3d0c936

• created test to make sure the trips list for driver and user are updated tests passing

  marshi23

  committed
  adc1d60

  Copy full SHA for adc1d60

Commits on Sep 2, 2018

• minor clean up and bug fix 1 test failing

  marshi23

  committed
  65c59ca

  Copy full SHA for 65c59ca

• comments made

  marshi23

  committed
  a2c2d36

  Copy full SHA for a2c2d36