carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'develop' of ssh://gitea.einsle.de/carom/carom-server into develop

Browse Source 
# Conflicts:
#	Pipfile
#	Pipfile.lock
This commit is contained in:
Robert Einsle 2019-08-15 10:35:16 +02:00
commit d4e38eaa86
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Pipfile
View File

@ -6,13 +6,13 @@ verify_ssl = true
[dev-packages] [dev-packages]
[packages] [packages]
django = "==2.1.7" django = "==2.2.4"
django-crispy-forms = "==1.7.2" django-crispy-forms = "==1.7.2"
django-debug-toolbar = "==1.11" django-debug-toolbar = "==2.0"
django-extensions = "==2.1.6" django-extensions = "==2.2.1"
django-tables2 = "==2.0.6" django-tables2 = "==2.1.0"
djangorestframework = "==3.9.2" djangorestframework = "==3.10.2"
requests = "==2.21.0" requests = "==2.22.0"
[requires] [requires]
python_version = "3.5" python_version = "3.5"

56
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "dc53d6c95fe9c7220badc1943b92c674512569c7f25f0e60d7d110f8507a3e66" "sha256": "e3260c0ea7bca5d6b3fe892e0fa7a19215a7c4e5bc3ee0807c717f7a9c0d71ca"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -18,10 +18,10 @@
"default": { "default": {
"certifi": { "certifi": {
"hashes": [ "hashes": [
"sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
"sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
], ],
"version": "==2019.3.9" "version": "==2019.6.16"
}, },
"chardet": { "chardet": {
"hashes": [ "hashes": [
@ -32,11 +32,11 @@
}, },
"django": { "django": {
"hashes": [ "hashes": [
"sha256:275bec66fd2588dd517ada59b8bfb23d4a9abc5a362349139ddda3c7ff6f5ade", "sha256:16a5d54411599780ac9dfe3b9b38f90f785c51259a584e0b24b6f14a7f69aae8",
"sha256:939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963" "sha256:9a2f98211ab474c710fcdad29c82f30fc14ce9917c7a70c3682162a624de4035"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.1.7" "version": "==2.2.4"
}, },
"django-crispy-forms": { "django-crispy-forms": {
"hashes": [ "hashes": [
@ -48,35 +48,35 @@
}, },
"django-debug-toolbar": { "django-debug-toolbar": {
"hashes": [ "hashes": [
"sha256:89d75b60c65db363fb24688d977e5fbf0e73386c67acf562d278402a10fc3736", "sha256:17c53cd6bf4e7d69902aedf9a1d26c5d3b7369b54c5718744704f27b5a72f35d",
"sha256:c2b0134119a624f4ac9398b44f8e28a01c7686ac350a12a74793f3dd57a9eea0" "sha256:9a23ada2e43cd989195db3c18710b5d7451134a0d48127ab64c1d2ad81700342"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.11" "version": "==2.0"
}, },
"django-extensions": { "django-extensions": {
"hashes": [ "hashes": [
"sha256:109004f80b6f45ad1f56addaa59debca91d94aa0dc1cb19678b9364b4fe9b6f4", "sha256:4aafdb865104eaa5d681b9976b36c52c9d441be89b7d782e40808f1c5c0c8f93",
"sha256:307766e5e6c1caffe76c5d99239d8115d14ae3f7cab2cd991fcffd763dad904b" "sha256:8a2552fdeb222b23895ef52cdc28fc56efba976f6da07ca92937f6f5e626e345"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.1.6" "version": "==2.2.1"
}, },
"django-tables2": { "django-tables2": {
"hashes": [ "hashes": [
"sha256:11d914910745d6826ba2226f45ee7fc38dbc471dd62992b4204c6ee68ec10689", "sha256:cdecbb14206e7f5edcde73b3796a0eb5c583c63e170b7356aeac14ae9e4a3314",
"sha256:98038606603a157b79bb7564e589d1f21050c463d12c59d5b3848eba9e10a0ae" "sha256:ef8449a8ff3c3b13cd33c79b74cb2b24428a21e75176aa267a035a9d053abd36"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.0.6" "version": "==2.1.0"
}, },
"djangorestframework": { "djangorestframework": {
"hashes": [ "hashes": [
"sha256:8a435df9007c8b7d8e69a21ef06650e3c0cbe0d4b09e55dd1bd74c89a75a9fcd", "sha256:42979bd5441bb4d8fd69d0f385024a114c3cae7df0f110600b718751250f6929",
"sha256:f7a266260d656e1cf4ca54d7a7349609dc8af4fe2590edd0ecd7d7643ea94a17" "sha256:aedb48010ebfab9651aaab1df5fd3b4848eb4182afc909852a2110c24f89a359"
], ],
"index": "pypi", "index": "pypi",
"version": "==3.9.2" "version": "==3.10.2"
}, },
"idna": { "idna": {
"hashes": [ "hashes": [
@ -87,18 +87,18 @@
}, },
"pytz": { "pytz": {
"hashes": [ "hashes": [
"sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9", "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
"sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c" "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
], ],
"version": "==2018.9" "version": "==2019.2"
}, },
"requests": { "requests": {
"hashes": [ "hashes": [
"sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
"sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.21.0" "version": "==2.22.0"
}, },
"six": { "six": {
"hashes": [ "hashes": [
@ -116,10 +116,10 @@
}, },
"urllib3": { "urllib3": {
"hashes": [ "hashes": [
"sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1",
"sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"
], ],
"version": "==1.24.1" "version": "==1.25.3"
} }
}, },
"develop": {} "develop": {}

3
billard/admin.py
View File

@ -32,12 +32,14 @@ class LocationAdmin(admin.ModelAdmin):
@admin.register(Client) @admin.register(Client)
class ClientAdmin(admin.ModelAdmin): class ClientAdmin(admin.ModelAdmin):
list_display = ('uuid', 'location', 'report_user', 'last_seen') list_display = ('uuid', 'location', 'report_user', 'last_seen')
list_filter = ('location', 'report_user')
fields = ['location', 'uuid', 'report_user', 'last_seen'] fields = ['location', 'uuid', 'report_user', 'last_seen']
@admin.register(ClientData) @admin.register(ClientData)
class ClientDataAdmin(admin.ModelAdmin): class ClientDataAdmin(admin.ModelAdmin):
list_display = ('uuid', 'last_seen') list_display = ('uuid', 'last_seen')
list_filter = ('uuid', 'last_seen')
fields = ['location', 'last_seen'] fields = ['location', 'last_seen']
@ -78,6 +80,7 @@ class DeskAdminForm(forms.ModelForm):
class DeskAdmin(admin.ModelAdmin): class DeskAdmin(admin.ModelAdmin):
form = DeskAdminForm form = DeskAdminForm
list_display = ('client', 'desk_no', 'name', 'enabled', 'prize', 'prize_hh') list_display = ('client', 'desk_no', 'name', 'enabled', 'prize', 'prize_hh')
list_filter = ('client', 'desk_no', 'enabled', 'prize', 'prize_hh')
@admin.register(Accounting) @admin.register(Accounting)