Compare commits

..

13 Commits

Author SHA1 Message Date
8cb6093f0b chore(release): 1.11.5
All checks were successful
Build release images / build-container (push) Successful in 58s
2025-04-25 16:11:44 +02:00
7a92adcd3a Merge branch 'dev' of git.odit.services:lfk/frontend into dev 2025-04-25 16:11:00 +02:00
27396e17f2 fix(cards): Update table for edit events 2025-04-25 16:10:11 +02:00
fefd5c8237 chore(release): 1.11.4
All checks were successful
Build release images / build-container (push) Successful in 58s
2025-04-25 15:18:54 +02:00
f9993c60f5 feat(CardAssign): styled buttons 2025-04-25 15:18:21 +02:00
8e314f8676 feat(CardAssignment): support EAN13 2025-04-25 15:14:31 +02:00
98a3b07237 chore(release): 1.11.3
All checks were successful
Build release images / build-container (push) Successful in 1m0s
2025-04-25 14:53:55 +02:00
efad6fdf2e fix(cards): Z-Index for bulk card modal 2025-04-25 14:53:36 +02:00
bce6d484a9 chore(deps): Updated lock 2025-04-25 14:51:47 +02:00
2dea19df89 chore(release): 1.11.2
All checks were successful
Build release images / build-container (push) Successful in 1m1s
2025-04-23 11:01:55 +02:00
6c986467d3 fix(cardassignment): handle card not found 2025-04-23 11:01:06 +02:00
3cedbebe40 chore(release): 1.11.1
All checks were successful
Build release images / build-container (push) Successful in 1m2s
2025-04-22 22:28:19 +02:00
dc986e4fe5 ci: fix build 2025-04-22 22:27:53 +02:00
10 changed files with 387 additions and 376 deletions

View File

@@ -14,7 +14,7 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 19 node-version: 19
- run: npm i -g pnpm@10.7 && pnpm i - run: npm i -g pnpm@10.8 && pnpm i
- run: pnpm licenses:export - run: pnpm licenses:export
- name: Login to registry - name: Login to registry
uses: docker/login-action@v3 uses: docker/login-action@v3

View File

@@ -2,8 +2,44 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [1.11.5](https://git.odit.services/lfk/frontend/compare/1.11.4...1.11.5)
- fix(cards): Update table for edit events [`27396e1`](https://git.odit.services/lfk/frontend/commit/27396e17f2cd8be72c9c8100afe6ec75ac66dceb)
#### [1.11.4](https://git.odit.services/lfk/frontend/compare/1.11.3...1.11.4)
> 25 April 2025
- feat(CardAssign): styled buttons [`f9993c6`](https://git.odit.services/lfk/frontend/commit/f9993c60f565d7270b3a269e934b42b945c24b99)
- chore(release): 1.11.4 [`fefd5c8`](https://git.odit.services/lfk/frontend/commit/fefd5c8237b91ac7fd7ecf467a6feb1100f84811)
- feat(CardAssignment): support EAN13 [`8e314f8`](https://git.odit.services/lfk/frontend/commit/8e314f8676e5c189c09a33c9a382a8b984af5e30)
#### [1.11.3](https://git.odit.services/lfk/frontend/compare/1.11.2...1.11.3)
> 25 April 2025
- chore(deps): Updated lock [`bce6d48`](https://git.odit.services/lfk/frontend/commit/bce6d484a9b1d7c40d4575a64ad528da2cc8fb3c)
- chore(release): 1.11.3 [`98a3b07`](https://git.odit.services/lfk/frontend/commit/98a3b072370f029f82f79a75b8f809bc1b41d82f)
- fix(cards): Z-Index for bulk card modal [`efad6fd`](https://git.odit.services/lfk/frontend/commit/efad6fdf2eae12c904575727b61fc61ed8a27d14)
#### [1.11.2](https://git.odit.services/lfk/frontend/compare/1.11.1...1.11.2)
> 23 April 2025
- chore(release): 1.11.2 [`2dea19d`](https://git.odit.services/lfk/frontend/commit/2dea19df8990b34a56a345fef05487684ecec8c4)
- fix(cardassignment): handle card not found [`6c98646`](https://git.odit.services/lfk/frontend/commit/6c986467d39344a32e598b834a115932ab8c9a1f)
#### [1.11.1](https://git.odit.services/lfk/frontend/compare/1.11.0...1.11.1)
> 22 April 2025
- chore(release): 1.11.1 [`3cedbeb`](https://git.odit.services/lfk/frontend/commit/3cedbebe40b7699e39edc133e4bcbc16f4e7eb56)
- ci: fix build [`dc986e4`](https://git.odit.services/lfk/frontend/commit/dc986e4fe5d462909e34b8bbf9a3c10accb2a00b)
#### [1.11.0](https://git.odit.services/lfk/frontend/compare/1.10.6...1.11.0) #### [1.11.0](https://git.odit.services/lfk/frontend/compare/1.10.6...1.11.0)
> 22 April 2025
- chore: move to tailwind v4 [`81a8ce0`](https://git.odit.services/lfk/frontend/commit/81a8ce002cd5a470f5ac4f064360c09bcf815ac8) - chore: move to tailwind v4 [`81a8ce0`](https://git.odit.services/lfk/frontend/commit/81a8ce002cd5a470f5ac4f064360c09bcf815ac8)
- chore(deps): bump [`244be47`](https://git.odit.services/lfk/frontend/commit/244be471f07a6ab77768fb599cc2381a319e4e22) - chore(deps): bump [`244be47`](https://git.odit.services/lfk/frontend/commit/244be471f07a6ab77768fb599cc2381a319e4e22)
- chore: move privacy & imprint to website links [`3288ffb`](https://git.odit.services/lfk/frontend/commit/3288ffb3cc52bcfbb2b94c373932e9d614fba80f) - chore: move privacy & imprint to website links [`3288ffb`](https://git.odit.services/lfk/frontend/commit/3288ffb3cc52bcfbb2b94c373932e9d614fba80f)
@@ -11,6 +47,7 @@ All notable changes to this project will be documented in this file. Dates are d
- chore: tailwind class cleanup [`80ab4e0`](https://git.odit.services/lfk/frontend/commit/80ab4e037e44edf1f076d4a365ef36c614e7cb0a) - chore: tailwind class cleanup [`80ab4e0`](https://git.odit.services/lfk/frontend/commit/80ab4e037e44edf1f076d4a365ef36c614e7cb0a)
- fix(cardassignment): debounce w/ immediate start [`1d6ed99`](https://git.odit.services/lfk/frontend/commit/1d6ed990736c6156b67f0715ee1f86aeb2be0390) - fix(cardassignment): debounce w/ immediate start [`1d6ed99`](https://git.odit.services/lfk/frontend/commit/1d6ed990736c6156b67f0715ee1f86aeb2be0390)
- fix(RunnerDetail): move to standard html select for groups [`e1bf435`](https://git.odit.services/lfk/frontend/commit/e1bf435080a3845a4a29f9b8bce7aba3e9220cf9) - fix(RunnerDetail): move to standard html select for groups [`e1bf435`](https://git.odit.services/lfk/frontend/commit/e1bf435080a3845a4a29f9b8bce7aba3e9220cf9)
- chore(release): 1.11.0 [`cae6be6`](https://git.odit.services/lfk/frontend/commit/cae6be6f867aece8997799e90f783a7b5f9b7602)
- feat(ImportRunnerModal): sort groups by name [`3124574`](https://git.odit.services/lfk/frontend/commit/312457494cb0da805df5ec2811604ea45a09963d) - feat(ImportRunnerModal): sort groups by name [`3124574`](https://git.odit.services/lfk/frontend/commit/312457494cb0da805df5ec2811604ea45a09963d)
- feat(cards): badge style for runner links [`1605b0f`](https://git.odit.services/lfk/frontend/commit/1605b0f7b2c12d2b247f40aefc03d2d053fea60d) - feat(cards): badge style for runner links [`1605b0f`](https://git.odit.services/lfk/frontend/commit/1605b0f7b2c12d2b247f40aefc03d2d053fea60d)

View File

@@ -2,8 +2,8 @@ FROM registry.odit.services/hub/library/node:23.10.0-alpine3.21 AS build
ARG NPM_REGISTRY_URL=https://registry.npmjs.org ARG NPM_REGISTRY_URL=https://registry.npmjs.org
WORKDIR /app WORKDIR /app
COPY package.json pnpm-lock.yaml vite.config.js tailwind.config.cjs postcss.config.cjs index.html ./ COPY package.json pnpm-lock.yaml vite.config.js index.html ./
RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@10.7 RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@10.8
RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
COPY src ./src COPY src ./src

View File

@@ -13,7 +13,7 @@
<body> <body>
<span style="display: none; visibility: hidden" id="buildinfo" <span style="display: none; visibility: hidden" id="buildinfo"
>RELEASE_INFO-1.11.0-RELEASE_INFO</span >RELEASE_INFO-1.11.5-RELEASE_INFO</span
> >
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
<script src="/env.js"></script> <script src="/env.js"></script>

View File

@@ -1,6 +1,6 @@
{ {
"name": "@odit/lfk-frontend", "name": "@odit/lfk-frontend",
"version": "1.11.0", "version": "1.11.5",
"type": "module", "type": "module",
"scripts": { "scripts": {
"i18n-order": "node order.js", "i18n-order": "node order.js",

675
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -111,7 +111,7 @@
aria-hidden="true">&#8203;</span aria-hidden="true">&#8203;</span
> >
<div <div
class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-2xl sm:w-full" class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-2xl sm:w-full relative z-10"
role="dialog" role="dialog"
aria-modal="true" aria-modal="true"
aria-labelledby="modal-headline" aria-labelledby="modal-headline"

View File

@@ -180,11 +180,9 @@
bind:runner bind:runner
bind:editable bind:editable
bind:original_data bind:original_data
on:dataUpdated={(event) => { on:dataUpdated={(editevent) => {
current_cards[ console.log(editevent.detail.card)
current_cards.findIndex((c) => c.id === event.detail.card.id) current_cards = current_cards.filter((c) => c.id !== editevent.detail.card.id).concat([editevent.detail.card]).sort((a, b) => a.code - b.code);
] = event.detail.card;
current_cards = current_cards;
options.update((options) => ({ options.update((options) => ({
...options, ...options,
data: current_cards, data: current_cards,

View File

@@ -389,6 +389,12 @@
:paused={!scannerActive} :paused={!scannerActive}
on:detect={(e) => { on:detect={(e) => {
if (scannerActive) { if (scannerActive) {
if (`${e.detail.decodedText}`.length === 13) {
e.detail.decodedText = e.detail.decodedText.substring(
0,
e.detail.decodedText.length - 1
);
}
scannerActive = false; scannerActive = false;
console.log({ type: "DETECT", code: e.detail.decodedText }); console.log({ type: "DETECT", code: e.detail.decodedText });
if (runnerinfo.id === 0) { if (runnerinfo.id === 0) {
@@ -433,7 +439,7 @@
state = "assigning"; state = "assigning";
RunnerCardService.runnerCardControllerGetAll() RunnerCardService.runnerCardControllerGetAll()
.then((cards) => { .then((cards) => {
console.log(cards); // console.log(cards);
const card = cards.find((c) => c.code === cardCode); const card = cards.find((c) => c.code === cardCode);
if (card) { if (card) {
console.log("card found", card); console.log("card found", card);
@@ -450,7 +456,10 @@
scannerActive = false; scannerActive = false;
}); });
} else { } else {
scannerActive = true; console.log("card not found");
// scannerActive = true;
state = "error_card";
scannerActive = false;
} }
}) })
.catch(() => { .catch(() => {

View File

@@ -7,3 +7,21 @@
* { * {
font-family: Athiti; font-family: Athiti;
} }
.html5-qrcode-element {
@apply block;
@apply w-full;
@apply p-4;
}
#qr-scanner__dashboard_section_csr {
/* padding-right: 20px; */
padding: 1rem;
}
#html5-qrcode-select-camera {
@apply px-2 py-2 inline-flex text-lg leading-5 font-semibold rounded-md border border-current bg-neutral-100 text-neutral-800 mb-2;
}
#html5-qrcode-button-camera-start {
@apply px-2 inline-flex text-lg leading-5 font-semibold rounded-md border border-current bg-green-100 text-green-800 mb-2 cursor-pointer;
}
#html5-qrcode-button-camera-stop {
@apply px-2 inline-flex text-lg leading-5 font-semibold rounded-md border border-current bg-red-100 text-red-800 mb-2 cursor-pointer;
}