Compare commits
469 Commits
Author | SHA1 | Date | |
---|---|---|---|
8b63a9d5df | |||
8eaa3b9039 | |||
b3f0199036 | |||
6efe5a897c | |||
2ea1b38454 | |||
161eb42942 | |||
296c89ce20 | |||
d2e8a3f7ef | |||
4071893ed5 | |||
1859efb98c | |||
0e001cf680 | |||
b753b59080 | |||
01d77b22c3 | |||
54c44afd47 | |||
d4d3baba31 | |||
d082dae44c | |||
f33d7f1437 | |||
65dcd7f453 | |||
5f8cf9abbf | |||
f3d71fd081 | |||
d3e73ba739 | |||
bbac3e67bc | |||
f36a0bfa92 | |||
45207d6500 | |||
c92b1bed11 | |||
ffbae85e11 | |||
100e7d2d8b | |||
280d5b8bb8 | |||
9b9a64fb52 | |||
f913d52842 | |||
a4c676ee8e | |||
088fab2d51 | |||
3be01f1240 | |||
8d6465de71 | |||
89c1c4f64c | |||
f9d26ed888 | |||
d69ace6292 | |||
cf2453c4c6 | |||
e9cc86d064 | |||
94e103b365 | |||
adb025c308 | |||
0efdbc5378 | |||
abfaab8743 | |||
d0159b3fb6 | |||
efe9b6340d | |||
7ca6a9827a | |||
e641759ff7 | |||
e25c788123 | |||
c617cf2cab | |||
4d9faf7406 | |||
ebcddbbfa5 | |||
f19403f0ea | |||
a915d33a54 | |||
d30a8951f6 | |||
408a1e71b7 | |||
11d73abae4 | |||
062d623649 | |||
53a78fa09e | |||
d813bf4c89 | |||
d6f895c535 | |||
df85d72217 | |||
0599d39690 | |||
247ece861e | |||
156d5099d5 | |||
b83b38e2b9 | |||
9dd489e6c4 | |||
d63c5dbffe | |||
79bea27c14 | |||
4aea098e3d | |||
406ae3aae0 | |||
994604ddbf | |||
c71c015616 | |||
1f4b2aa2f5 | |||
2262e0ae49 | |||
|
eca1cacfeb | ||
|
c799c62621 | ||
|
658a55b810 | ||
|
b50d841862 | ||
|
c620a92250 | ||
|
427272514b | ||
|
936c5caa5b | ||
|
648b18eb6a | ||
|
8f87c43f8a | ||
|
3053444ca2 | ||
|
c53f917374 | ||
|
1a5f886810 | ||
|
4a2d0e2619 | ||
|
ba50bf815f | ||
|
9805e8b2e6 | ||
|
a485baf7d2 | ||
|
332495411e | ||
|
92a4ca97eb | ||
|
bcd5363ff6 | ||
|
c3e785122b | ||
|
13670f0317 | ||
|
0600c1b653 | ||
|
1f896e1a40 | ||
|
fd0df50d14 | ||
|
8973c1fe9a | ||
|
012e5a16fa | ||
|
49716421a1 | ||
|
5f413f0cad | ||
|
985174eec9 | ||
|
0e69216920 | ||
|
5a81547108 | ||
|
e23adb4316 | ||
|
061cda89d0 | ||
|
e68db9f54a | ||
|
58f1abce21 | ||
|
16bbc67850 | ||
|
cdbaf58253 | ||
|
beac7c6eaa | ||
|
ef4baeed88 | ||
|
e2a4b0b7ec | ||
|
57256e9ba7 | ||
|
1310807939 | ||
|
3e6cadffbd | ||
|
a1d71b92d5 | ||
|
17754f9a88 | ||
|
5726d8bf2e | ||
|
2ae8a9cfad | ||
|
0b0c771558 | ||
|
dc30f38662 | ||
|
d71656412a | ||
|
2d8d39442d | ||
|
c9e1483206 | ||
|
849a7ae95c | ||
|
38208f6420 | ||
|
474b7de02d | ||
|
19fdb785ba | ||
|
3559d4acc0 | ||
|
efb0f70f31 | ||
|
28460e10ff | ||
|
5e964dd8e8 | ||
|
25fcc34b68 | ||
|
73485ac1af | ||
|
08a35f0d2c | ||
|
745eee03c5 | ||
|
d977286637 | ||
|
5b7a4f8aa5 | ||
|
6bc53a0cd2 | ||
|
03f069fc74 | ||
|
1c18d93d13 | ||
|
6da1861139 | ||
|
f6bcdcfc2b | ||
|
7b368df9b9 | ||
|
0782675d19 | ||
|
7966301651 | ||
|
fb477429cc | ||
|
3f6d60bb50 | ||
|
10d8959178 | ||
|
dcd79d085a | ||
|
70eb1febff | ||
|
896daa70c5 | ||
|
a5769dad83 | ||
|
bc4a69b64c | ||
|
162d98add7 | ||
|
b5e4b1cd08 | ||
|
072efe7fc3 | ||
|
8d63b30a32 | ||
|
129c9f9ee3 | ||
|
b7c2d94c62 | ||
|
558988a57a | ||
|
2fdce22698 | ||
|
c3d6fa97cf | ||
|
3eba873eb5 | ||
|
ecf38725e3 | ||
|
90ecb2bd57 | ||
|
f7ea8a4621 | ||
|
45af7791ff | ||
|
f484833380 | ||
|
f374815371 | ||
|
bb21dd700e | ||
|
0a5a7e72e3 | ||
|
75dc2afc80 | ||
|
8348f5bb8f | ||
|
4c921bfaaa | ||
|
595fe60fc4 | ||
|
1d35438444 | ||
|
f58afb37bd | ||
|
20437ba548 | ||
|
02f447d63c | ||
|
1bd59cbbf8 | ||
|
89fc42c47a | ||
|
927459b6c5 | ||
|
efcf07565b | ||
|
a6a7c1cd77 | ||
|
2812891b23 | ||
|
fa147e74fc | ||
|
7281d1f11d | ||
|
eb0d898c19 | ||
|
13ffa1dc98 | ||
|
27e3307a8e | ||
|
2619238996 | ||
|
e24d5defb7 | ||
|
99d0eb6d1c | ||
|
6ca4c29e38 | ||
|
003b4de822 | ||
|
863160881f | ||
|
ac0aa056cf | ||
|
c0bc7b82b3 | ||
|
64c53441cb | ||
|
d8adfd91c5 | ||
|
c0b236ff6c | ||
|
2d50ad8a0b | ||
|
e73d105420 | ||
|
fab4880389 | ||
|
b7c44a39da | ||
|
3363cf682a | ||
|
c546cbf833 | ||
|
931ef38f29 | ||
|
0e037e664f | ||
|
b3d274eabf | ||
|
cd7aba50e5 | ||
|
fc14efbda1 | ||
|
2f64fa1018 | ||
|
d1344d57b8 | ||
|
57aa737465 | ||
|
3c0d3c1a39 | ||
|
3dd347ee8c | ||
|
2cf432ed2c | ||
|
d83a164cc6 | ||
|
53a29062ea | ||
|
46f5f72bd4 | ||
|
fd4da93c20 | ||
|
e8247e30ab | ||
|
2166def0f1 | ||
|
3c148e5297 | ||
|
434020f7ad | ||
|
3c3741c33f | ||
|
7ea652e23e | ||
|
fa9402e25e | ||
|
ad16b5a391 | ||
|
17a363d69d | ||
|
8fb5f2ff7a | ||
|
6873b32005 | ||
|
a7cee2891c | ||
|
7b7f72bf1e | ||
|
4f090a22df | ||
|
1f5d4980e5 | ||
|
40bc4bf1e8 | ||
|
c4c10f9ab7 | ||
|
3326dac51a | ||
|
e927736b45 | ||
|
d52d382653 | ||
|
42c0fe6c9b | ||
|
c257069644 | ||
|
c5f3a53347 | ||
|
d96a66ee3e | ||
|
d5e00b8fe3 | ||
|
801d2ae380 | ||
|
68df4e5ce2 | ||
|
aa07ffb125 | ||
|
adec1f102e | ||
|
f9c2e7f4bc | ||
|
fc0c08d58e | ||
|
8626c78708 | ||
|
a398752c0c | ||
|
cc5b0b1ee1 | ||
|
220426e6f8 | ||
|
bd484a994e | ||
|
f780be6b63 | ||
|
fc75945a76 | ||
|
f8fa34f269 | ||
|
79d55bfc44 | ||
|
88e0599cd7 | ||
|
1c93f528f6 | ||
|
d522aaad45 | ||
|
d91089238d | ||
|
8b0d3decd4 | ||
|
598ddc6a85 | ||
|
e28500c557 | ||
|
b95f36f09c | ||
|
4064848242 | ||
|
6ff893a08d | ||
|
4e9915aab0 | ||
|
5100d0fd0c | ||
|
60aa6310bb | ||
|
adfd61fac9 | ||
|
4057705e22 | ||
|
3e6b1ecccc | ||
|
de945cd16c | ||
|
330ed6b926 | ||
|
83d7e61875 | ||
|
9910c0e0d3 | ||
|
877f77babd | ||
|
95fa835496 | ||
|
6244b817d8 | ||
|
8b62380c52 | ||
|
270406ff58 | ||
|
716dd94943 | ||
|
cd2e20c744 | ||
|
faa2abfca3 | ||
|
839002cc47 | ||
|
4861f5ce49 | ||
|
5960e9ee77 | ||
|
c6a406272f | ||
|
79ecb1630b | ||
|
c4baf94d3a | ||
|
c6761e1379 | ||
|
3fb442ab5d | ||
|
df4d12cfb8 | ||
|
1e94109910 | ||
|
bda2c90e3d | ||
|
995af2fbd3 | ||
|
65a322466a | ||
|
48caa14cd8 | ||
|
f55efca9fd | ||
|
f3c3ddfebf | ||
|
3ff0015690 | ||
|
2ae971a7ad | ||
|
d4eaa1454c | ||
|
4abe5092ec | ||
|
cae86d3014 | ||
|
e5857bc68e | ||
|
319c0adc16 | ||
|
28afd8f563 | ||
|
30549dd6d8 | ||
|
8194978bcc | ||
|
1ff7c98f93 | ||
|
36e25fc1b7 | ||
|
d4400b788d | ||
|
0c85266ab2 | ||
|
292486f8fd | ||
|
0268280a73 | ||
|
9a7d3938aa | ||
|
d6eb6781c6 | ||
|
9386b4a4b9 | ||
|
d4faff7a6c | ||
|
06ca00e627 | ||
|
fbeb3fd362 | ||
|
2fb98fdeed | ||
|
6556227f88 | ||
|
bebe2aa874 | ||
|
0833536d5e | ||
|
a7f37e88a9 | ||
|
d7de013954 | ||
|
facc1c5a0d | ||
|
0340f333b6 | ||
|
3b925d4b37 | ||
|
c14d88f421 | ||
|
c558994c6d | ||
|
2a2738ddeb | ||
|
7ace852f43 | ||
|
4fed3c9320 | ||
|
4fdbb40e92 | ||
|
c06dea22f6 | ||
|
0fa2f06a0e | ||
|
fe2355a405 | ||
|
a3e9ba02ac | ||
|
e90f4d21e8 | ||
|
4218b741db | ||
|
2e6bc006f5 | ||
|
003ad498db | ||
|
6f477b6d22 | ||
|
0f547a532c | ||
|
ab14ead2dc | ||
|
7004b6cf44 | ||
|
0cd5dab07c | ||
|
08b6643eda | ||
|
ca64dcd4e2 | ||
|
86c32772c0 | ||
|
1bfd7693dd | ||
|
66a19034dd | ||
|
a32b344b2c | ||
|
6fc89eeb9a | ||
|
ddb0b08ef2 | ||
|
13320602bf | ||
|
396210d924 | ||
|
50c90b085c | ||
|
f75e65a3de | ||
|
e433aed773 | ||
|
4f3c196179 | ||
|
69d0e06b57 | ||
|
9acaa4033e | ||
|
3537470cff | ||
|
c6586ad224 | ||
|
e364b1e3ef | ||
|
13766be8cb | ||
|
17d41d7f99 | ||
|
7fbb9d7bcd | ||
|
060f9a01b6 | ||
|
20f50d533a | ||
|
23d1189591 | ||
|
e494967888 | ||
|
eba176c000 | ||
|
3d5f211824 | ||
|
5c4e77d6bb | ||
|
353ca4fef1 | ||
|
feef3d825c | ||
|
86911c106d | ||
|
3697ff9f21 | ||
|
c907c56c4a | ||
|
3f90c33a3a | ||
|
b5804f5d21 | ||
|
cecfa6db4f | ||
|
f4d0988fdd | ||
|
5627746e98 | ||
|
9eed69363f | ||
|
12414a9dc7 | ||
|
00dac1dec7 | ||
|
0965498145 | ||
|
65c9262257 | ||
|
23f414b2d5 | ||
|
3e287cb7f4 | ||
|
9fe38b2560 | ||
|
3c4a67a952 | ||
|
548c4ae23e | ||
|
c3daad9cd7 | ||
|
d24da8d56b | ||
|
de5e89b155 | ||
|
c8cfed2018 | ||
|
a9c45119d6 | ||
|
5c25d5c79f | ||
|
1a43135e55 | ||
|
150aca8269 | ||
|
c895d5cc4d | ||
|
28229ea954 | ||
|
91a77b776f | ||
|
8b6c179c84 | ||
|
35b5a4d2a1 | ||
|
cc94ec1ca6 | ||
|
542bce0ab6 | ||
|
6eeaf76e96 | ||
|
07ea908c73 | ||
|
189d76fc22 | ||
|
3d7bafd7e1 | ||
|
47ed5a2b5c | ||
|
4c0a37495f | ||
|
3435c50ca0 | ||
|
49135f0873 | ||
|
5e2ac3b833 | ||
|
cfc0db2507 | ||
|
a2996a5074 | ||
|
8cad18d5ea | ||
|
96a553c130 | ||
|
0b713fad34 | ||
|
dbef4039bd | ||
|
727b2fc313 | ||
|
43714c1b1d | ||
|
cfe4904084 | ||
|
81434d7fde | ||
|
97d23c5bcd | ||
|
e39d2813df | ||
|
bff2d826dc | ||
|
8ebe15f22f | ||
|
f12c89a9ee | ||
|
4aed242a48 | ||
|
e91bf14298 | ||
|
edac1ee6a9 | ||
|
a872788def | ||
|
032dd9bdc6 | ||
|
5811541722 | ||
|
606cde59f8 | ||
|
d7ead2aa5c | ||
|
9f0258905d | ||
|
83b43dfff5 | ||
|
e5721b3573 | ||
|
655d72d4ae | ||
|
d0fca63dd7 | ||
|
a045fd77d7 | ||
|
f4df257548 | ||
|
f09ba377b5 | ||
|
f8a71af4d8 | ||
|
7aee85c08f | ||
|
38da04a412 | ||
|
1a9363b723 | ||
|
7d1d9bbcc8 | ||
|
1660c7a635 |
148
.gitignore
vendored
148
.gitignore
vendored
@ -1,100 +1,19 @@
|
|||||||
# Created by https://www.gitignore.io
|
|
||||||
|
|
||||||
### Vim ###
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
.vimrc
|
|
||||||
.vimtags
|
|
||||||
|
|
||||||
|
|
||||||
### Python ###
|
|
||||||
# Byte-compiled / optimized / DLL files
|
|
||||||
__pycache__/
|
|
||||||
*.py[cod]
|
|
||||||
|
|
||||||
# C extensions
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Distribution / packaging
|
|
||||||
.Python
|
|
||||||
env/
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
downloads/
|
|
||||||
eggs/
|
|
||||||
.eggs/
|
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
|
|
||||||
# PyInstaller
|
|
||||||
# Usually these files are written by a python script from a template
|
|
||||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
|
||||||
*.manifest
|
|
||||||
*.spec
|
|
||||||
|
|
||||||
# Installer logs
|
|
||||||
pip-log.txt
|
|
||||||
pip-delete-this-directory.txt
|
|
||||||
|
|
||||||
# Unit test / coverage reports
|
|
||||||
htmlcov/
|
|
||||||
.tox/
|
|
||||||
.coverage
|
|
||||||
.coverage.*
|
|
||||||
.cache
|
|
||||||
nosetests.xml
|
|
||||||
coverage.xml
|
|
||||||
*,cover
|
|
||||||
|
|
||||||
# Translations
|
|
||||||
*.mo
|
|
||||||
*.pot
|
|
||||||
|
|
||||||
# Django stuff:
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Sphinx documentation
|
|
||||||
docs/_build/
|
|
||||||
|
|
||||||
# PyBuilder
|
|
||||||
target/
|
|
||||||
|
|
||||||
|
|
||||||
### grunt ###
|
|
||||||
# Grunt usually compiles files inside this directory
|
|
||||||
dist/
|
|
||||||
|
|
||||||
# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
|
|
||||||
.tmp/
|
|
||||||
|
|
||||||
|
|
||||||
### Bower ###
|
|
||||||
bower_components
|
|
||||||
.bower-cache
|
|
||||||
.bower-registry
|
|
||||||
.bower-tmp
|
|
||||||
|
|
||||||
|
# Created by https://www.gitignore.io/api/vim,node
|
||||||
|
|
||||||
### Node ###
|
### Node ###
|
||||||
# Logs
|
# Logs
|
||||||
logs
|
logs
|
||||||
*.log
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
|
||||||
# Runtime data
|
# Runtime data
|
||||||
pids
|
pids
|
||||||
*.pid
|
*.pid
|
||||||
*.seed
|
*.seed
|
||||||
|
*.pid.lock
|
||||||
|
|
||||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||||
lib-cov
|
lib-cov
|
||||||
@ -102,20 +21,65 @@ lib-cov
|
|||||||
# Coverage directory used by tools like istanbul
|
# Coverage directory used by tools like istanbul
|
||||||
coverage
|
coverage
|
||||||
|
|
||||||
|
# nyc test coverage
|
||||||
|
.nyc_output
|
||||||
|
|
||||||
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
||||||
.grunt
|
.grunt
|
||||||
|
|
||||||
|
# Bower dependency directory (https://bower.io/)
|
||||||
|
bower_components
|
||||||
|
|
||||||
# node-waf configuration
|
# node-waf configuration
|
||||||
.lock-wscript
|
.lock-wscript
|
||||||
|
|
||||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
||||||
build/Release
|
build/Release
|
||||||
|
|
||||||
# Dependency directory
|
# Dependency directories
|
||||||
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
|
node_modules/
|
||||||
node_modules
|
jspm_packages/
|
||||||
|
|
||||||
|
# Typescript v1 declaration files
|
||||||
|
typings/
|
||||||
|
|
||||||
|
# Optional npm cache directory
|
||||||
|
.npm
|
||||||
|
|
||||||
|
# Optional eslint cache
|
||||||
|
.eslintcache
|
||||||
|
|
||||||
|
# Optional REPL history
|
||||||
|
.node_repl_history
|
||||||
|
|
||||||
|
# Output of 'npm pack'
|
||||||
|
*.tgz
|
||||||
|
|
||||||
|
# Yarn Integrity file
|
||||||
|
.yarn-integrity
|
||||||
|
|
||||||
|
# Yarn Lock file
|
||||||
|
yarn.lock
|
||||||
|
|
||||||
|
# dotenv environment variables file
|
||||||
|
.env
|
||||||
|
|
||||||
|
|
||||||
### Local files ###
|
### Vim ###
|
||||||
config.cfg
|
# swap
|
||||||
/flask_session
|
[._]*.s[a-v][a-z]
|
||||||
|
[._]*.sw[a-p]
|
||||||
|
[._]s[a-v][a-z]
|
||||||
|
[._]sw[a-p]
|
||||||
|
# session
|
||||||
|
Session.vim
|
||||||
|
# temporary
|
||||||
|
.netrwhist
|
||||||
|
*~
|
||||||
|
# auto-generated tag files
|
||||||
|
tags
|
||||||
|
|
||||||
|
# End of https://www.gitignore.io/api/vim,node
|
||||||
|
|
||||||
|
/dist
|
||||||
|
|
||||||
|
35
.jscsrc
Normal file
35
.jscsrc
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"preset": "google",
|
||||||
|
"fileExtensions": [".js", "jscs"],
|
||||||
|
|
||||||
|
"requireSemicolons": true,
|
||||||
|
"requireParenthesesAroundIIFE": true,
|
||||||
|
"maximumLineLength": 120,
|
||||||
|
"validateLineBreaks": "LF",
|
||||||
|
"validateIndentation": 4,
|
||||||
|
"disallowTrailingComma": true,
|
||||||
|
"disallowUnusedParams": true,
|
||||||
|
|
||||||
|
"disallowSpacesInsideObjectBrackets": null,
|
||||||
|
"disallowImplicitTypeConversion": ["string"],
|
||||||
|
|
||||||
|
"safeContextKeyword": "_this",
|
||||||
|
|
||||||
|
"jsDoc": {
|
||||||
|
"checkAnnotations": "closurecompiler",
|
||||||
|
"checkParamNames": true,
|
||||||
|
"requireParamTypes": true,
|
||||||
|
"checkRedundantParams": true,
|
||||||
|
"checkReturnTypes": true,
|
||||||
|
"checkRedundantReturns": true,
|
||||||
|
"requireReturnTypes": true,
|
||||||
|
"checkTypes": "capitalizedNativeCase",
|
||||||
|
"checkRedundantAccess": true,
|
||||||
|
"requireNewlineAfterDescription": true
|
||||||
|
},
|
||||||
|
|
||||||
|
"excludeFiles": [
|
||||||
|
"test/data/**",
|
||||||
|
"patterns/*"
|
||||||
|
]
|
||||||
|
}
|
21
.jshintrc
21
.jshintrc
@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"bitwise": true,
|
|
||||||
"browser": true,
|
|
||||||
"curly": true,
|
|
||||||
"eqeqeq": true,
|
|
||||||
"esnext": true,
|
|
||||||
"latedef": true,
|
|
||||||
"noarg": true,
|
|
||||||
"node": true,
|
|
||||||
"strict": true,
|
|
||||||
"undef": true,
|
|
||||||
"unused": true,
|
|
||||||
"quotmark": "single",
|
|
||||||
"indent": 2,
|
|
||||||
"jquery": true,
|
|
||||||
"globals": {
|
|
||||||
"angular": false,
|
|
||||||
"moment": false,
|
|
||||||
"Highcharts": false
|
|
||||||
}
|
|
||||||
}
|
|
75
Gruntfile.js
75
Gruntfile.js
@ -1,75 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = function(grunt) {
|
|
||||||
require('load-grunt-tasks')(grunt);
|
|
||||||
require('time-grunt')(grunt);
|
|
||||||
|
|
||||||
// Options
|
|
||||||
var options = {
|
|
||||||
accountant: {
|
|
||||||
frontend: {
|
|
||||||
app: require('./bower.json'),
|
|
||||||
src: 'accountant-ui',
|
|
||||||
dist: 'accountant-ui_dist'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
config: {
|
|
||||||
src: 'grunt-config/*.js'
|
|
||||||
},
|
|
||||||
pkg: grunt.file.readJSON('package.json'),
|
|
||||||
banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %>\n'+
|
|
||||||
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %> */\n',
|
|
||||||
};
|
|
||||||
|
|
||||||
var configs = require('load-grunt-configs')(grunt, options);
|
|
||||||
grunt.initConfig(configs);
|
|
||||||
|
|
||||||
grunt.registerTask('dependencies', [
|
|
||||||
'shell:npm_install',
|
|
||||||
'shell:bower_install',
|
|
||||||
'shell:pip_install',
|
|
||||||
'wiredep:app',
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('pydev', [
|
|
||||||
'newer:flake8'
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('jsdev', [
|
|
||||||
'newer:jshint',
|
|
||||||
'newer:jscs'
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('htmldev', [
|
|
||||||
'newer:htmllint'
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('dev', [
|
|
||||||
'dependencies',
|
|
||||||
'pydev',
|
|
||||||
'jsdev',
|
|
||||||
'htmldev'
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('serve', [
|
|
||||||
'dev',
|
|
||||||
'bgShell:runserver',
|
|
||||||
'connect:livereload',
|
|
||||||
'watch'
|
|
||||||
]);
|
|
||||||
|
|
||||||
grunt.registerTask('dist', [
|
|
||||||
'wiredep',
|
|
||||||
'clean:dist',
|
|
||||||
'useminPrepare',
|
|
||||||
'copy:dist',
|
|
||||||
'copy:styles',
|
|
||||||
'cssmin:generated',
|
|
||||||
'concat:generated',
|
|
||||||
'ngAnnotate',
|
|
||||||
'uglify:generated',
|
|
||||||
'filerev',
|
|
||||||
'usemin'
|
|
||||||
]);
|
|
||||||
};
|
|
@ -1,7 +0,0 @@
|
|||||||
.italic {
|
|
||||||
font-style: italic
|
|
||||||
}
|
|
||||||
|
|
||||||
.stroke {
|
|
||||||
text-decoration: line-through
|
|
||||||
}
|
|
@ -1,96 +0,0 @@
|
|||||||
<!--
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="fr">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
|
|
||||||
<!-- Title -->
|
|
||||||
<title>Accountant</title>
|
|
||||||
|
|
||||||
<!-- build:css(accountant-ui) css/vendor.css -->
|
|
||||||
<!-- bower:css -->
|
|
||||||
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
|
|
||||||
<link rel="stylesheet" href="bower_components/bootstrap-additions/dist/bootstrap-additions.css" />
|
|
||||||
<link rel="stylesheet" href="bower_components/angular-xeditable/dist/css/xeditable.css" />
|
|
||||||
<link rel="stylesheet" href="bower_components/angular-ui-notification/dist/angular-ui-notification.css" />
|
|
||||||
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.css" />
|
|
||||||
<!-- endbower -->
|
|
||||||
<!-- endbuild -->
|
|
||||||
|
|
||||||
<!-- Custom styles -->
|
|
||||||
<!-- build:css(.tmp) css/main.css -->
|
|
||||||
<!-- include: "type": "css", "files": "css/*.css" -->
|
|
||||||
<link href="css/main.css" rel="stylesheet" type="text/css">
|
|
||||||
<!-- /include -->
|
|
||||||
<!-- endbuild -->
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<!-- htmllint attr-bans="false" -->
|
|
||||||
<body style="padding-bottom: 50px; padding-top: 70px" ng-app="accountant">
|
|
||||||
<!-- htmllint attr-bans="$previous" -->
|
|
||||||
<!-- Navbar -->
|
|
||||||
<nav class="navbar navbar-fixed-top navbar-inverse">
|
|
||||||
<div class="container-fluid">
|
|
||||||
<!-- Brand -->
|
|
||||||
<div class="navbar-header">
|
|
||||||
<a class="navbar-brand" href="#/accounts"> Accountant</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div class="container-fluid" ng-controller="MainController">
|
|
||||||
<div ng-view></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- build:js(accountant-ui) js/vendor.js -->
|
|
||||||
<!-- bower:js -->
|
|
||||||
<script src="bower_components/jquery/dist/jquery.js"></script>
|
|
||||||
<script src="bower_components/moment/moment.js"></script>
|
|
||||||
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
|
|
||||||
<script src="bower_components/angular/angular.js"></script>
|
|
||||||
<script src="bower_components/angular-resource/angular-resource.js"></script>
|
|
||||||
<script src="bower_components/angular-route/angular-route.js"></script>
|
|
||||||
<script src="bower_components/angular-strap/dist/angular-strap.js"></script>
|
|
||||||
<script src="bower_components/angular-strap/dist/angular-strap.tpl.js"></script>
|
|
||||||
<script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
|
|
||||||
<script src="bower_components/angular-ui-notification/dist/angular-ui-notification.js"></script>
|
|
||||||
<script src="bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
|
|
||||||
<script src="bower_components/highstock-release/highstock.js"></script>
|
|
||||||
<script src="bower_components/highstock-release/highcharts-more.js"></script>
|
|
||||||
<script src="bower_components/highstock-release/modules/exporting.js"></script>
|
|
||||||
<script src="bower_components/angular-http-auth/src/http-auth-interceptor.js"></script>
|
|
||||||
<script src="bower_components/meanie-angular-storage/release/meanie-angular-storage.js"></script>
|
|
||||||
<script src="bower_components/bootbox/bootbox.js"></script>
|
|
||||||
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
|
|
||||||
<script src="bower_components/ngBootbox/dist/ngBootbox.js"></script>
|
|
||||||
<!-- endbower -->
|
|
||||||
<!-- endbuild -->
|
|
||||||
|
|
||||||
<!-- Custom Javascript libraries -->
|
|
||||||
<!-- build:js({.tmp,accountant-ui}) js/scripts.js -->
|
|
||||||
<!-- include: "type": "js", "files": "js/*.js" -->
|
|
||||||
<script src="js/accounts.js"></script>
|
|
||||||
<script src="js/app.js"></script>
|
|
||||||
<script src="js/operations.js"></script>
|
|
||||||
<script src="js/scheduler.js"></script>
|
|
||||||
<!-- /include -->
|
|
||||||
<!-- endbuild -->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,211 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('accountant.accounts', [
|
|
||||||
'ngResource',
|
|
||||||
'ui-notification',
|
|
||||||
'xeditable',
|
|
||||||
'ngBootbox'
|
|
||||||
])
|
|
||||||
|
|
||||||
.config(['$resourceProvider', function($resourceProvider) {
|
|
||||||
// Keep trailing slashes to avoid redirect by flask..
|
|
||||||
$resourceProvider.defaults.stripTrailingSlashes = false;
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('Account', ['$resource', function($resource) {
|
|
||||||
var Account = $resource(
|
|
||||||
'/api/account/:id', {
|
|
||||||
id: '@id'
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
Account.prototype.getSolds = function() {
|
|
||||||
var Solds = $resource('/api/account/:id/solds', {id: this.id});
|
|
||||||
|
|
||||||
this.solds = Solds.get();
|
|
||||||
};
|
|
||||||
|
|
||||||
Account.prototype.getBalance = function(begin, end) {
|
|
||||||
var Balance = $resource(
|
|
||||||
'/api/account/:id/balance', {
|
|
||||||
id: this.id,
|
|
||||||
begin: begin.format('YYYY-MM-DD'),
|
|
||||||
end: end.format('YYYY-MM-DD')
|
|
||||||
});
|
|
||||||
|
|
||||||
this.balance = Balance.get();
|
|
||||||
};
|
|
||||||
|
|
||||||
return Account;
|
|
||||||
}])
|
|
||||||
|
|
||||||
.controller(
|
|
||||||
'AccountController', [
|
|
||||||
'$scope', '$ngBootbox', 'Account', 'Notification',
|
|
||||||
function($scope, $ngBootbox, Account, Notification) {
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Return the class for an account current value compared to authorized
|
|
||||||
* overdraft.
|
|
||||||
*/
|
|
||||||
$scope.rowClass = function(account) {
|
|
||||||
if(!account || !account.authorized_overdraft || !account.current) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(account.current < account.authorized_overdraft) {
|
|
||||||
return 'danger';
|
|
||||||
} else if(account.current < 0) {
|
|
||||||
return 'warning';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Return the class for a value compared to account authorized overdraft.
|
|
||||||
*/
|
|
||||||
$scope.valueClass = function(account, value) {
|
|
||||||
if(!account || !value) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(value < account.authorized_overdraft) {
|
|
||||||
return 'text-danger';
|
|
||||||
} else if(value < 0) {
|
|
||||||
return 'text-warning';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add an empty account.
|
|
||||||
*/
|
|
||||||
$scope.add = function() {
|
|
||||||
var account = new Account({
|
|
||||||
authorized_overdraft: 0
|
|
||||||
});
|
|
||||||
|
|
||||||
// Insert account at the begining of the array.
|
|
||||||
$scope.accounts.splice(0, 0, account);
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Cancel account edition. Remove it from array if a new one.
|
|
||||||
*/
|
|
||||||
$scope.cancelEdit = function(rowform, account, $index) {
|
|
||||||
if(!account.id) {
|
|
||||||
// Account not saved, just remove it from array.
|
|
||||||
$scope.accounts.splice($index, 1);
|
|
||||||
} else {
|
|
||||||
rowform.$cancel();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Save account.
|
|
||||||
*/
|
|
||||||
$scope.save = function(account) {
|
|
||||||
//var account = $scope.accounts[$index];
|
|
||||||
|
|
||||||
//account = angular.merge(account, $data);
|
|
||||||
|
|
||||||
return account.$save().then(function(data) {
|
|
||||||
Notification.success('Account #' + data.id + ' saved.');
|
|
||||||
|
|
||||||
// TODO Alexis Lahouze 2016-03-08 Update solds
|
|
||||||
|
|
||||||
return data;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Delete an account.
|
|
||||||
*/
|
|
||||||
$scope.delete = function(account, $index) {
|
|
||||||
var id = account.id;
|
|
||||||
|
|
||||||
$ngBootbox.confirm(
|
|
||||||
'Voulez-vous supprimer le compte \'' + account.name + '\' ?',
|
|
||||||
function(result) {
|
|
||||||
if(result) {
|
|
||||||
account.$delete().then(function() {
|
|
||||||
Notification.success('Account #' + id + ' deleted.');
|
|
||||||
|
|
||||||
// Remove account from array.
|
|
||||||
$scope.accounts.splice($index, 1);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Load accounts.
|
|
||||||
$scope.accounts = Account.query();
|
|
||||||
|
|
||||||
}])
|
|
||||||
|
|
||||||
.directive(
|
|
||||||
'accountFormDialog', function($ngBootbox) {
|
|
||||||
return {
|
|
||||||
restrict: 'A',
|
|
||||||
scope: {
|
|
||||||
account: '=ngModel'
|
|
||||||
},
|
|
||||||
link: function(scope, element) {
|
|
||||||
var title = 'Account';
|
|
||||||
|
|
||||||
if(scope.account && scope.account.id) {
|
|
||||||
title = title + ' #' + scope.account.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
scope.form = {};
|
|
||||||
|
|
||||||
element.on('click', function() {
|
|
||||||
//angular.copy(scope.account, scope.form);
|
|
||||||
|
|
||||||
// Open dialog with form.
|
|
||||||
$ngBootbox.customDialog({
|
|
||||||
scope: scope,
|
|
||||||
title: title,
|
|
||||||
templateUrl: 'views/account.form.tmpl.html',
|
|
||||||
onEscape: true,
|
|
||||||
buttons: {
|
|
||||||
save: {
|
|
||||||
label: 'Save',
|
|
||||||
className: 'btn-success',
|
|
||||||
callback: function() {
|
|
||||||
// Validate form
|
|
||||||
console.log(scope.form);
|
|
||||||
|
|
||||||
// Save account
|
|
||||||
console.log(scope.account);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
cancel: {
|
|
||||||
label: 'Cancel',
|
|
||||||
className: 'btn-default',
|
|
||||||
callback: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
@ -1,154 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('accountant', [
|
|
||||||
'accountant.accounts',
|
|
||||||
'accountant.operations',
|
|
||||||
'accountant.scheduler',
|
|
||||||
'ngRoute',
|
|
||||||
'ngBootbox',
|
|
||||||
'http-auth-interceptor',
|
|
||||||
'Storage.Service'
|
|
||||||
])
|
|
||||||
|
|
||||||
.factory('sessionInjector', ['$storage', function($storage) {
|
|
||||||
var sessionInjector = {
|
|
||||||
request : function(config) {
|
|
||||||
var token = $storage.get('token');
|
|
||||||
|
|
||||||
if(token) {
|
|
||||||
var token_type = $storage.get('token_type');
|
|
||||||
var authorization = token_type + ' ' + token;
|
|
||||||
config.headers.Authorization = authorization;
|
|
||||||
}
|
|
||||||
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return sessionInjector;
|
|
||||||
}])
|
|
||||||
|
|
||||||
.config(['$httpProvider', function($httpProvider) {
|
|
||||||
// Define interceptors.
|
|
||||||
$httpProvider.interceptors.push('sessionInjector');
|
|
||||||
}])
|
|
||||||
|
|
||||||
.config(['$routeProvider', function($routeProvider) {
|
|
||||||
// Defining template and controller in function of route.
|
|
||||||
$routeProvider
|
|
||||||
.when('/account/:accountId/operations', {
|
|
||||||
templateUrl: 'views/operations.html',
|
|
||||||
controller: 'OperationController',
|
|
||||||
controllerAs: 'operationsCtrl'
|
|
||||||
})
|
|
||||||
.when('/account/:accountId/scheduler', {
|
|
||||||
templateUrl: 'views/scheduler.html',
|
|
||||||
controller: 'SchedulerController',
|
|
||||||
controllerAs: 'schedulerCtrl'
|
|
||||||
})
|
|
||||||
.when('/accounts', {
|
|
||||||
templateUrl: 'views/accounts.html',
|
|
||||||
controller: 'AccountController',
|
|
||||||
controllerAs: 'accountsCtrl'
|
|
||||||
})
|
|
||||||
.otherwise({
|
|
||||||
redirectTo: '/accounts'
|
|
||||||
});
|
|
||||||
|
|
||||||
}])
|
|
||||||
|
|
||||||
.config(['$storageProvider', function($storageProvider) {
|
|
||||||
// Configure storage
|
|
||||||
// Set global prefix for stored keys
|
|
||||||
$storageProvider.setPrefix('accountant');
|
|
||||||
|
|
||||||
// Change the default storage engine
|
|
||||||
// Defaults to 'local'
|
|
||||||
$storageProvider.setDefaultStorageEngine('session');
|
|
||||||
|
|
||||||
// Change the enabled storage engines
|
|
||||||
// Defaults to ['memory', 'cookie', 'session', 'local']
|
|
||||||
$storageProvider.setEnabledStorageEngines(['local', 'session']);
|
|
||||||
}])
|
|
||||||
|
|
||||||
.run(function(editableOptions) {
|
|
||||||
editableOptions.theme = 'bs3'; // bootstrap3 theme. Can be also 'bs2', 'default'
|
|
||||||
})
|
|
||||||
|
|
||||||
.controller('MainController', [
|
|
||||||
'$scope', '$rootScope', '$http', 'authService', '$storage', '$ngBootbox',
|
|
||||||
function($scope, $rootScope, $http, authService, $storage, $ngBootbox) {
|
|
||||||
$scope.dialogShown = false;
|
|
||||||
|
|
||||||
$scope.showLoginForm = function() {
|
|
||||||
// First, if there are registered credentials, use them
|
|
||||||
if($scope.dialogShown) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.dialogShown = true;
|
|
||||||
|
|
||||||
$storage.clear();
|
|
||||||
|
|
||||||
$ngBootbox.customDialog({
|
|
||||||
title: 'Authentification requise',
|
|
||||||
templateUrl: 'views/login.tmpl.html',
|
|
||||||
buttons: {
|
|
||||||
login: {
|
|
||||||
label: 'Login',
|
|
||||||
className: 'btn-primary',
|
|
||||||
callback: function() {
|
|
||||||
$scope.dialogShown = false;
|
|
||||||
|
|
||||||
var email = $('#email').val();
|
|
||||||
var password = $('#password').val();
|
|
||||||
$http.post(
|
|
||||||
'/api/user/login',
|
|
||||||
{
|
|
||||||
'email': email,
|
|
||||||
'password': password
|
|
||||||
}
|
|
||||||
).success(function(result) {
|
|
||||||
// TODO Alexis Lahouze 2015-08-28 Handle callback.
|
|
||||||
// Call to /api/login to retrieve the token
|
|
||||||
$storage.set('token_type', result.token_type);
|
|
||||||
$storage.set('token', result.token);
|
|
||||||
$storage.set('expiration_date', result.expiration_date);
|
|
||||||
|
|
||||||
authService.loginConfirmed();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
cancel: {
|
|
||||||
label: 'Annuler',
|
|
||||||
className: 'btn-default',
|
|
||||||
callback: function() {
|
|
||||||
authService.loginCancelled(null, 'Login cancelled by user action.');
|
|
||||||
$scope.dialogShown = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$rootScope.$on('event:auth-loginRequired', $scope.showLoginForm);
|
|
||||||
}])
|
|
||||||
|
|
||||||
;
|
|
@ -1,466 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('accountant.operations', [
|
|
||||||
'accountant.accounts',
|
|
||||||
'ngRoute',
|
|
||||||
'ngResource',
|
|
||||||
'ngBootbox',
|
|
||||||
'ui-notification',
|
|
||||||
'mgcrea.ngStrap',
|
|
||||||
'highcharts-ng',
|
|
||||||
])
|
|
||||||
|
|
||||||
.config(['$resourceProvider', function($resourceProvider) {
|
|
||||||
// Keep trailing slashes to avoid redirect by flask..
|
|
||||||
$resourceProvider.defaults.stripTrailingSlashes = false;
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('Operation', [ '$resource', function($resource) {
|
|
||||||
return $resource(
|
|
||||||
'/api/operation/:id', {
|
|
||||||
id: '@id'
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('OHLC', [ '$resource', '$routeParams',
|
|
||||||
function($resource, $routeParams) {
|
|
||||||
return $resource(
|
|
||||||
'/api/account/:account_id/ohlc', {
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('Category', [ '$resource', '$routeParams',
|
|
||||||
function($resource, $routeParams) {
|
|
||||||
return $resource(
|
|
||||||
'/api/account/:account_id/category', {
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('Balance', [ '$resource', '$routeParams',
|
|
||||||
function($resource, $routeParams) {
|
|
||||||
return $resource(
|
|
||||||
'/api/account/:account_id/balance', {
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}])
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Controller for category chart.
|
|
||||||
*/
|
|
||||||
.controller(
|
|
||||||
'CategoryChartController', [
|
|
||||||
'$rootScope', '$scope', '$http', 'Category', 'Balance',
|
|
||||||
function($rootScope, $scope, $http, Category, Balance) {
|
|
||||||
|
|
||||||
var colors = Highcharts.getOptions().colors;
|
|
||||||
$scope.revenueColor = colors[2];
|
|
||||||
$scope.expenseColor = colors[3];
|
|
||||||
|
|
||||||
// Configure pie chart for categories.
|
|
||||||
$scope.config = {
|
|
||||||
options: {
|
|
||||||
chart: {
|
|
||||||
type: 'pie',
|
|
||||||
animation: {
|
|
||||||
duration: 500
|
|
||||||
}
|
|
||||||
},
|
|
||||||
plotOptions: {
|
|
||||||
pie: {
|
|
||||||
startAngle: -90
|
|
||||||
},
|
|
||||||
series: {
|
|
||||||
allowPointSelect: 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
tooltip: {
|
|
||||||
valueDecimals: 2,
|
|
||||||
valueSuffix: '€'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
yAxis: {
|
|
||||||
title: {
|
|
||||||
text: 'Categories'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
title: {
|
|
||||||
text: 'Répartition dépenses/recettes'
|
|
||||||
},
|
|
||||||
series: [{
|
|
||||||
name: 'Value',
|
|
||||||
data: [],
|
|
||||||
innerSize: '33%',
|
|
||||||
size: '60%',
|
|
||||||
dataLabels: {
|
|
||||||
formatter: function() {
|
|
||||||
return this.point.name;
|
|
||||||
},
|
|
||||||
distance: -40
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
name: 'Value',
|
|
||||||
data: [],
|
|
||||||
innerSize: '66%',
|
|
||||||
size: '60%',
|
|
||||||
dataLabels: {
|
|
||||||
formatter: function() {
|
|
||||||
return this.point.name !== null && this.percentage >= 2.5 ? this.point.name : null;
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.brightenColor = function(color) {
|
|
||||||
var brightness = 0.2;
|
|
||||||
|
|
||||||
return Highcharts.Color(color).brighten(brightness).get();
|
|
||||||
};
|
|
||||||
|
|
||||||
// Load categories, mainly to populate the pie chart.
|
|
||||||
$scope.load = function(begin, end) {
|
|
||||||
$scope.config.loading = true;
|
|
||||||
|
|
||||||
Category.query({
|
|
||||||
begin: begin.format('YYYY-MM-DD'),
|
|
||||||
end: end.format('YYYY-MM-DD')
|
|
||||||
}, function(data) {
|
|
||||||
var expenses = [], revenues = [];
|
|
||||||
|
|
||||||
var expenseColor = $scope.brightenColor($scope.expenseColor);
|
|
||||||
var revenueColor = $scope.brightenColor($scope.revenueColor);
|
|
||||||
|
|
||||||
angular.forEach(angular.fromJson(data), function(category) {
|
|
||||||
expenses.push({
|
|
||||||
name: category.category,
|
|
||||||
y: -category.expenses,
|
|
||||||
color: expenseColor
|
|
||||||
});
|
|
||||||
|
|
||||||
revenues.push({
|
|
||||||
name: category.category,
|
|
||||||
y: category.revenues,
|
|
||||||
color: revenueColor
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Note: expenses and revenues must be in the same order than in series[0].
|
|
||||||
$scope.config.series[1].data = revenues.concat(expenses);
|
|
||||||
|
|
||||||
$scope.config.loading = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get account balance.
|
|
||||||
*/
|
|
||||||
$scope.getBalance = function(begin, end) {
|
|
||||||
Balance.get({
|
|
||||||
begin: begin.format('YYYY-MM-DD'),
|
|
||||||
end: end.format('YYYY-MM-DD')
|
|
||||||
}, function(balance) {
|
|
||||||
// Update pie chart subtitle with Balance.
|
|
||||||
$scope.config.subtitle = {
|
|
||||||
text: 'Balance: ' + balance.balance
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.config.series[0].data = [{
|
|
||||||
name: 'Revenues',
|
|
||||||
y: balance.revenues,
|
|
||||||
color: $scope.revenueColor
|
|
||||||
}, {
|
|
||||||
name: 'Expenses',
|
|
||||||
y: -balance.expenses,
|
|
||||||
color: $scope.expenseColor,
|
|
||||||
}];
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
// Reload categories and account status on range selection.
|
|
||||||
$rootScope.$on('rangeSelectedEvent', function(e, args) {
|
|
||||||
$scope.load(args.begin, args.end);
|
|
||||||
$scope.getBalance(args.begin, args.end);
|
|
||||||
});
|
|
||||||
}])
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Controller for the sold chart.
|
|
||||||
*/
|
|
||||||
.controller(
|
|
||||||
'SoldChartController', [
|
|
||||||
'$rootScope', '$scope', '$http', 'OHLC',
|
|
||||||
function($rootScope, $scope, $http, OHLC) {
|
|
||||||
// Configure chart for operations.
|
|
||||||
$scope.config = {
|
|
||||||
options: {
|
|
||||||
chart: {
|
|
||||||
zoomType: 'x'
|
|
||||||
},
|
|
||||||
rangeSelector: {
|
|
||||||
buttons: [{
|
|
||||||
type: 'month',
|
|
||||||
count: 1,
|
|
||||||
text: '1m'
|
|
||||||
}, {
|
|
||||||
type: 'month',
|
|
||||||
count: 3,
|
|
||||||
text: '3m'
|
|
||||||
}, {
|
|
||||||
type: 'month',
|
|
||||||
count: 6,
|
|
||||||
text: '6m'
|
|
||||||
}, {
|
|
||||||
type: 'year',
|
|
||||||
count: 1,
|
|
||||||
text: '1y'
|
|
||||||
}, {
|
|
||||||
type: 'all',
|
|
||||||
text: 'All'
|
|
||||||
}],
|
|
||||||
selected: 0,
|
|
||||||
},
|
|
||||||
navigator: {
|
|
||||||
enabled: true
|
|
||||||
},
|
|
||||||
tooltip: {
|
|
||||||
crosshairs: true,
|
|
||||||
shared: true,
|
|
||||||
valueDecimals: 2,
|
|
||||||
valueSuffix: '€'
|
|
||||||
},
|
|
||||||
scrollbar: {
|
|
||||||
liveRedraw: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
series: [{
|
|
||||||
type: 'ohlc',
|
|
||||||
name: 'Sold',
|
|
||||||
data: [],
|
|
||||||
dataGrouping : {
|
|
||||||
units : [[
|
|
||||||
'week', // unit name
|
|
||||||
[1] // allowed multiples
|
|
||||||
], [
|
|
||||||
'month',
|
|
||||||
[1, 2, 3, 4, 6]
|
|
||||||
]]
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
title: {
|
|
||||||
text: 'Sold evolution'
|
|
||||||
},
|
|
||||||
xAxis: {
|
|
||||||
type: 'datetime',
|
|
||||||
dateTimeLabelFormats: {
|
|
||||||
month: '%e. %b',
|
|
||||||
year: '%Y'
|
|
||||||
},
|
|
||||||
minRange: 3600 * 1000 * 24 * 14, // 2 weeks
|
|
||||||
events: {
|
|
||||||
afterSetExtremes: function(e) {
|
|
||||||
$scope.$emit('rangeSelectedEvent', {
|
|
||||||
begin: moment.utc(e.min), end: moment.utc(e.max)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
currentMin: moment.utc().startOf('month'),
|
|
||||||
currentMax: moment.utc().endOf('month')
|
|
||||||
},
|
|
||||||
yAxis: {
|
|
||||||
plotLines: [{
|
|
||||||
color: 'orange',
|
|
||||||
width: 2,
|
|
||||||
value: 0.0
|
|
||||||
}, {
|
|
||||||
color: 'red',
|
|
||||||
width: 2,
|
|
||||||
value: 0.0
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
useHighStocks: true
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.loadSolds = function() {
|
|
||||||
$scope.config.loading = true;
|
|
||||||
|
|
||||||
OHLC.query({}, function(data) {
|
|
||||||
$scope.config.series[0].data = [];
|
|
||||||
|
|
||||||
angular.forEach(data, function(operation) {
|
|
||||||
$scope.config.series[0].data.push([
|
|
||||||
moment.utc(operation.operation_date).valueOf(),
|
|
||||||
operation.open, operation.high, operation.low, operation.close
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
$scope.$emit('rangeSelectedEvent', {
|
|
||||||
begin: $scope.config.xAxis.currentMin,
|
|
||||||
end: $scope.config.xAxis.currentMax
|
|
||||||
});
|
|
||||||
|
|
||||||
$scope.config.loading = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
// Reload solds when an operation is saved.
|
|
||||||
$rootScope.$on('operationSavedEvent', function() {
|
|
||||||
$scope.loadSolds();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Reload solds when an operation is deleted.
|
|
||||||
$rootScope.$on('operationDeletedEvent', function() {
|
|
||||||
$scope.loadSolds();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Update authorized overdraft on account loading.
|
|
||||||
$rootScope.$on('accountLoadedEvent', function(e, account) {
|
|
||||||
$scope.config.yAxis.plotLines[1].value = account.authorized_overdraft;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Select beginning and end of month.
|
|
||||||
$scope.loadSolds();
|
|
||||||
}])
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Controller for the operations.
|
|
||||||
*/
|
|
||||||
.controller(
|
|
||||||
'OperationController', [
|
|
||||||
'$scope', '$rootScope', '$routeParams', '$ngBootbox', 'Notification', 'Account', 'Operation',
|
|
||||||
function($scope, $rootScope, $routeParams, $ngBootbox, Notification, Account, Operation) {
|
|
||||||
// List of operations.
|
|
||||||
$scope.operations = [];
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add an empty operation.
|
|
||||||
*/
|
|
||||||
$scope.add = function() {
|
|
||||||
var operation = new Operation({
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
});
|
|
||||||
|
|
||||||
$scope.operations.splice(0, 0, operation);
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Load operations.
|
|
||||||
*/
|
|
||||||
$scope.load = function(begin, end) {
|
|
||||||
$scope.operations = Operation.query({
|
|
||||||
account_id: $routeParams.accountId,
|
|
||||||
begin: begin.format('YYYY-MM-DD'),
|
|
||||||
end: end.format('YYYY-MM-DD')
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Cancel edition.
|
|
||||||
*/
|
|
||||||
$scope.cancelEdit = function(operation, rowform, $index) {
|
|
||||||
if(!operation.id) {
|
|
||||||
$scope.operations.splice($index, 1);
|
|
||||||
} else {
|
|
||||||
rowform.$cancel();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Toggle pointed indicator for an operation.
|
|
||||||
*/
|
|
||||||
$scope.togglePointed = function(operation, rowform) {
|
|
||||||
operation.pointed = !operation.pointed;
|
|
||||||
|
|
||||||
// Save operation if not editing it.
|
|
||||||
if(!rowform.$visible) {
|
|
||||||
$scope.save(operation);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Toggle cancel indicator for an operation.
|
|
||||||
*/
|
|
||||||
$scope.toggleCanceled = function(operation) {
|
|
||||||
operation.canceled = !operation.canceled;
|
|
||||||
|
|
||||||
$scope.save(operation);
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Save an operation and emit operationSavedEvent.
|
|
||||||
*/
|
|
||||||
$scope.save = function($data, $index) {
|
|
||||||
// Check if $data is already a resource.
|
|
||||||
var operation;
|
|
||||||
|
|
||||||
if($data.$save) {
|
|
||||||
operation = $data;
|
|
||||||
} else {
|
|
||||||
operation = $scope.operations[$index];
|
|
||||||
operation = angular.merge(operation, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
operation.confirmed = true;
|
|
||||||
|
|
||||||
return operation.$save().then(function(data) {
|
|
||||||
Notification.success('Operation #' + data.id + ' saved.');
|
|
||||||
|
|
||||||
$scope.$emit('operationSavedEvent', data);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Delete an operation and emit operationDeletedEvent.
|
|
||||||
*/
|
|
||||||
$scope.delete = function(operation, $index) {
|
|
||||||
var id = operation.id;
|
|
||||||
|
|
||||||
$ngBootbox.confirm(
|
|
||||||
'Voulez-vous supprimer l\'opération \\\'' + operation.label + '\\\' ?',
|
|
||||||
function(result) {
|
|
||||||
if(result) {
|
|
||||||
operation.$delete().then(function() {
|
|
||||||
Notification.success('Operation #' + id + ' deleted.');
|
|
||||||
|
|
||||||
// Remove operation from array.
|
|
||||||
$scope.operation.splice($index, 1);
|
|
||||||
|
|
||||||
$scope.$emit('operationDeletedEvent', operation);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.account = Account.get({
|
|
||||||
id: $routeParams.accountId
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Reload operations on rangeSelectedEvent.
|
|
||||||
*/
|
|
||||||
$rootScope.$on('rangeSelectedEvent', function(e, args) {
|
|
||||||
$scope.load(args.begin, args.end);
|
|
||||||
});
|
|
||||||
}]);
|
|
@ -1,120 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
// vim: set tw=80 ts=2 sw=2 sts=2:
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('accountant.scheduler', [
|
|
||||||
'ngRoute',
|
|
||||||
'ngBootbox',
|
|
||||||
'ui-notification',
|
|
||||||
'mgcrea.ngStrap'
|
|
||||||
])
|
|
||||||
|
|
||||||
.config(['$resourceProvider', function($resourceProvider) {
|
|
||||||
// Keep trailing slashes to avoid redirect by flask..
|
|
||||||
$resourceProvider.defaults.stripTrailingSlashes = false;
|
|
||||||
}])
|
|
||||||
|
|
||||||
.factory('ScheduledOperation', ['$resource', function($resource) {
|
|
||||||
return $resource(
|
|
||||||
'/api/scheduled_operation/:id', {
|
|
||||||
id: '@id'
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}])
|
|
||||||
|
|
||||||
.controller(
|
|
||||||
'SchedulerController', [
|
|
||||||
'$scope', '$rootScope', '$routeParams', '$ngBootbox', 'Notification', 'ScheduledOperation',
|
|
||||||
function($scope, $rootScope, $routeParams, $ngBootbox, Notification, ScheduledOperation) {
|
|
||||||
// Operation store.
|
|
||||||
$scope.operations = [];
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add a new operation at the beginning of th array.
|
|
||||||
*/
|
|
||||||
$scope.add = function() {
|
|
||||||
var operation = new ScheduledOperation({
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
});
|
|
||||||
|
|
||||||
// Insert new operation at the beginning of the array.
|
|
||||||
$scope.operations.splice(0, 0, operation);
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Load operations.
|
|
||||||
*/
|
|
||||||
$scope.load = function() {
|
|
||||||
$scope.operations = ScheduledOperation.query({
|
|
||||||
account_id: $routeParams.accountId
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Save operation.
|
|
||||||
*/
|
|
||||||
$scope.save = function($data, $index) {
|
|
||||||
var operation;
|
|
||||||
|
|
||||||
if($data.$save) {
|
|
||||||
operation = $data;
|
|
||||||
} else {
|
|
||||||
operation = $scope.operations[$index];
|
|
||||||
operation = angular.merge(operation, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
return operation.$save().then(function(data) {
|
|
||||||
Notification.success('Operation #' + data.id + ' saved.');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Cancel operation edition. Delete if new.
|
|
||||||
*/
|
|
||||||
$scope.cancelEdit = function(operation, rowform, $index) {
|
|
||||||
if(!operation.id) {
|
|
||||||
$scope.operations.splice($index, 1);
|
|
||||||
} else {
|
|
||||||
rowform.$cancel();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Delete operation.
|
|
||||||
*/
|
|
||||||
$scope.delete = function(operation, $index) {
|
|
||||||
var id = operation.id;
|
|
||||||
|
|
||||||
$ngBootbox.confirm(
|
|
||||||
'Voulez-vous supprimer l\'operation planifiée \\\'' + operation.label + '\\\' ?',
|
|
||||||
function(result) {
|
|
||||||
if(result) {
|
|
||||||
operation.$delete().then(function() {
|
|
||||||
Notification.success('Operation #' + id + ' deleted.');
|
|
||||||
|
|
||||||
// Remove account from array.
|
|
||||||
$scope.operations.splice($index, 1);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Load operations on controller initialization.
|
|
||||||
$scope.load();
|
|
||||||
}]);
|
|
@ -1,22 +0,0 @@
|
|||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<form class="form-horizontal" role="form" name="form">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-sm-4 control-label" for="name">Account name</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input id="name" class="form-control"
|
|
||||||
name="name" ng-model="account.name"
|
|
||||||
placeholder="Account name" type="text">
|
|
||||||
</input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-sm-4 control-label" for="authorized-overdraft">Authorized overdraft</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input id="authorized-overdraft" class="form-control" type="number"
|
|
||||||
name="authorized_overdraft" ng-model="account.authorized_overdraft"
|
|
||||||
placeholder="Authorized overdraft">
|
|
||||||
</input>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
@ -1,92 +0,0 @@
|
|||||||
<!--
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<div class="row">
|
|
||||||
<table class="table table-striped table-condensed table-hover">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Nom du compte</th>
|
|
||||||
<th class="col-md-1">Solde courant</th>
|
|
||||||
<th class="col-md-1">Solde pointé</th>
|
|
||||||
<th class="col-md-1">Découvert autorisé</th>
|
|
||||||
<th class="col-md-1">Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td colspan="5">
|
|
||||||
<button class="btn btn-success btn-success"
|
|
||||||
ng-click="add()">Ajouter</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<tr id="{{ account.id }}"
|
|
||||||
class="form-inline" ng-class="rowClass(account)"
|
|
||||||
ng-repeat="account in accounts | orderBy:'name'" ng-init="account.getSolds()">
|
|
||||||
<td>
|
|
||||||
<a href="#/account/{{ account.id }}/operations">{{ account.name }}</a>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span ng-class="valueClass(account, account.solds.current)">
|
|
||||||
{{ account.solds.current | currency : "€" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span ng-class="valueClass(account, account.solds.pointed)">
|
|
||||||
{{ account.solds.pointed | currency : "€" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
{{ account.authorized_overdraft | currency : "€" }}
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<div class="btn-group btn-group-xs">
|
|
||||||
<!-- Edit account. -->
|
|
||||||
<button type="button" class="btn btn-success"
|
|
||||||
account-form-dialog ng-model="account">
|
|
||||||
<span class="fa fa-pencil-square-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Cancel account edition. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-click="cancelEdit(rowform, account, $index)">
|
|
||||||
<span class="fa fa-times"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Delete account, with confirm. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-click="delete(account, $index)">
|
|
||||||
<span class="fa fa-trash-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Open account scheduler. -->
|
|
||||||
<a class="btn btn-default"
|
|
||||||
ng-if="account.id"
|
|
||||||
href="#/account/{{ account.id }}/scheduler">
|
|
||||||
<span class="fa fa-clock-o"></span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
@ -1,18 +0,0 @@
|
|||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<form class="form-horizontal">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="email" class="col-sm-4 control-label">Adresse email</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input type="text" class="form-control" id="email" ng-model="email"
|
|
||||||
placeholder="Nom d'utilisateur">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password" class="col-sm-4 control-label">Mot de passe</label>
|
|
||||||
<div class="col-sm-8">
|
|
||||||
<input type="password" class="form-control" id="password" ng-model="password" placeholder="Mot de passe">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
@ -1,152 +0,0 @@
|
|||||||
<!--
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<div>
|
|
||||||
<!-- Chart row -->
|
|
||||||
<div class="row">
|
|
||||||
<!-- Sold evolution chart placeholder -->
|
|
||||||
<div class="col-md-8" ng-controller="SoldChartController">
|
|
||||||
<highchart id="sold-chart" config="config"></highchart>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Category piechart -->
|
|
||||||
<div class="col-md-4" ng-controller="CategoryChartController">
|
|
||||||
<highchart id="categories-chart" config="config"></highchart>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<table class="table table-striped table-condensed table-hover">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th class="col-md-1">Date d'op.</th>
|
|
||||||
<th>Libellé de l'opération</th>
|
|
||||||
<th class="col-md-1">Montant</th>
|
|
||||||
<th class="col-md-1">Solde</th>
|
|
||||||
<th class="col-md-2">Catégorie</th>
|
|
||||||
<th class="col-md-2">Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td colspan="6">
|
|
||||||
<button class="btn btn-success" ng-click="add()">
|
|
||||||
Ajouter
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<tr id="{{ operation.id }}" class="form-inline"
|
|
||||||
ng-class="{stroke: operation.canceled, italic: !operation.confirmed, warning: operation.sold < 0, danger: operation.sold < account.authorized_overdraft}"
|
|
||||||
ng-repeat="operation in operations | orderBy:['-operation_date', '-value', 'label']">
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.operation_date"
|
|
||||||
e-data-date-format="yyyy-MM-dd" e-bs-datepicker
|
|
||||||
e-timezone="UTC"
|
|
||||||
e-class="input-sm" e-style="width: 100%"
|
|
||||||
e-name="operation_date" e-form="rowform" e-required>
|
|
||||||
{{ operation.operation_date | date:"yyyy-MM-dd" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.label"
|
|
||||||
e-placeholder="Libellé de l'opération"
|
|
||||||
e-class="input-sm" e-style="width: 100%"
|
|
||||||
e-name="label" e-form="rowform" e-required>
|
|
||||||
{{ operation.label }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-number="operation.value"
|
|
||||||
e-class="input-sm" e-style="width: 100%"
|
|
||||||
e-name="value" e-form="rowform" e-required>
|
|
||||||
{{ operation.value | currency:"€" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td ng-class="{'text-warning': operation.sold < 0, 'text-danger': operation.sold < account.authorized_overdraft}">
|
|
||||||
{{ operation.sold | currency:"€" }}
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.category"
|
|
||||||
e-placeholder="Catégorie"
|
|
||||||
e-class="input-sm" e-style="width: 100%"
|
|
||||||
e-name="category" e-form="rowform" e-required>
|
|
||||||
{{ operation.category }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<form editable-form name="rowform"
|
|
||||||
onbeforesave="save($data, $index)"
|
|
||||||
shown="!operation.id">
|
|
||||||
<div class="btn-group btn-group-xs">
|
|
||||||
<!-- Save current operation, for editing and non-confirmed non-canceled operation. -->
|
|
||||||
<button type="submit" class="btn btn-success"
|
|
||||||
ng-if="!operation.canceled && (!operation.confirmed || rowform.$visible)"
|
|
||||||
title="Save">
|
|
||||||
<span class="fa fa-floppy-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Edit operation, for non-canceled and non-editing operation -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="!operation.canceled && !rowform.$visible"
|
|
||||||
ng-click="rowform.$show()" title="edit">
|
|
||||||
<span class="fa fa-pencil-square-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Cancel edition, for editing operation. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="rowform.$visible"
|
|
||||||
ng-click="cancelEdit(operation, rowform)">
|
|
||||||
<span class="fa fa-times"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Toggle pointed operation, for non-canceled operations. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="!operation.canceled"
|
|
||||||
ng-click="togglePointed(operation, rowform)"
|
|
||||||
ng-class="{active: operation.pointed}" title="point">
|
|
||||||
<span ng-class="{'fa fa-check-square-o': operation.pointed, 'fa fa-square-o': !operation.pointed}"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Toggle canceled operation, for non-editing operations. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-click="toggleCanceled(operation)"
|
|
||||||
ng-if="operation.scheduled_operation_id && !rowform.$visible"
|
|
||||||
ng-class="{active: operation.canceled}" title="cancel">
|
|
||||||
<span class="fa fa-remove"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Delete operation, with confirm. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="operation.id && !operation.scheduled_operation_id"
|
|
||||||
ng-click="delete(operation, $index)">
|
|
||||||
<span class="fa fa-trash-o"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
@ -1,142 +0,0 @@
|
|||||||
<!--
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
<!-- vim: set tw=80 ts=2 sw=2 sts=2: -->
|
|
||||||
<div class="row">
|
|
||||||
<table class="table table-striped table-condensed table-hover">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th class="col-md-1">Date de début</th>
|
|
||||||
<th class="col-md-1">Date de fin</th>
|
|
||||||
<th class="col-md-1">Jour</th>
|
|
||||||
<th class="col-md-1">Fréq.</th>
|
|
||||||
<th>Libellé de l'opération</th>
|
|
||||||
<th class="col-md-1">Montant</th>
|
|
||||||
<th class="col-md-2">Catégorie</th>
|
|
||||||
<th class="col-md-1">Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td colspan="8">
|
|
||||||
<button class="btn btn-success" ng-click="add()">
|
|
||||||
Ajouter
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<tr id="{{ operation.id }}" class="form-inline"
|
|
||||||
ng-repeat="operation in operations">
|
|
||||||
<td class="col-md-1">
|
|
||||||
<span editable-text="operation.start_date"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-bs-datepicker e-data-date-format="yyyy-MM-dd"
|
|
||||||
e-name="start_date" e-form="rowform" e-required>
|
|
||||||
{{ operation.start_date | date: "yyyy-MM-dd" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.stop_date"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-bs-datepicker e-data-date-format="yyyy-MM-dd"
|
|
||||||
e-name="stop_date" e-form="rowform" e-required>
|
|
||||||
{{ operation.stop_date | date: "yyyy-MM-dd" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-number="operation.day"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-name="day" e-form="rowform" e-required>
|
|
||||||
{{ operation.day }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-number="operation.frequency"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-name="frequency" e-form="rowform" e-required>
|
|
||||||
{{ operation.frequency }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.label"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-placeholder="Libellé de l'opération"
|
|
||||||
e-name="label" e-form="rowform" e-required>
|
|
||||||
{{ operation.label }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-number="operation.value"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-name="value" e-form="rowform" e-required>
|
|
||||||
{{ operation.value | currency : "€" }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<span editable-text="operation.category"
|
|
||||||
e-style="width: 100%"
|
|
||||||
e-name="category" e-form="rowform">
|
|
||||||
{{ operation.category }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>
|
|
||||||
<form editable-form name="rowform"
|
|
||||||
onbeforesave="save($data, $index)"
|
|
||||||
shown="!operation.id">
|
|
||||||
<div class="btn-group btn-group-xs">
|
|
||||||
<!-- Save current operation -->
|
|
||||||
<button type="submit" class="btn btn-success"
|
|
||||||
ng-if="rowform.$visible" title="Save">
|
|
||||||
<span class="fa fa-floppy-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Edit operation. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="!rowform.$visible"
|
|
||||||
ng-click="rowform.$show()" title="edit">
|
|
||||||
<span class="fa fa-pencil-square-o"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Cancel edit. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="rowform.$visible"
|
|
||||||
ng-click="cancelEdit(operation, rowform, $index)"
|
|
||||||
title="Cancel">
|
|
||||||
<span class="fa fa-times"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Remove operation. -->
|
|
||||||
<button type="button" class="btn btn-default"
|
|
||||||
ng-if="operation.id"
|
|
||||||
ng-click="delete(operation, $index)"
|
|
||||||
title="remove">
|
|
||||||
<span class="fa fa-trash"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
54
bower.json
54
bower.json
@ -1,54 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "accountant",
|
|
||||||
"version": "0.1.0",
|
|
||||||
"authors": [
|
|
||||||
"Alexis Lahouze <xals@lahouze.org>"
|
|
||||||
],
|
|
||||||
"license": "AGPL",
|
|
||||||
"main": [
|
|
||||||
"accountant-ui/index.html",
|
|
||||||
"accountant-ui/js/app.js"
|
|
||||||
],
|
|
||||||
"ignore": [
|
|
||||||
"**/.*",
|
|
||||||
"node_modules",
|
|
||||||
"bower_components",
|
|
||||||
"test",
|
|
||||||
"tests"
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"jquery": "~2.2",
|
|
||||||
"moment": "~2.12",
|
|
||||||
"bootstrap": "~3.3.6",
|
|
||||||
"bootstrap-additions": "~0.3.1",
|
|
||||||
"angular": "~1.5",
|
|
||||||
"angular-resource": "~1.5",
|
|
||||||
"angular-route": "~1.5",
|
|
||||||
"angular-strap": "~2.3.6",
|
|
||||||
"angular-xeditable": "~0.1",
|
|
||||||
"angular-ui-notification": "~0.2",
|
|
||||||
"highcharts-ng": "~0.0.11",
|
|
||||||
"highstock-release": "~4.2",
|
|
||||||
"angular-http-auth": "~1.3",
|
|
||||||
"meanie-angular-storage": "~1.1",
|
|
||||||
"font-awesome": ">=4.5.0",
|
|
||||||
"bootbox": "~4.4.0",
|
|
||||||
"angular-bootstrap": "~1.3",
|
|
||||||
"ngBootbox": "^0.1.3"
|
|
||||||
},
|
|
||||||
"overrides": {
|
|
||||||
"bootstrap": {
|
|
||||||
"main": [
|
|
||||||
"less/bootstrap.less",
|
|
||||||
"dist/css/bootstrap.css",
|
|
||||||
"dist/js/bootstrap.js"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"font-awesome": {
|
|
||||||
"main": [
|
|
||||||
"./css/font-awesome.css",
|
|
||||||
"./fonts/*"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
10
config/helpers.js
Normal file
10
config/helpers.js
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
var path = require('path');
|
||||||
|
|
||||||
|
var _root = path.resolve(__dirname, '..');
|
||||||
|
|
||||||
|
function root(args) {
|
||||||
|
args = Array.prototype.slice.call(arguments, 0);
|
||||||
|
return path.join.apply(path, [_root].concat(args));
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.root = root;
|
119
config/webpack.common.js
Normal file
119
config/webpack.common.js
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
const webpack = require('webpack');
|
||||||
|
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||||
|
const helpers = require('./helpers');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
entry: {
|
||||||
|
'polyfills': './src/polyfills.ts',
|
||||||
|
'vendor': './src/vendor.ts',
|
||||||
|
'app': './src/main.ts',
|
||||||
|
'styles': './src/main.scss'
|
||||||
|
},
|
||||||
|
|
||||||
|
resolve: {
|
||||||
|
extensions: ['.ts', '.js'],
|
||||||
|
},
|
||||||
|
|
||||||
|
module: {
|
||||||
|
rules: [{
|
||||||
|
enforce: 'pre',
|
||||||
|
test: /webpack\.config\.js$/,
|
||||||
|
include: helpers.root('src', 'app'),
|
||||||
|
loader: 'eslint-loader',
|
||||||
|
options: {
|
||||||
|
useEslintrc: false,
|
||||||
|
emitWarning: true,
|
||||||
|
emitError: true,
|
||||||
|
failOnWarning: true,
|
||||||
|
failOnError: true,
|
||||||
|
baseConfig: 'webpack',
|
||||||
|
rules: {
|
||||||
|
indent: ['error', 4]
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
// Javascript
|
||||||
|
enforce: 'pre',
|
||||||
|
test: /\.jsx?$/,
|
||||||
|
include: helpers.root('src', 'app'),
|
||||||
|
loader: 'eslint-loader',
|
||||||
|
options: {
|
||||||
|
useEslintrc: false,
|
||||||
|
emitWarning: false,
|
||||||
|
emitError: true,
|
||||||
|
failOnWarning: false,
|
||||||
|
failOnError: true,
|
||||||
|
baseConfig: 'angular',
|
||||||
|
rules: {
|
||||||
|
indent: ['error', 4]
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
'angular',
|
||||||
|
'html',
|
||||||
|
'security',
|
||||||
|
'this',
|
||||||
|
'jquery',
|
||||||
|
'promise'
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// }, {
|
||||||
|
// test: /\.jsx?$/,
|
||||||
|
// exclude: /node_modules/,
|
||||||
|
// loader: 'babel-loader'
|
||||||
|
}, {
|
||||||
|
test: /\.ts$/,
|
||||||
|
use: [
|
||||||
|
{
|
||||||
|
loader: 'awesome-typescript-loader',
|
||||||
|
options: { configFileName: helpers.root('src', 'tsconfig.json') }
|
||||||
|
},
|
||||||
|
'angular2-template-loader'
|
||||||
|
]
|
||||||
|
}, {
|
||||||
|
test: /\.html$/,
|
||||||
|
include: helpers.root('src'),
|
||||||
|
loader: 'html-loader'
|
||||||
|
}, {
|
||||||
|
test: /\.css$/,
|
||||||
|
//include: helpers.root('src'),
|
||||||
|
use: [
|
||||||
|
'style-loader',
|
||||||
|
'css-loader',
|
||||||
|
'resolve-url-loader'
|
||||||
|
]
|
||||||
|
}, {
|
||||||
|
test: /\.scss$/,
|
||||||
|
use: [
|
||||||
|
'style-loader',
|
||||||
|
'css-loader',
|
||||||
|
'resolve-url-loader',
|
||||||
|
'sass-loader?sourceMap'
|
||||||
|
]
|
||||||
|
}, {
|
||||||
|
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
|
||||||
|
loader: 'file-loader?name=assets/[name].[hash].[ext]'
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
|
||||||
|
optimization: {
|
||||||
|
splitChunks: {
|
||||||
|
name: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
plugins: [
|
||||||
|
// Workaround for angular/angular#11580
|
||||||
|
new webpack.ContextReplacementPlugin(
|
||||||
|
// The (\\|\/) piece accounts for path separators in *nix and Windows
|
||||||
|
/angular(\\|\/)core(\\|\/)@angular/,
|
||||||
|
helpers.root('./src'), // location of your src
|
||||||
|
{} // a map of your routes
|
||||||
|
),
|
||||||
|
|
||||||
|
new HtmlWebpackPlugin({
|
||||||
|
template: 'src/index.ejs'
|
||||||
|
})
|
||||||
|
],
|
||||||
|
};
|
34
config/webpack.dev.js
Normal file
34
config/webpack.dev.js
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
const webpackMerge = require('webpack-merge');
|
||||||
|
const ExtractTextPlugin = require('extract-text-webpack-plugin');
|
||||||
|
const commonConfig = require('./webpack.common.js');
|
||||||
|
const helpers = require('./helpers');
|
||||||
|
|
||||||
|
module.exports = webpackMerge(commonConfig, {
|
||||||
|
devtool: 'cheap-module-eval-source-map',
|
||||||
|
|
||||||
|
mode: 'development',
|
||||||
|
|
||||||
|
output: {
|
||||||
|
path: helpers.root('dist'),
|
||||||
|
publicPath: '/',
|
||||||
|
filename: '[name].js',
|
||||||
|
chunkFilename: '[id].chunk.js'
|
||||||
|
},
|
||||||
|
|
||||||
|
plugins: [
|
||||||
|
new ExtractTextPlugin('[name].css')
|
||||||
|
],
|
||||||
|
|
||||||
|
devServer: {
|
||||||
|
proxy: {
|
||||||
|
'/api': {
|
||||||
|
target: 'http://localhost:5000',
|
||||||
|
secure: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
historyApiFallback: true,
|
||||||
|
stats: 'minimal'
|
||||||
|
}
|
||||||
|
});
|
41
config/webpack.prod.js
Normal file
41
config/webpack.prod.js
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/* jshint esversion: 6 */
|
||||||
|
const webpack = require('webpack');
|
||||||
|
const webpackMerge = require('webpack-merge');
|
||||||
|
const ExtractTextPlugin = require('extract-text-webpack-plugin');
|
||||||
|
const commonConfig = require('./webpack.common.js');
|
||||||
|
const helpers = require('./helpers');
|
||||||
|
|
||||||
|
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
|
||||||
|
|
||||||
|
module.exports = webpackMerge(commonConfig, {
|
||||||
|
devtool: 'source-map',
|
||||||
|
|
||||||
|
mode: 'production',
|
||||||
|
|
||||||
|
output: {
|
||||||
|
path: helpers.root('dist'),
|
||||||
|
publicPath: '/',
|
||||||
|
filename: '[name].[hash].js',
|
||||||
|
chunkFilename: '[id].[hash].chunk.js'
|
||||||
|
},
|
||||||
|
|
||||||
|
plugins: [
|
||||||
|
new webpack.NoEmitOnErrorsPlugin(),
|
||||||
|
new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
|
||||||
|
mangle: {
|
||||||
|
keep_fnames: true
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
new ExtractTextPlugin('[name].[hash].css'),
|
||||||
|
new webpack.DefinePlugin({
|
||||||
|
'process.env': {
|
||||||
|
'ENV': JSON.stringify(ENV)
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
new webpack.LoaderOptionsPlugin({
|
||||||
|
htmlLoader: {
|
||||||
|
minimize: false // workaround for ng2
|
||||||
|
}
|
||||||
|
})
|
||||||
|
]
|
||||||
|
});
|
@ -1,7 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
runserver: {
|
|
||||||
cmd: 'python -m manage runserver -d -r',
|
|
||||||
fail: true,
|
|
||||||
bg: true
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,7 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
dist: [
|
|
||||||
'<%= accountant.frontend.dist %>'
|
|
||||||
]
|
|
||||||
};
|
|
@ -1,40 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
options: {
|
|
||||||
port: 5001,
|
|
||||||
hostname: 'localhost',
|
|
||||||
base: '<%= accountant.frontend.src %>',
|
|
||||||
apiUrl: 'http://localhost:5000/api/',
|
|
||||||
swaggerUiUrl: 'http://localhost:5000/swaggerui/',
|
|
||||||
livereload: 1337,
|
|
||||||
},
|
|
||||||
proxies: [{
|
|
||||||
context: '/api',
|
|
||||||
host: '127.0.0.1',
|
|
||||||
port: 5000,
|
|
||||||
https: false
|
|
||||||
}, {
|
|
||||||
contect: '/swaggerui',
|
|
||||||
host: '127.0.0.1',
|
|
||||||
port: 5000,
|
|
||||||
https: false
|
|
||||||
}],
|
|
||||||
livereload: {
|
|
||||||
options: {
|
|
||||||
//open: true,
|
|
||||||
middleware: function(connect, options, middlewares) {
|
|
||||||
var connectLogger = require('connect-logger');
|
|
||||||
var connectProxy = require('connect-proxy-layer');
|
|
||||||
var apiProxy = connectProxy(options.apiUrl);
|
|
||||||
var swaggerUiProxy = connectProxy(options.swaggerUiUrl);
|
|
||||||
|
|
||||||
return [
|
|
||||||
connectLogger(),
|
|
||||||
connect().use('/api', apiProxy),
|
|
||||||
connect().use('/swaggerUi', swaggerUiProxy),
|
|
||||||
].concat(middlewares);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,22 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
dist: {
|
|
||||||
files: [{
|
|
||||||
expand: true,
|
|
||||||
dot: true,
|
|
||||||
cwd: '<%= accountant.frontend.src %>',
|
|
||||||
dest: '<%= accountant.frontend.dist %>',
|
|
||||||
src :[
|
|
||||||
'*.html',
|
|
||||||
'views/*.html',
|
|
||||||
]
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
styles: {
|
|
||||||
expand: true,
|
|
||||||
cwd: '<%= accountant.frontend.src %>/css',
|
|
||||||
dest: '.tmp/css',
|
|
||||||
src: '{,*/}*.css'
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,17 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
options: {
|
|
||||||
encoding: 'utf-8',
|
|
||||||
algorithm: 'md5',
|
|
||||||
length: 8
|
|
||||||
},
|
|
||||||
dist: {
|
|
||||||
src: [
|
|
||||||
'<%= accountant.frontend.dist %>/css/*.css',
|
|
||||||
'<%= accountant.frontend.dist %>/js/*.js',
|
|
||||||
'!<%= accountant.frontend.dist %>/css/*.map.css',
|
|
||||||
'!<%= accountant.frontend.dist %>/js/*.map.js'
|
|
||||||
]
|
|
||||||
},
|
|
||||||
};
|
|
@ -1,7 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
src: [
|
|
||||||
'accountant/**/*.py'
|
|
||||||
]
|
|
||||||
};
|
|
@ -1,16 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
frontend: {
|
|
||||||
options: {
|
|
||||||
'attr-name-style': 'dash',
|
|
||||||
'attr-req-value': false,
|
|
||||||
'id-class-ignore-regex': '{{.*?}}',
|
|
||||||
'id-class-style': 'dash',
|
|
||||||
'indent-style': 'spaces',
|
|
||||||
'indent-width': 2
|
|
||||||
},
|
|
||||||
src: [
|
|
||||||
'<%= accountant.frontend.src %>/*.html',
|
|
||||||
'<%= accountant.frontend.src %>/views/*.html'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,13 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
options: {
|
|
||||||
basePath: '<%= accountant.frontend.src %>',
|
|
||||||
baseUrl: ''
|
|
||||||
},
|
|
||||||
index: {
|
|
||||||
files: {
|
|
||||||
'<%= accountant.frontend.src %>/index.html': '<%= accountant.frontend.src %>/index.html'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,13 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
options: {
|
|
||||||
config: '.jscsrc',
|
|
||||||
verbose: true
|
|
||||||
},
|
|
||||||
frontend_js: [
|
|
||||||
'<%= accountant.frontend.src %>/js/*.js'
|
|
||||||
],
|
|
||||||
toolchain: [
|
|
||||||
'Gruntfile.js',
|
|
||||||
'grunt-config/*.js'
|
|
||||||
]
|
|
||||||
};
|
|
@ -1,13 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
options: {
|
|
||||||
jshintrc: '.jshintrc',
|
|
||||||
reporter: require('jshint-stylish')
|
|
||||||
},
|
|
||||||
frontend_js: [
|
|
||||||
'<%= accountant.frontend.src %>/js/*.js'
|
|
||||||
],
|
|
||||||
toolchain: [
|
|
||||||
'Gruntfile.js',
|
|
||||||
'grunt-config/*.js'
|
|
||||||
]
|
|
||||||
};
|
|
@ -1,12 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
dist: {
|
|
||||||
files: [{
|
|
||||||
expand: true,
|
|
||||||
cwd: '.tmp/concat/js',
|
|
||||||
src: '*.js',
|
|
||||||
dest: '.tmp/concat/js'
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,11 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
npm_install: {
|
|
||||||
command: 'npm install'
|
|
||||||
},
|
|
||||||
bower_install: {
|
|
||||||
command: 'bower install'
|
|
||||||
},
|
|
||||||
pip_install: {
|
|
||||||
command: 'pip install --upgrade --requirement requirements.txt'
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,16 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
html: ['<%= accountant.frontend.dist %>/{,*/}*.html'],
|
|
||||||
css: ['<%= accountant.frontend.dist %>/css/{,*/}*.css'],
|
|
||||||
js: ['<%= accountant.frontend.dist %>/js/{,*/}*.js'],
|
|
||||||
options: {
|
|
||||||
assetsDir: [
|
|
||||||
'<%= accountant.frontend.dist %>',
|
|
||||||
'<%= accountant.frontend.dist %>/css',
|
|
||||||
],
|
|
||||||
patterns: {
|
|
||||||
js: [[/(images\/[^''""]*\.(png|jpg|jpeg|gif|webp|svg))/g, 'Replacing references to images']]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,17 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
html: '<%= accountant.frontend.src %>/index.html ',
|
|
||||||
options: {
|
|
||||||
dest: '<%= accountant.frontend.dist %>',
|
|
||||||
flow: {
|
|
||||||
html: {
|
|
||||||
steps: {
|
|
||||||
js: ['concat', 'uglify'],
|
|
||||||
css: ['cssmin']
|
|
||||||
},
|
|
||||||
post: {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,43 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
bower: {
|
|
||||||
files: 'bower.json',
|
|
||||||
tasks: ['wiredep']
|
|
||||||
},
|
|
||||||
js: {
|
|
||||||
files: [
|
|
||||||
'<%= accountant.frontend.src %>/js/*.js %>',
|
|
||||||
'grunt-config/*.js'
|
|
||||||
],
|
|
||||||
tasks: ['jsdev']
|
|
||||||
},
|
|
||||||
py: {
|
|
||||||
files: 'accountant/**/*.py',
|
|
||||||
tasks: ['pydev', 'bgShell:runserver']
|
|
||||||
},
|
|
||||||
html: {
|
|
||||||
files: [
|
|
||||||
'<%= accountant.frontend.src %>/*.html',
|
|
||||||
'<%= accountant.frontend.src %>/views/*.html'
|
|
||||||
],
|
|
||||||
tasks: ['htmldev']
|
|
||||||
},
|
|
||||||
gruntfile: {
|
|
||||||
files: ['Gruntfile.js', 'grunt-config/*.js']
|
|
||||||
},
|
|
||||||
livereload: {
|
|
||||||
options: {
|
|
||||||
livereload: '<%= connect.options.livereload %>'
|
|
||||||
},
|
|
||||||
files: [
|
|
||||||
'<%= accountant.frontend.src %>/{,*/}*.html',
|
|
||||||
'<%= accountant.frontend.src %>/js/*.js',
|
|
||||||
'<%= accountant.frontend.src %>/css/*.css'
|
|
||||||
]
|
|
||||||
},
|
|
||||||
requirements: {
|
|
||||||
files: ['requirements.txt'],
|
|
||||||
tasks: ['shell:pip_install']
|
|
||||||
}
|
|
||||||
};
|
|
@ -1,6 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
app: {
|
|
||||||
src: ['<%= accountant.frontend.src %>/index.html'],
|
|
||||||
ignorePath: /\.\.\//
|
|
||||||
}
|
|
||||||
};
|
|
47
manage.py
47
manage.py
@ -1,47 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
from flask.ext.script import Manager
|
|
||||||
from flask.ext.migrate import Migrate, MigrateCommand, stamp
|
|
||||||
|
|
||||||
from accountant import app, db
|
|
||||||
|
|
||||||
from accountant.api.models.users import User
|
|
||||||
|
|
||||||
manager = Manager(app)
|
|
||||||
|
|
||||||
migrate = Migrate(app, db)
|
|
||||||
|
|
||||||
manager.add_command('db', MigrateCommand)
|
|
||||||
|
|
||||||
|
|
||||||
@manager.command
|
|
||||||
def initdb():
|
|
||||||
""" Create the database ans stamp it. """
|
|
||||||
|
|
||||||
tables = db.engine.table_names()
|
|
||||||
|
|
||||||
if len(tables) > 1 and 'alembic_version' not in tables:
|
|
||||||
exit("Database already initialized.")
|
|
||||||
|
|
||||||
db.metadata.create_all(bind=db.engine)
|
|
||||||
stamp()
|
|
||||||
print("Database created.")
|
|
||||||
|
|
||||||
user_manager = Manager(usage="Manage users.")
|
|
||||||
|
|
||||||
manager.add_command('user', user_manager)
|
|
||||||
|
|
||||||
|
|
||||||
@user_manager.command
|
|
||||||
def add(email, password):
|
|
||||||
""" Add a new user. """
|
|
||||||
user = User()
|
|
||||||
user.email = email
|
|
||||||
user.password = User.hash_password(password)
|
|
||||||
|
|
||||||
db.session.add(user)
|
|
||||||
|
|
||||||
print("User '%s' successfully added." % email)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
manager.run()
|
|
@ -1 +0,0 @@
|
|||||||
Generic single-database configuration.
|
|
@ -1,45 +0,0 @@
|
|||||||
# A generic, single database configuration.
|
|
||||||
|
|
||||||
[alembic]
|
|
||||||
# template used to generate migration files
|
|
||||||
# file_template = %%(rev)s_%%(slug)s
|
|
||||||
|
|
||||||
# set to 'true' to run the environment during
|
|
||||||
# the 'revision' command, regardless of autogenerate
|
|
||||||
# revision_environment = false
|
|
||||||
|
|
||||||
|
|
||||||
# Logging configuration
|
|
||||||
[loggers]
|
|
||||||
keys = root,sqlalchemy,alembic
|
|
||||||
|
|
||||||
[handlers]
|
|
||||||
keys = console
|
|
||||||
|
|
||||||
[formatters]
|
|
||||||
keys = generic
|
|
||||||
|
|
||||||
[logger_root]
|
|
||||||
level = WARN
|
|
||||||
handlers = console
|
|
||||||
qualname =
|
|
||||||
|
|
||||||
[logger_sqlalchemy]
|
|
||||||
level = WARN
|
|
||||||
handlers =
|
|
||||||
qualname = sqlalchemy.engine
|
|
||||||
|
|
||||||
[logger_alembic]
|
|
||||||
level = INFO
|
|
||||||
handlers =
|
|
||||||
qualname = alembic
|
|
||||||
|
|
||||||
[handler_console]
|
|
||||||
class = StreamHandler
|
|
||||||
args = (sys.stderr,)
|
|
||||||
level = NOTSET
|
|
||||||
formatter = generic
|
|
||||||
|
|
||||||
[formatter_generic]
|
|
||||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
|
||||||
datefmt = %H:%M:%S
|
|
@ -1,73 +0,0 @@
|
|||||||
from __future__ import with_statement
|
|
||||||
from alembic import context
|
|
||||||
from sqlalchemy import engine_from_config, pool
|
|
||||||
from logging.config import fileConfig
|
|
||||||
|
|
||||||
# this is the Alembic Config object, which provides
|
|
||||||
# access to the values within the .ini file in use.
|
|
||||||
config = context.config
|
|
||||||
|
|
||||||
# Interpret the config file for Python logging.
|
|
||||||
# This line sets up loggers basically.
|
|
||||||
fileConfig(config.config_file_name)
|
|
||||||
|
|
||||||
# add your model's MetaData object here
|
|
||||||
# for 'autogenerate' support
|
|
||||||
# from myapp import mymodel
|
|
||||||
# target_metadata = mymodel.Base.metadata
|
|
||||||
from flask import current_app
|
|
||||||
config.set_main_option('sqlalchemy.url', current_app.config.get('SQLALCHEMY_DATABASE_URI'))
|
|
||||||
target_metadata = current_app.extensions['migrate'].metadata
|
|
||||||
|
|
||||||
# other values from the config, defined by the needs of env.py,
|
|
||||||
# can be acquired:
|
|
||||||
# my_important_option = config.get_main_option("my_important_option")
|
|
||||||
# ... etc.
|
|
||||||
|
|
||||||
def run_migrations_offline():
|
|
||||||
"""Run migrations in 'offline' mode.
|
|
||||||
|
|
||||||
This configures the context with just a URL
|
|
||||||
and not an Engine, though an Engine is acceptable
|
|
||||||
here as well. By skipping the Engine creation
|
|
||||||
we don't even need a DBAPI to be available.
|
|
||||||
|
|
||||||
Calls to context.execute() here emit the given string to the
|
|
||||||
script output.
|
|
||||||
|
|
||||||
"""
|
|
||||||
url = config.get_main_option("sqlalchemy.url")
|
|
||||||
context.configure(url=url)
|
|
||||||
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
|
|
||||||
def run_migrations_online():
|
|
||||||
"""Run migrations in 'online' mode.
|
|
||||||
|
|
||||||
In this scenario we need to create an Engine
|
|
||||||
and associate a connection with the context.
|
|
||||||
|
|
||||||
"""
|
|
||||||
engine = engine_from_config(
|
|
||||||
config.get_section(config.config_ini_section),
|
|
||||||
prefix='sqlalchemy.',
|
|
||||||
poolclass=pool.NullPool)
|
|
||||||
|
|
||||||
connection = engine.connect()
|
|
||||||
context.configure(
|
|
||||||
connection=connection,
|
|
||||||
target_metadata=target_metadata
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
finally:
|
|
||||||
connection.close()
|
|
||||||
|
|
||||||
if context.is_offline_mode():
|
|
||||||
run_migrations_offline()
|
|
||||||
else:
|
|
||||||
run_migrations_online()
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
|||||||
"""${message}
|
|
||||||
|
|
||||||
Revision ID: ${up_revision}
|
|
||||||
Revises: ${down_revision}
|
|
||||||
Create Date: ${create_date}
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = ${repr(up_revision)}
|
|
||||||
down_revision = ${repr(down_revision)}
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
${imports if imports else ""}
|
|
||||||
|
|
||||||
def upgrade():
|
|
||||||
${upgrades if upgrades else "pass"}
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
|
||||||
${downgrades if downgrades else "pass"}
|
|
@ -1,34 +0,0 @@
|
|||||||
"""Add user support.
|
|
||||||
|
|
||||||
Revision ID: 1232daf66ac
|
|
||||||
Revises: 144929e0f5f
|
|
||||||
Create Date: 2015-08-31 10:24:40.578432
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = '1232daf66ac'
|
|
||||||
down_revision = '144929e0f5f'
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade():
|
|
||||||
### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.create_table('user',
|
|
||||||
sa.Column('id', sa.Integer(), nullable=False),
|
|
||||||
sa.Column('email', sa.String(length=200), nullable=False),
|
|
||||||
sa.Column('password', sa.String(length=100), nullable=True),
|
|
||||||
sa.Column('active', sa.Boolean(), server_default=sa.text('true'), nullable=False),
|
|
||||||
sa.PrimaryKeyConstraint('id')
|
|
||||||
)
|
|
||||||
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
|
|
||||||
### end Alembic commands ###
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
|
||||||
### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.drop_index(op.f('ix_user_email'), table_name='user')
|
|
||||||
op.drop_table('user')
|
|
||||||
### end Alembic commands ###
|
|
@ -1,142 +0,0 @@
|
|||||||
"""Improve operation scheduling.
|
|
||||||
|
|
||||||
Revision ID: 144929e0f5f
|
|
||||||
Revises: None
|
|
||||||
Create Date: 2015-07-17 15:04:01.002581
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = '144929e0f5f'
|
|
||||||
down_revision = None
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from accountant.api.models.scheduled_operations import ScheduledOperation
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade():
|
|
||||||
op.get_bind().execute("DROP VIEW operation")
|
|
||||||
op.rename_table('entry', 'operation')
|
|
||||||
|
|
||||||
# Add column "canceled" in table "entry"
|
|
||||||
op.add_column(
|
|
||||||
'operation',
|
|
||||||
sa.Column(
|
|
||||||
'canceled',
|
|
||||||
sa.Boolean(),
|
|
||||||
nullable=False,
|
|
||||||
default=False,
|
|
||||||
server_default=sa.false()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add column "confirmed" in table "entry"
|
|
||||||
op.add_column(
|
|
||||||
'operation',
|
|
||||||
sa.Column(
|
|
||||||
'confirmed',
|
|
||||||
sa.Boolean(),
|
|
||||||
nullable=False,
|
|
||||||
default=True,
|
|
||||||
server_default=sa.true()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Drop unused table canceled_operation.
|
|
||||||
op.drop_table('canceled_operation')
|
|
||||||
|
|
||||||
op.get_bind().execute(
|
|
||||||
"alter sequence entry_id_seq rename to operation_id_seq"
|
|
||||||
)
|
|
||||||
|
|
||||||
connection = op.get_bind()
|
|
||||||
Session = sa.orm.sessionmaker()
|
|
||||||
session = Session(bind=connection)
|
|
||||||
|
|
||||||
# Get all scheduled operations
|
|
||||||
scheduled_operations = ScheduledOperation.query(session).all()
|
|
||||||
|
|
||||||
for scheduled_operation in scheduled_operations:
|
|
||||||
scheduled_operation.reschedule(session)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"canceled_operation",
|
|
||||||
sa.Column("id", sa.Integer, primary_key=True),
|
|
||||||
sa.Column(
|
|
||||||
"scheduled_operation_id", sa.Integer(),
|
|
||||||
sa.ForeignKey("scheduled_operation.id")),
|
|
||||||
sa.Column("operation_date", sa.Date, nullable=False)
|
|
||||||
)
|
|
||||||
|
|
||||||
op.drop_column('operation', 'canceled')
|
|
||||||
op.drop_column('operation', 'confirmed')
|
|
||||||
|
|
||||||
op.get_bind().execute(
|
|
||||||
"alter sequence operation_id_seq rename to entry_id_seq"
|
|
||||||
)
|
|
||||||
op.rename_table('operation', 'entry')
|
|
||||||
|
|
||||||
op.get_bind().execute(
|
|
||||||
"""
|
|
||||||
CREATE VIEW operation AS
|
|
||||||
SELECT entry.id,
|
|
||||||
entry.operation_date,
|
|
||||||
entry.label,
|
|
||||||
entry.value,
|
|
||||||
entry.account_id,
|
|
||||||
entry.category,
|
|
||||||
entry.pointed,
|
|
||||||
entry.scheduled_operation_id,
|
|
||||||
false AS canceled
|
|
||||||
FROM entry
|
|
||||||
UNION
|
|
||||||
SELECT NULL::bigint AS id,
|
|
||||||
scheduled_operation.operation_date,
|
|
||||||
scheduled_operation.label,
|
|
||||||
scheduled_operation.value,
|
|
||||||
scheduled_operation.account_id,
|
|
||||||
scheduled_operation.category,
|
|
||||||
false AS pointed,
|
|
||||||
scheduled_operation.id AS scheduled_operation_id,
|
|
||||||
false AS canceled
|
|
||||||
FROM (
|
|
||||||
SELECT scheduled_operation_1.id,
|
|
||||||
scheduled_operation_1.start_date,
|
|
||||||
scheduled_operation_1.stop_date,
|
|
||||||
scheduled_operation_1.day,
|
|
||||||
scheduled_operation_1.frequency,
|
|
||||||
scheduled_operation_1.label,
|
|
||||||
scheduled_operation_1.value,
|
|
||||||
scheduled_operation_1.account_id,
|
|
||||||
scheduled_operation_1.category,
|
|
||||||
generate_series(scheduled_operation_1.start_date::timestamp without time zone, scheduled_operation_1.stop_date::timestamp without time zone, scheduled_operation_1.frequency::double precision * '1 mon'::interval) AS operation_date
|
|
||||||
FROM scheduled_operation scheduled_operation_1) scheduled_operation
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT entry.scheduled_operation_id,
|
|
||||||
date_trunc('MONTH'::text, entry.operation_date::timestamp with time zone) AS operation_date
|
|
||||||
FROM entry
|
|
||||||
UNION
|
|
||||||
SELECT canceled_operation.scheduled_operation_id,
|
|
||||||
date_trunc('MONTH'::text, canceled_operation.operation_date::timestamp with time zone) AS operation_date
|
|
||||||
FROM canceled_operation
|
|
||||||
) saved_operation ON saved_operation.scheduled_operation_id = scheduled_operation.id AND saved_operation.operation_date = date_trunc('MONTH'::text, scheduled_operation.operation_date)
|
|
||||||
WHERE saved_operation.scheduled_operation_id IS NULL
|
|
||||||
UNION
|
|
||||||
SELECT NULL::bigint AS id,
|
|
||||||
canceled_operation.operation_date,
|
|
||||||
scheduled_operation.label,
|
|
||||||
scheduled_operation.value,
|
|
||||||
scheduled_operation.account_id,
|
|
||||||
scheduled_operation.category,
|
|
||||||
false AS pointed,
|
|
||||||
scheduled_operation.id AS scheduled_operation_id,
|
|
||||||
true AS canceled
|
|
||||||
FROM scheduled_operation
|
|
||||||
JOIN canceled_operation ON canceled_operation.scheduled_operation_id = scheduled_operation.id;
|
|
||||||
"""
|
|
||||||
)
|
|
110
package.json
110
package.json
@ -4,31 +4,89 @@
|
|||||||
"repository": "https://git.lahouze.org/xals/accountant",
|
"repository": "https://git.lahouze.org/xals/accountant",
|
||||||
"license": "AGPL-1.0",
|
"license": "AGPL-1.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"connect-logger": "0.0.1",
|
"@angular/cli": "^6.0.7",
|
||||||
"connect-proxy-layer": "^0.1.2",
|
"@angular/compiler-cli": "^6.0.3",
|
||||||
"grunt": "~1.0",
|
"@ngtools/webpack": "^6.1.0-beta.1",
|
||||||
"grunt-bg-shell": "^2.3.1",
|
"angular2-template-loader": "^0.6.2",
|
||||||
"grunt-contrib-clean": "~1.0",
|
"awesome-typescript-loader": "^5.0.0",
|
||||||
"grunt-contrib-concat": "~1.0",
|
"babel-core": "^6.26.0",
|
||||||
"grunt-contrib-connect": "~1.0",
|
"babel-eslint": "^8.2.2",
|
||||||
"grunt-contrib-cssmin": "~1.0",
|
"babel-loader": "^7.1.4",
|
||||||
"grunt-contrib-jshint": "~1.0",
|
"copy-webpack-plugin": "^4.5.1",
|
||||||
"grunt-contrib-uglify": "~1.0",
|
"css-loader": "^0.28.10",
|
||||||
"grunt-contrib-watch": "~1.0",
|
"ejs-loader": "^0.3.1",
|
||||||
"grunt-copy": "^0.1.0",
|
"eslint": "^4.18.2",
|
||||||
"grunt-filerev": "^2.3.1",
|
"eslint-config-angular": "^0.5.0",
|
||||||
"grunt-flake8": "^0.1.3",
|
"eslint-config-webpack": "^1.2.5",
|
||||||
"grunt-htmllint": "^0.2.7",
|
"eslint-loader": "^2.0.0",
|
||||||
"grunt-include-source": "^0.7.1",
|
"eslint-plugin-angular": "^3.3.0",
|
||||||
"grunt-jscs": "^2.7.0",
|
"eslint-plugin-html": "^4.0.2",
|
||||||
"grunt-newer": "^1.1.1",
|
"eslint-plugin-jquery": "^1.3.0",
|
||||||
"grunt-ng-annotate": "~2.0",
|
"eslint-plugin-promise": "^3.7.0",
|
||||||
"grunt-shell": "^1.1.2",
|
"eslint-plugin-security": "^1.4.0",
|
||||||
"grunt-usemin": "^3.1.1",
|
"eslint-plugin-this": "^0.2.2",
|
||||||
"grunt-wiredep": "~3.0",
|
"extract-text-webpack-plugin": "^4.0.0-beta.0",
|
||||||
"jshint-stylish": "^2.1.0",
|
"file-loader": "^1.1.11",
|
||||||
"load-grunt-configs": "^0.4.3",
|
"html-loader": "^0.5.5",
|
||||||
"load-grunt-tasks": "^3.2.0",
|
"html-webpack-plugin": "^3.0.6",
|
||||||
"time-grunt": "^1.3.0"
|
"htmllint-loader": "^2.1.4",
|
||||||
|
"imports-loader": "^0.8.0",
|
||||||
|
"less": "^3.0.1",
|
||||||
|
"less-loader": "^4.1.0",
|
||||||
|
"loglevel": "^1.6.1",
|
||||||
|
"ngtemplate-loader": "^2.0.1",
|
||||||
|
"node-sass": "^4.7.2",
|
||||||
|
"null-loader": "^0.1.1",
|
||||||
|
"raw-loader": "^0.5.1",
|
||||||
|
"resolve-url-loader": "^2.3.0",
|
||||||
|
"sass-loader": "^7.0.2",
|
||||||
|
"script-ext-html-webpack-plugin": "^2.0.1",
|
||||||
|
"style-loader": "^0.21.0",
|
||||||
|
"ts-loader": "^4.0.1",
|
||||||
|
"typescript": "~2.7.2",
|
||||||
|
"typescript-eslint-parser": "^15.0.0",
|
||||||
|
"url-loader": "^1.0.1",
|
||||||
|
"webpack": "^4.8.0",
|
||||||
|
"webpack-cli": "^3.0.1",
|
||||||
|
"webpack-dev-server": "^3.1.0",
|
||||||
|
"webpack-merge": "^4.1.1"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/animations": "^6.0.3",
|
||||||
|
"@angular/common": "^6.0.3",
|
||||||
|
"@angular/compiler": "^6.0.3",
|
||||||
|
"@angular/core": "^6.0.3",
|
||||||
|
"@angular/forms": "^6.0.3",
|
||||||
|
"@angular/http": "^6.0.3",
|
||||||
|
"@angular/platform-browser": "^6.0.3",
|
||||||
|
"@angular/platform-browser-dynamic": "^6.0.3",
|
||||||
|
"@angular/router": "^6.0.3",
|
||||||
|
"@ng-bootstrap/ng-bootstrap": "^2.0.0",
|
||||||
|
"@nsalaun/ng-logger": "^5.0.0",
|
||||||
|
"@swimlane/ngx-charts": "^8.0.2",
|
||||||
|
"@types/d3": "^5.0.0",
|
||||||
|
"@types/geojson": "^7946.0.3",
|
||||||
|
"@types/node": "^10.3.2",
|
||||||
|
"@types/underscore": "^1.8.8",
|
||||||
|
"angular2-text-mask": "^9.0.0",
|
||||||
|
"base64util": "^2.0.0-f",
|
||||||
|
"bootstrap": "4.1.1",
|
||||||
|
"d3": "^5.0.0",
|
||||||
|
"font-awesome": "^4.7.0",
|
||||||
|
"jquery": "^3.3.1",
|
||||||
|
"jqwidgets-scripts": "^5.7.2",
|
||||||
|
"moment": "^2.21.0",
|
||||||
|
"ng2-nvd3": "^2.0.0",
|
||||||
|
"ngx-toastr": "^8.3.0",
|
||||||
|
"reflect-metadata": "^0.1.12",
|
||||||
|
"rxjs": "^6.2.0",
|
||||||
|
"rxjs-compat": "^6.2.0",
|
||||||
|
"underscore": "^1.8.3",
|
||||||
|
"zone.js": "^0.8.20"
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "rm -Rf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
|
||||||
|
"test": "karma start",
|
||||||
|
"dev": "webpack-dev-server --config config/webpack.dev.js --inline --progress --colors --hot --info --debug --devtool eval-cheap-module-source-map"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,178 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
--
|
|
||||||
-- PostgreSQL database dump
|
|
||||||
--
|
|
||||||
|
|
||||||
SET statement_timeout = 0;
|
|
||||||
SET client_encoding = 'UTF8';
|
|
||||||
SET standard_conforming_strings = on;
|
|
||||||
SET check_function_bodies = false;
|
|
||||||
SET client_min_messages = warning;
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
|
|
||||||
|
|
||||||
|
|
||||||
SET search_path = public, pg_catalog;
|
|
||||||
|
|
||||||
SET default_tablespace = '';
|
|
||||||
|
|
||||||
SET default_with_oids = false;
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: account; Type: TABLE; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE account (
|
|
||||||
id integer NOT NULL,
|
|
||||||
name character varying(200) NOT NULL,
|
|
||||||
authorized_overdraft integer DEFAULT 0 NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: account_id_seq; Type: SEQUENCE; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE SEQUENCE account_id_seq
|
|
||||||
START WITH 1
|
|
||||||
INCREMENT BY 1
|
|
||||||
NO MINVALUE
|
|
||||||
NO MAXVALUE
|
|
||||||
CACHE 1;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: account_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER SEQUENCE account_id_seq OWNED BY account.id;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry; Type: TABLE; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE entry (
|
|
||||||
id bigint NOT NULL,
|
|
||||||
operation_date date,
|
|
||||||
label character varying(500) NOT NULL,
|
|
||||||
comment character varying(500),
|
|
||||||
value numeric(15,2) NOT NULL,
|
|
||||||
account_id integer NOT NULL,
|
|
||||||
category character varying(100),
|
|
||||||
pointed boolean DEFAULT false NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_id_seq; Type: SEQUENCE; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE SEQUENCE entry_id_seq
|
|
||||||
START WITH 1
|
|
||||||
INCREMENT BY 1
|
|
||||||
NO MINVALUE
|
|
||||||
NO MAXVALUE
|
|
||||||
CACHE 1;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER SEQUENCE entry_id_seq OWNED BY entry.id;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: id; Type: DEFAULT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY account ALTER COLUMN id SET DEFAULT nextval('account_id_seq'::regclass);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: id; Type: DEFAULT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY entry ALTER COLUMN id SET DEFAULT nextval('entry_id_seq'::regclass);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: account_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY account
|
|
||||||
ADD CONSTRAINT account_pkey PRIMARY KEY (id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY entry
|
|
||||||
ADD CONSTRAINT entry_pkey PRIMARY KEY (id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_account_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE INDEX entry_account_id_idx ON entry USING btree (account_id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_operation_date_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE INDEX entry_operation_date_idx ON entry USING btree (operation_date);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: entry_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY entry
|
|
||||||
ADD CONSTRAINT entry_account_id_fkey FOREIGN KEY (account_id) REFERENCES account(id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public; Type: ACL; Schema: -; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
REVOKE ALL ON SCHEMA public FROM PUBLIC;
|
|
||||||
REVOKE ALL ON SCHEMA public FROM postgres;
|
|
||||||
GRANT ALL ON SCHEMA public TO postgres;
|
|
||||||
GRANT ALL ON SCHEMA public TO PUBLIC;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- PostgreSQL database dump complete
|
|
||||||
--
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
ALTER TABLE account ADD COLUMN authorized_overdraft INTEGER NOT NULL DEFAULT 0;
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
ALTER TABLE entry ADD COLUMN pointed BOOLEAN NOT NULL DEFAULT false;
|
|
||||||
|
|
||||||
UPDATE entry SET pointed = operation_date IS NOT NULL;
|
|
||||||
|
|
||||||
UPDATE entry SET operation_date = value_date;
|
|
||||||
|
|
||||||
ALTER TABLE entry DROP COLUMN value_date;
|
|
||||||
|
|
||||||
CREATE INDEX entry_operation_date_idx ON entry USING btree (operation_date);
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of Accountant.
|
|
||||||
|
|
||||||
Accountant is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Accountant is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with Accountant. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
@ -1,16 +0,0 @@
|
|||||||
create table scheduled_operation(
|
|
||||||
id serial primary key,
|
|
||||||
start_date date not null,
|
|
||||||
stop_date date not null,
|
|
||||||
day integer not null check (day > 0 and day <= 31),
|
|
||||||
frequency integer not null check (frequency > 0),
|
|
||||||
label varchar(500) not null,
|
|
||||||
value numeric(15,2) not null,
|
|
||||||
account_id integer not null references account(id),
|
|
||||||
category varchar(100)
|
|
||||||
);
|
|
||||||
|
|
||||||
create index scheduled_operation_account_id_idx on scheduled_operation(account_id);
|
|
||||||
|
|
||||||
alter table entry add column scheduled_operation_id integer references scheduled_operation(id);
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
alter table entry alter column operation_date set not null;
|
|
||||||
alter table entry drop column comment;
|
|
53
src/accounts/account.module.ts
Normal file
53
src/accounts/account.module.ts
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
|
import { HttpClientModule } from '@angular/common/http';
|
||||||
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
|
import { NgLoggerModule, Level } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { ToastrModule } from 'ngx-toastr';
|
||||||
|
|
||||||
|
import { AccountService } from './account.service';
|
||||||
|
import { AccountBalancesService } from './accountBalances.service';
|
||||||
|
import { AccountListComponent } from './accountList.component';
|
||||||
|
import { AccountDeleteModalComponent } from './accountDeleteModal.component';
|
||||||
|
import { AccountEditModalComponent } from './accountEditModal.component';
|
||||||
|
import { AccountFormComponent } from './accountForm.component';
|
||||||
|
import { AccountRowComponent } from './accountRow.component';
|
||||||
|
import { DailyBalanceService } from './dailyBalance.service';
|
||||||
|
import { AccountListState } from './account.states'
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
HttpClientModule,
|
||||||
|
CommonModule,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
RouterModule.forChild([
|
||||||
|
AccountListState
|
||||||
|
]),
|
||||||
|
NgLoggerModule,
|
||||||
|
ToastrModule,
|
||||||
|
NgbModule
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
AccountService,
|
||||||
|
AccountBalancesService,
|
||||||
|
DailyBalanceService,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
AccountListComponent,
|
||||||
|
AccountDeleteModalComponent,
|
||||||
|
AccountEditModalComponent,
|
||||||
|
AccountFormComponent,
|
||||||
|
AccountRowComponent
|
||||||
|
],
|
||||||
|
entryComponents: [
|
||||||
|
AccountListComponent,
|
||||||
|
AccountDeleteModalComponent,
|
||||||
|
AccountEditModalComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class AccountModule {}
|
42
src/accounts/account.service.ts
Normal file
42
src/accounts/account.service.ts
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AccountService {
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient
|
||||||
|
) {}
|
||||||
|
|
||||||
|
private url(id?: Number): string {
|
||||||
|
if(id) {
|
||||||
|
return `/api/account/${id}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `/api/account`;
|
||||||
|
}
|
||||||
|
|
||||||
|
query(): Observable<Account[]> {
|
||||||
|
return this.http.get<Account[]>(this.url());
|
||||||
|
}
|
||||||
|
|
||||||
|
get(id: number): Observable<Account> {
|
||||||
|
return this.http.get<Account>(this.url(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
create(account: Account): Observable<Account> {
|
||||||
|
return this.http.post<Account>(this.url(), account);
|
||||||
|
}
|
||||||
|
|
||||||
|
update(account: Account): Observable<Account> {
|
||||||
|
return this.http.post<Account>(this.url(account.id), account);
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(account: Account): Observable<Account> {
|
||||||
|
return this.http.delete<Account>(this.url(account.id));
|
||||||
|
}
|
||||||
|
}
|
8
src/accounts/account.states.ts
Normal file
8
src/accounts/account.states.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { AccountListComponent } from './accountList.component';
|
||||||
|
|
||||||
|
export const AccountListState = {
|
||||||
|
path: 'accounts',
|
||||||
|
component: AccountListComponent
|
||||||
|
}
|
15
src/accounts/account.ts
Normal file
15
src/accounts/account.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { AccountBalances } from './accountBalances';
|
||||||
|
|
||||||
|
export class Account {
|
||||||
|
public id: number;
|
||||||
|
public name: string;
|
||||||
|
public authorized_overdraft: number;
|
||||||
|
|
||||||
|
public balances: AccountBalances;
|
||||||
|
|
||||||
|
public constructor() {
|
||||||
|
this.authorized_overdraft = 0;
|
||||||
|
}
|
||||||
|
}
|
18
src/accounts/accountBalances.service.ts
Normal file
18
src/accounts/accountBalances.service.ts
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { HttpClient, HttpParams } from "@angular/common/http";
|
||||||
|
|
||||||
|
import { AccountBalances } from './accountBalances';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AccountBalancesService {
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient
|
||||||
|
) {}
|
||||||
|
|
||||||
|
get(id: number): Observable<AccountBalances> {
|
||||||
|
return this.http.get<AccountBalances>(`/api/account/${id}/balances`);
|
||||||
|
}
|
||||||
|
}
|
6
src/accounts/accountBalances.ts
Normal file
6
src/accounts/accountBalances.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
export class AccountBalances {
|
||||||
|
public current: number;
|
||||||
|
public pointed: number;
|
||||||
|
public future: number;
|
||||||
|
}
|
20
src/accounts/accountDeleteModal.component.html
Normal file
20
src/accounts/accountDeleteModal.component.html
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<div class="modal-header">
|
||||||
|
<h3 class="modal-title" id="modal-title">{{ title() }}</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-body" id="modal-body">
|
||||||
|
<p>
|
||||||
|
Do you really want to delete account #{{ account.id }} with name:<br/>
|
||||||
|
{{ account.name }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button class="btn btn-danger" (click)="submit()">
|
||||||
|
Yes
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="btn btn-default" (click)="cancel()">
|
||||||
|
No
|
||||||
|
</button>
|
||||||
|
</div>
|
32
src/accounts/accountDeleteModal.component.ts
Normal file
32
src/accounts/accountDeleteModal.component.ts
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
import { Component, Input } from '@angular/core';
|
||||||
|
|
||||||
|
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'account-delete-modal',
|
||||||
|
templateUrl: './accountDeleteModal.component.html'
|
||||||
|
})
|
||||||
|
export class AccountDeleteModalComponent {
|
||||||
|
@Input() account: Account
|
||||||
|
|
||||||
|
constructor(public activeModal: NgbActiveModal) {}
|
||||||
|
|
||||||
|
title(): string {
|
||||||
|
if(this.account.id) {
|
||||||
|
return "Account #" + this.account.id;
|
||||||
|
} else {
|
||||||
|
return "New account";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
submit(): void {
|
||||||
|
this.activeModal.close(this.account);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel(): void {
|
||||||
|
this.activeModal.dismiss("closed");
|
||||||
|
}
|
||||||
|
}
|
17
src/accounts/accountEditModal.component.html
Normal file
17
src/accounts/accountEditModal.component.html
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<div class="modal-header">
|
||||||
|
<h3 class="modal-title" id="modal-title">{{ title() }}</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-body" id="modal-body">
|
||||||
|
<account-form [account]="account" (submit)="submit()" #accountForm="accountForm"></account-form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button class="btn btn-primary" [disabled]="!accountForm.form.valid" (click)="submit()">
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="btn btn-default" (click)="cancel()">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
41
src/accounts/accountEditModal.component.ts
Normal file
41
src/accounts/accountEditModal.component.ts
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
import { Component, Input, ViewChild } from '@angular/core';
|
||||||
|
|
||||||
|
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
import { AccountFormComponent } from './accountForm.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'account-edit-modal',
|
||||||
|
templateUrl: './accountEditModal.component.html'
|
||||||
|
})
|
||||||
|
export class AccountEditModalComponent {
|
||||||
|
@Input() account: Account;
|
||||||
|
@ViewChild('accountForm') accountForm: AccountFormComponent;
|
||||||
|
|
||||||
|
constructor(private activeModal: NgbActiveModal) {}
|
||||||
|
|
||||||
|
title(): string {
|
||||||
|
if(this.account.id) {
|
||||||
|
return "Account #" + this.account.id;
|
||||||
|
} else {
|
||||||
|
return "New account";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
submit(): void {
|
||||||
|
let formModel = this.accountForm.form.value;
|
||||||
|
let account = Object.assign({}, this.account);
|
||||||
|
|
||||||
|
account.id = this.account.id;
|
||||||
|
account.name = formModel.name;
|
||||||
|
account.authorized_overdraft = formModel.authorizedOverdraft;
|
||||||
|
|
||||||
|
this.activeModal.close(account);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel(): void {
|
||||||
|
this.activeModal.dismiss("closed");
|
||||||
|
}
|
||||||
|
}
|
47
src/accounts/accountForm.component.html
Normal file
47
src/accounts/accountForm.component.html
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
<form novalidate
|
||||||
|
(keyup.enter)="submit()" [formGroup]="form">
|
||||||
|
<div class="form-group row">
|
||||||
|
<label class="col-sm-4 control-label" for="name">
|
||||||
|
Account name
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="col-sm-8"
|
||||||
|
[class.has-danger]="name.errors">
|
||||||
|
<input class="form-control"
|
||||||
|
id="name" formControlName="name"
|
||||||
|
placeholder="Account name">
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="name.errors">
|
||||||
|
<p *ngIf="name.errors.required">The account name is required.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group row">
|
||||||
|
<label class="col-sm-4 control-label" for="authorized-overdraft">
|
||||||
|
Authorized overdraft
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="col-sm-8"
|
||||||
|
[class.has-danger]="authorizedOverdraft.errors">
|
||||||
|
<div class="input-group">
|
||||||
|
<input class="form-control"
|
||||||
|
id="authorized-overdraft" formControlName="authorizedOverdraft"
|
||||||
|
placeholder="Authorized overdraft">
|
||||||
|
|
||||||
|
<div class="input-group-addon">.00€</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="authorizedOverdraft.errors">
|
||||||
|
<p *ngIf="authorizedOverdraft.errors.required">
|
||||||
|
The authorized overdraft is required.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p *ngIf="authorizedOverdraft.errors.max">
|
||||||
|
The authorized overdraft must be less than or equal to 0.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
44
src/accounts/accountForm.component.ts
Normal file
44
src/accounts/accountForm.component.ts
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Component, OnInit, OnChanges, Input, Output, EventEmitter } from '@angular/core';
|
||||||
|
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'account-form',
|
||||||
|
exportAs: 'accountForm',
|
||||||
|
templateUrl: './accountForm.component.html'
|
||||||
|
})
|
||||||
|
export class AccountFormComponent implements OnInit {
|
||||||
|
public form: FormGroup;
|
||||||
|
@Input() account: Account;
|
||||||
|
@Output('submit') submitEventEmitter: EventEmitter<void> = new EventEmitter<void>();
|
||||||
|
|
||||||
|
constructor(private formBuilder: FormBuilder) {}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.form = this.formBuilder.group({
|
||||||
|
name: ['', Validators.required],
|
||||||
|
authorizedOverdraft: ['', [Validators.required, Validators.max(0)]],
|
||||||
|
});
|
||||||
|
|
||||||
|
this.form.patchValue({
|
||||||
|
name: this.account.name,
|
||||||
|
authorizedOverdraft: this.account.authorized_overdraft
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
submit() {
|
||||||
|
if(this.form.valid) {
|
||||||
|
this.submitEventEmitter.emit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get name() {
|
||||||
|
return this.form.get('name');
|
||||||
|
}
|
||||||
|
|
||||||
|
get authorizedOverdraft() {
|
||||||
|
return this.form.get('authorizedOverdraft');
|
||||||
|
}
|
||||||
|
}
|
27
src/accounts/accountList.component.html
Normal file
27
src/accounts/accountList.component.html
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
<div class="row">
|
||||||
|
<table class="table table-sm table-striped table-condensed table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Nom du compte</th>
|
||||||
|
<th>Solde courant</th>
|
||||||
|
<th>Solde pointé</th>
|
||||||
|
<th>Découvert autorisé</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td colspan="5">
|
||||||
|
<button class="btn btn-success" (click)="add()">
|
||||||
|
Ajouter
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr *ngFor="let account of accounts"
|
||||||
|
[account-row]="account" (needsReload)="load()">
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
74
src/accounts/accountList.component.ts
Normal file
74
src/accounts/accountList.component.ts
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Component, Inject, OnInit } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { ToastrService } from 'ngx-toastr';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
import { AccountBalances } from './accountBalances';
|
||||||
|
import { AccountService } from './account.service';
|
||||||
|
import { AccountEditModalComponent } from './accountEditModal.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'account-list',
|
||||||
|
templateUrl: './accountList.component.html',
|
||||||
|
})
|
||||||
|
export class AccountListComponent implements OnInit {
|
||||||
|
accounts: Account[];
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private accountService: AccountService,
|
||||||
|
private toastrService: ToastrService,
|
||||||
|
private logger: Logger,
|
||||||
|
private ngbModal: NgbModal
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
// Load accounts.
|
||||||
|
this.load();
|
||||||
|
}
|
||||||
|
|
||||||
|
load() {
|
||||||
|
this.logger.log("Load accounts.");
|
||||||
|
this.accountService.query().subscribe(accounts => {
|
||||||
|
this.accounts = accounts;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Add an empty account.
|
||||||
|
*/
|
||||||
|
add() {
|
||||||
|
const modal = this.ngbModal.open(AccountEditModalComponent, {
|
||||||
|
size: 'lg'
|
||||||
|
});
|
||||||
|
|
||||||
|
modal.componentInstance.account = new Account();
|
||||||
|
|
||||||
|
modal.result.then((account: Account) => {
|
||||||
|
this.logger.log("Modal closed => save account", account);
|
||||||
|
this.save(account);
|
||||||
|
}, (reason) => function(reason) {
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Save account.
|
||||||
|
*/
|
||||||
|
save(account) {
|
||||||
|
this.accountService.create(account).subscribe(account => {
|
||||||
|
this.toastrService.success('Account #' + account.id + ' saved.');
|
||||||
|
|
||||||
|
this.load();
|
||||||
|
}, result => {
|
||||||
|
this.logger.error('Error while saving account', account, result);
|
||||||
|
|
||||||
|
this.toastrService.error(
|
||||||
|
'Error while saving account: ' + result.message
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
};
|
41
src/accounts/accountRow.component.html
Normal file
41
src/accounts/accountRow.component.html
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<td>
|
||||||
|
<a [routerLink]="[account.id, 'operations']">{{ account.name }}</a>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<span (ngClass)="valueClass(accountBalances?.current)">
|
||||||
|
{{ accountBalances?.current | currency:'EUR':'symbol' }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<span (ngClass)="valueClass(accountBalances?.pointed)">
|
||||||
|
{{ accountBalances?.pointed | currency:'EUR':'symbol' }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>{{ account.authorized_overdraft | currency:'EUR':'symbol' }}</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<div class="btn-group btn-group-sm">
|
||||||
|
<!-- Edit account. -->
|
||||||
|
<button type="button" class="btn btn-success"
|
||||||
|
(click)="modify()">
|
||||||
|
<span class="fa fa-pencil-square-o"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Delete account, with confirm. -->
|
||||||
|
<button type="button" class="btn btn-danger"
|
||||||
|
(click)="confirmDelete()">
|
||||||
|
<span class="fa fa-trash-o"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Open account scheduler. -->
|
||||||
|
<a class="btn btn-secondary"
|
||||||
|
[hidden]="!account.id"
|
||||||
|
[routerLink]="[account.id, 'scheduler']">
|
||||||
|
<span class="fa fa-clock-o"></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
135
src/accounts/accountRow.component.ts
Normal file
135
src/accounts/accountRow.component.ts
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { CurrencyPipe } from '@angular/common';
|
||||||
|
import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { ToastrService } from 'ngx-toastr';
|
||||||
|
|
||||||
|
import { Account } from './account';
|
||||||
|
import { AccountBalances } from './accountBalances';
|
||||||
|
import { AccountBalancesService } from './accountBalances.service';
|
||||||
|
import { AccountService } from './account.service';
|
||||||
|
import { AccountDeleteModalComponent } from './accountDeleteModal.component';
|
||||||
|
import { AccountEditModalComponent } from './accountEditModal.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'tr[account-row]',
|
||||||
|
host: {
|
||||||
|
"[id]": "account.id",
|
||||||
|
"[class.warning]": "warning",
|
||||||
|
"[class.danger]": "danger"
|
||||||
|
},
|
||||||
|
templateUrl: './accountRow.component.html'
|
||||||
|
})
|
||||||
|
export class AccountRowComponent implements OnInit {
|
||||||
|
@Input('account-row') account: Account;
|
||||||
|
@Output() needsReload: EventEmitter<void> = new EventEmitter<void>();
|
||||||
|
|
||||||
|
public accountBalances: AccountBalances;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private accountService: AccountService,
|
||||||
|
private accountBalancesService: AccountBalancesService,
|
||||||
|
private toastrService: ToastrService,
|
||||||
|
private logger: Logger,
|
||||||
|
private ngbModal: NgbModal
|
||||||
|
) {
|
||||||
|
this.logger.log("AccountRowComponent constructor");
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.logger.log(this.account);
|
||||||
|
this.accountBalancesService
|
||||||
|
.get(this.account.id)
|
||||||
|
.subscribe((accountBalances: AccountBalances) => {
|
||||||
|
this.accountBalances = accountBalances;
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
get warning() {
|
||||||
|
return this.account && this.accountBalances
|
||||||
|
&& this.account.authorized_overdraft < this.accountBalances.current
|
||||||
|
&& this.accountBalances.current < 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
get error() {
|
||||||
|
return this.account && this.accountBalances
|
||||||
|
&& this.accountBalances.current < this.account.authorized_overdraft;
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return the class for a value compared to account authorized overdraft.
|
||||||
|
*/
|
||||||
|
valueClass(value: number) {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value < this.account.authorized_overdraft) {
|
||||||
|
return 'text-danger';
|
||||||
|
} else if (value < 0) {
|
||||||
|
return 'text-warning';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
confirmDelete() {
|
||||||
|
const modal = this.ngbModal.open(AccountDeleteModalComponent);
|
||||||
|
|
||||||
|
modal.componentInstance.account = this.account;
|
||||||
|
|
||||||
|
modal.result.then((account: Account) => {
|
||||||
|
this.delete(account);
|
||||||
|
}, (reason) => function(reason) {
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Delete an account.
|
||||||
|
*/
|
||||||
|
delete(account: Account) {
|
||||||
|
var id = account.id;
|
||||||
|
|
||||||
|
this.accountService.delete(account).subscribe(account => {
|
||||||
|
this.toastrService.success('account #' + id + ' deleted.');
|
||||||
|
|
||||||
|
this.needsReload.emit();
|
||||||
|
}, function(result) {
|
||||||
|
this.toastrService.error(
|
||||||
|
'An error occurred while trying to delete account #' +
|
||||||
|
id + ':<br />' + result
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Open the popup to modify the account, save it on confirm.
|
||||||
|
*/
|
||||||
|
modify() {
|
||||||
|
const modal = this.ngbModal.open(AccountEditModalComponent, {
|
||||||
|
size: 'lg'
|
||||||
|
});
|
||||||
|
|
||||||
|
modal.componentInstance.account = this.account;
|
||||||
|
|
||||||
|
modal.result.then((account: Account) => {
|
||||||
|
this.logger.log("Modal closed => save account", account);
|
||||||
|
this.save(account);
|
||||||
|
}, (reason) => function(reason) {
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
save(account: Account) {
|
||||||
|
this.accountService.update(account).subscribe((account: Account) => {
|
||||||
|
this.toastrService.success('Account #' + account.id + ' saved.');
|
||||||
|
|
||||||
|
this.needsReload.emit();
|
||||||
|
}, result => {
|
||||||
|
this.logger.error('Error while saving account', account, result);
|
||||||
|
|
||||||
|
this.toastrService.error(
|
||||||
|
'Error while saving account: ' + result.message
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
19
src/accounts/dailyBalance.service.ts
Normal file
19
src/accounts/dailyBalance.service.ts
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { DailyBalance } from './dailyBalance';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class DailyBalanceService {
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient
|
||||||
|
) {}
|
||||||
|
|
||||||
|
query(id: number): Observable<DailyBalance[]> {
|
||||||
|
return this.http.get<DailyBalance[]>(`/api/account/${id}/daily_balances`);
|
||||||
|
}
|
||||||
|
}
|
8
src/accounts/dailyBalance.ts
Normal file
8
src/accounts/dailyBalance.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
export class DailyBalance {
|
||||||
|
public operation_date: string;
|
||||||
|
public balance: number;
|
||||||
|
public expenses: number;
|
||||||
|
public revenues: number;
|
||||||
|
}
|
8
src/app.component.html
Normal file
8
src/app.component.html
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<!-- Navbar -->
|
||||||
|
<nav class="navbar fixed-top navbar-dark bg-dark">
|
||||||
|
<a class="navbar-brand" routerLink="/accounts"> Accountant</a>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<div class="container-fluid">
|
||||||
|
<router-outlet></router-outlet>
|
||||||
|
</div>
|
9
src/app.component.ts
Normal file
9
src/app.component.ts
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'accountant',
|
||||||
|
templateUrl: './app.component.html'
|
||||||
|
})
|
||||||
|
export class AppComponent { }
|
5
src/app.config.ts
Normal file
5
src/app.config.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Level } from '@nsalaun/ng-logger';
|
||||||
|
|
||||||
|
export const ApiBaseURL = "http://localhost:8080/api";
|
||||||
|
export const LogLevel = Level.LOG;
|
52
src/app.module.ts
Normal file
52
src/app.module.ts
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
|
import { NgLoggerModule } from '@nsalaun/ng-logger';
|
||||||
|
import { ToastrModule } from 'ngx-toastr';
|
||||||
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
|
import { LoginModule } from './login/login.module';
|
||||||
|
import { AccountModule } from './accounts/account.module';
|
||||||
|
import { ScheduleModule } from './scheduler/schedule.module';
|
||||||
|
import { OperationModule } from './operations/operation.module';
|
||||||
|
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
|
||||||
|
import { ApiBaseURL, LogLevel } from './app.config';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
BrowserModule,
|
||||||
|
BrowserAnimationsModule,
|
||||||
|
RouterModule.forRoot([
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
redirectTo: '/accounts',
|
||||||
|
pathMatch: 'full'
|
||||||
|
}
|
||||||
|
], {
|
||||||
|
enableTracing: true,
|
||||||
|
useHash: true,
|
||||||
|
onSameUrlNavigation: 'reload'
|
||||||
|
}),
|
||||||
|
LoginModule,
|
||||||
|
NgLoggerModule.forRoot(LogLevel),
|
||||||
|
ToastrModule.forRoot(),
|
||||||
|
NgbModule.forRoot(),
|
||||||
|
AccountModule,
|
||||||
|
ScheduleModule,
|
||||||
|
OperationModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
AppComponent
|
||||||
|
],
|
||||||
|
bootstrap: [ AppComponent ]
|
||||||
|
})
|
||||||
|
|
||||||
|
export class AppModule {
|
||||||
|
constructor() {}
|
||||||
|
}
|
18
src/index.ejs
Normal file
18
src/index.ejs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<base href="/">
|
||||||
|
|
||||||
|
<!-- Title -->
|
||||||
|
<title><% htmlWebpackPlugin.options.title %></title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<!-- htmllint attr-bans="false" -->
|
||||||
|
<body style="padding-bottom: 50px; padding-top: 70px">
|
||||||
|
<!-- htmllint attr-bans="$previous" -->
|
||||||
|
<accountant></accountant>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
92
src/login/authInterceptor.ts
Normal file
92
src/login/authInterceptor.ts
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { Injectable, Injector } from '@angular/core';
|
||||||
|
import {
|
||||||
|
HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse
|
||||||
|
} from '@angular/common/http';
|
||||||
|
|
||||||
|
import { Observable} from 'rxjs/Rx';
|
||||||
|
import 'rxjs/add/operator/catch';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
|
||||||
|
import { LoginService } from './login.service';
|
||||||
|
import { Token } from './token';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuthInterceptor implements HttpInterceptor {
|
||||||
|
private observable: Observable<Token>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private logger: Logger,
|
||||||
|
private injector: Injector,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
injectAuthorizationHeader(request: HttpRequest<any>, accessToken: string) {
|
||||||
|
this.logger.log('Injecting Authorization header');
|
||||||
|
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
intercept(
|
||||||
|
request: HttpRequest<any>,
|
||||||
|
next: HttpHandler,
|
||||||
|
pass?: number
|
||||||
|
): Observable<HttpEvent<any>> {
|
||||||
|
if(!pass) {
|
||||||
|
pass = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let loginService = this.injector.get(LoginService);
|
||||||
|
|
||||||
|
if(request.url == loginService.url) {
|
||||||
|
this.logger.log('Login URL, do not handle.');
|
||||||
|
|
||||||
|
return next.handle(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.log(`Intercepted request, pass #${pass}`, request, next);
|
||||||
|
|
||||||
|
let accessToken = loginService.accessToken;
|
||||||
|
|
||||||
|
if(accessToken){
|
||||||
|
request = request.clone({
|
||||||
|
headers: request.headers.set('Authorization', `Bearer ${accessToken}`)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.log('Request', request);
|
||||||
|
|
||||||
|
let observable: Observable<any> = next.handle(request);
|
||||||
|
|
||||||
|
return observable.catch(
|
||||||
|
(error, caught): Observable<any> => {
|
||||||
|
this.logger.error('Error', error, caught);
|
||||||
|
|
||||||
|
if(!(error instanceof HttpErrorResponse) || error.status != 401) {
|
||||||
|
return Observable.throw(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.log('Unauthorized', error);
|
||||||
|
|
||||||
|
if(pass === 3) {
|
||||||
|
return Observable.throw(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!this.observable) {
|
||||||
|
this.logger.log('No current login observable.');
|
||||||
|
this.observable = loginService.login();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.observable.flatMap((token: Token): Observable<HttpEvent<any>> => {
|
||||||
|
this.logger.log('Logged in, access_token:', token.access_token);
|
||||||
|
this.observable = null;
|
||||||
|
return this.intercept(request, next, ++pass);
|
||||||
|
}).catch((error) => {
|
||||||
|
this.observable = null;
|
||||||
|
return Observable.throw(error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
39
src/login/login.module.ts
Normal file
39
src/login/login.module.ts
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
|
import { HttpClientModule } from '@angular/common/http';
|
||||||
|
import { HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { NgLoggerModule } from '@nsalaun/ng-logger';
|
||||||
|
|
||||||
|
import { AuthInterceptor } from './authInterceptor';
|
||||||
|
import { LoginService } from './login.service';
|
||||||
|
import { LoginFormComponent } from './loginForm.component';
|
||||||
|
import { LoginModalComponent } from './loginModal.component';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
HttpClientModule,
|
||||||
|
CommonModule,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
NgLoggerModule,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
LoginService,
|
||||||
|
{
|
||||||
|
provide: HTTP_INTERCEPTORS,
|
||||||
|
useClass: AuthInterceptor,
|
||||||
|
multi: true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
LoginModalComponent,
|
||||||
|
LoginFormComponent,
|
||||||
|
],
|
||||||
|
entryComponents: [
|
||||||
|
LoginModalComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class LoginModule {};
|
67
src/login/login.service.ts
Normal file
67
src/login/login.service.ts
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { Observable} from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import * as base64 from 'base64util';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
|
import { Token } from './token';
|
||||||
|
import { LoginModalComponent } from './loginModal.component';
|
||||||
|
import { Login } from './login';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class LoginService {
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private httpClient: HttpClient,
|
||||||
|
private logger: Logger,
|
||||||
|
private ngbModal: NgbModal,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public readonly url: string = '/api/user/login';
|
||||||
|
|
||||||
|
login(): Observable<Token> {
|
||||||
|
let modal = this.ngbModal.open(LoginModalComponent);
|
||||||
|
|
||||||
|
sessionStorage.clear();
|
||||||
|
|
||||||
|
let observable: Observable<any> = Observable.fromPromise(modal.result);
|
||||||
|
|
||||||
|
return observable.flatMap((login: Login) =>
|
||||||
|
this.doLogin(login)
|
||||||
|
).map((token: Token): Token => {
|
||||||
|
this.accessToken = token.access_token;
|
||||||
|
return token;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
logout() {
|
||||||
|
sessionStorage.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
doLogin(login: Login): Observable<any> {
|
||||||
|
var authdata = base64.encode(
|
||||||
|
`${login.email}:${login.password}`
|
||||||
|
);
|
||||||
|
|
||||||
|
let headers = new HttpHeaders()
|
||||||
|
headers = headers.set('Authorization', `Basic ${authdata}`);
|
||||||
|
|
||||||
|
this.logger.log("Headers", headers);
|
||||||
|
|
||||||
|
return this.httpClient.post(this.url, {}, {
|
||||||
|
headers: headers
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
get accessToken(): string {
|
||||||
|
return sessionStorage.getItem('access_token');
|
||||||
|
}
|
||||||
|
|
||||||
|
set accessToken(token: string) {
|
||||||
|
sessionStorage.setItem('access_token', token);
|
||||||
|
}
|
||||||
|
};
|
6
src/login/login.ts
Normal file
6
src/login/login.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
export class Login {
|
||||||
|
public email: string;
|
||||||
|
public password: string;
|
||||||
|
}
|
29
src/login/loginForm.component.html
Normal file
29
src/login/loginForm.component.html
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
<form novalidate (keyup.enter)="submit()" [formGroup]="form">
|
||||||
|
<div class="form-group row">
|
||||||
|
<label for="email" class="col-sm-4 control-label">Adresse email</label>
|
||||||
|
|
||||||
|
<div class="col-sm-8"
|
||||||
|
[class.has-danger]="email.errors">
|
||||||
|
<input type="text" class="form-control" id="email"
|
||||||
|
formControlName="email" placeholder="Nom d'utilisateur">
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="email.errors">
|
||||||
|
<p *ngIf="email.errors.required">The email is required.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group row">
|
||||||
|
<label for="password" class="col-sm-4 control-label">Mot de passe</label>
|
||||||
|
|
||||||
|
<div class="col-sm-8"
|
||||||
|
[class.has-danger]="password.errors">
|
||||||
|
<input type="password" class="form-control" id="password"
|
||||||
|
formControlName="password" placeholder="Mot de passe">
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="password.errors">
|
||||||
|
<p *ngIf="password.errors.required">The password is required.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
40
src/login/loginForm.component.ts
Normal file
40
src/login/loginForm.component.ts
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
import { Component, OnInit, OnChanges, Input, Output, EventEmitter } from '@angular/core';
|
||||||
|
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||||
|
|
||||||
|
import { Login } from './login';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'login-form',
|
||||||
|
exportAs: 'loginForm',
|
||||||
|
templateUrl: './loginForm.component.html'
|
||||||
|
})
|
||||||
|
|
||||||
|
export class LoginFormComponent {
|
||||||
|
public form: FormGroup;
|
||||||
|
@Input('login-form') private login: Login
|
||||||
|
@Output('submit') submitEventEmitter: EventEmitter<void> = new EventEmitter<void>();
|
||||||
|
|
||||||
|
constructor(private formBuilder : FormBuilder) {}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.form = this.formBuilder.group({
|
||||||
|
email: ['', Validators.required],
|
||||||
|
password: ['', Validators.required]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
submit() {
|
||||||
|
if(this.form.valid) {
|
||||||
|
this.submitEventEmitter.emit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get email() {
|
||||||
|
return this.form.get('email');
|
||||||
|
}
|
||||||
|
|
||||||
|
get password() {
|
||||||
|
return this.form.get('password');
|
||||||
|
}
|
||||||
|
}
|
17
src/login/loginModal.component.html
Normal file
17
src/login/loginModal.component.html
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<div class="modal-header">
|
||||||
|
<h3 class="modal-title" id="modal-title">Authentification requise</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-body" id="modal-body">
|
||||||
|
<login-form (submit)="submit()" #loginForm="loginForm"></login-form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button class="btn btn-succes" [disabled]="!loginForm.form.valid" (click)="submit()">
|
||||||
|
Login
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="btn btn-default" (click)="cancel()">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
35
src/login/loginModal.component.ts
Normal file
35
src/login/loginModal.component.ts
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
import { Component, Input, ViewChild } from '@angular/core';
|
||||||
|
|
||||||
|
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
//import { jqxWindowComponent } from 'jqwidgets-scripts/jqwidgets-ts/angular_jqxwindow';
|
||||||
|
import { jqxButtonComponent } from 'jqwidgets-scripts/jqwidgets-ts/angular_jqxbuttons';
|
||||||
|
|
||||||
|
import { Login } from './login';
|
||||||
|
import { LoginFormComponent } from './loginForm.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'login-modal',
|
||||||
|
templateUrl: './loginModal.component.html'
|
||||||
|
})
|
||||||
|
export class LoginModalComponent {
|
||||||
|
@ViewChild('loginForm') loginForm: LoginFormComponent;
|
||||||
|
|
||||||
|
constructor(private activeModal: NgbActiveModal) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
submit(): void {
|
||||||
|
let formModel = this.loginForm.form.value;
|
||||||
|
let login: Login = new Login();
|
||||||
|
|
||||||
|
login.email = formModel.email;
|
||||||
|
login.password = formModel.password;
|
||||||
|
|
||||||
|
this.activeModal.close(login);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel(): void {
|
||||||
|
this.activeModal.dismiss("closed");
|
||||||
|
}
|
||||||
|
}
|
6
src/login/token.ts
Normal file
6
src/login/token.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
export class Token {
|
||||||
|
public access_token: string;
|
||||||
|
public refresh_token: string;
|
||||||
|
}
|
17
src/main.scss
Normal file
17
src/main.scss
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
$fa-font-path: '~font-awesome/fonts';
|
||||||
|
|
||||||
|
@import '~font-awesome/scss/font-awesome';
|
||||||
|
|
||||||
|
@import '~bootstrap/scss/bootstrap';
|
||||||
|
|
||||||
|
@import '~jqwidgets-scripts/jqwidgets/styles/jqx.base';
|
||||||
|
|
||||||
|
@import '~ngx-toastr/toastr';
|
||||||
|
|
||||||
|
.italic {
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stroke {
|
||||||
|
text-decoration: line-through;
|
||||||
|
}
|
7
src/main.ts
Normal file
7
src/main.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||||
|
|
||||||
|
import { AppModule } from './app.module';
|
||||||
|
|
||||||
|
platformBrowserDynamic().bootstrapModule(AppModule);
|
203
src/operations/balanceChart.component.ts
Normal file
203
src/operations/balanceChart.component.ts
Normal file
@ -0,0 +1,203 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
|
import { Component, ViewChild, Input, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router, ParamMap } from '@angular/router';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { jqxChartComponent } from 'jqwidgets-scripts/jqwidgets-ts/angular_jqxchart';
|
||||||
|
|
||||||
|
import { Account } from '../accounts/account';
|
||||||
|
import { DailyBalance } from './dailyBalance';
|
||||||
|
import { DailyBalanceService } from '../accounts/dailyBalance.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'balance-chart',
|
||||||
|
template: `
|
||||||
|
<jqxChart #balanceChart
|
||||||
|
[width]="'100%'"
|
||||||
|
[height]="400"
|
||||||
|
[title]="'Balance evolution'"
|
||||||
|
[description]="''"
|
||||||
|
[source]="data"
|
||||||
|
[xAxis]="xAxis"
|
||||||
|
[valueAxis]="valueAxis"
|
||||||
|
[seriesGroups]="seriesGroups"
|
||||||
|
(onRangeSelectionChanged)="select($event)">
|
||||||
|
</jqxChart>
|
||||||
|
`
|
||||||
|
})
|
||||||
|
export class BalanceChartComponent implements OnInit {
|
||||||
|
private _account: Account;
|
||||||
|
@ViewChild('balanceChart') chart: jqxChartComponent;
|
||||||
|
|
||||||
|
public data;
|
||||||
|
|
||||||
|
public xAxis: any = {
|
||||||
|
type: 'date',
|
||||||
|
dataField: 'operation_date',
|
||||||
|
displayText: 'Date',
|
||||||
|
baseUnit: 'day',
|
||||||
|
|
||||||
|
bands: [{
|
||||||
|
fillColor: 'blue',
|
||||||
|
opacity: 0.10
|
||||||
|
}],
|
||||||
|
|
||||||
|
rangeSelector: {
|
||||||
|
size: 80,
|
||||||
|
padding: { /*left: 0, right: 0,*/top: 0, bottom: 0 },
|
||||||
|
backgroundColor: 'white',
|
||||||
|
dataField: 'balance',
|
||||||
|
//baseUnit: 'month',
|
||||||
|
baseUnit: 'day',
|
||||||
|
gridLines: { visible: false },
|
||||||
|
serieType: 'line',
|
||||||
|
//labels: {
|
||||||
|
// formatFunction: (value: any): any => {
|
||||||
|
// return this.months[value.getMonth()] + '\'' + value.getFullYear().toString().substring(2);
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public valueAxis: any = {
|
||||||
|
title: {
|
||||||
|
visible: false
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
public seriesGroups: any = [{
|
||||||
|
type: 'stackedcolumn',
|
||||||
|
valueAxis: {
|
||||||
|
title: { text: 'Expenses/revenues' },
|
||||||
|
position: 'right',
|
||||||
|
visible: true,
|
||||||
|
gridLines: { visible: false },
|
||||||
|
labels: {
|
||||||
|
horizontalAlignment: 'left',
|
||||||
|
formatSettings: {
|
||||||
|
sufix: '€',
|
||||||
|
decimalPlaces: 2
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
series: [{
|
||||||
|
dataField: 'expenses',
|
||||||
|
displayText: 'Expenses',
|
||||||
|
fillColor: 'tomato'
|
||||||
|
}, {
|
||||||
|
dataField: 'revenues',
|
||||||
|
displayText: 'Revenues',
|
||||||
|
fillColor: 'yellowgreen'
|
||||||
|
}]
|
||||||
|
}, {
|
||||||
|
type: 'stepline',
|
||||||
|
valueAxis: {
|
||||||
|
title: { text: 'Balance' },
|
||||||
|
//gridLines: { visible: false },
|
||||||
|
labels: {
|
||||||
|
formatSettings: {
|
||||||
|
sufix: '€',
|
||||||
|
decimalPlaces: 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
series: [{
|
||||||
|
dataField: 'balance',
|
||||||
|
displayText: 'Balance',
|
||||||
|
fillColor: 'steelblue'
|
||||||
|
}],
|
||||||
|
bands: [{
|
||||||
|
minValue: 0, maxValue: 0, fillColor: 'orange', lineWidth: 1
|
||||||
|
}, {
|
||||||
|
minValue: 0, maxValue: 0, fillColor: 'red', lineWidth: 1
|
||||||
|
}]
|
||||||
|
}];
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private router: Router,
|
||||||
|
private activatedRoute: ActivatedRoute,
|
||||||
|
private logger: Logger,
|
||||||
|
private dailyBalanceService: DailyBalanceService,
|
||||||
|
) {
|
||||||
|
this.data = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
loadData() {
|
||||||
|
this.logger.info('Loading data.');
|
||||||
|
|
||||||
|
let accountId = this.activatedRoute.snapshot.paramMap.get('accountId');
|
||||||
|
|
||||||
|
this.dailyBalanceService.query(
|
||||||
|
+accountId
|
||||||
|
).subscribe((results) => {
|
||||||
|
this.data = results;
|
||||||
|
|
||||||
|
let lastResult = results[results.length -1];
|
||||||
|
|
||||||
|
this.updateXBands(results[0].operation_date, lastResult.operation_date);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
setLines(account: Account) {
|
||||||
|
if (account) {
|
||||||
|
this.seriesGroups[1].bands[1].minValue = account.authorized_overdraft;
|
||||||
|
this.seriesGroups[1].bands[1].maxValue = account.authorized_overdraft;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.activatedRoute.queryParamMap.subscribe((params: ParamMap) => {
|
||||||
|
let fromDay = params.get('from');
|
||||||
|
let toDay = params.get('to');
|
||||||
|
|
||||||
|
this.xAxis.minValue = moment(fromDay).toDate();
|
||||||
|
this.xAxis.maxValue = moment(toDay).toDate();
|
||||||
|
|
||||||
|
if(this.chart && this.chart.host) {
|
||||||
|
this.chart.refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.loadData();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set account(account: Account) {
|
||||||
|
this._account = account;
|
||||||
|
|
||||||
|
this.setLines(account);
|
||||||
|
}
|
||||||
|
|
||||||
|
get account(): Account {
|
||||||
|
return this._account;
|
||||||
|
}
|
||||||
|
|
||||||
|
updateXBands(minDate, maxDate) {
|
||||||
|
if(moment(maxDate) > moment()) {
|
||||||
|
if(moment(minDate) < moment()) {
|
||||||
|
this.xAxis.bands[0].minValue = moment().toDate();
|
||||||
|
} else {
|
||||||
|
this.xAxis.bands[0].minValue = moment(minDate).toDate();
|
||||||
|
}
|
||||||
|
this.xAxis.bands[0].maxValue = moment(maxDate).toDate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
select(event: any) {
|
||||||
|
let args = event.args;
|
||||||
|
|
||||||
|
this.updateXBands(args.minValue, args.maxValue);
|
||||||
|
|
||||||
|
let accountId = this.activatedRoute.snapshot.paramMap.get('accountId');
|
||||||
|
|
||||||
|
this.router.navigate(['account', accountId, 'operations'], {
|
||||||
|
queryParams: {
|
||||||
|
from: moment(args.minValue).format('YYYY-MM-DD'),
|
||||||
|
to: moment(args.maxValue).format('YYYY-MM-DD')
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
39
src/operations/category.service.ts
Normal file
39
src/operations/category.service.ts
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { HttpClient, HttpParams } from "@angular/common/http";
|
||||||
|
|
||||||
|
import { Category } from './category';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CategoryService {
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient
|
||||||
|
) {}
|
||||||
|
|
||||||
|
formatDate(date: Date|string) {
|
||||||
|
if(date instanceof Date) {
|
||||||
|
return moment(date).format('YYYY-MM-DD');
|
||||||
|
}
|
||||||
|
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
query(id: number, minDate: Date|string = null, maxDate: Date|string = null): Observable<Category[]> {
|
||||||
|
let params: HttpParams = new HttpParams();
|
||||||
|
|
||||||
|
if(minDate) {
|
||||||
|
params = params.set('begin', this.formatDate(minDate));
|
||||||
|
}
|
||||||
|
|
||||||
|
if(maxDate) {
|
||||||
|
params = params.set('end', this.formatDate(maxDate));
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.http.get<Category[]>(`/api/account/${id}/category`, { params: params});
|
||||||
|
}
|
||||||
|
}
|
8
src/operations/category.ts
Normal file
8
src/operations/category.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
export class Category {
|
||||||
|
public category: string;
|
||||||
|
public expenses: number;
|
||||||
|
public revenues: number;
|
||||||
|
public income: number;
|
||||||
|
}
|
141
src/operations/categoryChart.component.ts
Normal file
141
src/operations/categoryChart.component.ts
Normal file
@ -0,0 +1,141 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { Component, ViewChild, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute, ParamMap } from '@angular/router';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { jqxChartComponent } from 'jqwidgets-scripts/jqwidgets-ts/angular_jqxchart';
|
||||||
|
|
||||||
|
import * as _ from 'underscore';
|
||||||
|
|
||||||
|
import { Category } from './category';
|
||||||
|
import { CategoryService } from './category.service';
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'category-chart',
|
||||||
|
template: `
|
||||||
|
<jqxChart #categoryChart
|
||||||
|
[width]="'100%'"
|
||||||
|
[height]="400"
|
||||||
|
[title]="'Categories'"
|
||||||
|
[description]="''"
|
||||||
|
[showLegend]="false"
|
||||||
|
[seriesGroups]="seriesGroups">
|
||||||
|
</jqxChart>
|
||||||
|
`
|
||||||
|
})
|
||||||
|
export class CategoryChartComponent implements OnInit {
|
||||||
|
@ViewChild('categoryChart') chart: jqxChartComponent;
|
||||||
|
|
||||||
|
public seriesGroups: any = [{
|
||||||
|
type: 'donut',
|
||||||
|
source: [],
|
||||||
|
//showLabels: true,
|
||||||
|
series: [{
|
||||||
|
dataField: 'value',
|
||||||
|
displayText: 'category',
|
||||||
|
initialAngle: 90,
|
||||||
|
radius: 130,
|
||||||
|
innerRadius: 90,
|
||||||
|
formatSettings: { sufix: '€', decimalPlaces: 2 },
|
||||||
|
radiusDataField: 'category',
|
||||||
|
colorFunction: (value, itemIndex, series, group) => {
|
||||||
|
if(group.source[itemIndex].type === 'expenses') {
|
||||||
|
return 'tomato';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'yellowgreen';
|
||||||
|
},
|
||||||
|
opacity: 0.5
|
||||||
|
}]
|
||||||
|
}, {
|
||||||
|
type: 'donut',
|
||||||
|
source: [],
|
||||||
|
showLabels: true,
|
||||||
|
series: [{
|
||||||
|
dataField: 'value',
|
||||||
|
displayText: 'name',
|
||||||
|
initialAngle: 90,
|
||||||
|
labelRadius: 50,
|
||||||
|
radius: 85,
|
||||||
|
innerRadius: 75,
|
||||||
|
formatSettings: { sufix: '€', decimalPlaces: 2 },
|
||||||
|
colorFunction: (value, itemIndex, series, group) => {
|
||||||
|
if(group.source[itemIndex].name === 'Expenses') {
|
||||||
|
return 'tomato';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'yellowgreen';
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}];
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private activatedRoute: ActivatedRoute,
|
||||||
|
private logger: Logger,
|
||||||
|
private categoryService: CategoryService,
|
||||||
|
) {
|
||||||
|
//this.data = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
loadData() {
|
||||||
|
let accountId = this.activatedRoute.snapshot.paramMap.get('accountId');
|
||||||
|
let fromDay = this.activatedRoute.snapshot.queryParamMap.get('from');
|
||||||
|
let toDay = this.activatedRoute.snapshot.queryParamMap.get('to');
|
||||||
|
|
||||||
|
this.categoryService.query(
|
||||||
|
+accountId,
|
||||||
|
fromDay,
|
||||||
|
toDay
|
||||||
|
).subscribe((results: Category[]) => {
|
||||||
|
let expenses = _.filter(results, function(item: Category) {
|
||||||
|
return item.expenses < 0;
|
||||||
|
}).map(function(item: Category) {
|
||||||
|
return {
|
||||||
|
category: item.category,
|
||||||
|
value: -item.expenses,
|
||||||
|
type: 'expenses'
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
expenses = _.sortBy(expenses, 'value').reverse();
|
||||||
|
|
||||||
|
let revenues = _.filter(results, function(item: Category) {
|
||||||
|
return item.revenues > 0;
|
||||||
|
}).map(function(item: Category) {
|
||||||
|
return {
|
||||||
|
category: item.category,
|
||||||
|
value: item.revenues,
|
||||||
|
type: 'revenues'
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
revenues = _.sortBy(revenues, 'value');
|
||||||
|
|
||||||
|
this.seriesGroups[0].source = expenses.concat(revenues);
|
||||||
|
|
||||||
|
let totals = [
|
||||||
|
{name: 'Expenses', value: 0},
|
||||||
|
{name: 'Revenues', value: 0}
|
||||||
|
];
|
||||||
|
|
||||||
|
results.forEach(function(item: Category) {
|
||||||
|
totals[0].value -= item.expenses;
|
||||||
|
totals[1].value += item.revenues;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.seriesGroups[1].source = totals;
|
||||||
|
|
||||||
|
if(this.chart && this.chart.host) {
|
||||||
|
this.chart.refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.activatedRoute.queryParamMap.subscribe(() => {this.loadData();});
|
||||||
|
|
||||||
|
this.loadData();
|
||||||
|
}
|
||||||
|
}
|
9
src/operations/dailyBalance.ts
Normal file
9
src/operations/dailyBalance.ts
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
export class DailyBalance {
|
||||||
|
public operation_date: string;
|
||||||
|
public expenses: number;
|
||||||
|
public revenues: number;
|
||||||
|
public income: number;
|
||||||
|
public balance: number;
|
||||||
|
}
|
58
src/operations/operation.module.ts
Normal file
58
src/operations/operation.module.ts
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { HttpClientModule } from '@angular/common/http';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
|
import { NgLoggerModule, Level } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { NgxChartsModule } from '@swimlane/ngx-charts';
|
||||||
|
import { ToastrModule } from 'ngx-toastr';
|
||||||
|
import { TextMaskModule } from 'angular2-text-mask';
|
||||||
|
import { jqxChartComponent } from 'jqwidgets-scripts/jqwidgets-ts/angular_jqxchart';
|
||||||
|
|
||||||
|
import { BalanceChartComponent } from './balanceChart.component';
|
||||||
|
import { CategoryChartComponent } from './categoryChart.component';
|
||||||
|
import { OperationRowComponent } from './operationRow.component';
|
||||||
|
import { CategoryService } from './category.service';
|
||||||
|
import { OperationService } from './operation.service';
|
||||||
|
import { OperationEditComponent } from './operationEdit.component';
|
||||||
|
import { OperationListComponent } from './operationList.component';
|
||||||
|
import { OperationDeleteModalComponent } from './operationDeleteModal.component';
|
||||||
|
import { OperationRoutes } from './operation.states';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
HttpClientModule,
|
||||||
|
CommonModule,
|
||||||
|
FormsModule,
|
||||||
|
RouterModule.forChild(
|
||||||
|
OperationRoutes
|
||||||
|
),
|
||||||
|
NgLoggerModule,
|
||||||
|
ToastrModule,
|
||||||
|
NgbModule,
|
||||||
|
NgxChartsModule,
|
||||||
|
TextMaskModule
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
CategoryService,
|
||||||
|
OperationService,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
jqxChartComponent,
|
||||||
|
BalanceChartComponent,
|
||||||
|
CategoryChartComponent,
|
||||||
|
OperationRowComponent,
|
||||||
|
OperationEditComponent,
|
||||||
|
OperationListComponent,
|
||||||
|
OperationDeleteModalComponent,
|
||||||
|
],
|
||||||
|
entryComponents: [
|
||||||
|
OperationDeleteModalComponent,
|
||||||
|
OperationListComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class OperationModule {}
|
71
src/operations/operation.service.ts
Normal file
71
src/operations/operation.service.ts
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||||
|
|
||||||
|
import { Observable } from 'rxjs/Rx';
|
||||||
|
|
||||||
|
import { Operation } from './operation';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class OperationService {
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
formatDate(date: Date|string) {
|
||||||
|
if(date instanceof Date) {
|
||||||
|
return moment(date).format('YYYY-MM-DD');
|
||||||
|
}
|
||||||
|
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
private url(id?: Number): string {
|
||||||
|
if(id) {
|
||||||
|
return `/api/operation/${id}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `/api/operation`;
|
||||||
|
}
|
||||||
|
|
||||||
|
query(
|
||||||
|
accountId: number,
|
||||||
|
minDate: Date|string = null,
|
||||||
|
maxDate: Date|string = null
|
||||||
|
): Observable<Operation[]> {
|
||||||
|
let params = new HttpParams();
|
||||||
|
|
||||||
|
params = params.set('account_id', `${accountId}`);
|
||||||
|
|
||||||
|
if(minDate) {
|
||||||
|
params = params.set('begin', this.formatDate(minDate));
|
||||||
|
}
|
||||||
|
|
||||||
|
if(maxDate) {
|
||||||
|
params = params.set('end', this.formatDate(maxDate));
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.http.get<Operation[]>(this.url(), {
|
||||||
|
params: params
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
get(id: number): Observable<Operation> {
|
||||||
|
return this.http.get<Operation>(this.url(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
create(operation: Operation): Observable<Operation> {
|
||||||
|
return this.http.post<Operation>(this.url(), operation);
|
||||||
|
}
|
||||||
|
|
||||||
|
update(operation: Operation): Observable<Operation> {
|
||||||
|
return this.http.post<Operation>(this.url(operation.id), operation);
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(operation: Operation): Observable<Operation> {
|
||||||
|
return this.http.delete<Operation>(this.url(operation.id));
|
||||||
|
}
|
||||||
|
}
|
17
src/operations/operation.states.ts
Normal file
17
src/operations/operation.states.ts
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { Routes } from '@angular/router';
|
||||||
|
|
||||||
|
import { OperationListComponent } from './operationList.component';
|
||||||
|
import { OperationEditComponent } from './operationEdit.component';
|
||||||
|
|
||||||
|
export const OperationRoutes: Routes = [{
|
||||||
|
path: 'accounts/:accountId/operations',
|
||||||
|
component: OperationListComponent,
|
||||||
|
}, {
|
||||||
|
path: 'accounts/:accountId/operations/new',
|
||||||
|
component: OperationEditComponent,
|
||||||
|
}, {
|
||||||
|
path: 'accounts/:accountId/operations/:operationId/edit',
|
||||||
|
component: OperationEditComponent,
|
||||||
|
}];
|
15
src/operations/operation.ts
Normal file
15
src/operations/operation.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
|
||||||
|
export class Operation {
|
||||||
|
public id: number;
|
||||||
|
public operation_date: string;
|
||||||
|
public label: string;
|
||||||
|
public value: number;
|
||||||
|
public category: string;
|
||||||
|
public scheduled_operation_id: number;
|
||||||
|
public account_id: number;
|
||||||
|
public balance: number;
|
||||||
|
public confirmed: boolean;
|
||||||
|
public pointed: boolean;
|
||||||
|
public canceled: boolean
|
||||||
|
}
|
22
src/operations/operationDeleteModal.component.html
Normal file
22
src/operations/operationDeleteModal.component.html
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<!-- vim: set tw=80 ts=2 sw=2 sts=2 : -->
|
||||||
|
<div class="modal-header">
|
||||||
|
<h3 class="modal-title" id="modal-title">Delete Operation #{{ operation.id }}</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-body" id="modal-body">
|
||||||
|
<p>
|
||||||
|
Do you really want to delete operation #{{ operation.id }} with label:<br/>
|
||||||
|
{{ operation.label }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button class="btn btn-danger" (click)="submit()">
|
||||||
|
Yes
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="btn btn-default" (click)="cancel()">
|
||||||
|
No
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
24
src/operations/operationDeleteModal.component.ts
Normal file
24
src/operations/operationDeleteModal.component.ts
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2:
|
||||||
|
import { Component, Input } from '@angular/core';
|
||||||
|
|
||||||
|
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
|
import { Operation } from './operation';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'operation-delete-modal',
|
||||||
|
templateUrl: './operationDeleteModal.component.html'
|
||||||
|
})
|
||||||
|
export class OperationDeleteModalComponent {
|
||||||
|
@Input() operation: Operation
|
||||||
|
|
||||||
|
constructor(private activeModal: NgbActiveModal) {}
|
||||||
|
|
||||||
|
submit(): void {
|
||||||
|
this.activeModal.close(this.operation);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel(): void {
|
||||||
|
this.activeModal.dismiss("closed");
|
||||||
|
}
|
||||||
|
}
|
79
src/operations/operationEdit.component.html
Normal file
79
src/operations/operationEdit.component.html
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
<!-- vim: set tw=80 ts=2 sw=2 sts=2 :-->
|
||||||
|
<div>
|
||||||
|
<div class="row">
|
||||||
|
<form novalidate (keyup.enter)="submit()" #form="ngForm">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="operation-date">Date</label>
|
||||||
|
|
||||||
|
<input class="form-control"
|
||||||
|
[class.has-danger]="operationDate.errors"
|
||||||
|
id="operation-date" name="operationDate"
|
||||||
|
[(ngModel)]="operation.operation_date" #operationDate="ngModel"
|
||||||
|
[textMask]="{mask: dateMask}"
|
||||||
|
placeholder="Operation date" required>
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="operationDate.errors">
|
||||||
|
<small class="form-text" *ngIf="operationDate.errors.required">
|
||||||
|
The operation date is required.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="label">Label</label>
|
||||||
|
|
||||||
|
<input class="form-control"
|
||||||
|
[class.has-danger]="label.errors"
|
||||||
|
id="label" name="label"
|
||||||
|
[(ngModel)]="operation.label" #label="ngModel"
|
||||||
|
placeholder="Label" required>
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="label.errors">
|
||||||
|
<small class="form-text" *ngIf="label.errors.required">
|
||||||
|
The operation label is required.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="value">Montant</label>
|
||||||
|
|
||||||
|
<input class="form-control"
|
||||||
|
[class.has-errors]="value.errors"
|
||||||
|
id="value" name="value"
|
||||||
|
[(ngModel)]="operation.value" #value="ngModel"
|
||||||
|
type="number" placeholder="Value" required>
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="value.errors">
|
||||||
|
<small class="form-text" *ngIf="value.errors.required">
|
||||||
|
The operation value is required.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="category">Catégorie</label>
|
||||||
|
|
||||||
|
<input class="form-control"
|
||||||
|
[class.has-errors]="category.errors"
|
||||||
|
id="category" name="category"
|
||||||
|
[(ngModel)]="operation.category" #category="ngModel"
|
||||||
|
placeholder="Category" required>
|
||||||
|
|
||||||
|
<div class="help-block text-danger" *ngIf="category.errors">
|
||||||
|
<small class="form-text" *ngIf="category.errors.required">
|
||||||
|
The operation category is required.
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button class="btn btn-primary" [disabled]="!form.valid" (click)="submit()">
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="btn btn-default" (click)="cancel()">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
86
src/operations/operationEdit.component.ts
Normal file
86
src/operations/operationEdit.component.ts
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import { Location } from '@angular/common';
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router, Params } from '@angular/router';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { ToastrService } from 'ngx-toastr';
|
||||||
|
|
||||||
|
import { Operation } from './operation';
|
||||||
|
import { OperationService } from './operation.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'operation-edit',
|
||||||
|
templateUrl: './operationEdit.component.html'
|
||||||
|
})
|
||||||
|
export class OperationEditComponent {
|
||||||
|
public operation: Operation = new Operation();
|
||||||
|
|
||||||
|
//dateMask = [/\d{4}/, '-', /0[1-9]|1[0-2]/, '-', /[0-2]\d|3[0-1]/];
|
||||||
|
dateMask = ['2', '0', /\d/, /\d/, '-', /[0-1]/, /\d/, '-', /[0-3]/, /\d/];
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private location: Location,
|
||||||
|
private router: Router,
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private logger: Logger,
|
||||||
|
private toastrService: ToastrService,
|
||||||
|
private operationService: OperationService
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.route.paramMap.subscribe((params: Params) => {
|
||||||
|
let operationId = params.get('operationId');
|
||||||
|
|
||||||
|
if (operationId) {
|
||||||
|
this.logger.info('Loading operation with id', operationId);
|
||||||
|
|
||||||
|
// Load Operation
|
||||||
|
this.operationService.get(
|
||||||
|
+operationId
|
||||||
|
).subscribe((operation: Operation) => {
|
||||||
|
this.operation = operation;
|
||||||
|
|
||||||
|
this.logger.info(operation);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.logger.info('Initialize new operation');
|
||||||
|
|
||||||
|
let accountId = params.get('accountId');
|
||||||
|
|
||||||
|
this.operation = new Operation();
|
||||||
|
this.operation.account_id = +accountId;
|
||||||
|
|
||||||
|
this.logger.info(this.operation);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
submit(): void {
|
||||||
|
this.save(this.operation);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Save an operation and return a promise.
|
||||||
|
*/
|
||||||
|
save(operation) {
|
||||||
|
operation.confirmed = true;
|
||||||
|
|
||||||
|
return this.operationService.create(operation).subscribe(
|
||||||
|
(operation) => {
|
||||||
|
this.toastrService.success('Operation #' + operation.id + ' saved.');
|
||||||
|
|
||||||
|
this.location.back();
|
||||||
|
}, (result) => {
|
||||||
|
this.toastrService.error(
|
||||||
|
'Error while saving operation: ' + result.message
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel(): void {
|
||||||
|
this.location.back();
|
||||||
|
}
|
||||||
|
}
|
46
src/operations/operationList.component.html
Normal file
46
src/operations/operationList.component.html
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<!-- vim: set tw=80 ts=2 sw=2 sts=2 : -->
|
||||||
|
<div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-8">
|
||||||
|
<balance-chart [account]="account"></balance-chart>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-4">
|
||||||
|
<category-chart></category-chart>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<table class="table table-striped table-condensed table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>#</th>
|
||||||
|
<th>Date d'op.</th>
|
||||||
|
<th>Libellé de l'opération</th>
|
||||||
|
<th>Montant</th>
|
||||||
|
<th>Solde</th>
|
||||||
|
<th>Catégorie</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td colspan="6">
|
||||||
|
<a class="btn btn-success"
|
||||||
|
[routerLink]="['new']">
|
||||||
|
Ajouter
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr [operation-row]="operation"
|
||||||
|
[account]="account"
|
||||||
|
(needsReload)="loadData()"
|
||||||
|
*ngFor="let operation of operations">
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
76
src/operations/operationList.component.ts
Normal file
76
src/operations/operationList.component.ts
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
// vim: set tw=80 ts=2 sw=2 sts=2 :
|
||||||
|
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router, Params } from '@angular/router';
|
||||||
|
|
||||||
|
import { Logger } from '@nsalaun/ng-logger';
|
||||||
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { ToastrService } from 'ngx-toastr';
|
||||||
|
|
||||||
|
import { Account } from '../accounts/account';
|
||||||
|
import { AccountService } from '../accounts/account.service';
|
||||||
|
import { Operation } from './operation';
|
||||||
|
import { OperationService } from './operation.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'operation-list',
|
||||||
|
templateUrl: './operationList.component.html'
|
||||||
|
})
|
||||||
|
export class OperationListComponent implements OnInit {
|
||||||
|
private account: Account;
|
||||||
|
public operations: Operation[];
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private toastrService: ToastrService,
|
||||||
|
private operationService: OperationService,
|
||||||
|
private accountService: AccountService,
|
||||||
|
private logger: Logger,
|
||||||
|
private ngbModal: NgbModal,
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private router: Router
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.route.queryParamMap.subscribe((params: Params) => {
|
||||||
|
if (params.get('from') && params.get('to')) {
|
||||||
|
this.loadData();
|
||||||
|
} else {
|
||||||
|
this.router.navigate([], {
|
||||||
|
queryParams: {
|
||||||
|
from: moment().startOf('month').format('YYYY-MM-DD'),
|
||||||
|
to: moment().endOf('month').format('YYYY-MM-DD')
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.route.paramMap.subscribe((params: Params) => {
|
||||||
|
let accountId = params.get('accountId');
|
||||||
|
|
||||||
|
this.accountService.get(
|
||||||
|
+accountId
|
||||||
|
).subscribe(account => {
|
||||||
|
this.account = account;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Load operations.
|
||||||
|
*/
|
||||||
|
loadData() {
|
||||||
|
let accountId = this.route.snapshot.paramMap.get('accountId');
|
||||||
|
let fromDay = this.route.snapshot.queryParamMap.get('from');
|
||||||
|
let toDay = this.route.snapshot.queryParamMap.get('to');
|
||||||
|
|
||||||
|
return this.operationService.query(
|
||||||
|
+accountId,
|
||||||
|
fromDay,
|
||||||
|
toDay
|
||||||
|
).subscribe((operations: Operation[]) => {
|
||||||
|
this.operations = operations.reverse();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user