Commit Graph

Select branches

Hide Pull Requests

delete-fees-in-chunks

fix-how-lock-entry-is-matched

master

#1

#10

#11

#12

#13

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#9

Mono Color

• 8f740eb8c5 generate member practice summary report without booking change checks master Bilal Catic 2020-03-09 17:18:38 +01:00
• 1451e0daaf Merge branch 'stop-adding-non-existing-bookings' into 'master' Bilal Catic 2020-01-15 18:31:17 +00:00
• 06601f272c do not add reservations to the db for tentative and free bookings Bilal Catic 2020-01-15 19:29:57 +01:00
• aa771bc7bd do not create booking reservation for non existing reservation in ORD with exceptions Bilal Catic 2020-01-15 18:48:55 +01:00
• 45258334c1 do not create booking reservation for non existing reservation in ORD Bilal Catic 2020-01-15 04:27:16 +01:00
• 55086fb54b handle unknown members, offices and rooms Bilal Catic 2020-01-13 12:42:20 +01:00
• 459e6d15ef Merge branch 'fix-bug-with-clean-slate-unlocked-incidents' into 'master' Bilal Catic 2020-01-09 22:31:54 +00:00
• 62dc399a1a stop inserting and changing deleted unlock incidents Bilal Catic 2020-01-09 23:23:28 +01:00
• 280e8af748 Merge branch 'allow-incident-price-modification-frontend' into 'master' Bilal Catic 2020-01-09 17:13:04 +00:00
• cf0b2793ec remove obsolete stylesheet file Bilal Catic 2020-01-09 03:47:17 +01:00
• e03bf7609e fix paging bug Bilal Catic 2020-01-09 03:41:16 +01:00
• a5bec0f7f3 remove logs on update request Bilal Catic 2020-01-09 02:30:22 +01:00
• aafd046063 show rounded decimals for default values; handle zero as normal input Bilal Catic 2020-01-09 02:26:35 +01:00
• 1a21e91796 implement backend methods to update incident fees Bilal Catic 2020-01-09 01:33:19 +01:00
• ff8a836fed add action for sending update data to backend Bilal Catic 2020-01-09 01:29:06 +01:00
• c78a0e4138 allow fees edit; track changes; focus last changed input field Bilal Catic 2020-01-08 19:09:35 +01:00
• 3a10e56eeb wait for door lock charges calculation Bilal Catic 2020-01-06 22:33:26 +01:00
• 7db5c314ce Merge branch 'fix-undetected-unschedule-use-in-brake-between-bookings' into 'master' Bilal Catic 2019-12-26 01:34:15 +00:00
• b2450faa0c add special check for unscheduled use in brake between reservations Bilal Catic 2019-12-26 02:31:40 +01:00
• 87d7193bb9 add method for finding last reservation in a block Bilal Catic 2019-12-26 02:30:03 +01:00
• c1f3f42368 match unlock entry before first reservation in a block Bilal Catic 2019-12-25 16:41:05 +01:00
• 57cb6e8eaf fix how unlock and lock entries are matched to the reservation fix-how-lock-entry-is-matched Bilal Catic 2019-12-23 09:08:36 +01:00
• a4573a9a13 Merge branch 'reformat-booking-moved-to-another-day-fee-for-the-hundreth-time' into 'master' Bilal Catic 2019-12-16 09:30:20 +00:00
• 40aef5ed30 reformat booking change incident fee description Bilal Catic 2019-12-16 10:29:52 +01:00
• f36b1d6628 Merge branch 'remove-first-5-minutes-from-unscheduled-use' into 'master' Bilal Catic 2019-12-15 17:15:52 +00:00
• ba5dc504b2 remove first N minutes from unscheduled use (N is time resolution) Bilal Catic 2019-12-15 18:15:23 +01:00
• 528626760b Merge branch 'fix-wrong-unscheduled-incident-detection' into 'master' Bilal Catic 2019-12-13 19:15:55 +00:00
• 501b8cf629 fix how unlocked and unscheduled incidents are applied Bilal Catic 2019-12-13 18:36:39 +01:00
• a604687c61 Merge branch 'fix-wrong-unlock-entry-detection' into 'master' Bilal Catic 2019-12-12 09:56:33 +00:00
• b71d869f49 fix wrong exit entry detection Bilal Catic 2019-12-12 09:19:33 +01:00
• 3d7db8b156 fix wrong entrance entry detection after reservation start Bilal Catic 2019-12-11 20:47:07 +01:00
• f0b4a069e8 do not delete fees with selected product Bilal Catic 2019-12-09 10:37:58 +01:00
• b16d2c78da Merge branch 'reformat-fees-text' into 'master' Bilal Catic 2019-12-09 06:58:32 +00:00
• 052f2ac482 change date of shortening fees to the date of booking Bilal Catic 2019-12-09 07:39:46 +01:00
• b13980a16d change date of shortening fees to the date of booking Bilal Catic 2019-12-09 06:55:14 +01:00
• 3b442f9b34 change "moved to another day" fee text explanation Bilal Catic 2019-12-09 06:51:30 +01:00
• 2dc787d2ed reformat "moved to another day" fee text, show old booking time Bilal Catic 2019-12-09 06:51:03 +01:00
• 9d142901df do not re-create deleted incidents Bilal Catic 2019-12-06 06:04:45 +01:00
• 988dd275ef Merge branch 'fix-incidents-for-bookings-with-break-between' into 'master' Bilal Catic 2019-12-06 04:46:42 +00:00
• d4f205af1f Fix wrong unlocked incident level on the last day of month Bilal Catic 2019-12-06 05:44:18 +01:00
• fa1fa35986 add custom check for incident between two, not back-to-back bookings Bilal Catic 2019-12-06 05:39:01 +01:00
• 18022571aa Merge branch 'fix-back-to-back-issue-2-unlocked-fee-applied' into 'master' Bilal Catic 2019-12-06 03:35:32 +00:00
• 8944f5181c fix how unlocked incident fees are applied Bilal Catic 2019-12-06 03:16:24 +01:00
• e462f076d0 Merge branch 'fix-repeated-booking' into 'master' Bilal Catic 2019-12-05 08:29:30 +00:00
• f9694570a5 add debugging logs Bilal Catic 2019-12-05 09:27:39 +01:00
• 166e2a0a9f look for all door lock events before if from timestamp is not defined Bilal Catic 2019-12-05 09:25:18 +01:00
• 6df1a798ee transform repeated booking to series of regular bookings Bilal Catic 2019-12-04 12:42:32 +01:00
• 4367ca4259 bookings are now added from fees array - for repeated bookings Bilal Catic 2019-12-03 18:23:20 +01:00
• 0ef109ffce insert debugging logs, comment for now Bilal Catic 2019-12-03 18:21:38 +01:00
• a14ca5aaa7 remove console logging Bilal Catic 2019-12-03 18:20:34 +01:00
• 2c24028999 Merge branch 'fix-undetected-unscheduled-use-incidents' into 'master' Bilal Catic 2019-12-02 19:59:44 +00:00
• c30fb1adf6 synchronize incidents detection and save incidents to the DB Bilal Catic 2019-12-02 20:57:46 +01:00
• fb959491d9 Merge branch 'implement-silent-fees-delete' into 'master' Bilal Catic 2019-11-26 12:18:04 +00:00
• b1aad87601 add silent option to Delete fees request Bilal Catic 2019-11-26 13:17:28 +01:00
• 9494fa48c5 Merge branch 'change-unscheduled-use-charge-time-limits' into 'master' Bilal Catic 2019-11-22 19:23:21 +00:00
• 93d46c231e allow first time segment length for unscheduled use to be configurable Bilal Catic 2019-11-22 20:22:44 +01:00
• 1436f0fdab Merge branch 'change-fees-formatting' into 'master' Bilal Catic 2019-11-22 07:59:09 +00:00
• 7c8a5e954e change fees formatting Bilal Catic 2019-11-22 08:58:36 +01:00
• bc4db56e54 Merge branch 'allow-deleting-incident-fees' into 'master' Bilal Catic 2019-11-21 14:16:28 +00:00
• 06a40e98e9 fix "Delete fee" on Member Incidents Report screen Bilal Catic 2019-11-21 15:12:41 +01:00
• d4a949aaf0 Merge branch 'allow-deleting-incident-fees' into 'master' Bilal Catic 2019-11-21 13:36:59 +00:00
• fa4e574d6e remove obsolete logging Bilal Catic 2019-11-21 14:34:50 +01:00
• 445a635300 split fees into specific categories and send delete request Bilal Catic 2019-11-21 14:32:52 +01:00
• d1d67c346a add checkbox option to the incident tables Bilal Catic 2019-11-21 09:21:21 +01:00
• 37abb86961 add and implement action to send "delete fees" request Bilal Catic 2019-11-21 07:13:30 +01:00
• 8a3db0d481 add deleteFees route and implement logic Bilal Catic 2019-11-21 07:12:50 +01:00
• 3d051766b1 fetch only non-deleted unlocked/unscheduled incidents Bilal Catic 2019-11-20 15:26:20 +01:00
• d4f823ff72 add deleted field to the unlocked/unscheduled incidents table and model Bilal Catic 2019-11-20 14:53:53 +01:00
• 015c29f992 Merge branch 'add-door-unlock-lock-time-column-in-incidents-table' into 'master' Bilal Catic 2019-11-20 12:50:56 +00:00
• cd79a47462 set main container width configurable Bilal Catic 2019-11-20 13:46:41 +01:00
• c0c4c1f4a1 add door unlock/lock time column to the incidents table Bilal Catic 2019-11-20 13:46:12 +01:00
• eff96f9e5e fix mapping screen crash when office/resource is unknown Bilal Catic 2019-11-20 13:45:54 +01:00
• fcb71a3f00 Merge branch 'change-fees-formatting' into 'master' Bilal Catic 2019-11-20 11:28:30 +00:00
• 136cad8bbd fix fee formatting issues Bilal Catic 2019-11-20 12:27:42 +01:00
• 4ea9d37915 Date range for sending fees Senad Uka 2019-10-28 20:42:18 +01:00
• 9ac1f57396 apply weekend rate to the reservation if applicable Bilal Catic 2019-10-28 20:02:57 +01:00
• 4946b051c5 Merge branch 'fix-name-compare' into 'master' Bilal Catic 2019-10-07 13:42:24 +00:00
• 0d9c6ce67e compare only part of the name Bilal Catic 2019-10-07 15:41:46 +02:00
• c1110f3678 Merge branch 'fix-manually-booking-fee-delete' into 'master' Bilal Catic 2019-10-07 13:17:26 +00:00
• 8ac69f1497 delete reservations removed from ORD Bilal Catic 2019-10-07 15:16:09 +02:00
• 639ba6b8cb fix practice summary report Bilal Catic 2019-10-07 09:55:00 +02:00
• aa8931f91a fix discount date Bilal Catic 2019-10-04 19:51:39 +02:00
• ef932ed36b add discount on first day of the month Bilal Catic 2019-10-04 19:41:51 +02:00
• bc56ed3f03 [NOT FINISHED] delete fees in chunks delete-fees-in-chunks Bilal Catic 2019-10-04 18:52:41 +02:00
• 5a07b74ae2 Merge branch 'improve-error-handling-for-addFees' into 'master' Bilal Catic 2019-10-04 14:57:58 +00:00
• 7f65a6784f Add logging in addFees steps Bilal Catic 2019-10-04 16:55:43 +02:00
• fc662b73a6 Add logging in addFees steps Bilal Catic 2019-10-04 16:54:12 +02:00
• ca55bf83af load resource price if booking price is zero Bilal Catic 2019-10-03 10:39:16 +02:00
• bc6b7b7268 remove NaN bug for incident charge fee Bilal Catic 2019-10-02 23:23:06 +02:00
• 5202e05325 Merge branch 'fix-wrong-date-on-fees' into 'master' Bilal Catic 2019-09-11 10:27:04 +00:00
• 0a4da1b18f fix dates in fees description Bilal Catic 2019-09-11 12:26:08 +02:00
• dc0a335eb9 fix hourly rate value Bilal Catic 2019-09-11 12:25:46 +02:00
• cd77159ea2 fix charging reservation changes Bilal Catic 2019-09-11 12:25:25 +02:00
• 75524f530a Merge branch 'add-env-variable-to-control-sending-fees-to-ORD' into 'master' Bilal Catic 2019-09-10 04:58:17 +00:00
• 45cb255283 Display error message if sending fees fails Bilal Catic 2019-09-10 06:56:21 +02:00
• 75201dea6d Control sending fees via ENV variable Bilal Catic 2019-09-10 06:56:02 +02:00
• 1e2eadba6c Merge branch 'disable-sending-fees-for-current-and-future-months' into 'master' Bilal Catic 2019-09-06 05:54:45 +00:00
• 392c7f33c3 disable adding fees for current or month in future Bilal Catic 2019-09-06 07:43:51 +02:00
• ddd375d4ce disable sending fees for current or month in future Bilal Catic 2019-09-06 07:25:03 +02:00
• b8d5830071 Merge branch 'skip-custom-fees-with-defined-prefix-when-deleting' into 'master' Bilal Catic 2019-09-05 08:51:28 +00:00