old-psihologija

senaduka/old-psihologija

Fork 0

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

aeffe86313 add router for "addFees" endpoint Bilal Catic 2019-07-18 03:45:39 +02:00
7437972a53 send request to add fees in ORD Bilal Catic 2019-07-18 03:44:16 +02:00
fdd4491e07 add button and modal dialog for invoice integration Bilal Catic 2019-07-16 11:23:11 +02:00
5a6bc3cc6f add route and controller for invoice integration Bilal Catic 2019-07-16 11:22:40 +02:00
ac1c82c16b control sequelize logging with env variable Bilal Catic 2019-07-24 07:20:05 +02:00
4fefa3a08d fix too long unscheduled use intervals Bilal Catic 2019-07-22 06:57:19 +02:00
dae71475ec fix undefined hourly rate bug Bilal Catic 2019-07-22 06:03:22 +02:00
00988b0dac do not charge cancellation under 30 minutes of creation Bilal Catic 2019-07-19 12:47:16 +02:00
ef40483c22 fix undefined hourlyRate bug Bilal Catic 2019-07-19 12:16:20 +02:00
96e12db213 Merge branch 'fix-cancellation-charges-display' into 'master' Bilal Catic 2019-07-16 08:18:03 +00:00
a27d71e578 display cancellation charges correctly Bilal Catic 2019-07-16 10:16:43 +02:00
966dbd9bdc Merge branch 'add-cancellation-incidents' into 'master' Bilal Catic 2019-07-16 00:52:52 +00:00
15faeac06f track and charge cancellation charges Bilal Catic 2019-07-16 02:51:07 +02:00
e61476393c Merge branch 'add-booking-change-log-table' into 'master' Bilal Catic 2019-07-15 09:49:51 +00:00
e150ebc7e8 implement booking reservation change log Bilal Catic 2019-07-15 01:24:18 +02:00
8a0e198690 Merge branch 'include-room-change-for-booking-change-incidents' into 'master' Bilal Catic 2019-07-12 02:46:15 +00:00
98899d6826 remove console log Bilal Catic 2019-07-12 04:41:34 +02:00
ad9bdfa606 track room change for booking change incidents Bilal Catic 2019-07-09 15:05:36 +02:00
edefaf7cf9 modify bookingChangeIncidents table Bilal Catic 2019-07-09 14:17:36 +02:00
129e6e78d6 update readme Bilal Catic 2019-07-08 20:46:14 +02:00
0560d1cb78 Merge branch 'include-cancelation-charges' into 'master' Bilal Catic 2019-07-08 18:28:14 +00:00
a11ce4252b make member clickable in booking change incidents table Bilal Catic 2019-07-08 20:27:35 +02:00
2a35d78ba7 Merge branch 'include-cancelation-charges' into 'master' Bilal Catic 2019-07-08 18:25:39 +00:00
f6e8e6667b display booking charge incidents; refactor frontend Bilal Catic 2019-07-08 20:23:50 +02:00
c0d7418f3f include booking change incidents in report; refactor Bilal Catic 2019-07-08 18:50:10 +02:00
6bed9aecc0 create incidents for booking changes Bilal Catic 2019-07-08 18:23:32 +02:00
7aab1e538e fetch reservations, find and update changed reservations Bilal Catic 2019-06-27 05:38:45 +02:00
aedb09d1be Merge branch 'improve-incidents-report-ui' into 'master' Bilal Catic 2019-07-07 01:47:02 +00:00
fb82f6d4da improve UI, refactor Bilal Catic 2019-07-07 03:45:07 +02:00
8926956fca include all incident types in summary Bilal Catic 2019-07-07 03:02:13 +02:00
79c8e9c9e2 set selected member in practice report dropdown Bilal Catic 2019-07-07 02:58:11 +02:00
e3eee4139b modify UI to display incidents separately Bilal Catic 2019-07-07 02:44:34 +02:00
bd513b7599 make difference between pre-reservation and post-reservation unscheduled use Bilal Catic 2019-07-07 02:43:07 +02:00
5d3653cd65 make difference between door lock charges related to reservations and standalone incidents Bilal Catic 2019-07-07 00:28:39 +02:00
72bb874d85 Merge branch 'fix-door-lock-charge-bug' into 'master' Bilal Catic 2019-07-03 12:35:47 +00:00
23b0924b5a include unscheduled use between reservations Bilal Catic 2019-07-03 14:34:34 +02:00
2b492025fb fix door lock charges Bilal Catic 2019-07-03 11:50:23 +02:00
fc4d374e23 fix door lock charges - unlocked incident Bilal Catic 2019-07-02 10:12:56 +02:00
b9715a1ebe Merge branch 'fix-door-lock-charge-bug' into 'master' Bilal Catic 2019-07-01 01:37:12 +00:00
26d58b87f2 fix invalid door lock charges Bilal Catic 2019-07-01 03:35:02 +02:00
5bbf7016dc Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-25 10:57:28 +00:00
e03f634aff fix timezone conversion when fetching booking reservations Bilal Catic 2019-06-24 22:33:10 +02:00
7f0042633c refactor; save date and time in UTC correctly Bilal Catic 2019-06-24 09:52:34 +02:00
0a95129e98 do not report unknown member multiple times; read dlock timestamps in correct timezone Bilal Catic 2019-06-23 11:05:27 +02:00
8198f35343 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-21 09:39:39 +00:00
f7c30919e6 add link to member summary report from incidents table Bilal Catic 2019-06-21 11:36:17 +02:00
ac92401960 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-20 17:00:49 +00:00
2e12daf1e4 fix inline button Bilal Catic 2019-06-20 18:01:36 +02:00
6aabe0f3fc improve date picker, allow inline button Bilal Catic 2019-06-20 14:11:39 +02:00
edbe1f1e59 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-20 11:36:43 +00:00
6a0ef53031 display summary for selected member and dates Bilal Catic 2019-06-20 13:34:27 +02:00
7455514b40 sort members fetched from OfficeRnD Bilal Catic 2019-06-19 09:31:12 +02:00
45a1eac3d9 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-18 22:26:06 +00:00
4166ff7a48 show incidents for selected member and selected dates Bilal Catic 2019-06-19 00:23:40 +02:00
0ccd2ff55c handle fetching members list and members incidents list Bilal Catic 2019-06-18 23:59:00 +02:00
785e336e55 add structure for member practice summary report Bilal Catic 2019-06-18 15:28:04 +02:00
82aad70912 create and use component for member incidents Bilal Catic 2019-06-18 15:27:18 +02:00
e5e86163ea improve date picker layout Bilal Catic 2019-06-18 15:25:24 +02:00
16a62b35de fix fetching incidents for specific date in backend Bilal Catic 2019-06-18 10:32:17 +02:00
1371ab0580 fix fetching incidents for specific dates from frontend Bilal Catic 2019-06-18 10:14:11 +02:00
69cc120f54 add date range picker to the incidents screen Bilal Catic 2019-06-17 20:10:57 +02:00
dc0efa5cea Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-17 11:16:40 +00:00
5ffc6620f8 add default values for missing env variables Bilal Catic 2019-06-17 13:16:18 +02:00
d134f7ac4b align fee column to the right Bilal Catic 2019-06-17 13:09:30 +02:00
781943026a fetch and display door lock incidents on frontend Bilal Catic 2019-06-17 12:45:23 +02:00
f9bd84c9c5 improve report data sent from backend Bilal Catic 2019-06-17 12:44:57 +02:00
cd50e1e671 add react table package Bilal Catic 2019-06-17 12:42:17 +02:00
3090b0c0cb add timezone env variable Bilal Catic 2019-06-17 12:41:55 +02:00
4c4e45f89f fix code style Bilal Catic 2019-06-16 12:18:48 +02:00
2c8d6bd077 add controller and service to fetch all incidents Bilal Catic 2019-06-16 11:53:20 +02:00
aa0264f230 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-15 12:49:17 +00:00
803fed2bcf calculate dlock charges on dlock file upload. Refactor member lookup Bilal Catic 2019-06-15 14:46:13 +02:00
e4b28fd69c Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-14 06:08:04 +00:00
596336c41b detect and save unscheduled and unlocked incidents Bilal Catic 2019-06-14 08:05:24 +02:00
07061d3d19 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-10 04:12:59 +00:00
39cb4ba92a remove old code Bilal Catic 2019-06-10 06:11:08 +02:00
e05b6f0f56 add mapping; store resourceId in doorLockEvents table Bilal Catic 2019-06-10 05:59:05 +02:00
04c9ee3806 add mapping; prevent upload before mapping office / resource Bilal Catic 2019-06-10 05:58:09 +02:00
c23077d94f add new constants / refactor old constants Bilal Catic 2019-06-10 05:55:58 +02:00
37aed91d35 add fuzzy search for office/resource matching Bilal Catic 2019-06-10 05:55:13 +02:00
4c528296ec allow multiple files upload Bilal Catic 2019-06-09 17:09:02 +02:00
4a030d63e6 add/update models Bilal Catic 2019-06-09 11:37:38 +02:00
c021b55c26 add migrations for new table, columns and modified column names Bilal Catic 2019-06-09 11:36:34 +02:00
0a712bf501 update axios, install moment timezone Bilal Catic 2019-06-08 11:20:30 +02:00
c1e24b92f4 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-06-03 07:44:32 +00:00
c5408c1295 fix parsing reports, change tables to use timestamps Bilal Catic 2019-06-03 09:22:23 +02:00
cae217739a Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-05-31 04:16:07 +00:00
727c6c940f fetch and save booking reservations Bilal Catic 2019-05-31 06:15:19 +02:00
f2141544af Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-05-31 03:44:46 +00:00
87134e4ede display upload errors, unknown members Bilal Catic 2019-05-31 05:42:50 +02:00
48503de853 Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-05-30 10:47:03 +00:00
79bcf91dc7 upload, parse and store door lock entries Bilal Catic 2019-05-30 03:44:11 +02:00
d141889c4d Merge branch 'add-door-lock-charges-screen' into 'master' Bilal Catic 2019-05-28 11:38:42 +00:00
e5c5a6384a change labels Bilal Catic 2019-05-28 13:36:07 +02:00
19c08195b4 seperate upload and report screens Bilal Catic 2019-05-28 13:04:33 +02:00
90b6d7b7e5 remove console logging Bilal Catic 2019-05-28 04:45:21 +02:00
6cc3643501 install and use redux to fetch data from server Bilal Catic 2019-05-28 04:39:50 +02:00
0100f15960 add door lock charges controller Bilal Catic 2019-05-28 04:38:53 +02:00
0f0fc49750 add key to react components Bilal Catic 2019-05-28 04:38:14 +02:00
64ed758593 add key to react components Bilal Catic 2019-05-28 01:28:14 +02:00

1 2 3 4