2024 Commits

Author	SHA1	Message	Date
James Cole	5f8b6640a9	A lot less queries thanks to efficient query.	2015-12-27 08:39:29 +01:00
James Cole	dd42d8437c	Removed code for unused chart.	2015-12-27 08:12:46 +01:00
James Cole	67a178591d	Some query optimisations.	2015-12-27 07:59:00 +01:00
James Cole	f5e5659c1f	Code cleanup.	2015-12-26 09:40:24 +01:00
James Cole	8b0f0fb615	Optimise queries.	2015-12-26 09:39:35 +01:00
James Cole	209116e766	Query optimisations.	2015-12-26 09:21:45 +01:00
James Cole	79392ab656	Add caching to various queries and lists.	2015-12-26 08:44:34 +01:00
James Cole	3ca1207231	#135	2015-12-26 08:24:41 +01:00
James Cole	cec1b147f2	#135	2015-12-26 08:23:52 +01:00
James Cole	b833e8dfa2	#135	2015-12-26 08:16:30 +01:00
James Cole	77b843efd8	#135	2015-12-26 08:15:22 +01:00
James Cole	eadc630fcb	#135	2015-12-26 08:12:44 +01:00
James Cole	170c1793cc	#135	2015-12-26 08:06:34 +01:00
James Cole	9f7c6c2d0c	Extra cache.	2015-12-25 17:11:55 +01:00
James Cole	72d054c55c	Add support for virtual balance currency, even though it cannot be stored yet.	2015-12-25 17:10:04 +01:00
James Cole	4f38b77ef6	Better caching.	2015-12-25 09:34:37 +01:00
James Cole	5862803434	This saves some queries.	2015-12-25 09:34:23 +01:00
James Cole	5b3beded39	I can't believe I left this here all this time.	2015-12-25 07:58:19 +01:00
James Cole	c61fb7a598	Marked some unused stuff as deprecated.	2015-12-25 07:52:56 +01:00
James Cole	33d9148029	Make sure charts are cached.	2015-12-25 07:43:34 +01:00
James Cole	63969f5a33	Same routine but for money spent on accounts.	2015-12-25 07:42:00 +01:00
James Cole	edde18aeef	Remove old chart.	2015-12-25 07:32:56 +01:00
James Cole	e16269daa8	Collect data for new chart.	2015-12-25 07:31:54 +01:00
James Cole	c07591ff5c	New method, earnedForAccounts	2015-12-25 07:31:43 +01:00
James Cole	75a478ad54	New chart, earned in period.	2015-12-25 07:31:29 +01:00
James Cole	15fd8cf486	Completed the renaming of some methods.	2015-12-24 10:27:45 +01:00
James Cole	55333156ac	Better cache control for some charts.	2015-12-24 10:14:01 +01:00
James Cole	8cdcba3231	Original fix in place. #133	2015-12-24 09:50:28 +01:00
James Cole	8bab9e84e2	Should not have edited that code. #133	2015-12-24 09:50:16 +01:00
James Cole	2faae83912	Include empty budgets. #133	2015-12-24 09:47:44 +01:00
James Cole	5a61a11a61	Attempt to fix bug #133	2015-12-24 09:45:21 +01:00
James Cole	a6d71988f2	Replaced some language calls.	2015-12-24 08:35:08 +01:00
James Cole	72cf6c9c0f	Removed old route.	2015-12-23 11:32:41 +01:00
James Cole	44811a3e7c	Fix a bug where the frontpage would not honor transaction order.	2015-12-21 11:30:58 +01:00
James Cole	1ab3f05b3a	Fix a bug where the report page would mess up the session dates.	2015-12-21 10:25:57 +01:00
James Cole	5e76488ae7	Better localisation in charts.	2015-12-20 08:40:58 +01:00
James Cole	9b40cc6881	Fix locale setting for Carbon.	2015-12-20 08:19:26 +01:00
James Cole	c1ba591b26	Rename languages.	2015-12-19 20:54:27 +01:00
James Cole	719af38a61	Cleanup.	2015-12-18 18:42:56 +01:00
James Cole	ac61dfae6b	File reformatting.	2015-12-18 16:38:50 +01:00
James Cole	4210cd10db	Cleanup.	2015-12-18 08:10:41 +01:00
James Cole	7921d128e4	Cleanup routine that checks for blocked domains.	2015-12-18 07:31:36 +01:00
James Cole	3fe57b7983	Report remembers budgets and categories.	2015-12-16 16:19:15 +01:00
James Cole	1b3d208540	First attempt at functional category chart.	2015-12-16 13:08:26 +01:00
James Cole	6a8bf0aa62	Fixed the "undefined" error.	2015-12-16 12:13:01 +01:00
James Cole	56715556ed	Second attempt.	2015-12-16 10:54:56 +01:00
James Cole	838330b909	First attempt at multi-year budget chart.	2015-12-16 10:17:15 +01:00
James Cole	69553b138b	First calculations for multi-year budget chart.	2015-12-15 12:52:42 +01:00
James Cole	36d7a02994	Some refactoring.	2015-12-15 12:46:40 +01:00
James Cole	301528e2d2	Quick links.	2015-12-15 12:38:18 +01:00
James Cole	0303b45707	First code for multi year budget chart.	2015-12-15 12:37:55 +01:00
James Cole	006d68e279	Expand chart generation.	2015-12-14 21:11:57 +01:00
James Cole	29dc122ad3	New charts (slight variations of previous charts)	2015-12-14 21:11:26 +01:00
James Cole	3c73fe92bf	Lower threshold.	2015-12-14 20:58:23 +01:00
James Cole	b8bab11acd	Fix bread crumbs, clean up routes.	2015-12-14 20:45:12 +01:00
James Cole	80dd62ef0a	Refer to correct translations.	2015-12-14 20:34:08 +01:00
James Cole	93244c1f78	Fix for left unbalanced field in report.	2015-12-14 12:35:52 +01:00
James Cole	be056cea6b	Update some queries.	2015-12-13 20:41:35 +01:00
James Cole	659ca8be14	Update some queries.	2015-12-13 20:40:41 +01:00
James Cole	ea9af8366d	Update some queries.	2015-12-13 20:39:26 +01:00
James Cole	80edd47d36	First attempts at building a multi-year report.	2015-12-13 17:31:25 +01:00
James Cole	d7746b3649	Support multi-year, not implemented yet.	2015-12-13 10:18:25 +01:00
James Cole	c4c4fbc34c	Refactor	2015-12-13 10:05:13 +01:00
James Cole	59f57c96e9	Refactor names.	2015-12-13 09:41:22 +01:00
James Cole	a2f852fecf	Clean up code.	2015-12-13 09:35:58 +01:00
James Cole	ad114ed329	Remove unused methods.	2015-12-13 09:30:02 +01:00
James Cole	c4c3d0f07f	Some refactoring.	2015-12-13 09:01:17 +01:00
James Cole	ce3e9ffd11	Better cache control.	2015-12-12 21:20:20 +01:00
James Cole	8fdd0cb795	Fixed some yearly charts.	2015-12-12 20:56:07 +01:00
James Cole	913e05a2e6	Really, reversed.	2015-12-12 20:20:18 +01:00
James Cole	fa1f703ef6	Some negative sums were failing regarding transfers.	2015-12-12 20:19:40 +01:00
James Cole	4004c53e1b	Fix negative amount thing.	2015-12-12 20:16:30 +01:00
James Cole	4838670649	Transfer fix.	2015-12-12 20:13:07 +01:00
James Cole	a985e09282	Fix query.	2015-12-12 20:10:52 +01:00
James Cole	9bd1503cb4	Expand query to catch all expenses.	2015-12-12 20:07:33 +01:00
James Cole	a2ccbf7844	Jump to year report if the period is too long.	2015-12-12 19:04:30 +01:00
James Cole	61bbe8a905	Don't need this file.	2015-12-12 17:51:40 +01:00
James Cole	59bc5d22d1	Clean up some urls	2015-12-12 17:51:07 +01:00
James Cole	1423d5b314	Expand query, let's see what happens.	2015-12-12 12:36:36 +01:00
James Cole	6426d1df06	Fix the report chart.	2015-12-12 10:41:51 +01:00
James Cole	9284eb3fe9	First attempt at account specific bill report.	2015-12-12 10:33:19 +01:00
James Cole	afdae8bc1e	Fix a sum for #129	2015-12-12 08:26:12 +01:00
James Cole	2a7085e593	Experimental budget lines. #129	2015-12-12 08:25:08 +01:00
James Cole	2408fb3ed4	Experimental budget lines. #129	2015-12-12 08:24:17 +01:00
James Cole	8316afb176	Experimental budget lines. #129	2015-12-12 08:21:46 +01:00
James Cole	041ca8a5d3	Amount reversal for #129	2015-12-12 08:05:10 +01:00
James Cole	fe4f1b306d	Fix a sum for #129	2015-12-11 18:52:21 +01:00
James Cole	a0972d99fb	Made a negative amount a positive as per #129	2015-12-11 18:49:07 +01:00
James Cole	e332bfef7c	First attempt at budgets (split by account).	2015-12-11 18:45:39 +01:00
James Cole	5aff0c4943	Some fixes for #129	2015-12-11 18:35:49 +01:00
James Cole	938581527e	Fix sorting.	2015-12-11 18:31:15 +01:00
James Cole	c38ae09735	Negative expenses, as per #129	2015-12-11 18:30:28 +01:00
James Cole	28c3cfe084	Fix display of amount. See issue #129	2015-12-11 18:15:37 +01:00
James Cole	4a2823bcba	Reverse sort.	2015-12-11 18:05:07 +01:00
James Cole	18eba02026	Expanded report for categories.	2015-12-11 18:03:13 +01:00
James Cole	d4690ce580	Fix date in budget report	2015-12-11 17:54:52 +01:00
James Cole	a785c450b1	First attempt at including a budget report.	2015-12-11 17:53:17 +01:00
James Cole	7480dc4a19	Fix a query.	2015-12-11 16:39:33 +01:00
James Cole	ad01891a67	First attempt at including expense report.	2015-12-11 16:36:40 +01:00
James Cole	67fe35d564	Small query fix.	2015-12-11 11:32:22 +01:00
James Cole	7f19b6957a	Expanded new report a bit. Mainly copy/paste work. Will have to see how it pans out.	2015-12-11 09:39:17 +01:00
Antonio Spinelli	b3d99cd210	apply demeter law for transaction type calls ... - adds contants for transaction type names - demeter law = never speaks with strangers	2015-12-10 16:53:48 -02:00
James Cole	958fcd1cfa	Report IP address	2015-12-07 14:41:04 +01:00
James Cole	8f57c7dcb3	Some fixes to amounts.	2015-12-06 13:17:00 +01:00
James Cole	77262f52a4	First functional view of default report.	2015-12-06 13:11:43 +01:00
James Cole	1fd375b875	Better redirect after logout.	2015-12-05 17:45:33 +01:00
James Cole	55be174037	Method to find an account.	2015-12-04 06:56:45 +01:00
James Cole	a17b7025f1	New function to build URL report.	2015-12-04 06:56:35 +01:00
James Cole	170cf7fd77	New routes for new reports.	2015-12-04 06:56:03 +01:00
James Cole	23cdb4d326	Expand month list for new reports.	2015-12-04 06:55:54 +01:00
James Cole	0b382426e9	First experimental report generator / choice thing.	2015-12-03 14:52:10 +01:00
James Cole	e3b6057bf8	Catch Swift exceptions and do a log only (instead of crashing) because the email message isn't actually critical.	2015-12-03 11:30:43 +01:00
James Cole	56c08d8302	Can block certain domains from registering, such as ten-minute-mail services. Two example domains provided in configuration.	2015-12-03 11:17:48 +01:00
James Cole	d4e759754d	Make password reset impossible for blocked users.	2015-12-02 13:28:11 +01:00
James Cole	04f71b3b43	Removed old code.	2015-12-02 09:01:40 +01:00
James Cole	d124de51db	Shouldn't be like this?	2015-12-02 09:00:28 +01:00
James Cole	d87d12a0f5	Better query. See if works.	2015-12-02 08:58:40 +01:00
James Cole	f2b08346d0	Log.	2015-12-02 08:50:28 +01:00
James Cole	d3682a6727	Another fix in reports.	2015-12-02 08:46:03 +01:00
James Cole	371bbd9508	Some cosmetic fixes to reports	2015-12-02 08:44:23 +01:00
James Cole	37e2f097ba	To make budget report more clear, add spent amount to "spent" column.	2015-12-02 08:35:15 +01:00
James Cole	7b8c86e1e3	Only get active piggy banks.	2015-12-02 08:25:38 +01:00
unknown	de634da513	Only get active savings accounts.	2015-12-02 08:22:25 +01:00
James Cole	8a9d576f61	Allow change to default currency. issue #121	2015-11-22 11:30:06 +01:00
James Cole	791d12fbb4	Fix for issue #123	2015-11-22 11:25:15 +01:00
James Cole	d1329be2fa	Bill scan routine should not grab transfers and income.	2015-11-20 20:13:10 +01:00
James Cole	5e3e9271ca	Added encryption to new password. See issue #118	2015-11-13 06:59:08 +01:00
James Cole	03e1673e92	Fix login message.	2015-11-01 08:06:51 +01:00
James Cole	9f992f003d	Fix redirect loop.	2015-11-01 08:03:41 +01:00
James Cole	45344ee347	Fixed a bug where budget chart would come up negative on overspent amounts.	2015-10-30 07:16:15 +01:00
James Cole	2c966a1234	Fixed ambiguous column.	2015-10-19 15:21:17 +02:00
James Cole	143ea69c0d	Fixed the fix (fixeption).	2015-10-19 15:20:18 +02:00
James Cole	8a02ead013	Blind validator update.	2015-10-19 15:16:30 +02:00
James Cole	930d5ab941	Better fix.	2015-10-17 21:15:16 +02:00
James Cole	e54a56d3a8	Experimental chart fix.	2015-10-17 21:14:25 +02:00
James Cole	ebc77540b9	Fix some reports.	2015-10-03 22:49:12 +02:00
James Cole	28d2583c10	Remove multiplication.	2015-10-03 22:34:25 +02:00
James Cole	ba6f4268f0	Get correct fields.	2015-10-03 17:55:08 +02:00
James Cole	0bd18f94ac	Fix ambiguous id.	2015-10-03 17:54:15 +02:00
James Cole	66fb63661f	Less journals.	2015-10-03 17:53:13 +02:00
James Cole	d9b16beb0a	Added some debug.	2015-10-03 17:51:13 +02:00
James Cole	6a01a9bdfd	Fix bill scan.	2015-10-01 07:48:50 +02:00
James Cole	b81b34a706	Fixed amount in bill chart.	2015-10-01 07:46:47 +02:00
James Cole	3750a00b5f	Fix amount, make it positive.	2015-09-30 19:43:02 +02:00
James Cole	05ddcc169d	Fix amount thing.	2015-09-30 19:41:21 +02:00
James Cole	f571a5f1bd	Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop ... * 'develop' of https://github.com/JC5/firefly-iii: Fixed the other chart too. Trying to fix chart. New code. Debug.	2015-09-30 19:32:58 +02:00
James Cole	48b786adea	Some fixes for amounts.	2015-09-30 19:31:21 +02:00
James Cole	d691fa9b4d	Fixed the other chart too.	2015-09-29 09:29:28 +02:00
James Cole	da50f9e419	Trying to fix chart.	2015-09-29 09:28:16 +02:00
James Cole	103de5e18a	New code. Debug.	2015-09-29 09:20:50 +02:00
James Cole	dac6efd98b	Fix amount in box.	2015-09-28 21:45:11 +02:00
James Cole	46aa7f81b2	Fixed a method call.	2015-09-28 20:41:53 +02:00
James Cole	0683c7cd67	Fixed chart	2015-09-28 14:43:08 +02:00
James Cole	50d7aa7b6a	Fix so chart will not display negatives.	2015-09-28 14:32:12 +02:00
James Cole	866bc2f3bd	Cleanup in budgets.	2015-09-27 17:44:49 +02:00
James Cole	49d4705014	Chart was negative.	2015-09-27 09:52:02 +02:00
James Cole	9163fcfccb	Quicker amount thing.	2015-09-27 09:47:13 +02:00
James Cole	7e10641461	Organized some category charts. Still needs some translating	2015-09-26 07:18:12 +02:00
James Cole	cdc0e3cfd8	Some cleaning up.	2015-09-25 20:40:24 +02:00
James Cole	5953f691d1	More should fit.	2015-09-25 20:15:38 +02:00
James Cole	e2790ca6c1	Try to limit the collection returned to the user.	2015-09-25 20:13:43 +02:00
James Cole	73cfbbd2ba	Fix some things so the date range has a better display.	2015-09-25 19:28:39 +02:00
James Cole	38bc38bf26	Add some period things.	2015-09-25 17:28:42 +02:00
James Cole	e12d13c838	Fixed a negative chart.	2015-09-25 16:43:34 +02:00
James Cole	fcc3af6136	Fixed something.	2015-09-25 16:38:36 +02:00
James Cole	491298e1cb	Some fixes in titles and bread crumbs.	2015-09-25 16:33:45 +02:00
James Cole	72b5895217	Added a subtitle to the category view.	2015-09-25 16:25:17 +02:00
James Cole	0a8f4017bd	Fix some chart things. Again.	2015-09-25 16:18:50 +02:00
James Cole	cb985f5897	Make sure the month chart can show the spent / earned.	2015-09-25 16:08:10 +02:00
James Cole	968ec0853f	Fixed the chart. Forgot an argument.	2015-09-25 16:06:06 +02:00
James Cole	0bde72d3df	Spent should not be negative for the chart.	2015-09-25 16:04:22 +02:00
James Cole	45293fbd42	Fixes for #109.	2015-09-25 16:00:14 +02:00
James Cole	a838dc163d	I need unit tests again. #109	2015-09-14 17:22:31 +02:00
James Cole	3d15a4ca6d	I need unit tests again. #109	2015-09-14 17:20:20 +02:00
James Cole	51c7d4fb1b	Properly show spent and earned. #109	2015-09-13 07:40:37 +02:00
James Cole	fa586dba7e	Also include all types.	2015-09-13 07:35:53 +02:00
James Cole	8ad40389f2	Corrected the field used for bug #109	2015-09-13 07:34:58 +02:00
James Cole	b3333cc2d3	Experimental fix for issue #109.	2015-09-13 07:32:39 +02:00
James Cole	3699a7ba9a	Some cleaning up.	2015-09-08 19:38:04 +02:00
James Cole	204e521ba4	Fixed sorting for contracts.	2015-09-08 19:36:54 +02:00
James Cole	c3958ed3c4	Fixed some bugs that caused inconsistencies in the monthly reports.	2015-08-29 07:20:53 +02:00
James Cole	e5b88be5fa	Fix a bug where an transfer to and from a shared asset would count as an expense/income.	2015-08-29 06:48:12 +02:00
James Cole	425552988a	Fix month report so transfers from a shared account to another shared account do not count as income.	2015-08-28 06:19:50 +02:00
James Cole	2bd1f783e5	Cleaned up some translations.	2015-08-23 07:41:12 +02:00
James Cole	21b6ad7a41	More checks in the bounce cron job.	2015-08-19 19:21:39 +02:00
James Cole	be8eaaffdf	Some code cleanup.	2015-08-16 20:26:11 +02:00
James Cole	28c753523f	Caught a nasty bug thanks to an alert Tweakers.net user. This fix will make the account-edit screen inconsistent for a select number of users. This will be detailed on the wiki.	2015-08-15 21:45:29 +02:00
James Cole	deefef83bd	Added sum for the current period, see issue #99	2015-08-09 17:01:12 +02:00
James Cole	51e30aed66	Added a sum of the current page and the sum of the entire category, in reference to issue #99.	2015-08-09 16:56:38 +02:00
James Cole	8d109a3cfe	Fixed a null pointer exception.	2015-08-09 13:54:58 +02:00
James Cole	c0d62237fc	Made the date thing throw a FF error.	2015-08-02 08:53:34 +02:00
James Cole	5a77bef494	Sort chart and code cleanup [skip ci]	2015-08-02 07:41:47 +02:00
James Cole	4f0ed97410	Fixed a bug where the category list in a monthly report would be empty.	2015-08-02 07:04:43 +02:00
James Cole	af7952f204	Removed old references to Google [skip ci]	2015-08-01 07:22:48 +02:00
James Cole	d8dcae856b	Remove log.	2015-08-01 07:12:34 +02:00
James Cole	7296796ed9	Fix chart.	2015-08-01 07:12:03 +02:00
James Cole	a2c2bb4948	Forgot a dot [skip ci]	2015-08-01 07:09:51 +02:00
James Cole	72ebfdc20e	Debug log.	2015-08-01 07:09:12 +02:00
James Cole	16b95ea78a	New chart.	2015-08-01 07:04:41 +02:00
James Cole	c04f08dfd8	Filter empty budgets.	2015-07-31 18:18:54 +02:00