Merge remote-tracking branch 'origin/v3.5'

This commit is contained in:
Adolfo Gómez García 2022-02-07 16:12:51 +01:00
commit 1b9fd22ba1
2 changed files with 8 additions and 7 deletions
server/src/uds/core
managers
reports/css

View File

@ -214,11 +214,12 @@ class StatsManager(metaclass=singleton.Singleton):
try: try:
def getKwarg(fld: str) -> str: def getKwarg(fld: str) -> str:
val = None val = kwargs.get(fld)
for i in FLDS_EQUIV[fld]: if val is None:
val = kwargs.get(i) for i in FLDS_EQUIV[fld]:
if val is not None: val = kwargs.get(i)
break if val is not None:
break
return val or '' return val or ''
fld1 = getKwarg('fld1') fld1 = getKwarg('fld1')

View File

@ -17,13 +17,13 @@
@bottom-right { @bottom-right {
content: '{printed}' content: '{printed}'
} }
@left-top { /*@left-top {
content: "{water}"; font: .5cm/1.5 Fontin Sans; content: "{water}"; font: .5cm/1.5 Fontin Sans;
background: #557891; color: #fff; text-align: right; background: #557891; color: #fff; text-align: right;
padding-right: 2em; height: 1.5em; width: 10cm; padding-right: 2em; height: 1.5em; width: 10cm;
transform-origin: 100% 0; transform-origin: 100% 0;
transform: rotate(-90deg); transform: rotate(-90deg);
} }*/
} }
body { body {
text-align: justify; text-align: justify;