Commit Graph

448 Commits

Author SHA1 Message Date
Finn c4b7fa5102 Added new stats and fixed test 2017-12-14 20:30:44 +00:00
Finn b9a57c7dcb org graphs and relevant test fixed 2017-12-14 17:25:00 +00:00
Finn b2627eea4f fixing graph code and added placeholder pie code 2017-12-14 17:20:06 +00:00
Finn f50c5e685c working graphs on frontend 2017-12-13 14:29:17 +00:00
Finn 8067d3cb96 made customer graphs work with passing test 2017-12-13 13:33:29 +00:00
Finn 8e1e9b2ec2 fixed snippets if no values to get 2017-12-12 17:31:05 +00:00
Finn 3100fec233 added snippet endpoint and test 2017-12-12 17:21:32 +00:00
Finn b3f1a018b5 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +00:00
Finn e6c236e1ff schema and map code updated, test fixed 2017-12-08 13:19:22 +00:00
Finn fb25cbe773 esta added to schema and updated admin interface 2017-12-08 12:30:49 +00:00
Finn 0b6d823145
Merge pull request #81 from Pear-Trading/finn/linkcorrections
added link corrections
2017-12-08 11:27:44 +00:00
Finn 1e02062ca3 added new tab linking and corrected redirect 2017-12-04 12:30:10 +00:00
Finn 8b91c3b3c8 Revert "added new tab linking and corrected redirect"
This reverts commit 4eb5a4fd3f.
2017-12-04 12:29:34 +00:00
Finn 4eb5a4fd3f added new tab linking and corrected redirect 2017-12-04 12:27:53 +00:00
Finn a95bfccdf9 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Tom Bloor 843037ea78
Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Finn 9a71c1b7f5 extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn 9adf9668b1 added location info to main map 2017-11-27 11:36:21 +00:00
Tom Bloor 1bc56016e7 Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor 6d138af016 Fixed issue with Importset for users and orgs trying to much data for
the group by
2017-11-23 16:52:33 +00:00
Finn 460c9e6049 extra org data added 2017-11-23 16:35:45 +00:00
Finn 8ada3f86b6 fixes added and working admin interface 2017-11-23 16:25:14 +00:00
Finn 0072a97a3a endpoint and code added for LIS orgs 2017-11-23 15:42:37 +00:00
Finn 8c166464cc database upgraded and interface added 2017-11-23 14:54:59 +00:00
Finn d36091528f Entity Assoiciations added to database 2017-11-23 13:20:26 +00:00
Tom Bloor fc0d2f6fa0
Fixed schema issue for import value foreign key being set wrong 2017-11-21 11:13:04 +00:00
Tom Bloor 9f4d39e029
Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor addd5c640c
dded minor logging to API login endpoint 2017-11-21 10:40:22 +00:00
Tom Bloor 9aaf3b4718
Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor bccb292441
Added badge on organisations showing if they are a user or not 2017-11-20 13:02:07 +00:00
Tom Bloor 14410b475a
Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor f49fb93658
Finishing off CSV import functionality 2017-11-15 18:22:49 +00:00
Tom Bloor 1015be7810
Allow for ignoring of values in import and toggle showing of them 2017-11-14 18:41:54 +00:00
Tom Bloor 7df6fecfc4
Added org lookup and assignment for import 2017-11-14 15:02:46 +00:00
Tom Bloor 37bc29829f
Refactored csv import flash errors 2017-11-14 12:57:28 +00:00
Tom Bloor cb7ab797f5 Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
	CHANGELOG.md
2017-11-14 12:43:29 +00:00
Tom Bloor 72929bf86b Added assigning users to import values 2017-11-13 19:00:34 +00:00
Tom Bloor 9096bef00d Further work on import functions 2017-11-13 13:30:33 +00:00
Tom Bloor 593efcedfa Schema update for v 16 to include import lookups 2017-11-13 13:02:22 +00:00
Finn 105c9093b8 fixes 2017-11-10 18:39:00 +00:00
Finn 049b4836c5 Added code to leaderboard web app API 2017-11-10 17:07:41 +00:00
Finn c4681ffc3a web app api leaderboard added 2017-11-10 16:45:58 +00:00
Tom Bloor 40dbd1eb50 Added ignore_value boolean to Import Value table 2017-10-27 12:10:52 +01:00
Tom Bloor e09974f0d9 First pass of importing data 2017-10-26 17:01:23 +01:00
Tom Bloor ef36cbc541 Add setting of is_local to organisations 2017-10-24 15:23:09 +01:00
Tom Bloor d881b3f95f Added is_local flag to organisation table 2017-10-24 13:47:41 +01:00
Tom Bloor dcd5896cea Added pagination to organisation listings 2017-10-24 13:31:04 +01:00
Tom Bloor ed8607fd35 Combine organisation lists into one with badges for warnings 2017-10-23 17:44:38 +01:00
Tom Bloor de90fe1f77 Added toggling of actioned on feedback, and view change for lists 2017-10-23 16:09:20 +01:00
Tom Bloor 0302a3d299 Upgrade to have actioned boolean on feedback - also fix boolean
deployment defaults
2017-10-23 15:46:30 +01:00
Tom Bloor 62881a0eda Added transaction distance calculation 2017-10-03 18:08:30 +01:00
Tom Bloor 37e8f0b46a Updated to allow for user updates to change location by postcode 2017-10-03 15:47:05 +01:00
Tom Bloor 202deb9178 Added output of location on User endpoint, and setting lat/long on user
registration
2017-10-03 15:33:43 +01:00
Tom Bloor 9e127b8851 Finalised Transaction report graph and test 2017-10-02 14:08:24 +01:00
Tom Bloor 13b594e64f Added footer with current git version shown 2017-09-29 16:21:24 +01:00
Tom Bloor e667947c65 Fix uninitialised warning 2017-09-29 16:14:02 +01:00
Tom Bloor a739b02eed Allow for day scale of transaction report 2017-09-29 16:04:41 +01:00
Tom Bloor cf2c7dcc4b Initial pass of Transaction reports 2017-09-29 14:45:44 +01:00
Tom Bloor c3519fa4df Improved Feedback list page 2017-09-28 16:39:16 +01:00
Tom Bloor 5e078f8f8b Added supplier location endpoint 2017-09-27 18:01:06 +01:00
Tom Bloor 0486d910ee Added script for setting up lat/long in db and showing in admin panels 2017-09-22 12:35:12 +01:00
Tom Bloor bfcacbee32 Added schema upgrade for transaction distance 2017-09-22 12:32:02 +01:00
Tom Bloor 62cad2d70e Added distance to transaction column 2017-09-21 17:25:55 +01:00
Tom Bloor e2e4e4769d Added upgrade DDL for lat-long on customers and orgs 2017-09-21 17:06:50 +01:00
Tom Bloor a810795ca5 Added lat and long to customers and organisations 2017-09-21 17:01:10 +01:00
Tom Bloor ad51891f51 Made script able to import into database 2017-09-21 16:57:14 +01:00
Tom Bloor db1bbab10f Upgrade for postcode data table 2017-09-21 16:47:02 +01:00
Tom Bloor 3e87326265 Added otucode listings for codepoint_open command 2017-09-21 15:52:01 +01:00
Tom Bloor f056199ec1 Merge branch 'development' into TBSliver/Postcode-Location 2017-09-21 15:49:27 +01:00
Tom Bloor 5a80d57ca2 Added table for storing postcodes 2017-09-21 15:48:25 +01:00
Tom Bloor 119774e434 First pass of codepoint_open importer 2017-09-21 15:17:45 +01:00
Finn 22bdb625f0 Added datetime format 2017-09-19 17:40:17 +01:00
Finn 5f241bbd46 Tests fixed and API improved and DB upgraded 2017-09-19 17:23:30 +01:00
Finn 8e2cecfcf5 added read API 2017-09-19 15:50:58 +01:00
Finn 813f4af63f New routes added 2017-09-19 14:41:11 +01:00
Finn 78964d7297 Made endpoints org only 2017-09-18 17:31:29 +01:00
Finn e388d360ac Changed endpoints in API 2017-09-18 17:26:35 +01:00
Finn 616181def3 Payroll sumission API improved and test added 2017-09-18 17:13:18 +01:00
Finn b224182e61 Merge branch 'development' into finn/OrgDataAPI 2017-09-18 15:39:14 +01:00
Finn 9cb4f7c782 Added error rewrites and added feedback test 2017-09-18 13:31:30 +01:00
Finn 9e56383b46 User and Register API errors improved 2017-09-18 11:34:22 +01:00
Finn dd36cd0c0c Feedback API error improved 2017-09-18 11:31:57 +01:00
Finn 414acd76fb Transaction API errors improved 2017-09-18 11:11:53 +01:00
Tom Bloor 99cb3e888e Merge pull request #57 from Pear-Trading/finn/interfacechange
Changed routing on submission
2017-09-15 13:09:50 +01:00
Tom Bloor 25511ced69 Fix calculation mistake on leadearboard display 2017-09-15 12:54:36 +01:00
Finn d1757bdac9 Changed routing on submission 2017-09-15 11:18:27 +01:00
Tom Bloor 1ffabb3e94 Updated all endpoints to use new transaction value multiple 2017-09-13 16:07:23 +01:00
Tom Bloor b34e47215a Change to using straight numeric columns with no decimal points 2017-09-13 15:23:48 +01:00
Tom Bloor 51e1c4d7d4 Change to using Moo for Test framework, and allow for PG testing 2017-09-13 15:23:23 +01:00
Tom Bloor 66f4844835 Merge pull request #55 from Pear-Trading/TBSliver/Large-Graph
Added large graph items
2017-09-08 15:41:10 +01:00
Finn 26a37904d2 Naming sanitised 2017-09-08 13:00:42 +01:00
Tom Bloor 6de616584a Add customer_range graph 2017-09-08 12:47:20 +01:00
Tom Bloor 4176c61c00 Remove post user/day, and reformat validators 2017-09-08 12:46:54 +01:00
Finn 9cfd5536b9 Removed redundant code and added error messages 2017-09-08 12:15:11 +01:00
Tom Bloor 83094f380d Continue defaulting to 0 as well 2017-09-08 12:03:48 +01:00
Tom Bloor e13a128179 Add zero to sums to force number on output 2017-09-08 12:00:23 +01:00
Finn 662219fc6e Initial API for submission added 2017-09-08 11:41:21 +01:00
Tom Bloor c6679e1261 Merge pull request #53 from Pear-Trading/TBSliver/Org-Snippets
Added org snippets endpoint
2017-09-07 16:25:21 +01:00
Tom Bloor d5dd71661d Fix inflation of booleans from database 2017-09-07 16:19:13 +01:00
Tom Bloor 05c20b9e85 Added new snippets endpoints 2017-09-07 16:03:01 +01:00
Finn edac93bef5 Changed deletion method to POST and working test 2017-09-07 13:20:53 +01:00
Finn 416ac6343a Added ability to delete transactions successfully 2017-09-07 12:53:01 +01:00
Finn 8034844cec Merge pull request #50 from Pear-Trading/finn/TransactionViewAPI
Transaction API added
2017-09-06 17:52:56 +01:00
Finn ebe6ccb33e Fixed page no 2017-09-06 17:03:53 +01:00
Tom Bloor 6ed0be4801 Use normal 1 instead of deferenced for proper inflation 2017-09-06 16:12:36 +01:00
Tom Bloor 8eda4f88b2 Fixed boolean inflation for User table 2017-09-06 16:11:57 +01:00
Tom Bloor d2b769d471 Auto inflate correctly based on database type for booleans 2017-09-06 16:10:34 +01:00
Finn 4e7c8bbfae Created test and fixed things
Still needs to spit out timezone on the datetime
2017-09-05 17:24:04 +01:00
Finn 06858fc005 Added outgoing transaction list API 2017-09-05 16:37:31 +01:00
Finn 60e6b2717e Added ability for when there is no image 2017-09-05 13:52:05 +01:00
Finn e7631dd90e Code for viewing single transaction added 2017-09-05 13:44:58 +01:00
Finn cd6c075588 View Transactions from a User on their page 2017-09-05 12:27:37 +01:00
Tom Bloor cae2806ad2 Merge pull request #44 from Pear-Trading/finn/StopSameOrgPurchase
Stopped Orgs from buying for themselves & added to test
2017-09-05 12:20:25 +01:00
Tom Bloor 1693bc7fb6 Merge pull request #45 from Pear-Trading/TBSliver/Org-Graph-Improvements
Added extra graph types
2017-09-05 12:19:18 +01:00
Finn a463b99fa9 Stopped Orgs from buying for themselves & added to test 2017-09-05 12:03:49 +01:00
Tom Bloor 4ba6a443fc Stop null values on org graphs 2017-09-04 17:39:48 +01:00
Tom Bloor 4d21de7bae Improved Graphs and added sales and purchase data graphs.
Includes an API change for development.
2017-09-04 17:29:28 +01:00
Finn fabd01f988 Fixed for sector in account editing 2017-09-04 17:05:10 +01:00
Finn 2137b5607f Fixed Org account editing for portal 2017-09-04 16:12:03 +01:00
Tom Bloor 4fa52901cb Update add org to work with new form 2017-09-04 14:09:36 +01:00
Tom Bloor 2ef5193e41 Fixed organisaiton listing and editing in backend 2017-09-04 14:03:58 +01:00
Tom Bloor cca27b5475 Fix org graphs test for entity upgrade 2017-08-31 19:12:13 +01:00
Tom Bloor adfcd8880f Fix User endpoints for entity upgrade 2017-08-31 19:08:22 +01:00
Tom Bloor dd6e21eb50 Fix upload tests for entity upgrade 2017-08-31 19:03:49 +01:00
Tom Bloor e91863a3d7 Fixed stats endpoint for leaderboards on entity upgrade 2017-08-31 18:31:42 +01:00
Tom Bloor aa6cc63506 Refactor leaderboard creation functions for entity upgrade 2017-08-31 18:25:27 +01:00
Tom Bloor 8d205d62c2 Refactor stats test to use fixtures and fix stats endpoints for entity
update
2017-08-31 18:04:51 +01:00
Tom Bloor 2980fd129f Fix search test for entity upgrade 2017-08-31 17:54:25 +01:00
Tom Bloor bf16077b10 Fix register for new entity work 2017-08-31 16:46:25 +01:00
Tom Bloor 4cc8aad367 Fix admin user test for entity upgrade 2017-08-31 16:38:03 +01:00
Tom Bloor 92afe1c531 Fix admin organisation management tests 2017-08-31 14:52:45 +01:00
Tom Bloor 18992784b2 Fix admin login test and required changes for entity upgrade 2017-08-31 13:35:49 +01:00
Tom Bloor bd8b1f91a4 Merge branch 'development' into TBSliver/Schema-Changes 2017-08-31 13:07:23 +01:00
Tom Bloor b2312f7dbc Fix unique constraint on LB values 2017-08-31 12:40:42 +01:00
Tom Bloor 27d06fbe37 Bump schema version number to 6 2017-08-31 12:39:36 +01:00
Tom Bloor fd98670333 Updated user to use new Entity table 2017-08-31 12:39:10 +01:00
Tom Bloor 2954297b35 Change transaction to use entity table 2017-08-31 12:30:52 +01:00
Tom Bloor 8acf3af28a Removed pending org and transaction 2017-08-31 12:30:37 +01:00
Tom Bloor 4f99ef82f6 Update organisation with extra information required for entity upgrade 2017-08-31 12:29:06 +01:00
Tom Bloor 7042020969 Change LB Value to link to entity instead of user 2017-08-31 12:19:47 +01:00
Tom Bloor 64cab5f17c Fixed whitespace in Feedback table 2017-08-31 12:18:07 +01:00
Tom Bloor 6a720b0a46 Added Entity to customer 2017-08-31 12:17:05 +01:00
Tom Bloor 736ffb89cf Added entity table 2017-08-31 12:16:38 +01:00
Finn 4189025c6f Added timings and descending submit at time for receipts 2017-08-31 11:51:22 +01:00
Finn 72813ff2a3 Made image upload optional 2017-08-31 11:41:38 +01:00
Tom Bloor 36e91866c9 Remove Administrator column 2017-08-31 11:26:30 +01:00
Tom Bloor 3ae8a43df4 Added organisation graph endpoint and tests 2017-08-29 12:42:27 +01:00
Tom Bloor 7ed2636978 Added fixture installer to main fixtures set 2017-08-25 17:12:12 +01:00
Tom Bloor df7f1de1a6 Merge pull request #37 from Pear-Trading/TBSliver/Login-Info
Added extra info to login return
2017-08-25 16:15:16 +01:00
Finn ef2e0627e1 Fixes and schema update stuff 2017-08-25 15:32:39 +01:00
Finn ff263374ec Added endpoints for organisation sector 2017-08-25 15:25:52 +01:00
Tom Bloor 4a4c568fb7 Return user type on login 2017-08-25 14:59:15 +01:00
Tom Bloor 0a9ca57689 Added user type attribute 2017-08-25 14:59:01 +01:00
Tom Bloor e886eb2ce6 Remove explicit undef returns 2017-08-25 14:44:36 +01:00
Finn 06e89c9199 Merge pull request #34 from Pear-Trading/finn/AccountUpdateFix
Fixed validation for organisation edit
2017-08-24 13:21:05 +01:00
Finn db45f710c3 Code fixed, now functioning account edit 2017-08-24 12:37:53 +01:00
Finn 9865130666 Added user account stuff test and some fixes 2017-08-23 18:42:19 +01:00
Finn 4c7836c9f6 Initial server code added for updating user account 2017-08-23 16:50:04 +01:00
Finn 6f01bf2661 Fixed validation removing redundant code 2017-08-23 16:47:29 +01:00
Finn 4d299cee10 Fixed validation for organisation edit 2017-08-23 16:25:08 +01:00
Tom Bloor 49beb3037d Merge pull request #33 from Pear-Trading/TBSliver/Recalc-Leaderboards
Recalculate Leaderboards
2017-08-21 17:04:26 +01:00
Tom Bloor 9b9b2bd322 Enabled recalculation of leaderboards at any point 2017-08-21 15:29:10 +01:00
Tom Bloor 3f743f0b5f Fixed all_day calculating from the wrong time 2017-08-21 15:29:09 +01:00
Finn a1b6dd8d2a Add Organisation Code 2017-08-21 15:10:33 +01:00
Finn 36a5fdf2e3 Fixed code and added test for reading and editing Organisations 2017-08-18 16:46:49 +01:00
Finn db2dc9fc0f Can now edit valid and pending organisations 2017-08-18 12:56:14 +01:00
Tom Bloor 056d37501b Fixing syntax error 2017-08-17 16:34:43 +01:00
Finn fa1968f035 DatetimeErrorlogfix 2017-08-17 16:26:11 +01:00
Tom Bloor d169249538 Better fix and change status to 400 for upload errors 2017-08-17 15:45:26 +01:00
Tom Bloor d07610e72d Check for organisation and transaction actually being defined on upload 2017-08-17 15:38:08 +01:00
Finn efbcdbce84 Added system redundancy 2017-08-14 16:21:06 +01:00
Finn c6726682d4 Leaderboards corrected and fixes 2017-08-14 16:10:14 +01:00
Finn d078a09ccd Added receipt datetime string submission validation & validator test 2017-08-14 15:35:23 +01:00
Finn 65d5bab444 Fixed errors and tests and updated DB 2017-08-14 15:04:24 +01:00
Finn b44a256434 Updated DB and added more DateTime 2017-08-14 12:45:54 +01:00
Finn 85c80980c3 Added code for date submission in receipt upload 2017-08-14 11:15:33 +01:00
Finn 9affdbf08e Removed redundant file and fixed user updat e+ added tests 2017-07-27 14:18:22 +01:00
Finn bad60c85e7 Removed bad error 2017-07-26 19:22:28 +01:00
Finn 397de48711 Error codes added and fix 2017-07-26 19:05:35 +01:00
Finn 2ef73c9346 Added User Account update code 2017-07-26 18:57:13 +01:00
Finn 2b3c13518b Added API endpoints and user info retrieval 2017-07-26 18:28:14 +01:00
Finn b0e9ef249a Rewrote code for login info retrieval 2017-07-26 16:45:46 +01:00
Finn dfa1ba11f0 Fix to naming of JSON 2017-07-26 15:55:39 +01:00
Finn 1d782a4e84 Added giving user info on login 2017-07-26 15:29:38 +01:00
Tom Bloor e2732a6a93 Change to underlying postcode regex for validation 2017-07-25 17:07:15 +01:00
Tom Bloor 4644f9217e Added pagination to organisation pages 2017-07-25 15:44:16 +01:00
Tom Bloor 1df31d79a0 Merge pull request #20 from Pear-Trading/TBSliver/Organisation-Approve
Fix organisation approving, Closes #7
2017-07-25 14:42:49 +01:00
Tom Bloor 9dd808c547 Fix issue with approving organisations. 2017-07-25 14:33:11 +01:00
Tom Bloor 01c7db6844 Removed admin api endpoint as unused 2017-07-25 14:23:03 +01:00
Tom Bloor b44cb5fe1d Fix issue with turning quote_names on with case insensitive search 2017-07-25 14:14:30 +01:00
Finn 6126e44c6b Final changes to schema an upgrade 2017-07-24 15:39:06 +01:00
Finn 09f9cf9d48 Feedback HTML views added and fixes made 2017-07-24 15:21:10 +01:00
Finn baea01e8b5 Schema and actual DB submit code added 2017-07-24 14:55:05 +01:00
Finn d38758ac90 New Feedback API endpoint added 2017-07-24 13:20:22 +01:00
Tom Bloor 50e06981d7 Fix issue with undefined leaderboard 2017-07-20 17:41:59 +01:00
Tom Bloor 243722df93 Fix issue with login error
fixes #9
2017-07-20 17:34:33 +01:00
Tom Bloor dde8988345 Deployment Handler Script
Adding the script and required items for deployment handler script to work
2017-07-20 17:08:02 +01:00
Finn 16abfe34ea Fixed rank sending and added leaderboard creation script 2017-07-20 11:56:24 +01:00
Finn 4f09483f59 Front page stat sending added 2017-07-19 17:29:00 +01:00
Tom Bloor 559e88d9e6 Fix issue with leaderboard position due to wrong calculation of trend 2017-06-13 23:15:10 +01:00