From 2b94dc5942a256e7a81dba804a24ddf74098bd48 Mon Sep 17 00:00:00 2001 From: Sean Engelhardt Date: Wed, 19 Apr 2017 14:56:15 +0200 Subject: [PATCH 1/3] Added configurable header and footer logos for PDF. --- openslides/core/config_variables.py | 25 ++++++++++++++- openslides/core/static/js/core/pdf.js | 20 ++++++------ .../templates/mediafiles/mediafile-list.html | 17 ++++++++++ openslides/users/static/js/users/site.js | 31 +++++++++++++++---- 4 files changed, 76 insertions(+), 17 deletions(-) diff --git a/openslides/core/config_variables.py b/openslides/core/config_variables.py index 58cb779f2..997e8685e 100644 --- a/openslides/core/config_variables.py +++ b/openslides/core/config_variables.py @@ -223,7 +223,9 @@ def get_config_variables(): name='logos_available', default_value=[ 'logo_projector_main', - 'logo_projector_header'], + 'logo_projector_header', + 'logo_pdf_header', + 'logo_pdf_footer'], weight=300, group='Logo', hidden=True) @@ -247,3 +249,24 @@ def get_config_variables(): weight=302, group='Logo', hidden=True) + + #PDF logos + yield ConfigVariable( + name='logo_pdf_header', + default_value={ + 'display_name': 'Header PDF logo', + 'path': ''}, + input_type='logo', + weight=310, + group='Logo', + hidden=True) + + yield ConfigVariable( + name='logo_pdf_footer', + default_value={ + 'display_name': 'Footer PDF logo', + 'path': ''}, + input_type='logo', + weight=311, + group='Logo', + hidden=True) diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js index 8e02663ac..0bd2faf99 100644 --- a/openslides/core/static/js/core/pdf.js +++ b/openslides/core/static/js/core/pdf.js @@ -144,18 +144,19 @@ angular.module('OpenSlidesApp.core.pdf', []) * @param {object} contentProvider - Object with on method `getContent`, which * returns an array for content */ - var createInstance = function(contentProvider) { + //images shall contain the the logos as URL: base64Str, just like the converter + var createInstance = function(contentProvider, images) { // PDF header var getHeader = function() { var columns = []; + var logoUrl = Config.get('logo_pdf_header').value.path; - // add here your custom logo (which has to be added to a custom vfs_fonts.js) - // see https://github.com/pdfmake/pdfmake/wiki/Custom-Fonts---client-side - /* - columns.push({ - image: 'logo.png', - fit: [180,40] - });*/ + if (logoUrl) { + columns.push({ + image: images[logoUrl], + fit: [180,40] + }); + } var line1 = [ Config.translate(Config.get('general_event_name').value), @@ -768,7 +769,7 @@ angular.module('OpenSlidesApp.core.pdf', []) height *= scaleByHeight; } alreadyConverted.push({ - image: BaseMap[element.getAttribute("src")], + image: images[element.getAttribute("src")], width: width, height: height }); @@ -837,7 +838,6 @@ angular.module('OpenSlidesApp.core.pdf', []) ParseHtml(content, html); return content; }, - BaseMap = images, /** * Creates containerelements for pdfMake * e.g create("text":"MyText") result in { text: "MyText" } diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html index c76c40676..4b756399d 100644 --- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html +++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html @@ -321,6 +321,7 @@ ng-mouseleave="mediafile.logoHover=false" ng-show="mediafile.canBeUsedAsLogo()"> +<<<<<<< e1a95588e7f81cf06db3e753be82bc17a125d059 @@ -335,6 +336,22 @@ {{ logo.display_name | translate }},
 +======= + + + + + + + + + + {{ logo.display_name }} + +
+>>>>>>> add logos in PDF (WIP) ': 1}}}, $scope, 'groups'); $scope.$watch(function () { @@ -685,10 +687,27 @@ angular.module('OpenSlidesApp.users.site', [ // Export as PDF $scope.pdfExportUserList = function () { - var filename = gettextCatalog.getString("List of participants")+".pdf"; - var userListContentProvider = UserListContentProvider.createInstance($scope.usersFiltered, $scope.groups); - var documentProvider = PdfMakeDocumentProvider.createInstance(userListContentProvider); - PdfCreate.download(documentProvider.getDocument(), filename); + var imageMap = {}; + 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 () { var filename = gettextCatalog.getString("List of access data")+".pdf"; @@ -1506,7 +1525,7 @@ angular.module('OpenSlidesApp.users.site', [ }, function (error) { // Error: Username or password is not correct. - $state.transitionTo($state.current, {msg: error.data.detail}, { + $state.transitionTo($state.current, {msg: error.data.detail}, { reload: true, inherit: false, notify: true }); } From fb45d30a34a075609d92cdf9ad79cf4fe7cd479e Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Wed, 26 Apr 2017 16:09:27 +0200 Subject: [PATCH 2/3] Changed PDF documentProvider to accept images and some cleanup. --- openslides/agenda/static/js/agenda/pdf.js | 20 +- openslides/agenda/static/js/agenda/site.js | 13 +- .../assignments/static/js/assignments/pdf.js | 89 +- .../assignments/static/js/assignments/site.js | 64 +- .../assignments/assignment-detail.html | 4 +- .../assignments/assignment-list.html | 2 +- openslides/core/config_variables.py | 2 +- openslides/core/static/js/core/pdf-worker.js | 11 +- openslides/core/static/js/core/pdf.js | 84 +- .../templates/mediafiles/mediafile-list.html | 19 +- openslides/motions/static/js/motions/pdf.js | 1102 +++++++++-------- openslides/users/static/js/users/pdf.js | 207 ++-- openslides/users/static/js/users/site.js | 42 +- 13 files changed, 878 insertions(+), 781 deletions(-) diff --git a/openslides/agenda/static/js/agenda/pdf.js b/openslides/agenda/static/js/agenda/pdf.js index 841ba0364..28e957cef 100644 --- a/openslides/agenda/static/js/agenda/pdf.js +++ b/openslides/agenda/static/js/agenda/pdf.js @@ -75,6 +75,24 @@ angular.module('OpenSlidesApp.agenda.pdf', ['OpenSlidesApp.core.pdf']) 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); + }); + }, + }; + } +]); }()); diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 9d68f685a..73b04808e 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -89,17 +89,15 @@ angular.module('OpenSlidesApp.agenda.site', [ 'AgendaTree', 'Projector', 'ProjectionDefault', - 'AgendaContentProvider', - 'PdfMakeDocumentProvider', 'gettextCatalog', 'gettext', 'osTableFilter', 'AgendaCsvExport', - 'PdfCreate', + 'AgendaPdfExport', 'ErrorMessage', function($scope, $filter, $http, $state, DS, operator, ngDialog, Agenda, TopicForm, - AgendaTree, Projector, ProjectionDefault, AgendaContentProvider, PdfMakeDocumentProvider, - gettextCatalog, gettext, osTableFilter, AgendaCsvExport, PdfCreate, ErrorMessage) { + AgendaTree, Projector, ProjectionDefault, gettextCatalog, gettext, osTableFilter, + AgendaCsvExport, AgendaPdfExport, ErrorMessage) { // Bind agenda tree to the scope $scope.$watch(function () { return Agenda.lastModified(); @@ -276,10 +274,7 @@ angular.module('OpenSlidesApp.agenda.site', [ }; // export $scope.pdfExport = function () { - var filename = gettextCatalog.getString('Agenda') + '.pdf'; - var agendaContentProvider = AgendaContentProvider.createInstance($scope.itemsFiltered); - var documentProvider = PdfMakeDocumentProvider.createInstance(agendaContentProvider); - PdfCreate.download(documentProvider.getDocument(), filename); + AgendaPdfExport.export($scope.itemsFiltered); }; $scope.csvExport = function () { AgendaCsvExport.export($scope.itemsFiltered); diff --git a/openslides/assignments/static/js/assignments/pdf.js b/openslides/assignments/static/js/assignments/pdf.js index d27f36c48..4f5df21c8 100644 --- a/openslides/assignments/static/js/assignments/pdf.js +++ b/openslides/assignments/static/js/assignments/pdf.js @@ -259,10 +259,11 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) }; }; - return { - createInstance: createInstance - }; -}]) + return { + createInstance: createInstance + }; + } +]) .factory('BallotContentProvider', [ '$filter', @@ -271,12 +272,12 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) 'Config', 'User', function($filter, gettextCatalog, PDFLayout, Config, User) { - var createInstance = function(scope, poll, pollNumber) { + var createInstance = function(assignment, poll, pollNumber) { // page title var createTitle = function() { return { - text: scope.assignment.title, + text: assignment.title, style: 'title', }; }; @@ -477,10 +478,11 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) }; }; - return { - createInstance: createInstance - }; -}]) + return { + createInstance: createInstance + }; + } +]) .factory('AssignmentCatalogContentProvider', [ 'gettextCatalog', @@ -552,9 +554,68 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) }; }; - return { - createInstance: createInstance - }; -}]); + return { + 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); + }, + }; + } +]); }()); diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index 1a5416af6..6a639ce3f 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -265,18 +265,14 @@ angular.module('OpenSlidesApp.assignments.site', [ 'Projector', 'ProjectionDefault', 'gettextCatalog', - 'AssignmentContentProvider', - 'AssignmentCatalogContentProvider', - 'PdfMakeDocumentProvider', 'User', 'osTableFilter', 'osTableSort', 'gettext', - 'PdfCreate', 'AssignmentPhases', + 'AssignmentPdfExport', function($scope, ngDialog, AssignmentForm, Assignment, Tag, Agenda, Projector, ProjectionDefault, - gettextCatalog, AssignmentContentProvider, AssignmentCatalogContentProvider, PdfMakeDocumentProvider, - User, osTableFilter, osTableSort, gettext, PdfCreate, AssignmentPhases) { + gettextCatalog, User, osTableFilter, osTableSort, gettext, AssignmentPhases, AssignmentPdfExport) { Assignment.bindAll({}, $scope, 'assignments'); Tag.bindAll({}, $scope, 'tags'); $scope.$watch(function () { @@ -383,20 +379,8 @@ angular.module('OpenSlidesApp.assignments.site', [ Assignment.destroy(assignment.id); }; // create the PDF List - $scope.makePDF_assignmentList = function () { - var filename = gettextCatalog.getString("Elections") + ".pdf"; - 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); + $scope.pdfExport = function () { + AssignmentPdfExport.export($scope.assignmentsFiltered); }; } ]) @@ -416,18 +400,13 @@ angular.module('OpenSlidesApp.assignments.site', [ 'assignmentId', 'Projector', 'ProjectionDefault', - 'AssignmentContentProvider', - 'BallotContentProvider', - 'PdfMakeDocumentProvider', - 'PdfMakeBallotPaperProvider', 'gettextCatalog', - 'PdfCreate', 'AssignmentPhases', + 'AssignmentPdfExport', 'ErrorMessage', - function($scope, $http, $filter, $timeout, filterFilter, gettext, ngDialog, AssignmentForm, operator, Assignment, - User, assignmentId, Projector, ProjectionDefault, AssignmentContentProvider, BallotContentProvider, - PdfMakeDocumentProvider, PdfMakeBallotPaperProvider, gettextCatalog, PdfCreate, AssignmentPhases, - ErrorMessage) { + function($scope, $http, $filter, $timeout, filterFilter, gettext, ngDialog, AssignmentForm, operator, + Assignment, User, assignmentId, Projector, ProjectionDefault, gettextCatalog, AssignmentPhases, + AssignmentPdfExport, ErrorMessage) { User.bindAll({}, $scope, 'users'); var assignment = Assignment.get(assignmentId); Assignment.loadRelations(assignment, 'agenda_item'); @@ -600,28 +579,13 @@ angular.module('OpenSlidesApp.assignments.site', [ }; - //creates the document as pdf - $scope.makePDF_singleAssignment = function() { - var filename = gettextCatalog.getString("Election") + "_" + $scope.assignment.title + ".pdf"; - var assignmentContentProvider = AssignmentContentProvider.createInstance($scope.assignment); - var documentProvider = PdfMakeDocumentProvider.createInstance(assignmentContentProvider); - PdfCreate.download(documentProvider.getDocument(), filename); + // Creates the document as pdf + $scope.pdfExport = function() { + AssignmentPdfExport.export($scope.assignment, true); }; - - //creates the ballotpaper as pdf - $scope.makePDF_assignmentpoll = function(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); + // Creates the ballotpaper as pdf + $scope.ballotpaperExport = function(pollId) { + AssignmentPdfExport.createBallotPdf($scope.assignment, pollId); }; // Just mark some vote value strings for translation. diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html index d9b40a250..28cd8787d 100644 --- a/openslides/assignments/static/templates/assignments/assignment-detail.html +++ b/openslides/assignments/static/templates/assignments/assignment-detail.html @@ -21,7 +21,7 @@ - + PDF @@ -152,7 +152,7 @@ - + Print ballot paper diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html index d8f61a412..313bf9802 100644 --- a/openslides/assignments/static/templates/assignments/assignment-list.html +++ b/openslides/assignments/static/templates/assignments/assignment-list.html @@ -39,7 +39,7 @@
  • - + PDF diff --git a/openslides/core/config_variables.py b/openslides/core/config_variables.py index 997e8685e..b4221d981 100644 --- a/openslides/core/config_variables.py +++ b/openslides/core/config_variables.py @@ -250,7 +250,7 @@ def get_config_variables(): group='Logo', hidden=True) - #PDF logos + # PDF logos yield ConfigVariable( name='logo_pdf_header', default_value={ diff --git a/openslides/core/static/js/core/pdf-worker.js b/openslides/core/static/js/core/pdf-worker.js index d91f990cd..a83fcc574 100644 --- a/openslides/core/static/js/core/pdf-worker.js +++ b/openslides/core/static/js/core/pdf-worker.js @@ -96,9 +96,14 @@ self.addEventListener('message', function(e) { // see https://github.com/bpampuch/pdfmake/issues/38 if (data.footerTpl) { data.footer = function (currentPage, pageCount) { - var footerText = data.footerTpl.text - .replace('{{currentPage}}', currentPage) - .replace('{{pageCount}}', pageCount); + 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('{{pageCount}}', pageCount); + } + } return { text: footerText, alignment: data.footerTpl.alignment, diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js index 0bd2faf99..a7ec7aa38 100644 --- a/openslides/core/static/js/core/pdf.js +++ b/openslides/core/static/js/core/pdf.js @@ -135,9 +135,11 @@ angular.module('OpenSlidesApp.core.pdf', []) .factory('PdfMakeDocumentProvider', [ + '$q', 'Config', 'PDFLayout', - function(Config, PDFLayout) { + 'PdfImageConverter', + function($q, Config, PDFLayout, PdfImageConverter) { /** * Provides the global document * @constructor @@ -145,16 +147,20 @@ angular.module('OpenSlidesApp.core.pdf', []) * returns an array for content */ //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 var getHeader = function() { var columns = []; - var logoUrl = Config.get('logo_pdf_header').value.path; - if (logoUrl) { + if (logoHeaderUrl) { columns.push({ - image: images[logoUrl], - fit: [180,40] + image: imageMap[logoHeaderUrl], + fit: [180, 40], }); } @@ -169,15 +175,15 @@ angular.module('OpenSlidesApp.core.pdf', []) var text = [line1, line2].join('\n'); columns.push({ text: text, - fontSize:10, - width: '100%' + fontSize: 10, + width: '100%', }); return { color: '#555', fontSize: 9, margin: [75, 30, 75, 10], // [left, top, right, bottom] columns: columns, - columnGap: 10 + columnGap: 10, }; }; @@ -186,12 +192,26 @@ angular.module('OpenSlidesApp.core.pdf', []) // Used placeholder for currentPage and pageCount which // are replaced by dynamic footer function in pdf-worker.js. 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 { alignment: 'right', margin: [0, 15, 75, 0], fontSize: 9, color: '#555', - text: '{{currentPage}} / {{pageCount}}' + columns: columns, + columnGap: 10, }; }; // Generates the document(definition) for pdfMake @@ -296,9 +316,18 @@ angular.module('OpenSlidesApp.core.pdf', []) }; }; - return { - getDocument: getDocument - }; + return $q(function (resolve) { + var imageSources = [ + logoHeaderUrl, + logoFooterUrl + ]; + PdfImageConverter.toBase64(imageSources).then(function (_imageMap) { + imageMap = _imageMap; + resolve({ + getDocument: getDocument + }); + }); + }); }; return { createInstance: createInstance @@ -862,7 +891,34 @@ angular.module('OpenSlidesApp.core.pdf', []) return { 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', [ '$timeout', diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html index 4b756399d..cd872c676 100644 --- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html +++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html @@ -321,7 +321,6 @@ ng-mouseleave="mediafile.logoHover=false" ng-show="mediafile.canBeUsedAsLogo()"> -<<<<<<< e1a95588e7f81cf06db3e753be82bc17a125d059 @@ -336,29 +335,13 @@ {{ logo.display_name | translate }},
         -======= - - - - - - - - - - {{ logo.display_name }} - -
    ->>>>>>> add logos in PDF (WIP)     - +
    • diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index 7a0fd98e5..528698f4e 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -5,349 +5,372 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) .factory('MotionContentProvider', [ + '$q', 'operator', 'gettextCatalog', 'PDFLayout', + 'PdfMakeConverter', + 'PdfImageConverter', + 'HTMLValidizer', 'Category', 'Config', 'Motion', - function(operator, gettextCatalog, PDFLayout, Category, Config, Motion) { - /** - * Provides the content as JS objects for Motions in pdfMake context - * @constructor - */ + function($q, operator, gettextCatalog, PDFLayout, PdfMakeConverter, PdfImageConverter, HTMLValidizer, Category, Config, Motion) { + /** + * Provides the content as JS objects for Motions in pdfMake context + * @constructor + */ - var createInstance = function(converter, motion, motionVersion, changeRecommendationMode, - changeRecommendations, lineNumberMode, includeReason, includeComments) { + var createInstance = function(motion, motionVersion, changeRecommendationMode, + changeRecommendations, lineNumberMode, includeReason, includeComments) { - // title - var identifier = motion.identifier ? ' ' + motion.identifier : ''; - var title = PDFLayout.createTitle( - gettextCatalog.getString('Motion') + identifier + ': ' + - motion.getTitle(motionVersion) - ); + var converter; - // subtitle - var subtitleLines = []; - if (motion.parent_id) { - var parentMotion = Motion.get(motion.parent_id); - subtitleLines.push( - gettextCatalog.getString('Amendment of motion') + ': ' + - (parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle()) + // 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 + var identifier = motion.identifier ? ' ' + motion.identifier : ''; + var title = PDFLayout.createTitle( + gettextCatalog.getString('Motion') + identifier + ': ' + + motion.getTitle(motionVersion) ); - } - subtitleLines.push(gettextCatalog.getString('Sequential number') + ': ' + motion.id); - var subtitle = PDFLayout.createSubtitle(subtitleLines); - // meta data table - var metaTable = function() { - var metaTableBody = []; + // subtitle + var subtitleLines = []; + if (motion.parent_id) { + var parentMotion = Motion.get(motion.parent_id); + subtitleLines.push( + gettextCatalog.getString('Amendment of motion') + ': ' + + (parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle()) + ); + } + subtitleLines.push(gettextCatalog.getString('Sequential number') + ': ' + motion.id); + var subtitle = PDFLayout.createSubtitle(subtitleLines); - // submitters - var submitters = _.map(motion.submitters, function (submitter) { - return submitter.get_full_name(); - }).join(', '); - metaTableBody.push([ - { - text: gettextCatalog.getString('Submitters') + ':', - style: ['bold', 'grey'], - }, - { - text: submitters, - style: 'grey' + // meta data table + var metaTable = function() { + var metaTableBody = []; + + // submitters + var submitters = _.map(motion.submitters, function (submitter) { + return submitter.get_full_name(); + }).join(', '); + metaTableBody.push([ + { + text: gettextCatalog.getString('Submitters') + ':', + style: ['bold', 'grey'], + }, + { + text: submitters, + style: 'grey' + } + ]); + + // state + metaTableBody.push([ + { + text: gettextCatalog.getString('State') + ':', + style: ['bold', 'grey'] + }, + { + text: motion.getStateName(), + style: 'grey' + } + ]); + + // recommendation + if (motion.getRecommendationName()) { + metaTableBody.push([ + { + text: Config.get('motions_recommendations_by').value + ':', + style: ['bold', 'grey'] + }, + { + text: motion.getRecommendationName(), + style: 'grey' + } + ]); } - ]); - // state - metaTableBody.push([ - { - text: gettextCatalog.getString('State') + ':', - style: ['bold', 'grey'] - }, - { - text: motion.getStateName(), - style: 'grey' + // category + if (motion.category) { + metaTableBody.push([ + { + text: gettextCatalog.getString('Category') + ':', + style: ['bold', 'grey'] }, + { + text: motion.category.name, + style: 'grey' + } + ]); } - ]); - // recommendation - if (motion.getRecommendationName()) { - metaTableBody.push([ - { - text: Config.get('motions_recommendations_by').value + ':', - style: ['bold', 'grey'] - }, - { - text: motion.getRecommendationName(), - style: 'grey' - } - ]); - } - - // category - if (motion.category) { - metaTableBody.push([ - { - text: gettextCatalog.getString('Category') + ':', - style: ['bold', 'grey'] }, - { - text: motion.category.name, - style: 'grey' - } - ]); - } - - // voting result - if (motion.polls.length > 0 && motion.polls[0].has_votes) { - var column1 = []; - var column2 = []; - var column3 = []; - motion.polls.map(function(poll, index) { - if (poll.has_votes) { - // votenumber - if (motion.polls.length > 1) { - column1.push(index + 1 + '. ' + gettextCatalog.getString('Vote')); - column2.push(''); - column3.push(''); - } - // yes - var yes = poll.getVote(poll.yes, 'yes'); - column1.push(gettextCatalog.getString('Yes') + ':'); - column2.push(yes.value); - column3.push(yes.percentStr); - // no - var no = poll.getVote(poll.no, 'no'); - column1.push(gettextCatalog.getString('No') + ':'); - column2.push(no.value); - column3.push(no.percentStr); - // abstain - var abstain = poll.getVote(poll.abstain, 'abstain'); - column1.push(gettextCatalog.getString('Abstain') + ':'); - column2.push(abstain.value); - column3.push(abstain.percentStr); - // votes valid - if (poll.votesvalid) { - var valid = poll.getVote(poll.votesvalid, 'votesvalid'); - column1.push(gettextCatalog.getString('Valid votes') + ':'); - column2.push(valid.value); - column3.push(valid.percentStr); - } - // votes invalid - if (poll.votesvalid) { - var invalid = poll.getVote(poll.votesinvalid, 'votesinvalid'); - column1.push(gettextCatalog.getString('Invalid votes') + ':'); - column2.push(invalid.value); - column3.push(invalid.percentStr); - } - // votes cast - if (poll.votescast) { - var cast = poll.getVote(poll.votescast, 'votescast'); - column1.push(gettextCatalog.getString('Votes cast') + ':'); - column2.push(cast.value); - column3.push(cast.percentStr); - } - } - }); - metaTableBody.push([ - { - text: gettextCatalog.getString('Voting result') + ':', - style: ['bold', 'grey'] - }, - { - columns: [ - { - text: column1.join('\n'), - width: 'auto' - }, - { - text: column2.join('\n'), - width: 'auto', - alignment: 'right' - }, - { - text: column3.join('\n'), - width: 'auto', - alignment: 'right' - }, - ], - columnGap: 7, - style: 'grey' - } - ]); - } - - // summary of change recommendations (for motion diff version only) - if (changeRecommendationMode == "diff" && changeRecommendations.length) { - var columnLineNumbers = []; - var columnChangeType = []; - angular.forEach(_.orderBy(changeRecommendations, ['line_from']), function(change) { - // line numbers column - var line; - if (change.line_from >= change.line_to - 1) { - line = change.line_from; - } else { - line = change.line_from + ' - ' + (change.line_to - 1); - } - columnLineNumbers.push( - gettextCatalog.getString('Line') + ' ' + line + ': ' - ); - // change type column - if (change.getType(motion.getVersion(motionVersion).text) === 0) { - columnChangeType.push(gettextCatalog.getString("Replacement")); - } else if (change.getType(motion.getVersion(motionVersion).text) === 1) { - columnChangeType.push(gettextCatalog.getString("Insertion")); - } else if (change.getType(motion.getVersion(motionVersion).text) === 2) { - columnChangeType.push(gettextCatalog.getString("Deletion")); - } - }); - metaTableBody.push([ - { - text: gettextCatalog.getString('Summary of change recommendations'), - style: ['bold', 'grey'] - }, - { - columns: [ - { - text: columnLineNumbers.join('\n'), - width: 'auto' - }, - { - text: columnChangeType.join('\n'), - width: 'auto' + // voting result + if (motion.polls.length > 0 && motion.polls[0].has_votes) { + var column1 = []; + var column2 = []; + var column3 = []; + motion.polls.map(function(poll, index) { + if (poll.has_votes) { + // votenumber + if (motion.polls.length > 1) { + column1.push(index + 1 + '. ' + gettextCatalog.getString('Vote')); + column2.push(''); + column3.push(''); + } + // yes + var yes = poll.getVote(poll.yes, 'yes'); + column1.push(gettextCatalog.getString('Yes') + ':'); + column2.push(yes.value); + column3.push(yes.percentStr); + // no + var no = poll.getVote(poll.no, 'no'); + column1.push(gettextCatalog.getString('No') + ':'); + column2.push(no.value); + column3.push(no.percentStr); + // abstain + var abstain = poll.getVote(poll.abstain, 'abstain'); + column1.push(gettextCatalog.getString('Abstain') + ':'); + column2.push(abstain.value); + column3.push(abstain.percentStr); + // votes valid + if (poll.votesvalid) { + var valid = poll.getVote(poll.votesvalid, 'votesvalid'); + column1.push(gettextCatalog.getString('Valid votes') + ':'); + column2.push(valid.value); + column3.push(valid.percentStr); + } + // votes invalid + if (poll.votesvalid) { + var invalid = poll.getVote(poll.votesinvalid, 'votesinvalid'); + column1.push(gettextCatalog.getString('Invalid votes') + ':'); + column2.push(invalid.value); + column3.push(invalid.percentStr); + } + // votes cast + if (poll.votescast) { + var cast = poll.getVote(poll.votescast, 'votescast'); + column1.push(gettextCatalog.getString('Votes cast') + ':'); + column2.push(cast.value); + column3.push(cast.percentStr); } - ], - columnGap: 7, - style: 'grey' - } - ]); - } - - // build table - // Used placeholder for 'layout' functions whiche are - // replaced by lineWitdh/lineColor function in pfd-worker.js. - // TODO: Remove placeholder and us static values for LineWidth and LineColor - // if pdfmake has fixed this. - var metaTableJsonString = { - table: { - widths: ['30%','70%'], - body: metaTableBody, - }, - margin: [0, 0, 0, 20], - layout: '{{motion-placeholder-to-insert-functions-here}}' - }; - return metaTableJsonString; - }; - - // motion title - var motionTitle = function() { - return [{ - text: motion.getTitle(motionVersion), - style: 'heading3' - }]; - }; - - // motion preamble - var motionPreamble = function () { - return { - text: Config.translate(Config.get('motions_preamble').value), - margin: [0, 10, 0, 0] - }; - }; - - - // motion text (with line-numbers) - var motionText = function() { - var motionTextContent = motion.getTextByMode(changeRecommendationMode, motionVersion); - return converter.convertHTML(motionTextContent, lineNumberMode); - }; - - // motion reason heading - var motionReason = function() { - if (includeReason) { - var reason = []; - if (motion.getReason(motionVersion)) { - reason.push({ - text: gettextCatalog.getString('Reason'), - style: 'heading3', - marginTop: 25, - }); - reason.push(converter.convertHTML(motion.getReason(motionVersion), lineNumberMode)); - } - return reason; - } - }; - - // motion comments handling - var motionComments = function () { - if (includeComments) { - var fields = Config.get('motions_comments').value; - var canSeeComment = function (index) { - return fields[index].public || operator.hasPerms('motions.can_manage'); - }; - var comments = []; - for (var i = 0; i < fields.length; i++) { - if (motion.comments[i] && canSeeComment(i)) { - var title = gettextCatalog.getString('Comment') + ' ' + fields[i].name; - if (!fields[i].public) { - title += ' (' + gettextCatalog.getString('internal') + ')'; } - comments.push({ - text: title, + }); + metaTableBody.push([ + { + text: gettextCatalog.getString('Voting result') + ':', + style: ['bold', 'grey'] + }, + { + columns: [ + { + text: column1.join('\n'), + width: 'auto' + }, + { + text: column2.join('\n'), + width: 'auto', + alignment: 'right' + }, + { + text: column3.join('\n'), + width: 'auto', + alignment: 'right' + }, + ], + columnGap: 7, + style: 'grey' + } + ]); + } + + // summary of change recommendations (for motion diff version only) + if (changeRecommendationMode == "diff" && changeRecommendations.length) { + var columnLineNumbers = []; + var columnChangeType = []; + angular.forEach(_.orderBy(changeRecommendations, ['line_from']), function(change) { + // line numbers column + var line; + if (change.line_from >= change.line_to - 1) { + line = change.line_from; + } else { + line = change.line_from + ' - ' + (change.line_to - 1); + } + columnLineNumbers.push( + gettextCatalog.getString('Line') + ' ' + line + ': ' + ); + // change type column + if (change.getType(motion.getVersion(motionVersion).text) === 0) { + columnChangeType.push(gettextCatalog.getString("Replacement")); + } else if (change.getType(motion.getVersion(motionVersion).text) === 1) { + columnChangeType.push(gettextCatalog.getString("Insertion")); + } else if (change.getType(motion.getVersion(motionVersion).text) === 2) { + columnChangeType.push(gettextCatalog.getString("Deletion")); + } + }); + metaTableBody.push([ + { + text: gettextCatalog.getString('Summary of change recommendations'), + style: ['bold', 'grey'] + }, + { + columns: [ + { + text: columnLineNumbers.join('\n'), + width: 'auto' + }, + { + text: columnChangeType.join('\n'), + width: 'auto' + } + ], + columnGap: 7, + style: 'grey' + } + ]); + } + + // build table + // Used placeholder for 'layout' functions whiche are + // replaced by lineWitdh/lineColor function in pfd-worker.js. + // TODO: Remove placeholder and us static values for LineWidth and LineColor + // if pdfmake has fixed this. + var metaTableJsonString = { + table: { + widths: ['30%','70%'], + body: metaTableBody, + }, + margin: [0, 0, 0, 20], + layout: '{{motion-placeholder-to-insert-functions-here}}' + }; + return metaTableJsonString; + }; + + // motion title + var motionTitle = function() { + return [{ + text: motion.getTitle(motionVersion), + style: 'heading3' + }]; + }; + + // motion preamble + var motionPreamble = function () { + return { + text: Config.translate(Config.get('motions_preamble').value), + margin: [0, 10, 0, 0] + }; + }; + + // motion text (with line-numbers) + var motionText = function() { + var motionTextContent = motion.getTextByMode(changeRecommendationMode, motionVersion); + return converter.convertHTML(motionTextContent, lineNumberMode); + }; + + // motion reason heading + var motionReason = function() { + if (includeReason) { + var reason = []; + if (motion.getReason(motionVersion)) { + reason.push({ + text: gettextCatalog.getString('Reason'), style: 'heading3', marginTop: 25, }); - comments.push(converter.convertHTML(motion.comments[i])); + reason.push(converter.convertHTML(motion.getReason(motionVersion), lineNumberMode)); } + return reason; } - return comments; - } + }; + + // motion comments handling + var motionComments = function () { + if (includeComments) { + var fields = Config.get('motions_comments').value; + var canSeeComment = function (index) { + return fields[index].public || operator.hasPerms('motions.can_manage'); + }; + var comments = []; + for (var i = 0; i < fields.length; i++) { + if (motion.comments[i] && canSeeComment(i)) { + var title = gettextCatalog.getString('Comment') + ' ' + fields[i].name; + if (!fields[i].public) { + title += ' (' + gettextCatalog.getString('internal') + ')'; + } + comments.push({ + text: title, + style: 'heading3', + marginTop: 25, + }); + comments.push(converter.convertHTML(motion.comments[i])); + } + } + return comments; + } + }; + + // Generates content as a pdfmake consumable + var getContent = function() { + var content = [ + title, + subtitle, + metaTable(), + motionTitle(), + motionPreamble(), + motionText(), + ]; + var reason = motionReason(); + if (reason) { + content.push(reason); + } + var comments = motionComments(); + if (comments) { + content.push(comments); + } + return content; + }; + + // 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, + getTitle: getTitle, + getIdentifier: getIdentifier, + getCategory: getCategory + }); + }); + }); }; - // 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 - var getContent = function() { - var content = [ - title, - subtitle, - metaTable(), - motionTitle(), - motionPreamble(), - motionText(), - ]; - var reason = motionReason(); - if (reason) { - content.push(reason); - } - var comments = motionComments(); - if (comments) { - content.push(comments); - } - return content; - }; return { - getContent: getContent, - getTitle: getTitle, - getIdentifier: getIdentifier, - getCategory: getCategory + createInstance: createInstance }; - }; - - return { - createInstance: createInstance - }; -}]) + } +]) .factory('PollContentProvider', [ 'PDFLayout', @@ -355,111 +378,112 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) 'Config', 'User', function(PDFLayout, gettextCatalog, Config, User) { - /** - * Generates a content provider for polls - * @constructor - * @param {string} title - title of poll - * @param {string} id - if of poll - */ - var createInstance = function(title, id) { - /** - * Returns a single section on the ballot paper - * @function - */ - var createSection = function() { - var sheetend = 75; - return { - stack: [{ - text: gettextCatalog.getString("Motion") + " " + id, - style: 'title', - }, { - text: title, - style: 'description' - }, - PDFLayout.createBallotEntry(gettextCatalog.getString("Yes")), - PDFLayout.createBallotEntry(gettextCatalog.getString("No")), - PDFLayout.createBallotEntry(gettextCatalog.getString("Abstain")), - ], - margin: [0, 0, 0, sheetend] - }; - }; - - /** - * Returns Content for single motion - * @function + * Generates a content provider for polls + * @constructor + * @param {string} title - title of poll * @param {string} id - if of poll */ - var getContent = function() { - var content = []; - var amount; - var amount_method = Config.get('motions_pdf_ballot_papers_selection').value; - switch (amount_method) { - case 'NUMBER_OF_ALL_PARTICIPANTS': - amount = User.getAll().length; - break; - case 'NUMBER_OF_DELEGATES': - //TODO: assumption that DELEGATES is always group id 2. This may not be true - var group_id = 2; - amount = User.filter({where: {'groups_id': {contains:group_id} }}).length; - break; - case 'CUSTOM_NUMBER': - amount = Config.get('motions_pdf_ballot_papers_number').value; - break; - default: - // should not happen. - amount = 0; - } - var fullpages = Math.floor(amount / 8); + var createInstance = function(title, id) { - for (var i=0; i < fullpages; i++) { - content.push({ - table: { - headerRows: 1, - widths: ['*', '*'], - body: [ - [createSection(), createSection()], - [createSection(), createSection()], - [createSection(), createSection()], - [createSection(), createSection()] - ], - pageBreak: 'after' + /** + * Returns a single section on the ballot paper + * @function + */ + var createSection = function() { + var sheetend = 75; + return { + stack: [{ + text: gettextCatalog.getString("Motion") + " " + id, + style: 'title', + }, { + text: title, + style: 'description' }, - layout: PDFLayout.getBallotLayoutLines(), - rowsperpage: 4 - }); - } - amount = amount - (fullpages * 8); - if (amount > 0) { - var partialpagebody = []; - while (amount > 1) { - partialpagebody.push([createSection(), createSection()]); - amount -=2; + PDFLayout.createBallotEntry(gettextCatalog.getString("Yes")), + PDFLayout.createBallotEntry(gettextCatalog.getString("No")), + PDFLayout.createBallotEntry(gettextCatalog.getString("Abstain")), + ], + margin: [0, 0, 0, sheetend] + }; + }; + + /** + * Returns Content for single motion + * @function + * @param {string} id - if of poll + */ + var getContent = function() { + var content = []; + var amount; + var amount_method = Config.get('motions_pdf_ballot_papers_selection').value; + switch (amount_method) { + case 'NUMBER_OF_ALL_PARTICIPANTS': + amount = User.getAll().length; + break; + case 'NUMBER_OF_DELEGATES': + //TODO: assumption that DELEGATES is always group id 2. This may not be true + var group_id = 2; + amount = User.filter({where: {'groups_id': {contains:group_id} }}).length; + break; + case 'CUSTOM_NUMBER': + amount = Config.get('motions_pdf_ballot_papers_number').value; + break; + default: + // should not happen. + amount = 0; } - if (amount == 1) { - partialpagebody.push([createSection(), '']); + var fullpages = Math.floor(amount / 8); + + for (var i=0; i < fullpages; i++) { + content.push({ + table: { + headerRows: 1, + widths: ['*', '*'], + body: [ + [createSection(), createSection()], + [createSection(), createSection()], + [createSection(), createSection()], + [createSection(), createSection()] + ], + pageBreak: 'after' + }, + layout: PDFLayout.getBallotLayoutLines(), + rowsperpage: 4 + }); } - content.push({ - table: { - headerRows: 1, - widths: ['50%', '50%'], - body: partialpagebody - }, - layout: PDFLayout.getBallotLayoutLines(), - rowsperpage: 4 - }); - } - return content; + amount = amount - (fullpages * 8); + if (amount > 0) { + var partialpagebody = []; + while (amount > 1) { + partialpagebody.push([createSection(), createSection()]); + amount -=2; + } + if (amount == 1) { + partialpagebody.push([createSection(), '']); + } + content.push({ + table: { + headerRows: 1, + widths: ['50%', '50%'], + body: partialpagebody + }, + layout: PDFLayout.getBallotLayoutLines(), + rowsperpage: 4 + }); + } + return content; + }; + + return { + getContent: getContent, + }; }; - return { - getContent: getContent, + createInstance: createInstance }; - }; - return { - createInstance: createInstance - }; -}]) + } +]) .factory('MotionCatalogContentProvider', [ 'gettextCatalog', @@ -467,91 +491,48 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) 'Category', 'Config', function(gettextCatalog, PDFLayout, Category, Config) { + /** + * Constructor + * @function + * @param {object} allMotions - A sorted array of all motions to parse + */ + var createInstance = function(allMotions) { - /** - * Constructor - * @function - * @param {object} allMotions - A sorted array of all motions to parse - */ - var createInstance = function(allMotions) { + var title = PDFLayout.createTitle( + Config.translate(Config.get('motions_export_title').value) + ); - var title = PDFLayout.createTitle( - Config.translate(Config.get('motions_export_title').value) - ); - - var createPreamble = function() { - var preambleText = Config.get('motions_export_preamble').value; - if (preambleText) { - return { - text: preambleText, - style: "preamble" - }; - } else { - return ""; - } - }; - - var createTOContent = function() { - var heading = { - text: gettextCatalog.getString("Table of contents"), - style: "heading2" + var createPreamble = function() { + var preambleText = Config.get('motions_export_preamble').value; + if (preambleText) { + return { + text: preambleText, + style: "preamble" + }; + } else { + return ""; + } }; - var toc = []; - angular.forEach(allMotions, function(motion) { - var identifier = motion.getIdentifier() ? motion.getIdentifier() : ''; - toc.push( - { - columns: [ - { - text: identifier, - style: 'tableofcontent', - width: 70 - }, - { - text: motion.getTitle(), - style: 'tableofcontent' - } - ] - } - ); - }); - - return [ - heading, - toc, - PDFLayout.addPageBreak() - ]; - }; - - // function to create the table of catergories (if any) - var createTOCategories = function() { - var categories = []; - _.forEach(allMotions, function(motion) { - var category = motion.getCategory(); - if (category) { - categories.push(category); - } - }); - categories = _.uniqBy(categories, 'id'); - if (categories.length > 1) { + var createTOContent = function() { var heading = { - text: gettextCatalog.getString("Categories"), + text: gettextCatalog.getString("Table of contents"), style: "heading2" }; var toc = []; - angular.forEach(_.orderBy(categories, ['prefix']), function(cat) { + angular.forEach(allMotions, function(motion) { + var identifier = motion.getIdentifier() ? motion.getIdentifier() : ''; toc.push( { columns: [ { - text: cat.prefix, + text: identifier, style: 'tableofcontent', - width: 50 + width: 70 }, { - text: cat.name, + text: motion.getTitle(), style: 'tableofcontent' } ] @@ -564,44 +545,87 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) toc, PDFLayout.addPageBreak() ]; - } else { - // if there are no categories, return "empty string" - // pdfmake takes "null" literally and throws an error - return ""; - } - }; + }; - // returns the pure content of the motion, parseable by pdfmake - var getContent = function() { - var motionContent = []; - angular.forEach(allMotions, function(motion, key) { - motionContent.push(motion.getContent()); - if (key < allMotions.length - 1) { - motionContent.push(PDFLayout.addPageBreak()); + // function to create the table of catergories (if any) + var createTOCategories = function() { + var categories = []; + _.forEach(allMotions, function(motion) { + var category = motion.getCategory(); + if (category) { + categories.push(category); + } + }); + categories = _.uniqBy(categories, 'id'); + if (categories.length > 1) { + var heading = { + text: gettextCatalog.getString("Categories"), + style: "heading2" + }; + + var toc = []; + angular.forEach(_.orderBy(categories, ['prefix']), function(cat) { + toc.push( + { + columns: [ + { + text: cat.prefix, + style: 'tableofcontent', + width: 50 + }, + { + text: cat.name, + style: 'tableofcontent' + } + ] + } + ); + }); + + return [ + heading, + toc, + PDFLayout.addPageBreak() + ]; + } else { + // if there are no categories, return "empty string" + // pdfmake takes "null" literally and throws an error + return ""; } - }); - var content = []; - // print extra data (title, preamble, categories, toc) only for more than 1 motion - if (allMotions.length > 1) { - content.push( - title, - createPreamble(), - createTOCategories(), - createTOContent() - ); - } - content.push(motionContent); - return content; - }; - return { - getContent: getContent - }; - }; + }; - return { - createInstance: createInstance - }; -}]) + // returns the pure content of the motion, parseable by pdfmake + var getContent = function() { + var motionContent = []; + angular.forEach(allMotions, function(motion, key) { + motionContent.push(motion.getContent()); + if (key < allMotions.length - 1) { + motionContent.push(PDFLayout.addPageBreak()); + } + }); + var content = []; + // print extra data (title, preamble, categories, toc) only for more than 1 motion + if (allMotions.length > 1) { + content.push( + title, + createPreamble(), + createTOCategories(), + createTOContent() + ); + } + content.push(motionContent); + return content; + }; + return { + getContent: getContent + }; + }; + + return { + createInstance: createInstance + }; + } +]) .factory('MotionPdfExport', [ '$http', @@ -633,7 +657,6 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) includeReason: true, includeComments: false, }); - var image_sources = []; if (singleMotion) { _.defaults(params, { @@ -653,47 +676,32 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) '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 imagePromises = _.map(image_sources, function (image_source) { - return PDFLayout.imageURLtoBase64(image_source).then(function (base64Str) { - imageMap[image_source] = base64Str; + var motionContentProviderArray = []; + var motionContentProviderPromises = _.map(motions, function (motion) { + var version = (singleMotion ? params.version : motion.active_version); + 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) { - //resolve promises to get base64 - $q.all(imagePromises).then(function(base64Str) { - 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; + $q.all(motionContentProviderPromises).then(function() { + var documentProviderPromise; if (singleMotion) { - documentProvider = PdfMakeDocumentProvider.createInstance(motionContentProviderArray[0]); + documentProviderPromise = PdfMakeDocumentProvider.createInstance(motionContentProviderArray[0]); } else { var motionCatalogContentProvider = MotionCatalogContentProvider.createInstance(motionContentProviderArray); - documentProvider = PdfMakeDocumentProvider.createInstance(motionCatalogContentProvider); + documentProviderPromise = PdfMakeDocumentProvider.createInstance(motionCatalogContentProvider); } - - resolve(documentProvider); + documentProviderPromise.then(function (documentProvider) { + resolve(documentProvider); + }); }); }); }, diff --git a/openslides/users/static/js/users/pdf.js b/openslides/users/static/js/users/pdf.js index cc7ca192f..4d8e93443 100644 --- a/openslides/users/static/js/users/pdf.js +++ b/openslides/users/static/js/users/pdf.js @@ -9,108 +9,109 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) 'PDFLayout', function(gettextCatalog, PDFLayout) { - var createInstance = function(userList, groups) { + var createInstance = function(userList, groups) { - //use the Predefined Functions to create the title - var title = PDFLayout.createTitle(gettextCatalog.getString("List of participants")); + //use the Predefined Functions to create the title + var title = PDFLayout.createTitle(gettextCatalog.getString("List of participants")); - //function to generate the user list - var createUserList = function() { - var userJsonList = []; + //function to generate the user list + var createUserList = function() { + var userJsonList = []; - angular.forEach(userList, function (user, counter) { + angular.forEach(userList, function (user, counter) { - //parse for the group names - var userGroups = []; - angular.forEach(user.groups_id, function (id) { - if (id) { - angular.forEach(groups, function(group) { - if (id == group.id) { - userGroups.push(gettextCatalog.getString(group.name)); - } - }); - } + //parse for the group names + var userGroups = []; + angular.forEach(user.groups_id, function (id) { + if (id) { + angular.forEach(groups, function(group) { + if (id == group.id) { + userGroups.push(gettextCatalog.getString(group.name)); + } + }); + } + }); + + var userJsonObj = [ + { + text: "" + (counter+1), + style: PDFLayout.flipTableRowStyle(userJsonList.length) + }, + { + text: user.short_name, + style: PDFLayout.flipTableRowStyle(userJsonList.length) + }, + { + text: user.structure_level, + style: PDFLayout.flipTableRowStyle(userJsonList.length) + }, + { + text: userGroups.join(" "), + style: PDFLayout.flipTableRowStyle(userJsonList.length) + } + ]; + userJsonList.push(userJsonObj); }); - var userJsonObj = [ - { - text: "" + (counter+1), - style: PDFLayout.flipTableRowStyle(userJsonList.length) - }, - { - text: user.short_name, - style: PDFLayout.flipTableRowStyle(userJsonList.length) - }, - { - text: user.structure_level, - style: PDFLayout.flipTableRowStyle(userJsonList.length) - }, - { - text: userGroups.join(" "), - style: PDFLayout.flipTableRowStyle(userJsonList.length) - } + var userTableBody = [ + [ + { + text: '#', + style: 'tableHeader' + }, + { + text: gettextCatalog.getString("Name"), + style: 'tableHeader' + }, + { + text: gettextCatalog.getString("Structure level"), + style: 'tableHeader' + }, + { + text: gettextCatalog.getString("Groups"), + style: 'tableHeader' + } + ] ]; - userJsonList.push(userJsonObj); - }); + userTableBody = userTableBody.concat((userJsonList)); - var userTableBody = [ - [ - { - text: '#', - style: 'tableHeader' + var userTableJsonString = { + table: { + widths: ['auto', '*', 'auto', 'auto'], + headerRows: 1, + body: userTableBody }, - { - text: gettextCatalog.getString("Name"), - style: 'tableHeader' - }, - { - text: gettextCatalog.getString("Structure level"), - style: 'tableHeader' - }, - { - text: gettextCatalog.getString("Groups"), - style: 'tableHeader' - } - ] - ]; - userTableBody = userTableBody.concat((userJsonList)); + layout: 'headerLineOnly' + }; - var userTableJsonString = { - table: { - widths: ['auto', '*', 'auto', 'auto'], - headerRows: 1, - body: userTableBody - }, - layout: 'headerLineOnly' + return userTableJsonString; }; - return userTableJsonString; - }; + var getContent = function() { + return [ + title, + createUserList() + ]; + }; - var getContent = function() { - return [ - title, - createUserList() - ]; + return { + getContent: getContent + }; }; return { - getContent: getContent + createInstance: createInstance }; - }; - - return { - createInstance: createInstance - }; - -}]) + } +]) .factory('UserAccessDataListContentProvider', [ 'gettextCatalog', 'PDFLayout', - function(gettextCatalog, PDFLayout) { + 'Config', + function(gettextCatalog, PDFLayout, Config) { - var createInstance = function(userList, groups, Config) { + var createInstance = function(userList) { var creadeUserHeadLine = function(user) { var titleLine = []; @@ -256,14 +257,17 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) var getContent = function() { var content = []; - angular.forEach(userList, function (user) { + angular.forEach(userList, function (user, index) { content.push(creadeUserHeadLine(user)); content.push(createAccessDataContent(user)); content.push(createWelcomeText()); - content.push({ - text: '', - pageBreak: 'after' - }); + // No pagebreak after the last user + if (index !== userList.length - 1) { + content.push({ + text: '', + pageBreak: 'after' + }); + } }); return [ @@ -280,5 +284,38 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) 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); + } + ); + } + }; + } ]); + }()); diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index b84bea68b..176066ffd 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -478,6 +478,7 @@ angular.module('OpenSlidesApp.users.site', [ '$scope', '$state', '$http', + '$q', 'ngDialog', 'UserForm', 'User', @@ -485,21 +486,15 @@ angular.module('OpenSlidesApp.users.site', [ 'PasswordGenerator', 'Projector', 'ProjectionDefault', - 'UserListContentProvider', 'Config', - 'UserAccessDataListContentProvider', - 'PdfMakeDocumentProvider', 'gettextCatalog', 'UserCsvExport', 'osTableFilter', 'osTableSort', 'gettext', - 'PdfCreate', - 'PDFLayout', - '$q', - function($scope, $state, $http, ngDialog, UserForm, User, Group, PasswordGenerator, Projector, ProjectionDefault, - UserListContentProvider, Config, UserAccessDataListContentProvider, PdfMakeDocumentProvider, gettextCatalog, - UserCsvExport, osTableFilter, osTableSort, gettext, PdfCreate, PDFLayout, $q) { + 'UserPdfExport', + function($scope, $state, $http, $q, ngDialog, UserForm, User, Group, PasswordGenerator, Projector, ProjectionDefault, + Config, gettextCatalog, UserCsvExport, osTableFilter, osTableSort, gettext, UserPdfExport) { User.bindAll({}, $scope, 'users'); Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups'); $scope.$watch(function () { @@ -687,35 +682,10 @@ angular.module('OpenSlidesApp.users.site', [ // Export as PDF $scope.pdfExportUserList = function () { - var imageMap = {}; - 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); - }); - }); + UserPdfExport.exportUserList($scope.usersFiltered); }; $scope.pdfExportUserAccessDataList = function () { - var filename = gettextCatalog.getString("List of access data")+".pdf"; - var userAccessDataListContentProvider = UserAccessDataListContentProvider.createInstance( - $scope.usersFiltered, $scope.groups, Config); - var documentProvider = PdfMakeDocumentProvider.createInstance(userAccessDataListContentProvider); - var noFooter = true; - PdfCreate.download(documentProvider.getDocument(noFooter), filename); + UserPdfExport.exportUserAccessDataList($scope.usersFiltered); }; // Export as a csv file $scope.csvExport = function () { From 7c8bc935f834e8fa09496c1875948ce6eb7944a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 27 Apr 2017 12:47:04 +0200 Subject: [PATCH 3/3] Show pdf footer logo. Fixed layout. --- CHANGELOG | 3 ++- openslides/core/config_variables.py | 4 ++-- openslides/core/static/js/core/pdf-worker.js | 8 ++------ openslides/core/static/js/core/pdf.js | 18 ++++++++++-------- openslides/core/static/js/core/site.js | 2 ++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4fd085a01..8b469a4cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,7 +36,8 @@ Users: Core: - No reload on logoff. OpenSlides is now a full single page application [#3172]. -- Adding support for choosing image files as logos [#3184, #3207]. +- Adding support for choosing image files as logos for projector and + pdf [#3184, #3207, #3208]. - Fixing error when clearing empty chat [#3199]. General: diff --git a/openslides/core/config_variables.py b/openslides/core/config_variables.py index b4221d981..70ff69874 100644 --- a/openslides/core/config_variables.py +++ b/openslides/core/config_variables.py @@ -254,7 +254,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_header', default_value={ - 'display_name': 'Header PDF logo', + 'display_name': 'PDF header logo', 'path': ''}, input_type='logo', weight=310, @@ -264,7 +264,7 @@ def get_config_variables(): yield ConfigVariable( name='logo_pdf_footer', default_value={ - 'display_name': 'Footer PDF logo', + 'display_name': 'PDF footer logo', 'path': ''}, input_type='logo', weight=311, diff --git a/openslides/core/static/js/core/pdf-worker.js b/openslides/core/static/js/core/pdf-worker.js index a83fcc574..4300bb558 100644 --- a/openslides/core/static/js/core/pdf-worker.js +++ b/openslides/core/static/js/core/pdf-worker.js @@ -96,20 +96,16 @@ self.addEventListener('message', function(e) { // see https://github.com/bpampuch/pdfmake/issues/38 if (data.footerTpl) { data.footer = function (currentPage, pageCount) { - var footerText = ''; for(var i = 0; i < data.footerTpl.columns.length; i++) { if (data.footerTpl.columns[i].text) { - footerText = data.footerTpl.columns[i].text + data.footerTpl.columns[i].text = data.footerTpl.columns[i].text .replace('{{currentPage}}', currentPage) .replace('{{pageCount}}', pageCount); } } return { - text: footerText, - alignment: data.footerTpl.alignment, + columns: data.footerTpl.columns, margin: data.footerTpl.margin, - fontSize: data.footerTpl.fontSize, - color: data.footerTpl.color }; }; } diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js index a7ec7aa38..46f47d8fa 100644 --- a/openslides/core/static/js/core/pdf.js +++ b/openslides/core/static/js/core/pdf.js @@ -161,6 +161,7 @@ angular.module('OpenSlidesApp.core.pdf', []) columns.push({ image: imageMap[logoHeaderUrl], fit: [180, 40], + width: '20%' }); } @@ -176,7 +177,8 @@ angular.module('OpenSlidesApp.core.pdf', []) columns.push({ text: text, fontSize: 10, - width: '100%', + alignment: 'right', + margin: [0, 10, 0, 0], }); return { color: '#555', @@ -194,22 +196,22 @@ angular.module('OpenSlidesApp.core.pdf', []) 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], + fit: [400,50], + width: '80%' }); } columns.push({ text: '{{currentPage}} / {{pageCount}}', - width: '100%', + color: '#555', + fontSize: 9, + alignment: 'right', + margin: [0, 15, 0, 0], }); return { - alignment: 'right', - margin: [0, 15, 75, 0], - fontSize: 9, - color: '#555', + margin: [75, 0, 75, 10], columns: columns, columnGap: 10, }; diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index c925a46ee..d0b144286 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -1714,6 +1714,8 @@ angular.module('OpenSlidesApp.core.site', [ gettext('List of speakers overlay'); gettext('Projector logo'); gettext('Projector header image'); + gettext('PDF header logo'); + gettext('PDF footer logo'); // Mark the string 'Default projector' here, because it does not appear in the templates. gettext('Default projector');