Display number of groups in projects and CSS adjustements.

Author: kiarn

usr/lib/linuxmuster-webui/plugins/lmn_groupmembership/resources/build/all.js

@@ -81,25 +81,29 @@ angular.module('lmn.groupmembership').controller 'LMNGroupMembershipController',
       dict['type'] == val
 
   $scope.getGroups = (username) ->
-    $http.get('/api/lmn/groupmembership/projects').then (resp) ->
-      $scope.projects = resp.data
-      promises = []
-      for project in $scope.projects
-          promises.push($http.get('/api/lmn/groupmembership/all_members_project/' + project.cn).then (resp) ->
-              for proj in $scope.projects
-                  if proj.cn == resp.data.cn
-                    proj.membersCount = resp.data.membersCount
-                    proj.adminsCount = resp.data.adminsCount
-                    proj.all_members = resp.data.all_members
-                    proj.all_admins = resp.data.all_admins)
-      $q.all(promises).then () -> $scope.loading_projects = false
-    $http.get('/api/lmn/groupmembership/printers').then (resp) ->
-      $scope.printers = resp.data
-      $scope.loading_printers = false
-    $http.get('/api/lmn/groupmembership/schoolclasses').then (resp) ->
-      $scope.classes = resp.data
-      $scope.classes_max_height = 25 * resp.data.length / 4 + "px"
-      $scope.loading_schoolclasses = false
+      $http.get('/api/lmn/groupmembership/projects').then (resp) ->
+            $scope.projects = resp.data
+            $scope.loading_projects = false
+            $scope.projects_max_height = 45 * resp.data.length / 3 + "px"
+            console.log($scope.projects_max_height)
+            # Disable recursiv search of members since it's pretty slow for schools with a lot of projects.
+            #      promises = []
+            #      for project in $scope.projects
+            #          promises.push($http.get('/api/lmn/groupmembership/all_members_project/' + project.cn).then (resp) ->
+            #              for proj in $scope.projects
+            #                  if proj.cn == resp.data.cn
+            #                    proj.membersCount = resp.data.membersCount
+            #                    proj.adminsCount = resp.data.adminsCount
+            #                    proj.all_members = resp.data.all_members
+            #                    proj.all_admins = resp.data.all_admins)
+            #      $q.all(promises).then () -> $scope.loading_projects = false
+      $http.get('/api/lmn/groupmembership/printers').then (resp) ->
+          $scope.printers = resp.data
+          $scope.loading_printers = false
+      $http.get('/api/lmn/groupmembership/schoolclasses').then (resp) ->
+          $scope.classes = resp.data
+          $scope.classes_max_height = 25 * resp.data.length / 3 + "px"
+          $scope.loading_schoolclasses = false
 
   $scope.createProject = () ->
     messagebox.prompt(gettext('Project Name'), '').then (msg) ->

usr/lib/linuxmuster-webui/plugins/lmn_groupmembership/resources/js/controllers/index.controller.coffee

@@ -75,7 +75,7 @@ <h3 translate>Schoolclasses</h3>
                 <span translate> There are no schoolclasses available. Ask the administrator to import students</span>
             </div>
             <div class="flex-container lmn-container-list" style="flex-direction: column;" ng:style="{'max-height': classes_max_height}">
-                <div ng:repeat="classe in classes|filter:filter" style="padding-right:10px;border-right:solid 2px #ff8f00;">
+                <div ng:repeat="classe in classes|orderBy:[sort.fx]:sortReverse|filter:filter" style="padding-right:10px;border-right:solid 2px #ff8f00;min-width:300px;">
                     <div ng-class="{'color-orange': classe.membership}">
                         <input id={{classe.groupname}} type="checkbox" ng-click='setMembership(classe)' ng-checked="classe.membership"></input>
                         <i class="fa fa-users"></i>
@@ -109,7 +109,6 @@ <h3 translate>Printer</h3>
                             <span translate>Printer</span>
                             <b style="word-wrap: break-word; -ms-word-break: break-all">{{printergroup.groupname}}</b>
                         </a>
-                        </a>
                     </div>
                 </div>
             </div>
@@ -126,16 +125,24 @@ <h3 translate>Projects</h3>
                 <i class="fa fa-info-circle"></i>
                 <span translate> There are no projects yet. You can create a new project using the menu bar.</span>
             </div>
-            <div class="flex-container lmn-container-list" >
-                <div ng:repeat="project in projects|orderBy:[sort.fx]:sortReverse|filter:filter" style="padding-right:10px;border-right:solid 2px #ff8f00;">
+            <div class="flex-container lmn-container-list" style="flex-direction: column;" ng:style="{'max-height': projects_max_height}">
+                <div ng:repeat="project in projects|orderBy:[sort.fx]:sortReverse|filter:filter" style="padding:3px 10px 3px 0;border-right:solid 2px #ff8f00;min-width:300px;">
                     <div ng:show="!projectIsHidden(project)" ng:class="{'color-orange': project.membership}" ng:style="!projectIsJoinable(project) && {'padding-left':'17px'}">
                         <input id={{project.groupname}} type="checkbox" ng:show="projectIsJoinable(project)" ng:click='setMembership(project)' ng:checked="project.membership">
                         <i class="fa fa-flask"></i>
                         <a href="#" ng-click='showGroupDetails($index, project.type, project.groupname)'>
-                            <b style="word-wrap: break-word; -ms-word-break: break-all">{{project.groupname}}</b>
+                            <b style="word-wrap: break-word; -ms-word-break: break-all;width:100%;">{{project.groupname}}</b>
                         </a>
-                        <span ng:show="!loading_projects" class="label label-danger pull-right" title="{{project.adminsCount}} admin(s)">{{project.adminsCount}}</span>
-                        <span ng:show="!loading_projects" class="label label-default pull-right" title="{{project.membersCount}} member(s)">{{project.membersCount}}</span>
+                        <span ng:show="!loading_projects" class="label label-danger pull-right" title="{{project.adminsCount}} admin(s)">
+                            {{project.sophomorixAdmins.length}} <span translate>adm.</span>
+                            <br />
+                            {{project.sophomorixAdminGroups.length}} <span translate>gr.</span>
+                        </span>
+                        <span ng:show="!loading_projects" class="label label-default pull-right" title="{{project.membersCount}} member(s)">
+                            {{project.sophomorixMembers.length}} <span translate>adm.</span>
+                            <br />
+                            {{project.sophomorixMemberGroups.length}} <span translate>gr.</span>
+                        </span>
                     </div>
                 </div>
             </div>