midgard/tab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
375 commits 1 branch 0 tags 560 KiB
Commit graph

273 commits

Author SHA1 Message Date
Felix Van der Jeugt
9302c3533b add distributions of debt sources and transaction amounts 2015-09-12 00:55:23 +02:00
Felix Van der Jeugt
c9010f59ee add shamepie -- the big slices are really gross! 2015-09-12 00:17:43 +02:00
Felix Van der Jeugt
eb2c85aa9f layout the table of shame 2015-09-11 23:49:27 +02:00
Felix Van der Jeugt
8f55d915e8 Merge branch 'master' into cute-little-statistics 2015-09-11 23:33:04 +02:00
Felix Van der Jeugt
24f8050ac9 implement simple wall of shame 2015-09-11 23:32:38 +02:00
benji
d44a7ab563 Ugly server debug hack 2015-09-11 22:41:43 +02:00
benji
29b51a63e2 i guess noctua removed this 2015-09-11 22:21:18 +02:00
benji
e6914babee Select2 on peer 2015-09-11 21:14:35 +02:00
benji
eb26d14e40 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 21:06:22 +02:00
benji
c3ea6dd433 Select2 on filter options 2015-09-11 21:05:00 +02:00
Ilion Beyst
a87f00ddbc collapsable filter div 2015-09-11 20:46:37 +02:00
Ilion Beyst
60b7a14a5d apparently exec_query fixes everything 2015-09-11 20:03:12 +02:00
benji
40f35be26c Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 18:23:07 +02:00
benji
c341c7213a Put default width on select2 2015-09-11 18:22:54 +02:00
Felix Van der Jeugt
3530fd1e5d add simplistic wall of shame 2015-09-11 18:04:45 +02:00
Ilion Beyst
6e192bb907 reload table on new transaction 2015-09-11 17:55:50 +02:00
Felix Van der Jeugt
e98950b336 remove console.log 2015-09-11 17:51:51 +02:00
Ilion Beyst
1472884ccb redirect to user page after sign in 2015-09-11 17:22:42 +02:00
Felix Van der Jeugt
b81bccabac initial commit for cute little statistics 2015-09-11 17:13:23 +02:00
benji
f9b6f17456 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 17:08:52 +02:00
benji
274059d10f btn - Zeus link - deploy 2015-09-11 17:08:46 +02:00
Ilion Beyst
39ee9a19a2 reverse transaction with negative amount 2015-09-11 16:35:46 +02:00
Felix Van der Jeugt
020a2b97e8 improve placeholders for date ranges 2015-09-11 16:34:09 +02:00
benji
b67e0954e3 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 15:50:10 +02:00
Ilion Beyst
bd2c986604 order query on time 2015-09-11 15:51:15 +02:00
benji
3ec19abab3 diefstal is een misdrijf 2015-09-11 15:50:07 +02:00
benji
670d748d40 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 15:18:42 +02:00
benji
5db705d8d4 Change styling filters to bootstrap 2015-09-11 15:18:36 +02:00
Ilion Beyst
8293662fff allow negative amounts to swap creditor and debtor 2015-09-11 15:16:20 +02:00
benji
bd5f444869 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 14:52:59 +02:00
benji
3d145d6e54 Add bootstrap 2015-09-11 14:52:26 +02:00
Ilion Beyst
bb9d4bc371 friendly ids! 2015-09-11 14:51:35 +02:00
Ilion Beyst
dbaded000f return forbidden for forbidden json requests 2015-09-11 14:32:24 +02:00
Ilion Beyst
2ea8124a01 fix lower bound in number filter 2015-09-11 14:24:28 +02:00
benji
315687ffad Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 14:12:59 +02:00
benji
ea14b6b472 typo 2015-09-11 14:12:54 +02:00
Ilion Beyst
9fea3a6ca4 format table values 2015-09-11 14:10:55 +02:00
benji
8d472c079b Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 13:17:07 +02:00
benji
a2681f9951 Remote transaction form 2015-09-11 13:16:53 +02:00
Ilion Beyst
4fad3416c0 fix general retartedness on my side 2015-09-11 12:07:43 +02:00
Ilion Beyst
bf9a845780 implement pagination 2015-09-11 12:07:43 +02:00
Felix Van der Jeugt
d336e778f7 improve (and fix) parsing 2015-09-11 11:55:33 +02:00
benji
dd7fc618b6 Make transaction form remote 2015-09-11 11:16:41 +02:00
benji
7c99a9229e Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 11:09:44 +02:00
benji
c8c77c0b9c Add calendar icons to input fields 2015-09-11 11:09:38 +02:00
Felix Van der Jeugt
0973898743 let filtering column depend on a data field, not the index 2015-09-11 11:08:15 +02:00
Ilion Beyst
fcb11bb036 fix :name in predicates 2015-09-11 10:46:03 +02:00
Ilion Beyst
e621f6ef29 re-enable filters 2015-09-11 10:39:06 +02:00
Felix Van der Jeugt
9dcfa33d16 reapply iasoon's pretty destructive styling in a non-destructive way 2015-09-11 10:34:04 +02:00
Felix Van der Jeugt
5e84d853fc Revert "style user transaction table" 
This reverts commit da7fb11b78.
 2015-09-11 10:24:44 +02:00
Felix Van der Jeugt
91a0023cd2 revert part of rewrite, preparing for reverting the bad commit 2015-09-11 10:24:29 +02:00
Felix Van der Jeugt
8baaae8b16 start with complete rewrite 2015-09-11 09:59:31 +02:00
benji
6f37cbf8ac Add font awesome 2015-09-10 22:57:00 +02:00
benji
80befb41c6 Remove simple form 2015-09-10 22:45:38 +02:00
benji
496cb16a8b Put back euro sign 2015-09-10 22:39:35 +02:00
Ilion Beyst
a3a7ff8c44 Revert "Merge branch 'master' into filter-datatables" 
This reverts commit 78863c40b7, reversing
changes made to bbaa070cca.
 2015-09-10 22:25:52 +02:00
Ilion Beyst
c31a58cf89 select correct peer in datatable query 2015-09-10 22:15:43 +02:00
benji
78863c40b7 Merge branch 'master' into filter-datatables 2015-09-10 21:49:08 +02:00
benji
c5dde90c43 Make transaction form remote 2015-09-10 21:46:05 +02:00
benji
bbaa070cca Add some more css to filters 2015-09-10 21:44:43 +02:00
Ilion Beyst
86f8f30ab2 comment filters until input is fixed 2015-09-10 21:42:20 +02:00
benji
331f00191e Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-10 21:12:09 +02:00
benji
0cf7faa598 Add some css to datatables 2015-09-10 21:12:03 +02:00
Ilion Beyst
25c3bdd0ca implement filters for datatable 2015-09-10 21:09:57 +02:00
Ilion Beyst
dd3c27c374 make datatable an object 2015-09-10 20:12:12 +02:00
Ilion Beyst
fdf4e27a27 integrate arel query with datatable 2015-09-10 19:41:47 +02:00
Ilion Beyst
8ef41c9503 add helpers to transactions_query 2015-09-10 17:41:47 +02:00
Ilion Beyst
bd99e150a4 union all 2015-09-10 17:41:47 +02:00
Ilion Beyst
81b30902f7 add issuer name to transactions query 2015-09-10 17:41:47 +02:00
Ilion Beyst
2d753146f0 update transactions query to include peer 2015-09-10 17:41:47 +02:00
Ilion Beyst
65e6278b67 set baby steps in the transactions query 2015-09-10 17:41:47 +02:00
Felix Van der Jeugt
2c1c92edb3 show all transactions on index, show user transactions on user show 2015-09-10 16:51:23 +02:00
benji
b30e1fb438 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-10 16:45:49 +02:00
benji
b55eb68118 Fix display correct amount in transaction form 2015-09-10 16:45:44 +02:00
Felix Van der Jeugt
61e6862154 fix more haml conversion errors 2015-09-10 16:34:11 +02:00
Felix Van der Jeugt
079c1ea4d0 Merge branch 'master' into datagrid 2015-09-10 16:18:46 +02:00
benji
ec5e556dde Prevent transaction amount with commas to give wrong results 2015-09-10 16:15:17 +02:00
Ilion Beyst
d75ad56e79 union all 2015-09-10 15:59:22 +02:00
Ilion Beyst
7fe28494ce add issuer name to transactions query 2015-09-10 15:47:54 +02:00
benji
8da50eb32c current fix for x-api-key 2015-09-10 15:43:00 +02:00
benji
d215b31739 Add euro symbol to amount field 2015-09-10 15:26:15 +02:00
Ilion Beyst
7e251e19cb update transactions query to include peer 2015-09-10 15:05:53 +02:00
Felix Van der Jeugt
b51e56ee25 remove ordering arrows because ugly and useless 2015-09-10 15:00:48 +02:00
Felix Van der Jeugt
7bb2502b6f Merge branch 'master' into datagrid 2015-09-10 14:56:51 +02:00
Felix Van der Jeugt
e891f242e9 fix broken conversion 2015-09-10 14:47:50 +02:00
Felix Van der Jeugt
a3373b019c convert datagrid partials to haml 2015-09-10 14:35:17 +02:00
benji
f5d3a58bbb Move inline form to users#show 2015-09-10 14:12:05 +02:00
Ilion Beyst
06e3a5821e set baby steps in the transactions query 2015-09-10 14:04:39 +02:00
Felix Van der Jeugt
870fb16f00 add datagrid partials to allow pretty tables 2015-09-10 13:53:27 +02:00
Felix Van der Jeugt
b2936f7645 chance scope to single user and show peers 2015-09-10 13:47:43 +02:00
Felix Van der Jeugt
00272f34ee better filtering 2015-09-10 13:25:25 +02:00
Felix Van der Jeugt
9bde05abbb attempt to do this the long way once more 2015-09-10 12:09:30 +02:00
Felix Van der Jeugt
3a7472dcd0 add some columns to datagrid 2015-09-10 01:31:47 +02:00
Felix Van der Jeugt
b4695d623f replace datatables for user with datagrid for transactions 2015-09-10 00:35:59 +02:00
Felix Van der Jeugt
8287b26d3f add filters for most columns, realise what mistake I made 2015-09-10 00:05:26 +02:00
Felix Van der Jeugt
5e4a5b727c add pagination 2015-09-09 22:22:50 +02:00
benji
5ff29d2a1f API test 2015-09-09 21:52:16 +02:00
Ilion Beyst
da7fb11b78 style user transaction table 2015-09-09 21:26:26 +02:00
Felix Van der Jeugt
1957e3854a parse ranges and return some data about the filtering 2015-09-09 21:09:19 +02:00
Ilion Beyst
4fa9a01c73 add column breakpoints 2015-09-09 20:54:22 +02:00
Felix Van der Jeugt
6f7da1dd5b add types to the input fields 2015-09-09 20:18:30 +02:00
benji
4c44b3f738 Rspec tests 2015-09-09 20:11:59 +02:00
Felix Van der Jeugt
c1d4b1c649 change table order 2015-09-09 20:06:42 +02:00
Ilion Beyst
4173275e96 make datatable responsive 2015-09-09 19:37:23 +02:00
Felix Van der Jeugt
7eb32bf1c3 Merge branch 'master' into filter-datatables 2015-09-09 18:17:55 +02:00
benji
86b751fb81 Keep selected value in select2 when creating transaction fails 2015-09-09 17:56:27 +02:00
Ilion Beyst
160e68b1a5 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 17:55:22 +02:00
benji
a1b3326b73 Add pure css grids 2015-09-09 17:43:50 +02:00
Ilion Beyst
e4bdeea61a Merge branch 'api' 2015-09-09 17:39:17 +02:00
Ilion Beyst
1ac1d54c26 add transaction default debtor and creditor 2015-09-09 17:37:03 +02:00
benji
f217f07a83 Add some links on application view 2015-09-09 17:34:49 +02:00
Felix Van der Jeugt
747d014b85 write my own filtering form and parse with an object 2015-09-09 17:14:06 +02:00
benji
990ec00260 Merge branch 'api' of https://github.com/ZeusWPI/Tab into api 2015-09-09 17:07:09 +02:00
benji
1d6ab0f6eb Add some styling 2015-09-09 17:06:39 +02:00
Ilion Beyst
21e6432b41 fix ability when not logged in 2015-09-09 16:56:55 +02:00
Ilion Beyst
3a0d5f1017 add cancancan ability for creating transactions 2015-09-09 16:51:41 +02:00
Ilion Beyst
44e83e2aba allow euros and cents in transaction params 2015-09-09 16:26:06 +02:00
Ilion Beyst
661728772f add debtor input field for penning 2015-09-09 15:31:23 +02:00
benji
c20c30297b Install simple form 2015-09-09 14:59:13 +02:00
Felix Van der Jeugt
028f52ecde write own datatables backend - no filtering 2015-09-09 14:46:06 +02:00
benji
786e0a8d01 Merge branch 'api' of https://github.com/ZeusWPI/Tab into api 2015-09-09 14:08:42 +02:00
benji
d948071e49 Put authentication on api 2015-09-09 14:08:40 +02:00
Ilion Beyst
3d8b1e9c60 fix transactions cretate 2015-09-09 13:33:55 +02:00
benji
c3bf2b74cc Merge branch 'api' of https://github.com/ZeusWPI/Tab into api 2015-09-09 12:59:12 +02:00
benji
6229556e38 Make create in transactions work 2015-09-09 12:58:44 +02:00
Ilion Beyst
3a659485a6 Merge branch 'master' into api 2015-09-09 12:56:34 +02:00
Ilion Beyst
b66a06f139 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 12:53:28 +02:00
Ilion Beyst
95f4c54780 re-annotate 2015-09-09 12:50:39 +02:00
Ilion Beyst
87c2994cf0 add issuer to transaction 2015-09-09 12:49:24 +02:00
Ilion Beyst
dbc533a1cb mess around with api params 2015-09-09 11:56:13 +02:00
benji
a2ae293df0 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-09 11:54:59 +02:00
benji
738283dddd Change skip_authenticity_token by :null_session 2015-09-09 11:53:30 +02:00
Ilion Beyst
d32bfc55fb Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 11:32:40 +02:00
Ilion Beyst
7423cb4dda Add client identification methods 2015-09-09 11:31:34 +02:00
benji
f1af878c9e Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-09 11:25:01 +02:00
benji
321d0ea716 Add ClientAbility 2015-09-09 11:24:45 +02:00
Ilion Beyst
1233431d14 Added Zeus user 2015-09-08 21:38:29 +02:00
Ilion Beyst
d48f5ffa2a Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 21:35:48 +02:00
benji
bb5a4019e6 Rewrite transaction controller 2015-09-08 21:07:00 +02:00
Ilion Beyst
eb717e8cbd Move transaction table to user/show 2015-09-08 20:45:32 +02:00
benji
272923d08d Convert erb to haml files 2015-09-08 19:39:13 +02:00
Felix Van der Jeugt
19a6f4b921 Merge branch 'master' into transaction-vc 2015-09-08 19:12:51 +02:00
Ilion Beyst
5d2eff242c Merge branch 'transaction-vc' of github.com:ZeusWPI/Tab into transaction-vc 2015-09-08 17:46:13 +02:00
Ilion Beyst
20bb280482 Make transaction datatable actually work 2015-09-08 17:46:07 +02:00
benji
2f07856b67 Add authorization to user controller 2015-09-08 17:40:40 +02:00
Felix Van der Jeugt
15ba18fa59 merge remote branch into transaction-vc 2015-09-08 17:32:03 +02:00
Ilion Beyst
c3c13f428a Fixed ajax datatable 2015-09-08 17:30:13 +02:00
Felix Van der Jeugt
363c825e55 add create controller and dummy view 2015-09-08 17:30:02 +02:00
benji
52808c27df Merge pull request #2 from ZeusWPI/cancancan 
Add ability of cancancan
 2015-09-08 17:29:15 +02:00
benji
380bce6ed6 Add index and show action for users 2015-09-08 17:28:46 +02:00