diff --git a/CHANGELOG b/CHANGELOG index fcdf808cd..df7012120 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,6 +66,7 @@ Users: - Added new field 'is_committee' and new default group 'Committees'. - Improved users CSV import (use group names instead of id). - Added more multiselect actions. +- Added QR code in users access pdf. Other: - Django 1.10 is now supported. Dropped support for Django 1.8 and 1.9. diff --git a/openslides/users/static/js/users/pdf.js b/openslides/users/static/js/users/pdf.js index 9877c0e0a..584869fcc 100644 --- a/openslides/users/static/js/users/pdf.js +++ b/openslides/users/static/js/users/pdf.js @@ -128,6 +128,9 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) }; var createAccessDataContent = function(user) { + var wifiQrCode = "WIFI:S:" + Config.get('users_pdf_wlan_ssid').value + + ";T:" + Config.get('users_pdf_wlan_encryption').value + + ";P:" + Config.get('users_pdf_wlan_password').value + ";;"; var accessDataColumns = { columns: [ { @@ -160,6 +163,15 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) text: Config.get('users_pdf_wlan_encryption').value || '-', style: 'userDataValue' }, + { + text: "\n" + }, + { + qr: wifiQrCode + }, + { + text: gettextCatalog.getString("scan QR code to connect to WLAN") + }, ] }, { @@ -193,6 +205,15 @@ angular.module('OpenSlidesApp.users.pdf', ['OpenSlidesApp.core.pdf']) link: Config.get('users_pdf_url').value, style: 'userDataValue' }, + { + text: "\n" + }, + { + qr: Config.get('users_pdf_url').value + }, + { + text: gettextCatalog.getString("scan QR code to open the URL") + }, ] } ],