From 88715646ba810e1e248f755977272604c841033d Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 27 Jul 2016 14:54:18 +0200
Subject: [PATCH] Show user fields is_committee and is_active in list view.
 (Fixes #2217)

New icon for is_committee and is_active.
Check is_committee field for csv import.
---
 openslides/users/static/js/users/site.js        | 11 +++++++++++
 .../static/templates/users/user-import.html     |  2 +-
 .../users/static/templates/users/user-list.html | 17 ++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index 33ec7c037..4dbebc663 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -785,6 +785,17 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
                 } else {
                     user.is_active = false;
                 }
+                // is committee
+                if (user.is_committee) {
+                    user.is_committee = user.is_committee.replace(quotionRe, '$1');
+                    if (user.is_committee == '1') {
+                        user.is_committee = true;
+                    } else {
+                        user.is_committee = false;
+                    }
+                } else {
+                    user.is_committee = false;
+                }
                 $scope.users.push(user);
             });
         });
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html
index 835e6d617..e1335879a 100644
--- a/openslides/users/static/templates/users/user-import.html
+++ b/openslides/users/static/templates/users/user-import.html
@@ -92,7 +92,7 @@
           <th translate>Structure level
           <th translate>Groups
           <th translate>Comment
-          <th translate>Is active</th>
+          <th translate>Is active
           <th translate>Is committee</th>
       <tbody>
         <tr ng-repeat="user in users | limitTo : itemsPerPage : limitBegin">
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index 7716c7ab5..f9d3cfdef 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/openslides/users/static/templates/users/user-list.html
@@ -137,25 +137,34 @@
       <tr>
         <!-- projector column -->
         <th ng-show="!isSelectMode" os-perms="core.can_manage_projector" class="minimum">
+
         <!-- selection column -->
         <th ng-show="isSelectMode" os-perms="users.can_manage" class="minimum deleteColumn">
           <input type="checkbox" ng-model="$parent.selectedAll" ng-change="checkAll()">
+
+        <!-- name column -->
         <th ng-click="toggleSort('first_name')" class="sortable">
           <translate>Name</translate>
           <!-- TODO: sort by first OR last name -->
           <i class="pull-right fa" ng-show="sortColumn === 'first_name' && header.sortable != false"
               ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
           </i>
+
+        <!-- structure level column -->
         <th ng-click="toggleSort('structure_level')" class="sortable optional">
           <translate>Structure level</translate>
           <i class="pull-right fa" ng-show="sortColumn === 'structure_level' && header.sortable != false"
               ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
           </i>
+
+        <!-- groups column -->
         <th ng-click="toggleSort('groups')" class="sortable optional">
           <translate>Groups</translate>
           <i class="pull-right fa" ng-show="sortColumn === 'groups' && header.sortable != false"
               ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
           </i>
+
+        <!-- present column -->
         <th os-perms="users.can_see_extra_data" ng-click="toggleSort('is_present')" class="sortable minimum">
           <translate>Present</translate>
           <i class="pull-right fa" ng-show="sortColumn === 'is_present' && header.sortable != false"
@@ -177,7 +186,13 @@
           <input type="checkbox" ng-model="user.selected">
         <!-- user data colums -->
         <td ng-mouseover="user.hover=true" ng-mouseleave="user.hover=false">
-          <strong><a ui-sref="users.user.detail({id: user.id})">{{ user.get_short_name() }}</a></strong>
+          <strong>
+            <i ng-show="!user.is_active" class="fa fa-ban"
+              title="{{ 'Is inactive' | translate }}"></i>
+            <i ng-show="user.is_committee" class="fa fa-users"
+              title="{{ 'Is a committee' | translate }}"></i>
+            <a ui-sref="users.user.detail({id: user.id})">{{ user.get_short_name() }}</a>
+          </strong>
           <div ng-if="user.comment">
             <small><i class="fa fa-info-circle"></i> {{ user.comment }}</small>
           </div>