Code

Added Reservation#31

Code

Open

jlaacke wants to merge 70 commits intotransportkollektiv:mastertransportkollektiv/voorwiel:masterfrom iteratec:pull_request/reservationiteratec/voorwiel:pull_request/reservationCopy head branch name to clipboard

+1,183-154

Commits

Commits on Dec 1, 2020

• Set default position of map to Wedel coordinates

  Amar-Bolkan

  committed
  06db9e5

  Copy full SHA for 06db9e5

• Add Costum login button, which accesses the cykel admin login page and redirects back to voorwiel

  Amar-Bolkan

  committed
  538223b

  Copy full SHA for 538223b

• Check TODO

  Amar-Bolkan

  committed
  2439be6

  Copy full SHA for 2439be6

Commits on Dec 3, 2020

• Custom Login funktion hinzugefuegt.

  Amar-Bolkan

  committed
  ac6e35b

  Copy full SHA for ac6e35b

Commits on Dec 4, 2020

• cleaned up

  Amar-Bolkan

  committed
  a80d747

  Copy full SHA for a80d747

• Added choosable return locations. Currently hardcoded

  Amar-Bolkan

  committed
  5e5d455

  Copy full SHA for 5e5d455

Commits on Dec 8, 2020

• Added selectable return location, when renting bikes

  Amar-Bolkan

  committed
  5250ecd

  Copy full SHA for 5250ecd

• Textbox for Error Message

  mlange304

  committed
  655f795

  Copy full SHA for 655f795

• Changed CustomLogin URL to relativ path

  Amar-Bolkan

  committed
  03f70b2

  Copy full SHA for 03f70b2

• Todo entfernt

  Amar-Bolkan

  committed
  85c2a72

  Copy full SHA for 85c2a72

Commits on Dec 9, 2020

• messages.json für custom login aktualisiert

  mlange304

  committed
  c928a55

  Copy full SHA for c928a55

• Changed request for station locations from POST to GET

  Amar-Bolkan

  committed
  2800e52

  Copy full SHA for 2800e52

• Added conditional rendering so the user has to select a location befor returning the bike

  Amar-Bolkan

  committed
  332020c

  Copy full SHA for 332020c

• Formatting

  Amar-Bolkan

  committed
  94e1228

  Copy full SHA for 94e1228

• added configurable messages for the return locations etc., also made the drop down list refetch the stations to ensure there are always selectable locations

  Amar-Bolkan

  committed
  12b3e3d

  Copy full SHA for 12b3e3d

• Formatting

  Amar-Bolkan

  committed
  47a1dc7

  Copy full SHA for 47a1dc7

• Message Dialog with wrong password from messages.json

  mlange304

  committed
  cbde3c0

  Copy full SHA for cbde3c0

• Made messages configurable for english and german display, red box during login only rendered when sending wrong user credentials

  Amar-Bolkan

  committed
  16ca31a

  Copy full SHA for 16ca31a

• Max with custom login 400

  mlange304

  committed
  acfbfef

  Copy full SHA for acfbfef

• Merge branch 'custom-login' of https://github.com/iteratec/voorwiel into custom-login

  mlange304

  committed
  f1722b3

  Copy full SHA for f1722b3

• Formatting

  Amar-Bolkan

  committed
  3011e45

  Copy full SHA for 3011e45

• made the selectable return option more intuitive for the user

  Amar-Bolkan

  committed
  9a1aa0b

  Copy full SHA for 9a1aa0b

• changes the message for choosable locations

  Amar-Bolkan

  committed
  b04ae0c

  Copy full SHA for b04ae0c

Commits on Dec 10, 2020

• Bug Fix when returning a bike, now each rentId gets associated with its own selectable rreturn location

  Amar-Bolkan

  committed
  ee3eeea

  Copy full SHA for ee3eeea

• removed unnecessary if statement inside endRent

  Amar-Bolkan

  committed
  5b26be5

  Copy full SHA for 5b26be5

• Formatting

  Amar-Bolkan

  committed
  02660e9

  Copy full SHA for 02660e9

Commits on Dec 14, 2020

• Design Änderungen der Error-Box

  mlange304

  committed
  eed8ebd

  Copy full SHA for eed8ebd

• Dropdown-Pfeil nicht mehr hardcoded sondern über CSS-Styles

  mlange304

  committed
  9448b5a

  Copy full SHA for 9448b5a

• Clean up

  mlange304

  committed
  8bce227

  Copy full SHA for 8bce227

• Merge branch 'master' into selectable-return-locations

  Amar-Bolkan

  authored
  8eeb3e8

  Copy full SHA for 8eeb3e8

• Merge pull request #1 from iteratec/selectable-return-locations

  Show description for 0267df0
  Amar-Bolkan

  authored
  0267df0

  Copy full SHA for 0267df0

• Created separate component to handle the returning bikes without tracker available. Added component to rent.vue and made it selectable by a boolean.

  Amar-Bolkan

  committed
  e56d5a8

  Copy full SHA for e56d5a8

• Merge pull request #2 from iteratec/configurable-bike-return-method

  Show description for d41736a
  mlange304

  authored
  d41736a

  Copy full SHA for d41736a

• removed a comment

  Amar-Bolkan

  committed
  808d38d

  Copy full SHA for 808d38d

Commits on Dec 15, 2020

• Formatting, removed unused methods inside Rent.vue

  Amar-Bolkan

  committed
  c421eea

  Copy full SHA for c421eea

• Moved TRACKERAVAILABLE into the config.development.js

  Amar-Bolkan

  committed
  55e6cf4

  Copy full SHA for 55e6cf4

Commits on Jan 8, 2021

• made environment configurable

  

  Jonas Laacke

  committed
  e81d3fb

  Copy full SHA for e81d3fb

Commits on Aug 9, 2021

• Merge branch 'stadtulm:master' into master

  jlaacke

  authored
  52b9421

  Copy full SHA for 52b9421

Commits on Aug 11, 2021

• set default for end station select; redirect to customLogin

  

  Jonas Laacke

  committed
  ec475c4

  Copy full SHA for ec475c4

Commits on Aug 12, 2021

• use gbfs station information for end station selection

  

  Jonas Laacke

  committed
  0678236

  Copy full SHA for 0678236

• cleaned up end rent functions

  

  Jonas Laacke

  committed
  695bb83

  Copy full SHA for 695bb83

Commits on Aug 25, 2021

• Added reservation button and functionality

  fabsei-it

  committed
  4ef059a

  Copy full SHA for 4ef059a

Commits on Aug 30, 2021

• Changed Reservation Dialog

  fabsei-it

  committed
  95caf26

  Copy full SHA for 95caf26

Commits on Sep 1, 2021

• Added DateTimePickerDialog to Reservation creation

  fabsei-it

  committed
  b17fa00

  Copy full SHA for b17fa00

Commits on Sep 6, 2021

• add stationselect + datetime format to reservation

  fabsei-it

  committed
  2da1b1d

  Copy full SHA for 2da1b1d

Commits on Sep 7, 2021

• only show spontaneous rent or reservation if allowed; choose vehicle type for reservation

  

  Jonas Laacke

  committed
  c82883b

  Copy full SHA for c82883b

Commits on Sep 8, 2021

• extended functionality for reservations

  fabsei-it

  committed
  47b4d48

  Copy full SHA for 47b4d48

• Merge branch 'dev' of github.com:iteratec/voorwiel into dev

  fabsei-it

  committed
  8bcfac1

  Copy full SHA for 8bcfac1

Commits on Sep 15, 2021

• Added methods for getting allowed dates

  fabsei-it

  committed
  0905be9

  Copy full SHA for 0905be9

• Change getAllowedDates

  fabsei-it

  committed
  6251d86

  Copy full SHA for 6251d86

Commits on Sep 22, 2021

• Added time limitation for new reservations

  fabsei-it

  committed
  3f56ad6

  Copy full SHA for 3f56ad6

Commits on Sep 24, 2021

• added vehicleType and station to allowedReservationDate request

  

  Jonas Laacke

  committed
  3059c18

  Copy full SHA for 3059c18

• added vehicleType and station to allowedReservationTime request

  

  Jonas Laacke

  committed
  91a4619

  Copy full SHA for 91a4619

Commits on Sep 27, 2021

• ReservationDialog resets upon closing it

  fabsei-it

  committed
  fe56053

  Copy full SHA for fe56053

Commits on Sep 28, 2021

• Reservationform validation

  fabsei-it

  committed
  b047202

  Copy full SHA for b047202

• Merge remote-tracking branch 'origin/dev' into dev

  fabsei-it

  committed
  5399dc6

  Copy full SHA for 5399dc6

Commits on Oct 1, 2021

• Fix button-row layout

  fabsei-it

  committed
  29185e4

  Copy full SHA for 29185e4

• Timepicker resets after closing reservationdialog

  fabsei-it

  committed
  7c59b41

  Copy full SHA for 7c59b41

• use forbidden ranges for reservation times

  

  Jonas Laacke

  committed
  c85fb3a

  Copy full SHA for c85fb3a

• Merge branch 'dev' of github.com:iteratec/voorwiel into dev

  fabsei-it

  committed
  df22dd8

  Copy full SHA for df22dd8

• merge fixes

  fabsei-it

  committed
  a321f54

  Copy full SHA for a321f54

• Fix forbidden time ranges

  fabsei-it

  committed
  796965f

  Copy full SHA for 796965f

• Station + vehicletype required for datetimepicker

  fabsei-it

  committed
  26cfc0a

  Copy full SHA for 26cfc0a

Commits on Oct 2, 2021

• determine end time for reservation

  

  Jonas Laacke

  committed
  093853f

  Copy full SHA for 093853f

Commits on Oct 4, 2021

• Timepicker blocks everything after maxTime

  fabsei-it

  committed
  7376e8f

  Copy full SHA for 7376e8f

Commits on Oct 6, 2021

• Code cleanup

  fabsei-it

  committed
  693bf86

  Copy full SHA for 693bf86

• Added min time to datepicker for reservation end

  fabsei-it

  committed
  190f41c

  Copy full SHA for 190f41c

Commits on Oct 13, 2021

• Code cleanup and small bug fix

  fabsei-it

  committed
  476a1d3

  Copy full SHA for 476a1d3

• Code cleanup

  fabsei-it

  committed
  a67a6b0

  Copy full SHA for a67a6b0

Commits on Oct 15, 2021

• cleaned up reservation code and fixed some bugs

  

  Jonas Laacke

  committed
  711e3f8

  Copy full SHA for 711e3f8