ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3942 from emanuelschuetze/fixAmendmentCSVExport

Browse Source 
Fixed missing submitters in amendment csv export
This commit is contained in:
Emanuel Schütze 2018-10-23 09:16:14 +02:00 committed by GitHub
commit 81bd123af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.rst
View File

@ -11,7 +11,9 @@ Bugfixes:
- Fixed image browser in CKEditor plugin to show uploaded images.
- Fixed sorting of users in dropdowns for speakers, submitters and candidates.
- Fixed election ballot paper layout (more space required for global 'no').
- Fixed missing output of special poll values (for motions and elections)
- Fixed missing output of special poll values (for motions and elections).
- Fixed amendment csv export (added missing submitters and recommendation, removed
html tags for old and new text).
Version 2.3 (2018-09-20)

37
openslides/motions/static/js/motions/csv.js
View File

@ -29,6 +29,9 @@ angular.module('OpenSlidesApp.motions.csv', [])
if (params.include.motionBlock) {
headerline.push('Motion block');
}
if (params.include.recommendation) {
headerline.push('Recommendation');
}
return _.map(headerline, function (entry) {
return gettextCatalog.getString(entry);
});
@ -104,6 +107,11 @@ angular.module('OpenSlidesApp.motions.csv', [])
row.push('"' + blockTitle + '"');
}
// Recommendation
if (params.include.recommendation) {
var recommendation = motion.recommendation ? motion.getRecommendationName() : '';
row.push('"' + recommendation + '"');
}
csvRows.push(row);
});
CsvDownload(csvRows, params.filename);
@ -130,13 +138,14 @@ angular.module('OpenSlidesApp.motions.csv', [])
])
.factory('AmendmentCsvExport', [
'$filter',
'gettextCatalog',
'CsvDownload',
'lineNumberingService',
function (gettextCatalog, CsvDownload, lineNumberingService) {
function ($filter, gettextCatalog, CsvDownload, lineNumberingService) {
var makeHeaderline = function () {
var headerline = ['Identifier', 'Submitters', 'Category', 'Motion block',
'Leadmotion', 'Line', 'Old text', 'New text'];
'Leadmotion', 'Line', 'Old text', 'New text', 'Recommendation'];
return _.map(headerline, function (entry) {
return gettextCatalog.getString(entry);
});
@ -148,12 +157,17 @@ angular.module('OpenSlidesApp.motions.csv', [])
];
_.forEach(amendments, function (amendment) {
var row = [];
// Identifier and title
// Identifier
row.push('"' + amendment.identifier !== null ? amendment.identifier : '' + '"');
// Submitters
var submitters = [];
angular.forEach(amendment.submitters, function(user) {
var user_short_name = [user.title, user.first_name, user.last_name].join(' ').trim();
_.forEach($filter('orderBy')(amendment.submitters, 'weight'), function (user) {
var user_short_name = [
user.user.title,
user.user.first_name,
user.user.last_name
].join(' ').trim();
submitters.push(user_short_name);
});
row.push('"' + submitters.join('; ') + '"');
@ -191,14 +205,23 @@ angular.module('OpenSlidesApp.motions.csv', [])
//row.push('"' + p_new.text.html + '"');
// Work around: Export the full paragraphs instead of changed lines
row.push('"' + amendment.getAmendmentParagraphsByMode('original', null, false)[0].text + '"');
row.push('"' + amendment.getAmendmentParagraphsByMode('changed', null, false)[0].text + '"');
// Remove all HTML tags from old and new text
var oldText = document.createElement("DIV");
oldText.innerHTML = amendment.getAmendmentParagraphsByMode('original', null, false)[0].text;
var newText = document.createElement("DIV");
newText.innerHTML = amendment.getAmendmentParagraphsByMode('changed', null, false)[0].text;
row.push('"' + (oldText.textContent || oldText.innerText) + '"');
row.push('"' + (newText.textContent || newText.innerText) + '"');
} else {
row.push('""');
row.push('""');
row.push('"' + amendment.getText() + '"');
}
// Recommendation
var recommendation = amendment.recommendation ? amendment.getRecommendationName() : '';
row.push('"' + recommendation + '"');
csvRows.push(row);
});
CsvDownload(csvRows, 'amendments-export.csv');