diff --git a/main/templates/pages/adm_ruleset.html b/main/templates/pages/adm_ruleset.html index c0a5ad9..a951f80 100644 --- a/main/templates/pages/adm_ruleset.html +++ b/main/templates/pages/adm_ruleset.html @@ -8,6 +8,7 @@ {% block extra_css %} + {% endblock %} {% block extra_scripts %} @@ -21,7 +22,7 @@
Свободных Мест: {{ licences_remaining }}
+Свободных Мест:
+ + | Name | Role | -Checked | diff --git a/main/views.py b/main/views.py index 0129b3a..5c336eb 100644 --- a/main/views.py +++ b/main/views.py @@ -300,30 +300,6 @@ class AdminPageView(LoginRequiredMixin, PermissionRequiredMixin, SuccessMessageM make_light_agent(user, self.request.user) log(user, self.request.user.userprofile) - def get_context_data(self, **kwargs) -> dict: - """ - Функция формирования контента страницы администратора (с проверкой прав доступа) - """ - - # context = super().get_context_data(**kwargs) - - # context['licences_remaining'] = max(0, ZENDESK_MAX_AGENTS - context['engineers']) - # return context - - context = setup_context(control_lit=True) - context.update(super().get_context_data(**kwargs)) - users = get_list_or_404( - UserProfile, role='agent') - context['engineers'], context['light_agents'] = count_users(get_users_list()) - context.update({ - 'users': users, - 'ZENDESK_ROLES': ZENDESK_ROLES, - 'engineers': context['engineers'], - 'light_agents': context['light_agents'], - 'licences_remaining': max(0, ZENDESK_MAX_AGENTS - context['engineers']), - }) - return context # TODO: need to get profile page url - class CustomLoginView(LoginView): """ @@ -349,7 +325,8 @@ class UsersViewSet(viewsets.ReadOnlyModelViewSet): 'users': serializer.data, 'engineers': count[0], 'light_agents': count[1], - "zendesk_users": self.get_zendesk_users(self.choose_users(users.values, profiles)) + 'zendesk_users': self.get_zendesk_users(self.choose_users(users.values, profiles)), + 'max_agents': ZENDESK_MAX_AGENTS } return Response(res) diff --git a/static/main/js/control.js b/static/main/js/control.js index 82f9f27..0215b05 100644 --- a/static/main/js/control.js +++ b/static/main/js/control.js @@ -1,15 +1,18 @@ "use strict"; +function head_checkbox() { + let head_checkbox = document.getElementById("head-checkbox"); + head_checkbox.addEventListener("click", () => { + let checkboxes = document.getElementsByName("users"); + for (let checkbox of checkboxes) checkbox.click(); + }); +} + // React class ModelUserTableRow extends React.Component { render() { return (|||
---|---|---|---|---|---|---|
- {this.props.user.name} - | -{this.props.user.user.email} | -{this.props.user.zendesk_role} | + | + {this.props.user.name} + | +{this.props.user.user.email} | +{this.props.user.zendesk_role} |
{this.props.user.name} | {this.props.user.email} | {this.props.user.zendesk_role} | -