diff --git a/README.md b/README.md index db34259..47468bb 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ sudo apt install make pip install --upgrade pip pip install -r requirements.txt ./manage.py migrate -./manage.py shell -c "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('vasya', '1@abc.net', 'promprog')" +./manage.py loaddata data.json ./manage.py runserver ``` Создать токен diff --git a/access_controller/settings.py b/access_controller/settings.py index 28feeb4..020480d 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -191,6 +191,8 @@ ZENDESK_GROUPS = { SOLVED_TICKETS_EMAIL = 'd.krikov@ngenix.net' +ZENDESK_MAX_AGENTS = 3 + REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. @@ -200,4 +202,3 @@ REST_FRAMEWORK = { } ONE_DAY = 12 # Количество часов в 1 рабочем дне - diff --git a/main/extra_func.py b/main/extra_func.py index 6ae7266..f2a4df9 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -443,7 +443,7 @@ class StatisticData: if first_log.old_role == ROLES['engineer']: self.statistic[first_log.change_time.date()] += get_timedelta(first_log).total_seconds() - if last_log.new_role == ROLES['engineer']: + if last_log.new_role == ROLES['engineer']: #TODO отдельная функция self.fill_daterange(last_log.change_time.date() + timedelta(days=1), self.end_date + timedelta(days=1)) if last_log.change_time.date() == timezone.now().date(): self.statistic[last_log.change_time.date()] += ( @@ -455,7 +455,7 @@ class StatisticData: if self.end_date == timezone.now().date(): self.statistic[self.end_date] = get_timedelta(None, timezone.now().time()).total_seconds() - for log_index in range(len(self.data) - 1): + for log_index in range(len(self.data) - 1): #TODO отдельная функция if self.data[log_index].new_role == ROLES['engineer']: current_log, next_log = self.data[log_index], self.data[log_index + 1] if current_log.change_time.date() != next_log.change_time.date(): diff --git a/main/templates/pages/adm_ruleset.html b/main/templates/pages/adm_ruleset.html index 92a0628..92686f1 100644 --- a/main/templates/pages/adm_ruleset.html +++ b/main/templates/pages/adm_ruleset.html @@ -20,6 +20,10 @@ {% block content %}
Свободных Мест: {{ licences_remaining }}
+