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

Merge pull request #3616 from emanuelschuetze/issue3613

Browse Source 
Adapt motion csv import example file (Fix #3613).
This commit is contained in:
Norman Jäckel 2018-03-04 20:58:50 +01:00 committed by GitHub
commit 15ad9340f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,6 @@ angular.module('OpenSlidesApp.motions.csv', [])
if (params.include.motionBlock) { if (params.include.motionBlock) {
headerline.push('Motion block'); headerline.push('Motion block');
} }
if (params.include.state) {
headerline.push('State');
}
if (params.include.recommendation) {
headerline.push('Recommendation');
}
return _.map(headerline, function (entry) { return _.map(headerline, function (entry) {
return gettextCatalog.getString(entry); return gettextCatalog.getString(entry);
}); });
@ -101,16 +95,6 @@ angular.module('OpenSlidesApp.motions.csv', [])
row.push('"' + blockTitle + '"'); row.push('"' + blockTitle + '"');
} }
// State
if (params.include.state) {
row.push('"' + motion.getStateName() + '"');
}
// Recommendation
if (params.include.recommendation) {
row.push('"' + motion.getRecommendationName() + '"');
}
csvRows.push(row); csvRows.push(row);
}); });
CsvDownload(csvRows, 'motions-export.csv'); CsvDownload(csvRows, 'motions-export.csv');
@ -126,9 +110,9 @@ angular.module('OpenSlidesApp.motions.csv', [])
recommendation: true, recommendation: true,
}}), }}),
// example entries // example entries
['A1', 'Title 1', 'Text 1', 'Reason 1', 'Submitter A', 'Category A', 'Last Year Conference A', 'Block A', 'permitted', ''], ['A1', 'Title 1', 'Text 1', 'Reason 1', 'Submitter A', 'Category A', 'Last Year Conference A', 'Block A'],
['B1', 'Title 2', 'Text 2', 'Reason 2', 'Submitter B', 'Category B', '', 'Block A', 'accepted', 'Acceptance'], ['B1', 'Title 2', 'Text 2', 'Reason 2', 'Submitter B', 'Category B', '', 'Block A'],
['' , 'Title 3', 'Text 3', '', '', '', '', '', '', ''], ['' , 'Title 3', 'Text 3', '', '', '', '', ''],
]; ];
CsvDownload(csvRows, 'motions-example.csv'); CsvDownload(csvRows, 'motions-example.csv');
}, },