Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Fachschaftsrat Physik TUKL
Protokoll
protokoll_skript
Commits
59ad24be
Commit
59ad24be
authored
Sep 04, 2019
by
Patrick Mischke
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.rlp.net/fsr_physik_tu_kl/protokoll/protokoll_skript
parents
5e6e60b7
e551fee0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
15 deletions
+18
-15
bin/module/esme.py
bin/module/esme.py
+8
-10
bin/proto.py
bin/proto.py
+2
-1
share/fsr
share/fsr
+0
-2
share/fsr_extern
share/fsr_extern
+5
-1
share/name.tex
share/name.tex
+3
-1
No files found.
bin/module/esme.py
View file @
59ad24be
...
@@ -92,8 +92,8 @@ class FsrLdap:
...
@@ -92,8 +92,8 @@ class FsrLdap:
"""
"""
logging
.
info
(
"Fetching Protokollant from LDAP ..."
)
logging
.
info
(
"Fetching Protokollant from LDAP ..."
)
try
:
try
:
fil
=
"(
uid="
+
current_user
()
+
"
)"
fil
=
"(
objectClass=posixAccount
)"
if
self
.
conn
.
search
(
'ou=people,'
+
self
.
base
,
fil
,
if
self
.
conn
.
search
(
'
uid='
+
current_user
()
+
',
ou=people,'
+
self
.
base
,
fil
,
# noqa: E501
attributes
=
[
'displayName'
]):
attributes
=
[
'displayName'
]):
logging
.
info
(
"Done"
)
logging
.
info
(
"Done"
)
return
" "
.
join
(
str
(
self
.
conn
.
entries
[
0
][
'displayName'
]).
split
(
", "
)[::
-
1
])
# noqa: E501
return
" "
.
join
(
str
(
self
.
conn
.
entries
[
0
][
'displayName'
]).
split
(
", "
)[::
-
1
])
# noqa: E501
...
@@ -157,10 +157,9 @@ class FsrLdap:
...
@@ -157,10 +157,9 @@ class FsrLdap:
fil
=
'(cn=intern)'
fil
=
'(cn=intern)'
fsr
=
[]
fsr
=
[]
if
self
.
conn
.
search
(
'ou=group,'
+
self
.
base
,
fil
,
if
self
.
conn
.
search
(
'ou=group,'
+
self
.
base
,
fil
,
attributes
=
[
'memberUid'
]):
attributes
=
[
'member'
]):
for
i
in
self
.
conn
.
entries
[
0
][
'memberUid'
]:
for
i
in
self
.
conn
.
entries
[
0
][
'member'
]:
if
self
.
conn
.
search
(
'ou=people,'
+
self
.
base
,
if
self
.
conn
.
search
(
i
,
'(objectClass=posixAccount)'
,
'(uid='
+
i
+
')'
,
attributes
=
[
'displayName'
]):
attributes
=
[
'displayName'
]):
fsr
+=
[
str
(
self
.
conn
.
entries
[
0
][
'displayName'
])]
fsr
+=
[
str
(
self
.
conn
.
entries
[
0
][
'displayName'
])]
fsr
.
sort
()
fsr
.
sort
()
...
@@ -232,10 +231,9 @@ class FsrLdap:
...
@@ -232,10 +231,9 @@ class FsrLdap:
fil
=
'(cn=extern)'
fil
=
'(cn=extern)'
fsr_extern
=
[]
fsr_extern
=
[]
if
self
.
conn
.
search
(
'ou=group,'
+
self
.
base
,
fil
,
if
self
.
conn
.
search
(
'ou=group,'
+
self
.
base
,
fil
,
attributes
=
[
'memberUid'
]):
attributes
=
[
'member'
]):
for
i
in
self
.
conn
.
entries
[
0
][
'memberUid'
]:
for
i
in
self
.
conn
.
entries
[
0
][
'member'
]:
if
self
.
conn
.
search
(
'ou=people,'
+
self
.
base
,
if
self
.
conn
.
search
(
i
,
'(objectClass=posixAccount)'
,
'(uid='
+
i
+
')'
,
attributes
=
[
'displayName'
]):
attributes
=
[
'displayName'
]):
fsr_extern
+=
[
str
(
self
.
conn
.
entries
[
0
][
'displayName'
])]
# noqa: E501
fsr_extern
+=
[
str
(
self
.
conn
.
entries
[
0
][
'displayName'
])]
# noqa: E501
fsr_extern
.
sort
()
fsr_extern
.
sort
()
...
...
bin/proto.py
View file @
59ad24be
...
@@ -240,7 +240,8 @@ if __name__ == "__main__":
...
@@ -240,7 +240,8 @@ if __name__ == "__main__":
if
not
OPT
.
Vollversamlung
:
if
not
OPT
.
Vollversamlung
:
body
+=
gen_attendance_tab
(
FSR
[
0
],
NUM_COLS
)
body
+=
gen_attendance_tab
(
FSR
[
0
],
NUM_COLS
)
body
+=
gen_attendance_tab
(
FSR
[
1
],
NUM_COLS_EXT
,
ext
=
True
,
default
=
'-'
)
body
+=
gen_attendance_tab
(
FSR
[
1
],
NUM_COLS_EXT
,
ext
=
True
,
default
=
'-'
)
footer
=
gen_footer
(
SHARE_DIR
,
OPT
.
Vollversamlung
,
REG
,
footer
=
gen_footer
(
SHARE_DIR
,
OPT
.
Vollversamlung
,
REG
,
SPRECHER
,
PROTOKOLLANT
,
DATE
)
SPRECHER
,
PROTOKOLLANT
,
DATE
)
...
...
share/fsr
View file @
59ad24be
...
@@ -11,12 +11,10 @@ Katharina Hilgert
...
@@ -11,12 +11,10 @@ Katharina Hilgert
Sarah Kovač
Sarah Kovač
Rutger Kuwertz
Rutger Kuwertz
Felix Lang
Felix Lang
Annika Lesch
Patrick Mischke
Patrick Mischke
Jacqueline Momperé
Jacqueline Momperé
Kevin Mours
Kevin Mours
Tarek Moussa
Tarek Moussa
Lukas Neusius
Diana Remmel
Diana Remmel
Lorenz Steinert
Lorenz Steinert
Aaron Thielmann
Aaron Thielmann
...
...
share/fsr_extern
View file @
59ad24be
Stefano Galimberti
Stefano Galimberti
Tatjana Grün
Gina Gräßle
Tamara Hamann
Sabrina Hammel
Maximilian Kiefer
Maximilian Kiefer
Nikolas Longen
Nikolas Longen
Christopher Mink
Christopher Mink
Linda Müller
Linda Müller
Stephanie Roden
Stephanie Roden
Matthias Rüb
Matthias Rüb
Felix Selz
Sven Stawinski
Marco Tummeley
Marco Tummeley
share/name.tex
View file @
59ad24be
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
\\
newcommand
{
\\
julian
}{
Julian Schulz
\\
xspace
}
\\
newcommand
{
\\
julian
}{
Julian Schulz
\\
xspace
}
\\
newcommand
{
\\
juls
}{
Julian Schulz
\\
xspace
}
\\
newcommand
{
\\
juls
}{
Julian Schulz
\\
xspace
}
\\
newcommand
{
\\
lorenz
}{
Lorenz Steinert
\\
xspace
}
\\
newcommand
{
\\
lorenz
}{
Lorenz Steinert
\\
xspace
}
\\
newcommand
{
\\
marco
}{
Marco
Tummeley
\\
xspace
}
\\
newcommand
{
\\
marco
}{
Marco
Decker
\\
xspace
}
\\
newcommand
{
\\
uei
}{
Markus Ühlein
\\
xspace
}
\\
newcommand
{
\\
uei
}{
Markus Ühlein
\\
xspace
}
\\
newcommand
{
\\
markus
}{
Markus Ühlein
\\
xspace
}
\\
newcommand
{
\\
markus
}{
Markus Ühlein
\\
xspace
}
\\
newcommand
{
\\
sternchen
}{
Katharina Hilgert
\\
xspace
}
\\
newcommand
{
\\
sternchen
}{
Katharina Hilgert
\\
xspace
}
...
@@ -98,6 +98,8 @@
...
@@ -98,6 +98,8 @@
\\
newcommand
{
\\
jacy
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
jacy
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
jaky
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
jaky
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
jacky
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
jacky
}{
Jacqueline Momperé
\\
xspace
}
\\
newcommand
{
\\
sven
}{
Sven Stawinski
\\
xspace
}
\\
newcommand
{
\\
felixzwei
}{
Felix Selz
\\
xspace
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment