Changed PDF documentProvider to accept images and some cleanup.

This commit is contained in:
FinnStutzenstein 2017-04-26 16:09:27 +02:00 committed by Emanuel Schütze
parent 2b94dc5942
commit fb45d30a34
13 changed files with 878 additions and 781 deletions

View File

@ -75,6 +75,24 @@ angular.module('OpenSlidesApp.agenda.pdf', ['OpenSlidesApp.core.pdf'])
createInstance: createInstance createInstance: createInstance
}; };
}]); }])
.factory('AgendaPdfExport', [
'gettextCatalog',
'AgendaContentProvider',
'PdfMakeDocumentProvider',
'PdfCreate',
function (gettextCatalog, AgendaContentProvider, PdfMakeDocumentProvider, PdfCreate) {
return {
export: function (items) {
var filename = gettextCatalog.getString('Agenda') + '.pdf';
var agendaContentProvider = AgendaContentProvider.createInstance(items);
PdfMakeDocumentProvider.createInstance(agendaContentProvider).then(function (documentProvider) {
PdfCreate.download(documentProvider.getDocument(), filename);
});
},
};
}
]);
}()); }());

View File

@ -89,17 +89,15 @@ angular.module('OpenSlidesApp.agenda.site', [
'AgendaTree', 'AgendaTree',
'Projector', 'Projector',
'ProjectionDefault', 'ProjectionDefault',
'AgendaContentProvider',
'PdfMakeDocumentProvider',
'gettextCatalog', 'gettextCatalog',
'gettext', 'gettext',
'osTableFilter', 'osTableFilter',
'AgendaCsvExport', 'AgendaCsvExport',
'PdfCreate', 'AgendaPdfExport',
'ErrorMessage', 'ErrorMessage',
function($scope, $filter, $http, $state, DS, operator, ngDialog, Agenda, TopicForm, function($scope, $filter, $http, $state, DS, operator, ngDialog, Agenda, TopicForm,
AgendaTree, Projector, ProjectionDefault, AgendaContentProvider, PdfMakeDocumentProvider, AgendaTree, Projector, ProjectionDefault, gettextCatalog, gettext, osTableFilter,
gettextCatalog, gettext, osTableFilter, AgendaCsvExport, PdfCreate, ErrorMessage) { AgendaCsvExport, AgendaPdfExport, ErrorMessage) {
// Bind agenda tree to the scope // Bind agenda tree to the scope
$scope.$watch(function () { $scope.$watch(function () {
return Agenda.lastModified(); return Agenda.lastModified();
@ -276,10 +274,7 @@ angular.module('OpenSlidesApp.agenda.site', [
}; };
// export // export
$scope.pdfExport = function () { $scope.pdfExport = function () {
var filename = gettextCatalog.getString('Agenda') + '.pdf'; AgendaPdfExport.export($scope.itemsFiltered);
var agendaContentProvider = AgendaContentProvider.createInstance($scope.itemsFiltered);
var documentProvider = PdfMakeDocumentProvider.createInstance(agendaContentProvider);
PdfCreate.download(documentProvider.getDocument(), filename);
}; };
$scope.csvExport = function () { $scope.csvExport = function () {
AgendaCsvExport.export($scope.itemsFiltered); AgendaCsvExport.export($scope.itemsFiltered);

View File

@ -262,7 +262,8 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('BallotContentProvider', [ .factory('BallotContentProvider', [
'$filter', '$filter',
@ -271,12 +272,12 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
'Config', 'Config',
'User', 'User',
function($filter, gettextCatalog, PDFLayout, Config, User) { function($filter, gettextCatalog, PDFLayout, Config, User) {
var createInstance = function(scope, poll, pollNumber) { var createInstance = function(assignment, poll, pollNumber) {
// page title // page title
var createTitle = function() { var createTitle = function() {
return { return {
text: scope.assignment.title, text: assignment.title,
style: 'title', style: 'title',
}; };
}; };
@ -480,7 +481,8 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('AssignmentCatalogContentProvider', [ .factory('AssignmentCatalogContentProvider', [
'gettextCatalog', 'gettextCatalog',
@ -555,6 +557,65 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]); }
])
.factory('AssignmentPdfExport', [
'gettextCatalog',
'AssignmentContentProvider',
'AssignmentCatalogContentProvider',
'PdfMakeDocumentProvider',
'BallotContentProvider',
'PdfMakeBallotPaperProvider',
'PdfCreate',
function (gettextCatalog, AssignmentContentProvider, AssignmentCatalogContentProvider,
PdfMakeDocumentProvider, BallotContentProvider, PdfMakeBallotPaperProvider, PdfCreate) {
return {
export: function (assignments, singleAssignment) {
var filename = singleAssignment ?
gettextCatalog.getString('Election') + '_' + assignments.title :
gettextCatalog.getString('Elections');
filename += '.pdf';
if (singleAssignment) {
assignments = [assignments];
}
var assignmentContentProviderArray = [];
// Convert the assignments to content providers
angular.forEach(assignments, function(assignment) {
assignmentContentProviderArray.push(AssignmentContentProvider.createInstance(assignment));
});
var documentProviderPromise;
if (singleAssignment) {
documentProviderPromise =
PdfMakeDocumentProvider.createInstance(assignmentContentProviderArray[0]);
} else {
var assignmentCatalogContentProvider =
AssignmentCatalogContentProvider.createInstance(assignmentContentProviderArray);
documentProviderPromise =
PdfMakeDocumentProvider.createInstance(assignmentCatalogContentProvider);
}
documentProviderPromise.then(function (documentProvider) {
PdfCreate.download(documentProvider.getDocument(), filename);
});
},
createBallotPdf: function (assignment, pollId) {
var thePoll;
var pollNumber;
angular.forEach(assignment.polls, function(poll, pollIndex) {
if (poll.id == pollId) {
thePoll = poll;
pollNumber = pollIndex+1;
}
});
var filename = gettextCatalog.getString('Ballot') + '_' + pollNumber + '_' + assignment.title + '.pdf';
var ballotContentProvider = BallotContentProvider.createInstance(assignment, thePoll, pollNumber);
var documentProvider = PdfMakeBallotPaperProvider.createInstance(ballotContentProvider);
PdfCreate.download(documentProvider.getDocument(), filename);
},
};
}
]);
}()); }());

View File

@ -265,18 +265,14 @@ angular.module('OpenSlidesApp.assignments.site', [
'Projector', 'Projector',
'ProjectionDefault', 'ProjectionDefault',
'gettextCatalog', 'gettextCatalog',
'AssignmentContentProvider',
'AssignmentCatalogContentProvider',
'PdfMakeDocumentProvider',
'User', 'User',
'osTableFilter', 'osTableFilter',
'osTableSort', 'osTableSort',
'gettext', 'gettext',
'PdfCreate',
'AssignmentPhases', 'AssignmentPhases',
'AssignmentPdfExport',
function($scope, ngDialog, AssignmentForm, Assignment, Tag, Agenda, Projector, ProjectionDefault, function($scope, ngDialog, AssignmentForm, Assignment, Tag, Agenda, Projector, ProjectionDefault,
gettextCatalog, AssignmentContentProvider, AssignmentCatalogContentProvider, PdfMakeDocumentProvider, gettextCatalog, User, osTableFilter, osTableSort, gettext, AssignmentPhases, AssignmentPdfExport) {
User, osTableFilter, osTableSort, gettext, PdfCreate, AssignmentPhases) {
Assignment.bindAll({}, $scope, 'assignments'); Assignment.bindAll({}, $scope, 'assignments');
Tag.bindAll({}, $scope, 'tags'); Tag.bindAll({}, $scope, 'tags');
$scope.$watch(function () { $scope.$watch(function () {
@ -383,20 +379,8 @@ angular.module('OpenSlidesApp.assignments.site', [
Assignment.destroy(assignment.id); Assignment.destroy(assignment.id);
}; };
// create the PDF List // create the PDF List
$scope.makePDF_assignmentList = function () { $scope.pdfExport = function () {
var filename = gettextCatalog.getString("Elections") + ".pdf"; AssignmentPdfExport.export($scope.assignmentsFiltered);
var assignmentContentProviderArray = [];
//convert the filtered assignments to content providers
angular.forEach($scope.assignmentsFiltered, function(assignment) {
assignmentContentProviderArray.push(AssignmentContentProvider.createInstance(assignment));
});
var assignmentCatalogContentProvider =
AssignmentCatalogContentProvider.createInstance(assignmentContentProviderArray);
var documentProvider =
PdfMakeDocumentProvider.createInstance(assignmentCatalogContentProvider);
PdfCreate.download(documentProvider.getDocument(), filename);
}; };
} }
]) ])
@ -416,18 +400,13 @@ angular.module('OpenSlidesApp.assignments.site', [
'assignmentId', 'assignmentId',
'Projector', 'Projector',
'ProjectionDefault', 'ProjectionDefault',
'AssignmentContentProvider',
'BallotContentProvider',
'PdfMakeDocumentProvider',
'PdfMakeBallotPaperProvider',
'gettextCatalog', 'gettextCatalog',
'PdfCreate',
'AssignmentPhases', 'AssignmentPhases',
'AssignmentPdfExport',
'ErrorMessage', 'ErrorMessage',
function($scope, $http, $filter, $timeout, filterFilter, gettext, ngDialog, AssignmentForm, operator, Assignment, function($scope, $http, $filter, $timeout, filterFilter, gettext, ngDialog, AssignmentForm, operator,
User, assignmentId, Projector, ProjectionDefault, AssignmentContentProvider, BallotContentProvider, Assignment, User, assignmentId, Projector, ProjectionDefault, gettextCatalog, AssignmentPhases,
PdfMakeDocumentProvider, PdfMakeBallotPaperProvider, gettextCatalog, PdfCreate, AssignmentPhases, AssignmentPdfExport, ErrorMessage) {
ErrorMessage) {
User.bindAll({}, $scope, 'users'); User.bindAll({}, $scope, 'users');
var assignment = Assignment.get(assignmentId); var assignment = Assignment.get(assignmentId);
Assignment.loadRelations(assignment, 'agenda_item'); Assignment.loadRelations(assignment, 'agenda_item');
@ -600,28 +579,13 @@ angular.module('OpenSlidesApp.assignments.site', [
}; };
//creates the document as pdf // Creates the document as pdf
$scope.makePDF_singleAssignment = function() { $scope.pdfExport = function() {
var filename = gettextCatalog.getString("Election") + "_" + $scope.assignment.title + ".pdf"; AssignmentPdfExport.export($scope.assignment, true);
var assignmentContentProvider = AssignmentContentProvider.createInstance($scope.assignment);
var documentProvider = PdfMakeDocumentProvider.createInstance(assignmentContentProvider);
PdfCreate.download(documentProvider.getDocument(), filename);
}; };
// Creates the ballotpaper as pdf
//creates the ballotpaper as pdf $scope.ballotpaperExport = function(pollId) {
$scope.makePDF_assignmentpoll = function(pollID) { AssignmentPdfExport.createBallotPdf($scope.assignment, pollId);
var thePoll;
var pollNumber;
angular.forEach($scope.assignment.polls, function(poll, pollIndex) {
if (poll.id == pollID) {
thePoll = poll;
pollNumber = pollIndex+1;
}
});
var filename = gettextCatalog.getString("Ballot") + "_" + pollNumber + "_" + $scope.assignment.title + ".pdf";
var ballotContentProvider = BallotContentProvider.createInstance($scope, thePoll, pollNumber);
var documentProvider = PdfMakeBallotPaperProvider.createInstance(ballotContentProvider);
PdfCreate.download(documentProvider.getDocument(), filename);
}; };
// Just mark some vote value strings for translation. // Just mark some vote value strings for translation.

View File

@ -21,7 +21,7 @@
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</a> </a>
<!-- pdf --> <!-- pdf -->
<a ng-click="makePDF_singleAssignment()" target="_blank" class="btn btn-default btn-sm"> <a ng-click="pdfExport()" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i> <i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate> <translate>PDF</translate>
</a> </a>
@ -152,7 +152,7 @@
<!-- angular requires to open the link in new tab with "target='_blank'". <!-- angular requires to open the link in new tab with "target='_blank'".
Otherwise the pdf url can't be open in same window; angular redirects to "/". --> Otherwise the pdf url can't be open in same window; angular redirects to "/". -->
<!-- PDF --> <!-- PDF -->
<a ng-click="makePDF_assignmentpoll(poll.id)" target="_blank" class="btn btn-default btn-sm"> <a ng-click="ballotpaperExport(poll.id)" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o"></i> <i class="fa fa-file-pdf-o"></i>
<translate>Print ballot paper</translate> <translate>Print ballot paper</translate>
</a> </a>

View File

@ -39,7 +39,7 @@
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownExport"> <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownExport">
<!-- PDF export --> <!-- PDF export -->
<li> <li>
<a href="" ng-click="makePDF_assignmentList()"> <a href="" ng-click="pdfExport()">
<i class="fa fa-file-pdf-o"></i> <i class="fa fa-file-pdf-o"></i>
<translate>PDF</translate> <translate>PDF</translate>
</a> </a>

View File

@ -250,7 +250,7 @@ def get_config_variables():
group='Logo', group='Logo',
hidden=True) hidden=True)
#PDF logos # PDF logos
yield ConfigVariable( yield ConfigVariable(
name='logo_pdf_header', name='logo_pdf_header',
default_value={ default_value={

View File

@ -96,9 +96,14 @@ self.addEventListener('message', function(e) {
// see https://github.com/bpampuch/pdfmake/issues/38 // see https://github.com/bpampuch/pdfmake/issues/38
if (data.footerTpl) { if (data.footerTpl) {
data.footer = function (currentPage, pageCount) { data.footer = function (currentPage, pageCount) {
var footerText = data.footerTpl.text var footerText = '';
for(var i = 0; i < data.footerTpl.columns.length; i++) {
if (data.footerTpl.columns[i].text) {
footerText = data.footerTpl.columns[i].text
.replace('{{currentPage}}', currentPage) .replace('{{currentPage}}', currentPage)
.replace('{{pageCount}}', pageCount); .replace('{{pageCount}}', pageCount);
}
}
return { return {
text: footerText, text: footerText,
alignment: data.footerTpl.alignment, alignment: data.footerTpl.alignment,

View File

@ -135,9 +135,11 @@ angular.module('OpenSlidesApp.core.pdf', [])
.factory('PdfMakeDocumentProvider', [ .factory('PdfMakeDocumentProvider', [
'$q',
'Config', 'Config',
'PDFLayout', 'PDFLayout',
function(Config, PDFLayout) { 'PdfImageConverter',
function($q, Config, PDFLayout, PdfImageConverter) {
/** /**
* Provides the global document * Provides the global document
* @constructor * @constructor
@ -145,16 +147,20 @@ angular.module('OpenSlidesApp.core.pdf', [])
* returns an array for content * returns an array for content
*/ */
//images shall contain the the logos as URL: base64Str, just like the converter //images shall contain the the logos as URL: base64Str, just like the converter
var createInstance = function(contentProvider, images) { var createInstance = function(contentProvider) {
// Logo urls
var logoHeaderUrl = Config.get('logo_pdf_header').value.path,
logoFooterUrl = Config.get('logo_pdf_footer').value.path;
var imageMap = {};
// PDF header // PDF header
var getHeader = function() { var getHeader = function() {
var columns = []; var columns = [];
var logoUrl = Config.get('logo_pdf_header').value.path;
if (logoUrl) { if (logoHeaderUrl) {
columns.push({ columns.push({
image: images[logoUrl], image: imageMap[logoHeaderUrl],
fit: [180,40] fit: [180, 40],
}); });
} }
@ -169,15 +175,15 @@ angular.module('OpenSlidesApp.core.pdf', [])
var text = [line1, line2].join('\n'); var text = [line1, line2].join('\n');
columns.push({ columns.push({
text: text, text: text,
fontSize:10, fontSize: 10,
width: '100%' width: '100%',
}); });
return { return {
color: '#555', color: '#555',
fontSize: 9, fontSize: 9,
margin: [75, 30, 75, 10], // [left, top, right, bottom] margin: [75, 30, 75, 10], // [left, top, right, bottom]
columns: columns, columns: columns,
columnGap: 10 columnGap: 10,
}; };
}; };
@ -186,12 +192,26 @@ angular.module('OpenSlidesApp.core.pdf', [])
// Used placeholder for currentPage and pageCount which // Used placeholder for currentPage and pageCount which
// are replaced by dynamic footer function in pdf-worker.js. // are replaced by dynamic footer function in pdf-worker.js.
var getFooter = function() { var getFooter = function() {
var columns = [];
// TODO: This does't work. The image does not get rendered.
if (logoFooterUrl) {
columns.push({
image: imageMap[logoFooterUrl],
fit: [180,40],
});
}
columns.push({
text: '{{currentPage}} / {{pageCount}}',
width: '100%',
});
return { return {
alignment: 'right', alignment: 'right',
margin: [0, 15, 75, 0], margin: [0, 15, 75, 0],
fontSize: 9, fontSize: 9,
color: '#555', color: '#555',
text: '{{currentPage}} / {{pageCount}}' columns: columns,
columnGap: 10,
}; };
}; };
// Generates the document(definition) for pdfMake // Generates the document(definition) for pdfMake
@ -296,9 +316,18 @@ angular.module('OpenSlidesApp.core.pdf', [])
}; };
}; };
return { return $q(function (resolve) {
var imageSources = [
logoHeaderUrl,
logoFooterUrl
];
PdfImageConverter.toBase64(imageSources).then(function (_imageMap) {
imageMap = _imageMap;
resolve({
getDocument: getDocument getDocument: getDocument
}; });
});
});
}; };
return { return {
createInstance: createInstance createInstance: createInstance
@ -862,7 +891,34 @@ angular.module('OpenSlidesApp.core.pdf', [])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('PdfImageConverter', [
'$q',
'PDFLayout',
function ($q, PDFLayout) {
return {
toBase64: function (imageSources) {
var imageMap = {};
var imagePromises = _.map(imageSources, function (imageSource) {
if (imageSource) {
return PDFLayout.imageURLtoBase64(imageSource).then(function (base64Str) {
imageMap[imageSource] = base64Str;
});
}
});
return $q(function (resolve) {
//resolve promises to get base64
$q.all(imagePromises).then(function() {
resolve(imageMap);
});
});
}
};
}
])
.factory('PdfCreate', [ .factory('PdfCreate', [
'$timeout', '$timeout',

View File

@ -321,7 +321,6 @@
ng-mouseleave="mediafile.logoHover=false" ng-mouseleave="mediafile.logoHover=false"
ng-show="mediafile.canBeUsedAsLogo()"> ng-show="mediafile.canBeUsedAsLogo()">
<span uib-dropdown> <span uib-dropdown>
<<<<<<< e1a95588e7f81cf06db3e753be82bc17a125d059
<span id="dropdownLogo{{ mediafile.id }}" class="pointer nobr" uib-dropdown-toggle> <span id="dropdownLogo{{ mediafile.id }}" class="pointer nobr" uib-dropdown-toggle>
<span uib-tooltip="{{ 'Manage logos' | translate }}" tooltip-class="nobr"> <span uib-tooltip="{{ 'Manage logos' | translate }}" tooltip-class="nobr">
<span ng-if="!mediafile.isUsedAsLogo()" ng-show="mediafile.hover"> <span ng-if="!mediafile.isUsedAsLogo()" ng-show="mediafile.hover">
@ -336,29 +335,13 @@
{{ logo.display_name | translate }}<span ng-if="!$last">,</br></span> {{ logo.display_name | translate }}<span ng-if="!$last">,</br></span>
</small> </small>
</span> </span>
=======
<span id="dropdownLogo{{ mediafile.id }}" class="pointer nobr"
uib-dropdown-toggle uib-tooltip="{{ 'Manage logos' | translate }}"
tooltip-class="nobr">
<span ng-if="!mediafile.isUsedAsLogo()" ng-show="mediafile.hover">
<i class="fa fa-picture-o"></i>
<i class="fa fa-plus"></i>
</span>
<span ng-if="mediafile.isUsedAsLogo()">
<i class="fa fa-picture-o spacer-right"></i>
<span ng-repeat="logo in mediafile.getLogos()">
<small>
{{ logo.display_name }}
</small>
<span ng-if="!$last"><br /><i class="fa fa-picture-o spacer-right"></i></span>
>>>>>>> add logos in PDF (WIP)
</span> </span>
</span> </span>
<span ng-if="hasProjectorHeaderLogo(mediafile) && mediafile.logoHover" <span ng-if="hasProjectorHeaderLogo(mediafile) && mediafile.logoHover"
uib-tooltip="{{ 'The projector header should have a default size of 1024x70px. Adapt the image width if you change the projector resolution.' | translate }}"> uib-tooltip="{{ 'The projector header should have a default size of 1024x70px. Adapt the image width if you change the projector resolution.' | translate }}">
<i class="fa fa-info-circle"></i> <i class="fa fa-info-circle"></i>
</span> </span>
<i class="fa fa-cog fa-lg spacer-left" ng-show="mediafile.logoHover"></i> <i class="fa fa-cog fa-lg spacer-left" ng-show="mediafile.logoHover && mediafile.isUsedAsLogo()"></i>
</span> </span>
<ul class="dropdown-menu" aria-labelledby="dropdownLogos{{ mediafile.id }}"> <ul class="dropdown-menu" aria-labelledby="dropdownLogos{{ mediafile.id }}">
<li ng-repeat="logo in logos"> <li ng-repeat="logo in logos">

View File

@ -5,21 +5,38 @@
angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
.factory('MotionContentProvider', [ .factory('MotionContentProvider', [
'$q',
'operator', 'operator',
'gettextCatalog', 'gettextCatalog',
'PDFLayout', 'PDFLayout',
'PdfMakeConverter',
'PdfImageConverter',
'HTMLValidizer',
'Category', 'Category',
'Config', 'Config',
'Motion', 'Motion',
function(operator, gettextCatalog, PDFLayout, Category, Config, Motion) { function($q, operator, gettextCatalog, PDFLayout, PdfMakeConverter, PdfImageConverter, HTMLValidizer, Category, Config, Motion) {
/** /**
* Provides the content as JS objects for Motions in pdfMake context * Provides the content as JS objects for Motions in pdfMake context
* @constructor * @constructor
*/ */
var createInstance = function(converter, motion, motionVersion, changeRecommendationMode, var createInstance = function(motion, motionVersion, changeRecommendationMode,
changeRecommendations, lineNumberMode, includeReason, includeComments) { changeRecommendations, lineNumberMode, includeReason, includeComments) {
var converter;
// Query all image sources from motion text and reason
// TODO: Do we need images for comments here too??
var getImageSources = function () {
var text = motion.getTextByMode(changeRecommendationMode, null);
var content = HTMLValidizer.validize(text) + HTMLValidizer.validize(motion.getReason());
var map = Function.prototype.call.bind([].map);
return map($(content).find('img'), function(element) {
return element.getAttribute('src');
});
};
// title // title
var identifier = motion.identifier ? ' ' + motion.identifier : ''; var identifier = motion.identifier ? ' ' + motion.identifier : '';
var title = PDFLayout.createTitle( var title = PDFLayout.createTitle(
@ -254,7 +271,6 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
}; };
}; };
// motion text (with line-numbers) // motion text (with line-numbers)
var motionText = function() { var motionText = function() {
var motionTextContent = motion.getTextByMode(changeRecommendationMode, motionVersion); var motionTextContent = motion.getTextByMode(changeRecommendationMode, motionVersion);
@ -303,19 +319,6 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
} }
}; };
// getters
var getTitle = function() {
return motion.getTitle(motionVersion);
};
var getIdentifier = function() {
return motion.identifier ? motion.identifier : '';
};
var getCategory = function() {
return motion.category;
};
// Generates content as a pdfmake consumable // Generates content as a pdfmake consumable
var getContent = function() { var getContent = function() {
var content = [ var content = [
@ -336,18 +339,38 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
} }
return content; return content;
}; };
return {
// getters
var getTitle = function() {
return motion.getTitle(motionVersion);
};
var getIdentifier = function() {
return motion.identifier ? motion.identifier : '';
};
var getCategory = function() {
return motion.category;
};
return $q(function (resolve) {
PdfImageConverter.toBase64(getImageSources()).then(function (imageMap) {
converter = PdfMakeConverter.createInstance(imageMap);
resolve({
getContent: getContent, getContent: getContent,
getTitle: getTitle, getTitle: getTitle,
getIdentifier: getIdentifier, getIdentifier: getIdentifier,
getCategory: getCategory getCategory: getCategory
}; });
});
});
}; };
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('PollContentProvider', [ .factory('PollContentProvider', [
'PDFLayout', 'PDFLayout',
@ -459,7 +482,8 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('MotionCatalogContentProvider', [ .factory('MotionCatalogContentProvider', [
'gettextCatalog', 'gettextCatalog',
@ -467,7 +491,6 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
'Category', 'Category',
'Config', 'Config',
function(gettextCatalog, PDFLayout, Category, Config) { function(gettextCatalog, PDFLayout, Category, Config) {
/** /**
* Constructor * Constructor
* @function * @function
@ -601,7 +624,8 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}]) }
])
.factory('MotionPdfExport', [ .factory('MotionPdfExport', [
'$http', '$http',
@ -633,7 +657,6 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
includeReason: true, includeReason: true,
includeComments: false, includeComments: false,
}); });
var image_sources = [];
if (singleMotion) { if (singleMotion) {
_.defaults(params, { _.defaults(params, {
@ -653,49 +676,34 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
'where': {'motion_version_id': {'==': motion.active_version}} 'where': {'motion_version_id': {'==': motion.active_version}}
}); });
} }
var text = motion.getTextByMode(params.changeRecommendationMode, null);
var content = HTMLValidizer.validize(text) + HTMLValidizer.validize(motion.getReason());
var map = Function.prototype.call.bind([].map);
var tmp_image_sources = map($(content).find('img'), function(element) {
return element.getAttribute('src');
});
image_sources = image_sources.concat(tmp_image_sources);
}); });
var imageMap = {}; var motionContentProviderArray = [];
var imagePromises = _.map(image_sources, function (image_source) { var motionContentProviderPromises = _.map(motions, function (motion) {
return PDFLayout.imageURLtoBase64(image_source).then(function (base64Str) { var version = (singleMotion ? params.version : motion.active_version);
imageMap[image_source] = base64Str; return MotionContentProvider.createInstance(
motion, version, params.changeRecommendationMode,
motion.changeRecommendations, params.lineNumberMode,
params.includeReason, params.includeComments
).then(function (contentProvider) {
motionContentProviderArray.push(contentProvider);
}); });
}); });
return $q(function (resolve) { return $q(function (resolve) {
//resolve promises to get base64 $q.all(motionContentProviderPromises).then(function() {
$q.all(imagePromises).then(function(base64Str) { var documentProviderPromise;
var converter = PdfMakeConverter.createInstance(imageMap);
var motionContentProviderArray = [];
//convert all motions to motionContentProviders
angular.forEach(motions, function (motion) {
var version = (singleMotion ? params.version : motion.active_version);
motionContentProviderArray.push(MotionContentProvider.createInstance(
converter, motion, version, params.changeRecommendationMode,
motion.changeRecommendations, params.lineNumberMode,
params.includeReason, params.includeComments
));
});
var documentProvider;
if (singleMotion) { if (singleMotion) {
documentProvider = PdfMakeDocumentProvider.createInstance(motionContentProviderArray[0]); documentProviderPromise = PdfMakeDocumentProvider.createInstance(motionContentProviderArray[0]);
} else { } else {
var motionCatalogContentProvider = MotionCatalogContentProvider.createInstance(motionContentProviderArray); var motionCatalogContentProvider = MotionCatalogContentProvider.createInstance(motionContentProviderArray);
documentProvider = PdfMakeDocumentProvider.createInstance(motionCatalogContentProvider); documentProviderPromise = PdfMakeDocumentProvider.createInstance(motionCatalogContentProvider);
} }
documentProviderPromise.then(function (documentProvider) {
resolve(documentProvider); resolve(documentProvider);
}); });
}); });
});
}, },
export: function (motions, params, singleMotion) { export: function (motions, params, singleMotion) {
_.defaults(params, { _.defaults(params, {

View File

@ -102,15 +102,16 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}
}]) ])
.factory('UserAccessDataListContentProvider', [ .factory('UserAccessDataListContentProvider', [
'gettextCatalog', 'gettextCatalog',
'PDFLayout', 'PDFLayout',
function(gettextCatalog, PDFLayout) { 'Config',
function(gettextCatalog, PDFLayout, Config) {
var createInstance = function(userList, groups, Config) { var createInstance = function(userList) {
var creadeUserHeadLine = function(user) { var creadeUserHeadLine = function(user) {
var titleLine = []; var titleLine = [];
@ -256,14 +257,17 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
var getContent = function() { var getContent = function() {
var content = []; var content = [];
angular.forEach(userList, function (user) { angular.forEach(userList, function (user, index) {
content.push(creadeUserHeadLine(user)); content.push(creadeUserHeadLine(user));
content.push(createAccessDataContent(user)); content.push(createAccessDataContent(user));
content.push(createWelcomeText()); content.push(createWelcomeText());
// No pagebreak after the last user
if (index !== userList.length - 1) {
content.push({ content.push({
text: '', text: '',
pageBreak: 'after' pageBreak: 'after'
}); });
}
}); });
return [ return [
@ -280,5 +284,38 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf'])
createInstance: createInstance createInstance: createInstance
}; };
} }
])
.factory('UserPdfExport', [
'gettextCatalog',
'UserListContentProvider',
'UserAccessDataListContentProvider',
'PdfMakeDocumentProvider',
'PdfCreate',
function (gettextCatalog, UserListContentProvider, UserAccessDataListContentProvider, PdfMakeDocumentProvider, PdfCreate) {
return {
exportUserList: function (users) {
var filename = gettextCatalog.getString('List of participants') + '.pdf';
var userListContentProvider = UserListContentProvider.createInstance(users);
PdfMakeDocumentProvider.createInstance(userListContentProvider).then(
function (documentProvider) {
PdfCreate.download(documentProvider.getDocument(), filename);
}
);
},
exportUserAccessDataList: function (users) {
var filename = gettextCatalog.getString('List of access data') + '.pdf';
var userAccessDataListContentProvider = UserAccessDataListContentProvider.createInstance(
users);
PdfMakeDocumentProvider.createInstance(userAccessDataListContentProvider).then(
function (documentProvider) {
var noFooter = true;
PdfCreate.download(documentProvider.getDocument(noFooter), filename);
}
);
}
};
}
]); ]);
}()); }());

View File

@ -478,6 +478,7 @@ angular.module('OpenSlidesApp.users.site', [
'$scope', '$scope',
'$state', '$state',
'$http', '$http',
'$q',
'ngDialog', 'ngDialog',
'UserForm', 'UserForm',
'User', 'User',
@ -485,21 +486,15 @@ angular.module('OpenSlidesApp.users.site', [
'PasswordGenerator', 'PasswordGenerator',
'Projector', 'Projector',
'ProjectionDefault', 'ProjectionDefault',
'UserListContentProvider',
'Config', 'Config',
'UserAccessDataListContentProvider',
'PdfMakeDocumentProvider',
'gettextCatalog', 'gettextCatalog',
'UserCsvExport', 'UserCsvExport',
'osTableFilter', 'osTableFilter',
'osTableSort', 'osTableSort',
'gettext', 'gettext',
'PdfCreate', 'UserPdfExport',
'PDFLayout', function($scope, $state, $http, $q, ngDialog, UserForm, User, Group, PasswordGenerator, Projector, ProjectionDefault,
'$q', Config, gettextCatalog, UserCsvExport, osTableFilter, osTableSort, gettext, UserPdfExport) {
function($scope, $state, $http, ngDialog, UserForm, User, Group, PasswordGenerator, Projector, ProjectionDefault,
UserListContentProvider, Config, UserAccessDataListContentProvider, PdfMakeDocumentProvider, gettextCatalog,
UserCsvExport, osTableFilter, osTableSort, gettext, PdfCreate, PDFLayout, $q) {
User.bindAll({}, $scope, 'users'); User.bindAll({}, $scope, 'users');
Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups'); Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups');
$scope.$watch(function () { $scope.$watch(function () {
@ -687,35 +682,10 @@ angular.module('OpenSlidesApp.users.site', [
// Export as PDF // Export as PDF
$scope.pdfExportUserList = function () { $scope.pdfExportUserList = function () {
var imageMap = {}; UserPdfExport.exportUserList($scope.usersFiltered);
var imagePromises = [];
var imageSources = [];
imageSources.push(Config.get('logo_pdf_header').value.path);
imageSources.push(Config.get('logo_pdf_footer').value.path);
imagePromises = _.map(imageSources, function (image_source) {
return PDFLayout.imageURLtoBase64(image_source).then(function (base64Str) {
imageMap[image_source] = base64Str;
});
});
return $q(function (resolve) {
$q.all(imagePromises).then(function(base64Str) {
var filename = gettextCatalog.getString("List of participants")+".pdf";
var userListContentProvider = UserListContentProvider.createInstance($scope.usersFiltered, $scope.groups);
var documentProvider = PdfMakeDocumentProvider.createInstance(userListContentProvider, imageMap);
PdfCreate.download(documentProvider.getDocument(), filename);
});
});
}; };
$scope.pdfExportUserAccessDataList = function () { $scope.pdfExportUserAccessDataList = function () {
var filename = gettextCatalog.getString("List of access data")+".pdf"; UserPdfExport.exportUserAccessDataList($scope.usersFiltered);
var userAccessDataListContentProvider = UserAccessDataListContentProvider.createInstance(
$scope.usersFiltered, $scope.groups, Config);
var documentProvider = PdfMakeDocumentProvider.createInstance(userAccessDataListContentProvider);
var noFooter = true;
PdfCreate.download(documentProvider.getDocument(noFooter), filename);
}; };
// Export as a csv file // Export as a csv file
$scope.csvExport = function () { $scope.csvExport = function () {