changing user import (closes #2666)

openslides/motions/static/templates/motions/motion-import.html

@@ -91,12 +91,12 @@
             {{ motion.text | limitTo:80 }}{{ motion.text.length > 80 ? '...' : '' }}
           <td>{{ motion.reason | limitTo:80 }}{{ motion.reason.length > 80 ? '...' : '' }}
           <td ng-class="{ 'text-warning': motion.submitter_create }">
-            <span ng-if="motion.submitter_create" title="{{ motion.submitter_create | translate }}" class="pointer">
+            <span ng-if="motion.submitter_create" title="{{ motion.submitter_create | translate }}">
               <i class="fa fa-plus-circle"></i>
             </span>
             {{ motion.submitter }}
           <td ng-class="{ 'text-warning': motion.category_create }">
-            <span ng-if="motion.category_create" title="{{ motion.category_create | translate }}" class="pointer">
+            <span ng-if="motion.category_create" title="{{ motion.category_create | translate }}">
               <i class="fa fa-plus-circle"></i>
             </span>
             {{ motion.category }}
@@ -129,7 +129,7 @@
       <button ng-click="clear()" class="btn btn-default" translate>
         Clear preview
       </button>
-      <button ng-if="!csvImporting" ng-click="import()" class="btn btn-primary" translate>
+      <button ng-if="!csvImporting && (motions.length - motionsFailed.length) > 0" ng-click="import()" class="btn btn-primary" translate>
         Import {{ motions.length - motionsFailed.length }} motions
       </button>
     </div>

openslides/topics/static/templates/topics/topic-import.html

@@ -133,7 +133,7 @@
       <button ng-click="clear()" class="btn btn-default" translate>
         Clear preview
       </button>
-      <button ng-if="!csvImporting" ng-click="import()" class="btn btn-primary" translate>
+      <button ng-if="!csvImporting && (items.length - itemdFailed.length) > 0" ng-click="import()" class="btn btn-primary" translate>
         Import {{ items.length - itemsFailed.length }} topics
       </button>
     </div>

openslides/users/static/js/users/csv.js

@@ -5,8 +5,11 @@
 angular.module('OpenSlidesApp.users.csv', [])
 
 .factory('UserCsvExport', [
-    function () {
+    'Group',
-        return function (element, users) {
+    'gettextCatalog',
+    function (Group, gettextCatalog) {
+        return {
+            export: function (element, users) {
                 var csvRows = [
                     ['title', 'first_name', 'last_name', 'structure_level', 'number', 'groups', 'comment', 'is_active', 'is_present', 'is_committee'],
                 ];
@@ -29,6 +32,35 @@ angular.module('OpenSlidesApp.users.csv', [])
                 element.href = 'data:text/csv;charset=utf-8,' + csvString;
                 element.download = 'users-export.csv';
                 element.target = '_blank';
+            },
+
+            downloadExample: function (element) {
+                // try to get an example with two groups and one with one group
+                var groups = Group.getAll();
+                var csvGroups = '';
+                var csvGroup = '';
+                if (groups.length >= 3) { // do not pick groups[0], this is the default group
+                    csvGroups = '"' + gettextCatalog.getString(groups[1].name) +
+                                ', ' + gettextCatalog.getString(groups[2].name) + '"';
+                }
+                if (groups.length >= 2) {
+                    csvGroup = gettextCatalog.getString(groups[groups.length - 1].name); // take last group
+                }
+                var csvRows = [
+                    // column header line
+                    ['title', 'first_name', 'last_name', 'structure_level', 'number', 'groups', 'comment', 'is_active', 'is_present', 'is_committee'],
+                    // example entries
+                    ['Dr.', 'Max', 'Mustermann', 'Berlin','1234567890', csvGroups, 'xyz', '1', '1', ''],
+                    ['', 'John', 'Doe', 'Washington','75/99/8-2', csvGroup, 'abc', '1', '1', ''],
+                    ['', 'Fred', 'Bloggs', 'London', '', '', '', '', '', ''],
+                    ['', '', 'Executive Board', '', '', '', '', '', '', '1'],
+
+                ];
+                var csvString = csvRows.join("%0A");
+                element.href = 'data:text/csv;charset=utf-8,' + csvString;
+                element.download = 'users-example.csv';
+                element.target = '_blank';
+            }
         };
     }
 ]);

openslides/users/static/js/users/site.js

@@ -682,7 +682,7 @@ angular.module('OpenSlidesApp.users.site', [
         // Export as a csv file
         $scope.csvExport = function () {
             var element = document.getElementById('downloadLinkCSV');
-            UserCsvExport(element, $scope.usersFiltered);
+            UserCsvExport.export(element, $scope.usersFiltered);
         };
     }
 ])
@@ -886,7 +886,8 @@ angular.module('OpenSlidesApp.users.site', [
     'gettextCatalog',
     'User',
     'Group',
-    function($scope, $q, gettext, gettextCatalog, User, Group) {
+    'UserCsvExport',
+    function($scope, $q, gettext, gettextCatalog, User, Group, UserCsvExport) {
         // import from textarea
         $scope.importByLine = function () {
             $scope.usernames = $scope.userlist[0].split("\n");
@@ -984,24 +985,29 @@ angular.module('OpenSlidesApp.users.site', [
                     user.number = "";
                 }
                 // groups
+                user.groups_id = []; // will be overwritten if there are groups
                 if (user.groups) {
-                    var csvGroups = user.groups.replace(quotionRe, '$1').split(",");
+                    user.groups = user.groups.replace(quotionRe, '$1').split(',');
-                    user.groups_id = [];
+                    user.groups = _.map(user.groups, function (group) {
-                    user.groupnames = [];
+                        return _.trim(group); // remove whitespaces on start or end
-                    if (csvGroups !== '') {
+                    });
+
                     // All group objects are already loaded via the resolve statement from ui-router.
                     var allGroups = Group.getAll();
-                        csvGroups.forEach(function(csvGroup) {
+                    // in allGroupsNames ar all original group names and translated names if a
-                            allGroups.forEach(function (allGroup) {
+                    // translation exists (e.g. for default group Delegates)
-                                if (csvGroup == allGroup.id) {
+                    var allGroupsNames = [];
-                                    user.groups_id.push(allGroup.id);
+                    _.forEach(allGroups, function (group) {
-                                    user.groupnames.push(allGroup.name);
+                        var groupTranslation = gettextCatalog.getString(group.name);
+                        if (group.name !== groupTranslation) {
+                            allGroupsNames.push(groupTranslation);
                         }
+                        allGroupsNames.push(group.name);
                     });
-                        });
+                    user.groupsToCreate = _.difference(user.groups, allGroupsNames);
-                    }
+
-                } else {
+                    // for template:
-                    user.groups_id = [];
+                    user.groupsNotToCreate = _.difference(user.groups, user.groupsToCreate);
                 }
                 // comment
                 if (user.comment) {
@@ -1106,9 +1112,48 @@ angular.module('OpenSlidesApp.users.site', [
         // import from csv file
         $scope.import = function () {
             $scope.csvImporting = true;
+
+            // collect all needed groups and create non existing groups
+            var groupsToCreate = [];
+            _.forEach($scope.users, function (user) {
+                if (!user.importerror && user.groups.length) {
+                    _.forEach(user.groupsToCreate, function (group) { // Just append groups, that are not listed yet.
+                        if (_.indexOf(groupsToCreate, group) == -1) {
+                            groupsToCreate.push(group);
+                        }
+                    });
+                }
+            });
+            var createPromises = [];
+            $scope.groupsCreated = 0;
+            _.forEach(groupsToCreate, function (groupname) {
+                var group = {
+                    name: groupname,
+                    permissions: []
+                };
+                createPromises.push(Group.create(group).then( function (success) {
+                    $scope.groupsCreated++;
+                }));
+            });
+
+            $q.all(createPromises).then(function () {
+                // reload allGroups, now all new groups are created
+                var allGroups = Group.getAll();
                 var existingUsers = User.getAll();
-            angular.forEach($scope.users, function (user) {
+
+                _.forEach($scope.users, function (user) {
                     if (!user.importerror) {
+                        // Assign all groups
+                        _.forEach(user.groups, function(csvGroup) {
+                            allGroups.forEach(function (allGroup) {
+                                // check with and without translation
+                                if (csvGroup === allGroup.name ||
+                                    csvGroup === gettextCatalog.getString(allGroup.name)) {
+                                    user.groups_id.push(allGroup.id);
+                                }
+                            });
+                        });
+
                         // Do nothing on duplicateAction==duplicateActions[0] (keep original)
                         if (user.duplicate && (user.duplicateAction == $scope.duplicateActions[1])) {
                             // delete existing user
@@ -1139,6 +1184,7 @@ angular.module('OpenSlidesApp.users.site', [
                     }
                 });
                 $scope.csvimported = true;
+            });
         };
         $scope.clear = function () {
             $scope.csv.result = null;
@@ -1146,20 +1192,7 @@ angular.module('OpenSlidesApp.users.site', [
         // download CSV example file
         $scope.downloadCSVExample = function () {
             var element = document.getElementById('downloadLink');
-            var csvRows = [
+            UserCsvExport.downloadExample(element);
-                // column header line
-                ['title', 'first_name', 'last_name', 'structure_level', 'number', 'groups', 'comment', 'is_active', 'is_present', 'is_committee'],
-                // example entries
-                ['Dr.', 'Max', 'Mustermann', 'Berlin','1234567890', '"3,4"', 'xyz', '1', '1', ''],
-                ['', 'John', 'Doe', 'Washington','75/99/8-2', '3', 'abc', '1', '1', ''],
-                ['', 'Fred', 'Bloggs', 'London', '', '', '', '', '', ''],
-                ['', '', 'Executive Board', '', '', '5', '', '', '', '1'],
-
-            ];
-            var csvString = csvRows.join("%0A");
-            element.href = 'data:text/csv;charset=utf-8,' + csvString;
-            element.download = 'users-example.csv';
-            element.target = '_blank';
         };
     }
 ])

openslides/users/static/templates/users/user-import.html

@@ -69,10 +69,6 @@
   <ul class="indentation">
       <li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br>
           <code>title, first_name, last_name, structure_level, number, groups, comment, is_active, is_present, is_committee</code>
-      <li><translate>Default groups</translate>:
-          <translate>Delegates</translate> <code>2</code>,
-          <translate>Staff</translate> <code>3</code>
-          <translate>Committees</translate> <code>4</code>
       <li translate>At least given name or surname have to be filled in. All
         other fields are optional and may be empty.
       <li translate>Only double quotes are accepted as text delimiter (no single quotes).
@@ -102,14 +98,15 @@
             <strong class="text-danger" ng-if="duplicates > 1">{{ duplicates }} <translate>duplicates</translate></strong>
 
               <div uib-dropdown>
-                <button type="button" class="btn btn-default btn-danger btn-sm" uib-dropdown-toggle>
+                <button id="GlobalAction" type="button" class="btn btn-default btn-danger btn-sm" uib-dropdown-toggle>
                   <translate>Set global action</translate>
                   <span class="caret"></span>
                 </button>
-                <ul class="dropdown-menu dropdown-entries">
+                <ul class="dropdown-menu" aria-labelledby="GlobalAction">
-                    <li role="menuitem" ng-repeat="action in duplicateActions" class="pointer"
+                  <li ng-repeat="action in duplicateActions">
-                        ng-click="setGlobalAction(action)">
+                    <a href ng-click="setGlobalAction(action)">
                       {{ action | translate }}
+                    </a>
                   </li>
                 </ul>
               </div>
@@ -146,7 +143,11 @@
           <td>
             {{ user.number }}
           <td>
-            <div ng-repeat="groupname in user.groupnames">
+            <div ng-repeat="groupname in user.groupsNotToCreate">
+              {{ groupname | translate }}
+            </div>
+            <div ng-repeat="groupname in user.groupsToCreate" class="text-warning">
+              <i class="fa fa-plus-circle"></i>
               {{ groupname | translate }}
             </div>
           <td style="max-width: 130px;">
@@ -164,16 +165,17 @@
               ng-click="user.is_committee = !user.is_committee"></i>
           <td ng-if="duplicates > 0">
               <div ng-if="user.duplicate" uib-tooltip="{{ user.duplicate_info }}" uib-dropdown>
-                <button type="button" class="btn btn-default btn-sm"
+                <button id="UserAction{{ $index }}" type="button" class="btn btn-default btn-sm"
                   uib-dropdown-toggle ng-class="user.duplicateAction == duplicateActions[0] ? 'btn-warning' : (user.duplicateAction == duplicateActions[1] ? 'btn-danger' : 'btn-success')">
                   {{ user.duplicateAction | translate }}
                   <span class="caret"></span>
                 </button>
-                <ul class="dropdown-menu dropdown-entries">
+                <ul class="dropdown-menu" aria-labelledby="UserAction{{ $index }}">
-                    <li role="menuitem" ng-repeat="action in duplicateActions" class="pointer"
+                  <li ng-repeat="action in duplicateActions">
-                      ng-click="user.duplicateAction = action; calcStats()">
+                      <a href ng-click="user.duplicateAction = action; calcStats()">
                         <i class="fa fa-check" ng-if="user.duplicateAction == action"></i>
                         {{ action | translate }}
+                      </a>
                   </li>
                 </ul>
     </table>
@@ -206,13 +208,14 @@
       <i class="fa fa-check-circle fa-lg"></i>
       {{ usersImported.length }}
       <translate>participants were successfully imported.</translate>
+      (<translate>Groups created</translate>: {{ groupsCreated }})
     </div>
 
     <div class="spacer">
       <button ng-click="clear()" class="btn btn-default" translate>
         Clear preview
       </button>
-      <button ng-if="!csvImporting" ng-click="import()" class="btn btn-primary" translate>
+      <button ng-if="!csvImporting && usersWillBeImported > 0" ng-click="import()" class="btn btn-primary" translate>
         Import {{ usersWillBeImported }} participants
       </button>
     </div>