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

Add QR codes to access data list (fixes #2665)

Browse Source
This commit is contained in:
Sean Engelhardt 2017-01-04 13:07:11 +01:00
parent 85c70b27f5
commit 9abf9d5d57
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -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.

21
openslides/users/static/js/users/pdf.js
View File

@ -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")
},
]
}
],