Commit Graph
214 Commits
Author SHA1 Message Date
Kiselev Igor 18ff4a529f Added statistic.html 2021-03-15 05:20:39 +03:00
Kiselev Igor 95c52f9302 Added and modified statistic.html 2021-03-15 05:18:08 +03:00
Yuriy Kulakov e75e93287e Added fixture with base users 2021-03-14 17:54:55 +03:00
Sokurov Idar 0cc788c039 minor fix 2021-03-14 17:26:41 +03:00
Sokurov Idar a430ee871d Add ticket unassignment(exclude solved tickets) 2021-03-14 17:13:41 +03:00
Степаненко Ольга 4f240e19f6 Add spelling settings and install tox but spelling is not still working 2021-03-14 16:30:14 +03:00
Степаненко Ольга 79b7418b61 Add enchant without correct working 2021-03-14 15:41:58 +03:00
Sokurov Idar 1cd8874e03 Merge branch 'develop' into hotfix/ticket_unassignment
# Conflicts:
#	main/models.py
2021-03-14 13:12:59 +03:00
Степаненко Ольга c9ae302103 Add documentation to new forms, and first part of extra_func 2021-03-14 12:42:18 +03:00
Степаненко Ольга be6005c4be Correct view documentation using typehints 2021-03-13 16:41:28 +03:00
Степаненко Ольга d50a88e8bc Add params to extra_func 2021-03-12 18:38:03 +03:00
Yuriy Kulakov a434a4a30b Merge feature/periodic into develop 2021-03-12 15:39:54 +03:00
Yuriy Kulakov d300cc2f06 Merge branch 'develop' into feature/periodic
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py
2021-03-12 15:37:50 +03:00
Yuriy Kulakov c1a10b6f2c Fixed bug with disappearance of table rows in control page at start 2021-03-12 14:54:57 +03:00
Artyom Kravchenko f6948d016d add some design to menu template(logo and color) 2021-03-12 14:39:51 +03:00
Artyom Kravchenko bd500207a3 Fixed AdminPageUSer form 2021-03-12 13:58:27 +03:00
Yuriy Kulakov abe44fec5f Refactored some functions in AdminPageView 2021-03-12 13:01:41 +03:00
Artyom Kravchenko 5665282ce5 fixed UserProfile model 2021-03-12 12:34:45 +03:00
Andrew Smirnov d2e76fdbd9 Update model, add documentation todos, add sampla code for logging. 2021-03-11 20:54:56 +03:00
Andrew Smirnov 674df0e66b Add model for tracking unassigned tickets 2021-03-11 20:28:04 +03:00
Sokurov Idar 9068febd30 bugfix 2021-03-11 19:55:09 +03:00
Yuriy Kulakov 72b70cc585 Fixed bug with api response 2021-03-11 19:29:16 +03:00
Sokurov Idar 60e1da2825 12-hour working day 2021-03-11 19:17:11 +03:00
Kiselev Igor 9b6238fa45 1/2 partof statistic.html 2021-03-11 19:03:45 +03:00
Sokurov Idar dd08821aea fix bag 2021-03-11 18:14:57 +03:00
Sokurov Idar ef9d0fc721 Merge branch 'develop' into feature/statistic/backend 2021-03-11 17:31:02 +03:00
Sokurov Idar b825bcdff3 Update class StatisticData 2021-03-11 17:30:55 +03:00
CaZzzer 7085532915 Merge branch 'bug/migrations' into 'develop'
#46 | Ошибка при запуске `./manage.py migrate`

See merge request 2020-2021/online/s101/group-02/access_controller!32
2021-03-11 08:17:11 +00:00
CaZzzer c2d6a790f9 Add meta with permissions to UserProfile, fix ./manage.py migrate errors 2021-03-11 00:10:44 -08:00
CaZzzer 3c43e0e38a Add models help text migration 2021-03-11 00:04:05 -08:00
Sokurov Idar 5efec2641a Refactor statistic page with class StatisticData 2021-03-09 00:53:11 +03:00
Sokurov Idar ce55ec61e6 extract function for easier processing a list of emails in future 2021-03-08 22:48:31 +03:00
Sokurov Idar 811ea45532 Merge branch 'develop' into feature/statistic/backend 2021-03-08 21:07:32 +03:00
Sokurov Idar b96deab2cb Update statistic backend 2021-03-08 21:07:09 +03:00
Sokurov Idar 49046022d7 small refactor: change variable`s names, add a bit documentation 2021-03-08 17:50:47 +03:00
Кравченко Артем 52f7858439 Merge branch 'feature/engineers_bug_page' into 'develop'
Feature/engineers bug page

See merge request 2020-2021/online/s101/group-02/access_controller!31
2021-03-08 13:41:54 +00:00
Artyom Kravchenko b01f5fb236 add button from menu for engineer rules request 2021-03-08 02:28:00 +03:00
Artyom Kravchenko 7ee8cc96af fixed get and end engineer role fuctions 2021-03-07 23:08:56 +03:00
Yuriy Kulakov 8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +03:00
Artyom Kravchenko fe944f4875 Fixed info bug on page 2021-03-06 01:36:19 +03:00
Vadim Melnikov 21b29fdc11 Added statistic layout 2021-03-05 19:07:13 +03:00
Sokurov Idar 4a604f0941 Merge branch 'develop' into feature/statistic/backend
# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
2021-03-04 23:16:21 +03:00
Sokurov Idar 8566e2b5b6 Updated version with days iteration 2021-03-04 23:13:10 +03:00
Andrew Smirnov 5909750fcc Remove todolist commant 2021-03-04 20:56:38 +03:00
Andrew Smirnov a393c31a13 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	main/views.py
2021-03-04 20:56:02 +03:00
Andrew Smirnov 1d7ff524b0 Documentation fix
Add enchant, remove intersphinx useless links, remove napoleon, fix todos
2021-03-04 20:54:45 +03:00
Кравченко Артем ba548ded2e Merge branch 'feature/adm_ruleset/backend' into 'develop'
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!29
2021-03-04 17:50:44 +00:00
Кулаков Юрий fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 20:46:25 +03:00
Кулаков Юрий 9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00
Andrew Smirnov 656081295e Profile view page refactoring 2021-03-04 20:01:10 +03:00