318 Commits

Author SHA1 Message Date
Bilal Catic
8f740eb8c5 generate member practice summary report without booking change checks 2020-03-09 17:18:38 +01:00
Bilal Catic
1451e0daaf Merge branch 'stop-adding-non-existing-bookings' into 'master'
Stop adding non existing bookings

See merge request saburly/psihologija!83
2020-01-15 18:31:17 +00:00
Bilal Catic
06601f272c do not add reservations to the db for tentative and free bookings 2020-01-15 19:29:57 +01:00
Bilal Catic
aa771bc7bd do not create booking reservation for non existing reservation in ORD with exceptions 2020-01-15 18:48:55 +01:00
Bilal Catic
45258334c1 do not create booking reservation for non existing reservation in ORD 2020-01-15 04:27:16 +01:00
Bilal Catic
55086fb54b handle unknown members, offices and rooms 2020-01-13 12:42:20 +01:00
Bilal Catic
459e6d15ef Merge branch 'fix-bug-with-clean-slate-unlocked-incidents' into 'master'
stop inserting and changing deleted unlock incidents

See merge request saburly/psihologija!82
2020-01-09 22:31:54 +00:00
Bilal Catic
62dc399a1a stop inserting and changing deleted unlock incidents 2020-01-09 23:23:28 +01:00
Bilal Catic
280e8af748 Merge branch 'allow-incident-price-modification-frontend' into 'master'
Allow incident price modification frontend+backend

See merge request saburly/psihologija!81
2020-01-09 17:13:04 +00:00
Bilal Catic
cf0b2793ec remove obsolete stylesheet file 2020-01-09 03:47:17 +01:00
Bilal Catic
e03bf7609e fix paging bug 2020-01-09 03:41:16 +01:00
Bilal Catic
a5bec0f7f3 remove logs on update request 2020-01-09 02:30:22 +01:00
Bilal Catic
aafd046063 show rounded decimals for default values; handle zero as normal input 2020-01-09 02:26:35 +01:00
Bilal Catic
1a21e91796 implement backend methods to update incident fees 2020-01-09 01:33:19 +01:00
Bilal Catic
ff8a836fed add action for sending update data to backend 2020-01-09 01:29:06 +01:00
Bilal Catic
c78a0e4138 allow fees edit; track changes; focus last changed input field 2020-01-08 19:09:35 +01:00
Bilal Catic
3a10e56eeb wait for door lock charges calculation 2020-01-06 22:33:26 +01:00
Bilal Catic
7db5c314ce Merge branch 'fix-undetected-unschedule-use-in-brake-between-bookings' into 'master'
Fix undetected unschedule use in brake between bookings

See merge request saburly/psihologija!80
2019-12-26 01:34:15 +00:00
Bilal Catic
b2450faa0c add special check for unscheduled use in brake between reservations 2019-12-26 02:31:40 +01:00
Bilal Catic
87d7193bb9 add method for finding last reservation in a block 2019-12-26 02:30:03 +01:00
Bilal Catic
c1f3f42368 match unlock entry before first reservation in a block 2019-12-25 16:41:05 +01:00
Bilal Catic
a4573a9a13 Merge branch 'reformat-booking-moved-to-another-day-fee-for-the-hundreth-time' into 'master'
reformat booking change incident fee description

See merge request saburly/psihologija!79
2019-12-16 09:30:20 +00:00
Bilal Catic
40aef5ed30 reformat booking change incident fee description 2019-12-16 10:29:52 +01:00
Bilal Catic
f36b1d6628 Merge branch 'remove-first-5-minutes-from-unscheduled-use' into 'master'
remove first N minutes from unscheduled use (N is time resolution)

See merge request saburly/psihologija!78
2019-12-15 17:15:52 +00:00
Bilal Catic
ba5dc504b2 remove first N minutes from unscheduled use (N is time resolution) 2019-12-15 18:15:23 +01:00
Bilal Catic
528626760b Merge branch 'fix-wrong-unscheduled-incident-detection' into 'master'
fix how unlocked and unscheduled incidents are applied

See merge request saburly/psihologija!77
2019-12-13 19:15:55 +00:00
Bilal Catic
501b8cf629 fix how unlocked and unscheduled incidents are applied 2019-12-13 18:36:39 +01:00
Bilal Catic
a604687c61 Merge branch 'fix-wrong-unlock-entry-detection' into 'master'
Fix wrong unlock entry detection

See merge request saburly/psihologija!76
2019-12-12 09:56:33 +00:00
Bilal Catic
b71d869f49 fix wrong exit entry detection 2019-12-12 09:19:33 +01:00
Bilal Catic
3d7db8b156 fix wrong entrance entry detection after reservation start 2019-12-11 20:47:07 +01:00
Bilal Catic
f0b4a069e8 do not delete fees with selected product 2019-12-09 10:37:58 +01:00
Bilal Catic
b16d2c78da Merge branch 'reformat-fees-text' into 'master'
Reformat fees text

See merge request saburly/psihologija!75
2019-12-09 06:58:32 +00:00
Bilal Catic
052f2ac482 change date of shortening fees to the date of booking 2019-12-09 07:39:46 +01:00
Bilal Catic
b13980a16d change date of shortening fees to the date of booking 2019-12-09 06:55:14 +01:00
Bilal Catic
3b442f9b34 change "moved to another day" fee text explanation 2019-12-09 06:51:30 +01:00
Bilal Catic
2dc787d2ed reformat "moved to another day" fee text, show old booking time 2019-12-09 06:51:03 +01:00
Bilal Catic
9d142901df do not re-create deleted incidents 2019-12-06 06:04:45 +01:00
Bilal Catic
988dd275ef Merge branch 'fix-incidents-for-bookings-with-break-between' into 'master'
Fix incidents for bookings with break between

See merge request saburly/psihologija!74
2019-12-06 04:46:42 +00:00
Bilal Catic
d4f205af1f Fix wrong unlocked incident level on the last day of month 2019-12-06 05:44:18 +01:00
Bilal Catic
fa1fa35986 add custom check for incident between two, not back-to-back bookings 2019-12-06 05:39:01 +01:00
Bilal Catic
18022571aa Merge branch 'fix-back-to-back-issue-2-unlocked-fee-applied' into 'master'
fix how unlocked incident fees are applied

See merge request saburly/psihologija!73
2019-12-06 03:35:32 +00:00
Bilal Catic
8944f5181c fix how unlocked incident fees are applied 2019-12-06 03:16:24 +01:00
Bilal Catic
e462f076d0 Merge branch 'fix-repeated-booking' into 'master'
Fix repeated booking

See merge request saburly/psihologija!72
2019-12-05 08:29:30 +00:00
Bilal Catic
f9694570a5 add debugging logs 2019-12-05 09:27:39 +01:00
Bilal Catic
166e2a0a9f look for all door lock events before if from timestamp is not defined 2019-12-05 09:25:18 +01:00
Bilal Catic
6df1a798ee transform repeated booking to series of regular bookings 2019-12-04 12:42:32 +01:00
Bilal Catic
4367ca4259 bookings are now added from fees array - for repeated bookings 2019-12-03 18:23:20 +01:00
Bilal Catic
0ef109ffce insert debugging logs, comment for now 2019-12-03 18:21:38 +01:00
Bilal Catic
a14ca5aaa7 remove console logging 2019-12-03 18:20:34 +01:00
Bilal Catic
2c24028999 Merge branch 'fix-undetected-unscheduled-use-incidents' into 'master'
synchronize incidents detection and save incidents to the DB

See merge request saburly/psihologija!71
2019-12-02 19:59:44 +00:00