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 |
|
Bilal Catic
|
c30fb1adf6
|
synchronize incidents detection and save incidents to the DB
|
2019-12-02 20:57:46 +01:00 |
|
Bilal Catic
|
fb959491d9
|
Merge branch 'implement-silent-fees-delete' into 'master'
add silent option to Delete fees request
See merge request saburly/psihologija!70
|
2019-11-26 12:18:04 +00:00 |
|
Bilal Catic
|
b1aad87601
|
add silent option to Delete fees request
|
2019-11-26 13:17:28 +01:00 |
|
Bilal Catic
|
9494fa48c5
|
Merge branch 'change-unscheduled-use-charge-time-limits' into 'master'
allow first time segment length for unscheduled use to be configurable
See merge request saburly/psihologija!69
|
2019-11-22 19:23:21 +00:00 |
|
Bilal Catic
|
93d46c231e
|
allow first time segment length for unscheduled use to be configurable
|
2019-11-22 20:22:44 +01:00 |
|
Bilal Catic
|
1436f0fdab
|
Merge branch 'change-fees-formatting' into 'master'
change fees formatting
See merge request saburly/psihologija!68
|
2019-11-22 07:59:09 +00:00 |
|
Bilal Catic
|
7c8a5e954e
|
change fees formatting
|
2019-11-22 08:58:36 +01:00 |
|
Bilal Catic
|
bc4db56e54
|
Merge branch 'allow-deleting-incident-fees' into 'master'
fix "Delete fee" on Member Incidents Report screen
See merge request saburly/psihologija!67
|
2019-11-21 14:16:28 +00:00 |
|
Bilal Catic
|
06a40e98e9
|
fix "Delete fee" on Member Incidents Report screen
|
2019-11-21 15:13:37 +01:00 |
|
Bilal Catic
|
d4a949aaf0
|
Merge branch 'allow-deleting-incident-fees' into 'master'
Allow deleting incident fees
See merge request saburly/psihologija!66
|
2019-11-21 13:36:59 +00:00 |
|
Bilal Catic
|
fa4e574d6e
|
remove obsolete logging
|
2019-11-21 14:34:50 +01:00 |
|
Bilal Catic
|
445a635300
|
split fees into specific categories and send delete request
|
2019-11-21 14:32:52 +01:00 |
|
Bilal Catic
|
d1d67c346a
|
add checkbox option to the incident tables
|
2019-11-21 09:21:21 +01:00 |
|
Bilal Catic
|
37abb86961
|
add and implement action to send "delete fees" request
|
2019-11-21 07:13:30 +01:00 |
|
Bilal Catic
|
8a3db0d481
|
add deleteFees route and implement logic
|
2019-11-21 07:12:50 +01:00 |
|
Bilal Catic
|
3d051766b1
|
fetch only non-deleted unlocked/unscheduled incidents
|
2019-11-20 15:26:20 +01:00 |
|
Bilal Catic
|
d4f823ff72
|
add deleted field to the unlocked/unscheduled incidents table and model
|
2019-11-20 14:53:53 +01:00 |
|
Bilal Catic
|
015c29f992
|
Merge branch 'add-door-unlock-lock-time-column-in-incidents-table' into 'master'
Add door unlock lock time column in incidents table
See merge request saburly/psihologija!65
|
2019-11-20 12:50:56 +00:00 |
|
Bilal Catic
|
cd79a47462
|
set main container width configurable
|
2019-11-20 13:46:41 +01:00 |
|
Bilal Catic
|
c0c4c1f4a1
|
add door unlock/lock time column to the incidents table
|
2019-11-20 13:46:12 +01:00 |
|
Bilal Catic
|
eff96f9e5e
|
fix mapping screen crash when office/resource is unknown
|
2019-11-20 13:45:54 +01:00 |
|
Bilal Catic
|
fcb71a3f00
|
Merge branch 'change-fees-formatting' into 'master'
fix fee formatting issues
See merge request saburly/psihologija!64
|
2019-11-20 11:28:30 +00:00 |
|
Bilal Catic
|
136cad8bbd
|
fix fee formatting issues
|
2019-11-20 12:27:42 +01:00 |
|