senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96 Commits 3 Branches 0 Tags
c0d7418f3fdccff223a1bc976e7555fd588197cd
Commit Graph

96 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bilal Catic
c0d7418f3f include booking change incidents in report; refactor 2019-07-08 18:50:10 +02:00
Bilal Catic
6bed9aecc0 create incidents for booking changes 2019-07-08 18:23:32 +02:00
Bilal Catic
7aab1e538e fetch reservations, find and update changed reservations 2019-07-07 03:53:31 +02:00
Bilal Catic
aedb09d1be Merge branch 'improve-incidents-report-ui' into 'master' 
Improve incidents report ui

See merge request saburly/psihologija!20
 2019-07-07 01:47:02 +00:00
Bilal Catic
fb82f6d4da improve UI, refactor 2019-07-07 03:45:07 +02:00
Bilal Catic
8926956fca include all incident types in summary 2019-07-07 03:02:13 +02:00
Bilal Catic
79c8e9c9e2 set selected member in practice report dropdown 2019-07-07 02:58:11 +02:00
Bilal Catic
e3eee4139b modify UI to display incidents separately 2019-07-07 02:44:34 +02:00
Bilal Catic
bd513b7599 make difference between pre-reservation and post-reservation unscheduled use 2019-07-07 02:43:07 +02:00
Bilal Catic
5d3653cd65 make difference between door lock charges related to reservations and standalone incidents 2019-07-07 00:28:39 +02:00
Bilal Catic
72bb874d85 Merge branch 'fix-door-lock-charge-bug' into 'master' 
fix door lock charges - unlocked incident

See merge request saburly/psihologija!19
 2019-07-03 12:35:47 +00:00
Bilal Catic
23b0924b5a include unscheduled use between reservations 2019-07-03 14:34:34 +02:00
Bilal Catic
2b492025fb fix door lock charges 2019-07-03 11:50:23 +02:00
Bilal Catic
fc4d374e23 fix door lock charges - unlocked incident 2019-07-02 10:12:56 +02:00
Bilal Catic
b9715a1ebe Merge branch 'fix-door-lock-charge-bug' into 'master' 
fix invalid door lock charges

See merge request saburly/psihologija!18
 2019-07-01 01:37:12 +00:00
Bilal Catic
26d58b87f2 fix invalid door lock charges 2019-07-01 03:35:02 +02:00
Bilal Catic
5bbf7016dc Merge branch 'add-door-lock-charges-screen' into 'master' 
Add door lock charges screen

See merge request saburly/psihologija!17
 2019-06-25 10:57:28 +00:00
Bilal Catic
e03f634aff fix timezone conversion when fetching booking reservations 2019-06-25 12:10:54 +02:00
Bilal Catic
7f0042633c refactor; save date and time in UTC correctly 2019-06-25 12:10:54 +02:00
Bilal Catic
0a95129e98 do not report unknown member multiple times; read dlock timestamps in correct timezone 2019-06-25 12:10:54 +02:00
Bilal Catic
8198f35343 Merge branch 'add-door-lock-charges-screen' into 'master' 
add link to member summary report from incidents table

See merge request saburly/psihologija!16
 2019-06-21 09:39:39 +00:00
Bilal Catic
f7c30919e6 add link to member summary report from incidents table 2019-06-21 11:36:42 +02:00
Bilal Catic
ac92401960 Merge branch 'add-door-lock-charges-screen' into 'master' 
improve date picker, allow inline button

See merge request saburly/psihologija!15
 2019-06-20 17:00:49 +00:00
Bilal Catic
2e12daf1e4 fix inline button 2019-06-20 18:01:36 +02:00
Bilal Catic
6aabe0f3fc improve date picker, allow inline button 2019-06-20 14:12:02 +02:00
Bilal Catic
edbe1f1e59 Merge branch 'add-door-lock-charges-screen' into 'master' 
sort members fetched from OfficeRnD

See merge request saburly/psihologija!13
 2019-06-20 11:36:43 +00:00
Bilal Catic
6a0ef53031 display summary for selected member and dates 2019-06-20 13:34:27 +02:00
Bilal Catic
7455514b40 sort members fetched from OfficeRnD 2019-06-20 00:06:21 +02:00
Bilal Catic
45a1eac3d9 Merge branch 'add-door-lock-charges-screen' into 'master' 
Add door lock charges screen

See merge request saburly/psihologija!12
 2019-06-18 22:26:06 +00:00
Bilal Catic
4166ff7a48 show incidents for selected member and selected dates 2019-06-19 00:23:40 +02:00
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