Compare commits

..

5 Commits

Author SHA1 Message Date
Lorenz Hilpert
3b466f7d65 css tag hinzugefügt für e2e 2023-01-19 13:04:46 +01:00
Nino Righi
62d93d1122 #3632 Updated Unit Test 2023-01-09 14:17:26 +01:00
Nino Righi
ed83fedd61 #3632 Fix Footer Active Styling 2023-01-09 14:02:23 +01:00
Lorenz Hilpert
2691a217db Lizenz Scandit Update 2023-01-03 14:40:45 +01:00
Lorenz Hilpert
b421f74d1a Merge branch 'feature/scanner-ipad' into develop 2023-01-02 09:43:57 +01:00
7 changed files with 12 additions and 11 deletions

View File

@@ -39,15 +39,15 @@
<div class="shell-footer-wrapper">
<shell-footer *ngIf="section$ | async; let section">
<ng-container *ngIf="section === 'customer'">
<a [routerLink]="['/kunde', 'product']" routerLinkActive="active">
<a [routerLink]="['/kunde', activatedProcessId$ | async, 'product']" routerLinkActive="active">
<ui-icon icon="catalog" size="30px"></ui-icon>
Artikelsuche
</a>
<a [routerLink]="['/kunde', 'customer']" routerLinkActive="active">
<a [routerLink]="['/kunde', activatedProcessId$ | async, 'customer']" routerLinkActive="active">
<ui-icon icon="customer" size="24px"></ui-icon>
Kundensuche
</a>
<a [routerLink]="['/kunde/goods/out']" routerLinkActive="active">
<a [routerLink]="['/kunde', activatedProcessId$ | async, 'goods', 'out']" routerLinkActive="active">
<ui-icon icon="box_out" size="24px"></ui-icon>
Warenausgabe
</a>

View File

@@ -175,15 +175,16 @@ describe('ShellComponent', () => {
it('should display the menu items for section customer', () => {
applicationServiceMock.getSection$.and.returnValue(of('customer'));
applicationServiceMock.getActivatedProcessId$.and.returnValue(of(1));
spectator.detectComponentChanges();
const anchors = spectator.queryAll('shell-footer a');
expect(anchors[0]).toHaveText('Artikelsuche');
expect(anchors[0]).toHaveAttribute('href', '/kunde/product');
expect(anchors[0]).toHaveAttribute('href', '/kunde/1/product');
expect(anchors[1]).toHaveText('Kundensuche');
expect(anchors[1]).toHaveAttribute('href', '/kunde/customer');
expect(anchors[1]).toHaveAttribute('href', '/kunde/1/customer');
expect(anchors[2]).toHaveText('Warenausgabe');
expect(anchors[2]).toHaveAttribute('href', '/kunde/goods/out');
expect(anchors[2]).toHaveAttribute('href', '/kunde/1/goods/out');
});
it('should display the menu items for section branch', () => {

View File

@@ -61,6 +61,6 @@
},
"checkForUpdates": 3600000,
"licence": {
"scandit": "AXvBoAZ/JLaLOMv7IyiBFShF6KLnGGdx7GC5pQ4v9wuaXnCY+2/4SPYNEGKmUtWkWGMtmbFmKJpRIxUE6kq1kppQrRlQE5LwMnf9IhFIX2YJckWxXl5RG0BCqdckUrS3d0CFyjpNuuHWQQ0SDDSlpCAcsK04LTiVtC800dhaj4YAVWnXnEbqsSwklW9mJv16nQS9r21VUvlsl9KReZkGymagAgRJps0gf7B6b/S7f6VQ3VT12Amu9/L207GDYh0GGMl6RaE+LjClqIak5jLiSD2l7a9F9lGMVScCTMYl2zw6Ugud4ttzaBY/uMUZfS15gW2H/2zfYO2mVwIOMBIXDFEoq/JOqjOLBB8IEgm6Eu6vKKFqwQ8F6HSKbo9Ba3/be59qMmztiFLaZXe8vNgAr4yJ+YCcrxK0iD/A30tTgL25E/H4QMRFWSAgFBoOwdbyYeM0WbqwasTMbtWUC7xyKr7EIYLN1LdxpnyuS6BObD/0AtuEdd3nrBl8Yc+4R/MOnJ5QF6vopNFhFGiVoYwaGR0G/NfTVMeIYHinwOjB1qQcA6Qr40IZqKK9VFuwsUw32MM5RrQQCr0olnGRrVO8JHmFaRIiwwQ4+NSRV7Z0iyDM9sh1A1Xl4IW5azQaqA4zGXOdiDBRvKGY5zOE2TWgDdzCe1oQ1d3Qk6VXDx+eCzFIAb1UA0ealeHAQ6SzWlXAkHuY+zrw3pGVoe2b4aSTkBRdegFAaU9/H2Xl9WAx4DW4pfUQRZBbR4htgaWs1a9vVUb76P8GpK2ihF4YIYLC9B1EW7hzaOfGfhWVFRmK7j544aiqbz+bL/HgG6QZhdyTRhHAj1oWl0/hSV1eeq7BgqsDQQEidHbX/Gg="
"scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
}
}

View File

@@ -61,6 +61,6 @@
},
"checkForUpdates": 3600000,
"licence": {
"scandit": "AXvBoAZ/JLaLOMv7IyiBFShF6KLnGGdx7GC5pQ4v9wuaXnCY+2/4SPYNEGKmUtWkWGMtmbFmKJpRIxUE6kq1kppQrRlQE5LwMnf9IhFIX2YJckWxXl5RG0BCqdckUrS3d0CFyjpNuuHWQQ0SDDSlpCAcsK04LTiVtC800dhaj4YAVWnXnEbqsSwklW9mJv16nQS9r21VUvlsl9KReZkGymagAgRJps0gf7B6b/S7f6VQ3VT12Amu9/L207GDYh0GGMl6RaE+LjClqIak5jLiSD2l7a9F9lGMVScCTMYl2zw6Ugud4ttzaBY/uMUZfS15gW2H/2zfYO2mVwIOMBIXDFEoq/JOqjOLBB8IEgm6Eu6vKKFqwQ8F6HSKbo9Ba3/be59qMmztiFLaZXe8vNgAr4yJ+YCcrxK0iD/A30tTgL25E/H4QMRFWSAgFBoOwdbyYeM0WbqwasTMbtWUC7xyKr7EIYLN1LdxpnyuS6BObD/0AtuEdd3nrBl8Yc+4R/MOnJ5QF6vopNFhFGiVoYwaGR0G/NfTVMeIYHinwOjB1qQcA6Qr40IZqKK9VFuwsUw32MM5RrQQCr0olnGRrVO8JHmFaRIiwwQ4+NSRV7Z0iyDM9sh1A1Xl4IW5azQaqA4zGXOdiDBRvKGY5zOE2TWgDdzCe1oQ1d3Qk6VXDx+eCzFIAb1UA0ealeHAQ6SzWlXAkHuY+zrw3pGVoe2b4aSTkBRdegFAaU9/H2Xl9WAx4DW4pfUQRZBbR4htgaWs1a9vVUb76P8GpK2ihF4YIYLC9B1EW7hzaOfGfhWVFRmK7j544aiqbz+bL/HgG6QZhdyTRhHAj1oWl0/hSV1eeq7BgqsDQQEidHbX/Gg="
"scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
}
}

View File

@@ -61,6 +61,6 @@
},
"checkForUpdates": 3600000,
"licence": {
"scandit": "AXvBoAZ/JLaLOMv7IyiBFShF6KLnGGdx7GC5pQ4v9wuaXnCY+2/4SPYNEGKmUtWkWGMtmbFmKJpRIxUE6kq1kppQrRlQE5LwMnf9IhFIX2YJckWxXl5RG0BCqdckUrS3d0CFyjpNuuHWQQ0SDDSlpCAcsK04LTiVtC800dhaj4YAVWnXnEbqsSwklW9mJv16nQS9r21VUvlsl9KReZkGymagAgRJps0gf7B6b/S7f6VQ3VT12Amu9/L207GDYh0GGMl6RaE+LjClqIak5jLiSD2l7a9F9lGMVScCTMYl2zw6Ugud4ttzaBY/uMUZfS15gW2H/2zfYO2mVwIOMBIXDFEoq/JOqjOLBB8IEgm6Eu6vKKFqwQ8F6HSKbo9Ba3/be59qMmztiFLaZXe8vNgAr4yJ+YCcrxK0iD/A30tTgL25E/H4QMRFWSAgFBoOwdbyYeM0WbqwasTMbtWUC7xyKr7EIYLN1LdxpnyuS6BObD/0AtuEdd3nrBl8Yc+4R/MOnJ5QF6vopNFhFGiVoYwaGR0G/NfTVMeIYHinwOjB1qQcA6Qr40IZqKK9VFuwsUw32MM5RrQQCr0olnGRrVO8JHmFaRIiwwQ4+NSRV7Z0iyDM9sh1A1Xl4IW5azQaqA4zGXOdiDBRvKGY5zOE2TWgDdzCe1oQ1d3Qk6VXDx+eCzFIAb1UA0ealeHAQ6SzWlXAkHuY+zrw3pGVoe2b4aSTkBRdegFAaU9/H2Xl9WAx4DW4pfUQRZBbR4htgaWs1a9vVUb76P8GpK2ihF4YIYLC9B1EW7hzaOfGfhWVFRmK7j544aiqbz+bL/HgG6QZhdyTRhHAj1oWl0/hSV1eeq7BgqsDQQEidHbX/Gg="
"scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
}
}

View File

@@ -61,6 +61,6 @@
},
"checkForUpdates": 3600000,
"licence": {
"scandit": "AXvBoAZ/JLaLOMv7IyiBFShF6KLnGGdx7GC5pQ4v9wuaXnCY+2/4SPYNEGKmUtWkWGMtmbFmKJpRIxUE6kq1kppQrRlQE5LwMnf9IhFIX2YJckWxXl5RG0BCqdckUrS3d0CFyjpNuuHWQQ0SDDSlpCAcsK04LTiVtC800dhaj4YAVWnXnEbqsSwklW9mJv16nQS9r21VUvlsl9KReZkGymagAgRJps0gf7B6b/S7f6VQ3VT12Amu9/L207GDYh0GGMl6RaE+LjClqIak5jLiSD2l7a9F9lGMVScCTMYl2zw6Ugud4ttzaBY/uMUZfS15gW2H/2zfYO2mVwIOMBIXDFEoq/JOqjOLBB8IEgm6Eu6vKKFqwQ8F6HSKbo9Ba3/be59qMmztiFLaZXe8vNgAr4yJ+YCcrxK0iD/A30tTgL25E/H4QMRFWSAgFBoOwdbyYeM0WbqwasTMbtWUC7xyKr7EIYLN1LdxpnyuS6BObD/0AtuEdd3nrBl8Yc+4R/MOnJ5QF6vopNFhFGiVoYwaGR0G/NfTVMeIYHinwOjB1qQcA6Qr40IZqKK9VFuwsUw32MM5RrQQCr0olnGRrVO8JHmFaRIiwwQ4+NSRV7Z0iyDM9sh1A1Xl4IW5azQaqA4zGXOdiDBRvKGY5zOE2TWgDdzCe1oQ1d3Qk6VXDx+eCzFIAb1UA0ealeHAQ6SzWlXAkHuY+zrw3pGVoe2b4aSTkBRdegFAaU9/H2Xl9WAx4DW4pfUQRZBbR4htgaWs1a9vVUb76P8GpK2ihF4YIYLC9B1EW7hzaOfGfhWVFRmK7j544aiqbz+bL/HgG6QZhdyTRhHAj1oWl0/hSV1eeq7BgqsDQQEidHbX/Gg="
"scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
}
}

View File

@@ -32,7 +32,7 @@
<div>
Anzahl Positionen
</div>
<div class="font-bold">
<div class="font-bold anzahl-positionen">
{{ itemsCount }}
</div>
<div class="text-right">