Commit Graph

66 Commits

Author SHA1 Message Date
Bilal Catic
0ccd2ff55c handle fetching members list and members incidents list 2019-06-18 23:59:00 +02:00
Bilal Catic
785e336e55 add structure for member practice summary report 2019-06-18 15:28:04 +02:00
Bilal Catic
82aad70912 create and use component for member incidents 2019-06-18 15:27:18 +02:00
Bilal Catic
e5e86163ea improve date picker layout 2019-06-18 15:25:24 +02:00
Bilal Catic
16a62b35de fix fetching incidents for specific date in backend 2019-06-18 10:32:17 +02:00
Bilal Catic
1371ab0580 fix fetching incidents for specific dates from frontend 2019-06-18 10:14:11 +02:00
Bilal Catic
69cc120f54 add date range picker to the incidents screen 2019-06-17 20:10:57 +02:00
Bilal Catic
dc0efa5cea Merge branch 'add-door-lock-charges-screen' into 'master'
Show incidents report

See merge request saburly/psihologija!11
2019-06-17 11:16:40 +00:00
Bilal Catic
5ffc6620f8 add default values for missing env variables 2019-06-17 13:16:18 +02:00
Bilal Catic
d134f7ac4b align fee column to the right 2019-06-17 13:09:30 +02:00
Bilal Catic
781943026a fetch and display door lock incidents on frontend 2019-06-17 12:45:23 +02:00
Bilal Catic
f9bd84c9c5 improve report data sent from backend 2019-06-17 12:44:57 +02:00
Bilal Catic
cd50e1e671 add react table package 2019-06-17 12:42:17 +02:00
Bilal Catic
3090b0c0cb add timezone env variable 2019-06-17 12:41:55 +02:00
Bilal Catic
4c4e45f89f fix code style 2019-06-16 12:18:48 +02:00
Bilal Catic
2c8d6bd077 add controller and service to fetch all incidents 2019-06-16 11:53:20 +02:00
Bilal Catic
aa0264f230 Merge branch 'add-door-lock-charges-screen' into 'master'
Refactor

See merge request saburly/psihologija!10
2019-06-15 12:49:17 +00:00
Bilal Catic
803fed2bcf calculate dlock charges on dlock file upload. Refactor member lookup 2019-06-15 14:46:13 +02:00
Bilal Catic
e4b28fd69c Merge branch 'add-door-lock-charges-screen' into 'master'
detect and save unscheduled and unlocked incidents

See merge request saburly/psihologija!9
2019-06-14 06:08:04 +00:00
Bilal Catic
596336c41b detect and save unscheduled and unlocked incidents 2019-06-14 08:05:24 +02:00
Bilal Catic
07061d3d19 Merge branch 'add-door-lock-charges-screen' into 'master'
Add door lock charges screen

See merge request saburly/psihologija!8
2019-06-10 04:12:59 +00:00
Bilal Catic
39cb4ba92a remove old code 2019-06-10 06:11:08 +02:00
Bilal Catic
e05b6f0f56 add mapping; store resourceId in doorLockEvents table 2019-06-10 06:05:06 +02:00
Bilal Catic
04c9ee3806 add mapping; prevent upload before mapping office / resource 2019-06-10 06:05:06 +02:00
Bilal Catic
c23077d94f add new constants / refactor old constants 2019-06-10 06:05:06 +02:00
Bilal Catic
37aed91d35 add fuzzy search for office/resource matching 2019-06-10 06:05:06 +02:00
Bilal Catic
4c528296ec allow multiple files upload 2019-06-10 06:05:06 +02:00
Bilal Catic
4a030d63e6 add/update models 2019-06-10 06:05:06 +02:00
Bilal Catic
c021b55c26 add migrations for new table, columns and modified column names 2019-06-10 06:05:06 +02:00
Bilal Catic
0a712bf501 update axios, install moment timezone 2019-06-10 06:05:06 +02:00
Bilal Catic
c1e24b92f4 Merge branch 'add-door-lock-charges-screen' into 'master'
fix parsing reports, change tables to use timestamps

See merge request saburly/psihologija!7
2019-06-03 07:44:32 +00:00
Bilal Catic
c5408c1295 fix parsing reports, change tables to use timestamps 2019-06-03 09:41:03 +02:00
Bilal Catic
cae217739a Merge branch 'add-door-lock-charges-screen' into 'master'
fetch and save booking reservations

See merge request saburly/psihologija!6
2019-05-31 04:16:07 +00:00
Bilal Catic
727c6c940f fetch and save booking reservations 2019-05-31 06:15:19 +02:00
Bilal Catic
f2141544af Merge branch 'add-door-lock-charges-screen' into 'master'
display upload errors, unknown members

See merge request saburly/psihologija!5
2019-05-31 03:44:46 +00:00
Bilal Catic
87134e4ede display upload errors, unknown members 2019-05-31 05:42:50 +02:00
Bilal Catic
48503de853 Merge branch 'add-door-lock-charges-screen' into 'master'
upload, parse and store door lock entries

See merge request saburly/psihologija!4
2019-05-30 10:47:03 +00:00
Bilal Catic
79bcf91dc7 upload, parse and store door lock entries 2019-05-30 12:45:55 +02:00
Bilal Catic
d141889c4d Merge branch 'add-door-lock-charges-screen' into 'master'
Add door lock charges screen

See merge request saburly/psihologija!3
2019-05-28 11:38:42 +00:00
Bilal Catic
e5c5a6384a change labels 2019-05-28 13:36:07 +02:00
Bilal Catic
19c08195b4 seperate upload and report screens 2019-05-28 13:04:33 +02:00
Bilal Catic
90b6d7b7e5 remove console logging 2019-05-28 04:45:21 +02:00
Bilal Catic
6cc3643501 install and use redux to fetch data from server 2019-05-28 04:39:50 +02:00
Bilal Catic
0100f15960 add door lock charges controller 2019-05-28 04:38:53 +02:00
Bilal Catic
0f0fc49750 add key to react components 2019-05-28 04:38:14 +02:00
Bilal Catic
64ed758593 add key to react components 2019-05-28 01:28:14 +02:00
Bilal Catic
d3f8810c7c add form for door lock charge report 2019-05-27 19:35:22 +02:00
Bilal Catic
790582ceda fix code style 2019-05-27 19:35:00 +02:00
Bilal Catic
ed457e470f add main menu navigation and door lock charges page 2019-05-27 14:39:22 +02:00
Bilal Catic
c67b203bec Merge branch 'master' of gitlab.com:saburly/psihologija 2019-05-27 10:51:23 +02:00