diff --git a/sorteerhoed/central_management.py b/sorteerhoed/central_management.py index 9e93cf1..ceb4c54 100644 --- a/sorteerhoed/central_management.py +++ b/sorteerhoed/central_management.py @@ -306,8 +306,8 @@ class CentralManagement(): self.eventQueue.put(Signal('scan.start')) cmd = [ 'sudo', 'scanimage', '-d', 'epkowa', '--format', 'jpeg', - '--resolution=100', '-l','20','-t','30','-x',str(self.config['scanner']['height']), - '-y',str(self.config['scanner']['width']) + '--resolution=100', '-l','20','-t','30','-x',str(255), + '-y',str(185) ] self.logger.info(f"{cmd}") filename = self.currentHit.getImagePath() diff --git a/www/backend.css b/www/backend.css index 771db0b..7b7c764 100644 --- a/www/backend.css +++ b/www/backend.css @@ -1,8 +1,3 @@ -@font-face { - font-family: 'bebas'; - src: url('font/BebasNeue-Regular.ttf'); -} - @font-face { font-family: 'freesans'; src: url('font/FreeSans.ttf') @@ -21,9 +16,9 @@ /* ////// GAT ACHTERKANT PLEK & POSITIE /////// */ /* */ /* */ - /* */ --pos-x: 20px; /* */ - /* */ --pos-y: 20px; /* */ - /* */ --width: 90%; /* 115mm */ + /* */ --pos-x: 0px; /* */ + /* */ --pos-y: 50px; /* */ + /* */ --width: 100%; /* 285mm */ /* */ --height: 100%; /* 500mm */ /* */ /* */ /* //////////////////////////////////////////// */ @@ -43,15 +38,33 @@ html, body{ overflow: hidden; } -#logo{ + + +#header{ background: #555; width: 100%; - padding: 2% 0% 1% 0%; - text-align: right; + padding: 2% 0% 30px 0%; + + +} + +#aai{ +position:absolute; + color: #fefefe; + padding-left: 50px; + font-size: 18px; + +} + +#header img{ +position: relative; +top: -5px; + padding-right: 50px; + float:right; + } #wrapper{ - position: absolute; left: var(--pos-x); top: var(--pos-y); @@ -68,7 +81,7 @@ table{ display: grid; border-collapse: collapse; min-width: 100%; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: 50px repeat(6, 1fr) 50px; } thead, tbody, tr{ @@ -108,3 +121,5 @@ td { tr:nth-child(even) td { background: #f8f6f9; } + +