' + t('errorLoad') + '
'; } @@ -353,6 +375,7 @@ document.addEventListener('DOMContentLoaded', () => { if (cachedData) { renderChart(cachedData, metricSelect.value); renderDonuts(cachedData, metricSelect.value); + updateTotal(cachedData, metricSelect.value); } }); }); diff --git a/httpdocs/assets/styles/components/_account.scss b/httpdocs/assets/styles/components/_account.scss index 0b3f6e2..78d8a5b 100644 --- a/httpdocs/assets/styles/components/_account.scss +++ b/httpdocs/assets/styles/components/_account.scss @@ -201,6 +201,212 @@ } } +// ─── Import-Sektion ────────────────────────────────────────────────────── +.import-section__title { + font-size: $font-size-lg; + font-weight: $font-weight-bold; + color: $color-text-dark; + margin-bottom: $space-2; +} + +.import-section__desc { + font-size: $font-size-sm; + color: $color-text-muted; + line-height: 1.55; + margin-bottom: $space-6; +} + +.import-upload__area { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: $space-2; + padding: $space-8 $space-6; + border: 2px dashed $color-input-border; + border-radius: $radius-md; + cursor: pointer; + transition: border-color $transition-fast, background $transition-fast; + + &:hover, + &--dragover { + border-color: var(--color-primary, $color-primary); + background: rgba(var(--color-primary-rgb, 58, 123, 191), 0.04); + } +} + +.import-upload__icon { + color: $color-text-muted; +} + +.import-upload__text { + font-size: $font-size-sm; + font-weight: $font-weight-medium; + color: $color-text-dark; +} + +.import-upload__hint { + font-size: $font-size-xs; + color: $color-text-muted; +} + +.import-upload__file-info { + display: flex; + align-items: center; + gap: $space-3; + margin-top: $space-3; + padding: $space-3 $space-4; + background: $color-bg; + border-radius: $radius-sm; + font-size: $font-size-sm; + color: $color-text-dark; +} + +.import-upload__remove { + margin-left: auto; + background: none; + border: none; + font-size: $font-size-lg; + color: $color-text-muted; + cursor: pointer; + padding: 0 $space-2; + line-height: 1; + + &:hover { color: $color-error; } +} + +.import-actions { + margin-top: $space-5; + display: flex; + gap: $space-4; + + &--preview { + padding-top: $space-5; + border-top: 1px solid $color-border; + } +} + +// ─── Import-Vorschau ───────────────────────────────────────────────────── +.import-preview__stats { + display: grid; + grid-template-columns: auto 1fr; + gap: $space-2 $space-6; + font-size: $font-size-sm; + + dt { + color: $color-text-muted; + font-weight: $font-weight-medium; + } + + dd { + color: $color-text-dark; + font-weight: $font-weight-bold; + margin: 0; + } + + &--result dd { + color: $color-text-dark; + font-weight: $font-weight-regular; + + strong { + color: var(--color-primary, $color-primary); + font-weight: $font-weight-bold; + } + } +} + +.import-preview__subtitle { + font-size: $font-size-sm; + font-weight: $font-weight-bold; + color: $color-text-dark; + margin-top: $space-5; + margin-bottom: $space-2; +} + +.import-preview__users { + list-style: none; + padding: 0; + margin: 0; + display: flex; + flex-direction: column; + gap: $space-2; + + li { + font-size: $font-size-sm; + color: $color-text-dark; + line-height: 1.6; + } +} + +.import-preview__email { + color: $color-text-muted; +} + +.import-user-options { + display: flex; + gap: $space-4; + margin-top: $space-1; +} + +.import-user-option { + display: inline-flex; + align-items: center; + gap: $space-1; + font-size: $font-size-xs; + color: $color-text-muted; + cursor: pointer; + + input[type="radio"] { + margin: 0; + accent-color: var(--color-primary, $color-primary); + } +} + +.import-badge { + display: inline-block; + font-size: $font-size-xs; + padding: 1px $space-2; + border-radius: $radius-pill; + font-weight: $font-weight-medium; + + &--matched { + background: rgba(34, 197, 94, 0.12); + color: #15803d; + } + + &--fallback { + background: rgba(234, 179, 8, 0.15); + color: #a16207; + } +} + +.import-preview__warnings { + list-style: none; + padding: 0; + margin: 0; + display: flex; + flex-direction: column; + gap: $space-1; + + li { + font-size: $font-size-sm; + color: $color-text-muted; + padding-left: $space-4; + position: relative; + + &::before { + content: '⚠'; + position: absolute; + left: 0; + font-size: $font-size-xs; + } + } +} + +.import-result { + border-left: 3px solid var(--color-primary, $color-primary); +} + // ─── Toast ─────────────────────────────────────────────────────────────────── .account-toast { position: fixed; diff --git a/httpdocs/assets/styles/sections/_statistics.scss b/httpdocs/assets/styles/sections/_statistics.scss index fab7908..3a7046a 100644 --- a/httpdocs/assets/styles/sections/_statistics.scss +++ b/httpdocs/assets/styles/sections/_statistics.scss @@ -87,6 +87,15 @@ } } +// ─── Gesamtsumme ─────────────────────────────────────────────────────────── +.statistics-total { + text-align: right; + padding: $space-3 $space-5 0; + font-size: $font-size-lg; + font-weight: $font-weight-bold; + color: $color-text-dark; +} + // ─── Chart ────────────────────────────────────────────────────────────────── .statistics-chart-wrap { position: relative; diff --git a/httpdocs/config/services.yaml b/httpdocs/config/services.yaml index 0a8b8ff..9da5307 100644 --- a/httpdocs/config/services.yaml +++ b/httpdocs/config/services.yaml @@ -69,5 +69,13 @@ services: tags: - { name: doctrine.middleware, connection: tenant } + App\Service\MiteImportService: + arguments: + $centralEm: '@doctrine.orm.central_entity_manager' + + App\Controller\ImportController: + arguments: + $tenantEm: '@doctrine.orm.tenant_entity_manager' + App\Controller\InviteController: arguments: ~ diff --git a/httpdocs/src/Controller/AccountController.php b/httpdocs/src/Controller/AccountController.php index 8a3e003..2e5f2e8 100644 --- a/httpdocs/src/Controller/AccountController.php +++ b/httpdocs/src/Controller/AccountController.php @@ -37,7 +37,7 @@ class AccountController extends AbstractController $isAdmin = $accountUser?->isAdmin() ?? false; $tab = $request->query->get('tab', $isAdmin ? 'account' : 'user'); - if (!$isAdmin && $tab === 'account') { + if (!$isAdmin && in_array($tab, ['account', 'import'], true)) { $tab = 'user'; } diff --git a/httpdocs/src/Controller/ImportController.php b/httpdocs/src/Controller/ImportController.php new file mode 100644 index 0000000..311bf3b --- /dev/null +++ b/httpdocs/src/Controller/ImportController.php @@ -0,0 +1,84 @@ +roleHelper->isAdmin()) { + return $this->json(['error' => $this->translator->trans('app.error.access_denied')], 403); + } + + $file = $request->files->get('file'); + if (!$file) { + return $this->json(['error' => $this->translator->trans('app.import.error_no_file')], 400); + } + + if ($file->getSize() > self::MAX_FILE_SIZE) { + return $this->json(['error' => $this->translator->trans('app.import.error_file_too_large')], 400); + } + + $ext = strtolower($file->getClientOriginalExtension()); + if ($ext !== 'xml') { + return $this->json(['error' => $this->translator->trans('app.import.error_invalid_format')], 400); + } + + try { + $xml = file_get_contents($file->getPathname()); + $analysis = $this->miteImportService->analyze($xml); + return $this->json($analysis); + } catch (\RuntimeException $e) { + return $this->json(['error' => $e->getMessage()], 422); + } + } + + #[Route('/api/import/mite/execute', name: 'api_import_mite_execute', methods: ['POST'])] + public function execute(Request $request): JsonResponse + { + if (!$this->roleHelper->isAdmin()) { + return $this->json(['error' => $this->translator->trans('app.error.access_denied')], 403); + } + + $file = $request->files->get('file'); + if (!$file) { + return $this->json(['error' => $this->translator->trans('app.import.error_no_file')], 400); + } + + /** @var User $user */ + $user = $this->getUser(); + + $createUsers = json_decode($request->request->get('createUsers', '[]'), true) ?? []; + $createUsers = array_map('intval', $createUsers); + + try { + $xml = file_get_contents($file->getPathname()); + $result = $this->miteImportService->execute($xml, $user->getId(), $this->tenantEm, $createUsers); + return $this->json($result); + } catch (\RuntimeException $e) { + return $this->json(['error' => $e->getMessage()], 422); + } + } +} diff --git a/httpdocs/src/Service/MiteImportService.php b/httpdocs/src/Service/MiteImportService.php new file mode 100644 index 0000000..68a08df --- /dev/null +++ b/httpdocs/src/Service/MiteImportService.php @@ -0,0 +1,476 @@ +parse($xml); + + $account = $this->tenantContext->getAccount(); + $userMapping = []; + foreach ($data['users'] as $miteUser) { + $matched = $this->userRepo->findByEmail($miteUser['email']); + $matchedInAccount = null; + if ($matched) { + $au = $this->accountUserRepo->findOneBy([ + 'account' => $account, + 'user' => $matched, + ]); + if ($au && !$au->isArchived()) { + $matchedInAccount = $matched; + } + } + + $userMapping[] = [ + 'miteId' => $miteUser['id'], + 'name' => $miteUser['name'], + 'email' => $miteUser['email'], + 'role' => $miteUser['role'], + 'matched' => $matchedInAccount !== null, + 'matchedUserId' => $matchedInAccount?->getId(), + 'matchedUserName' => $matchedInAccount?->getFullName(), + 'entryCount' => $this->countEntriesForUser($data['timeEntries'], $miteUser['id']), + ]; + } + + $warnings = $this->detectWarnings($data); + + $dateRange = $this->getDateRange($data['timeEntries']); + + return [ + 'customers' => count($data['customers']), + 'projects' => count($data['projects']), + 'services' => count($data['services']), + 'timeEntries' => count($data['timeEntries']), + 'users' => $userMapping, + 'warnings' => $warnings, + 'dateRange' => $dateRange, + ]; + } + + /** + * @param int[] $createUserIds mite-User-IDs, für die ein neuer System-User angelegt werden soll + */ + public function execute(string $xml, int $currentUserId, EntityManagerInterface $tenantEm, array $createUserIds = []): array + { + $data = $this->parse($xml); + + $account = $this->tenantContext->getAccount(); + $miteUserToSystemUser = []; + $usersCreated = 0; + + $miteUsersById = []; + foreach ($data['users'] as $mu) { + $miteUsersById[$mu['id']] = $mu; + } + + foreach ($data['users'] as $miteUser) { + $matched = $this->userRepo->findByEmail($miteUser['email']); + if ($matched) { + $au = $this->accountUserRepo->findOneBy([ + 'account' => $account, + 'user' => $matched, + ]); + if ($au && !$au->isArchived()) { + $miteUserToSystemUser[$miteUser['id']] = $matched->getId(); + continue; + } + } + + if (in_array($miteUser['id'], $createUserIds, true)) { + $user = $this->createUserFromMite($miteUser, $account); + $miteUserToSystemUser[$miteUser['id']] = $user->getId(); + $usersCreated++; + continue; + } + + $miteUserToSystemUser[$miteUser['id']] = $currentUserId; + } + + $tenantEm->beginTransaction(); + try { + $serviceMap = $this->importServices($data['services'], $tenantEm); + $clientMap = $this->importClients($data['customers'], $tenantEm); + $projectMap = $this->importProjects($data['projects'], $clientMap, $tenantEm); + + $tenantEm->flush(); + + $entryCount = $this->importTimeEntries( + $data['timeEntries'], + $projectMap, + $serviceMap, + $miteUserToSystemUser, + $currentUserId, + $tenantEm, + ); + + $tenantEm->flush(); + $tenantEm->commit(); + + return [ + 'services' => count($data['services']), + 'servicesCreated' => count($serviceMap['created']), + 'clients' => count($data['customers']), + 'clientsCreated' => count($clientMap['created']), + 'projects' => count($data['projects']), + 'projectsCreated' => count($projectMap['created']), + 'timeEntries' => $entryCount, + 'usersCreated' => $usersCreated, + ]; + } catch (\Throwable $e) { + $tenantEm->rollback(); + throw $e; + } + } + + private function parse(string $xml): array + { + libxml_use_internal_errors(true); + $doc = simplexml_load_string($xml); + if ($doc === false) { + $errors = libxml_get_errors(); + libxml_clear_errors(); + $msg = !empty($errors) ? $errors[0]->message : 'Unbekannter Fehler'; + throw new \RuntimeException('XML-Parsing fehlgeschlagen: ' . trim($msg)); + } + + $customers = []; + foreach ($doc->customers->customer ?? [] as $c) { + $customers[] = [ + 'id' => (int) $c->id, + 'name' => (string) $c->name, + 'hourlyRate' => (int) $c->{'hourly-rate'}, + 'note' => (string) $c->note, + 'archived' => ((string) $c->archived) === 'true', + ]; + } + + $projects = []; + foreach ($doc->projects->project ?? [] as $p) { + $projects[] = [ + 'id' => (int) $p->id, + 'customerId' => (int) $p->{'customer-id'}, + 'name' => (string) $p->name, + 'hourlyRate' => (int) $p->{'hourly-rate'}, + 'note' => (string) $p->note, + 'archived' => ((string) $p->archived) === 'true', + 'budget' => (int) $p->budget, + ]; + } + + $services = []; + foreach ($doc->services->service ?? [] as $s) { + $services[] = [ + 'id' => (int) $s->id, + 'name' => (string) $s->name, + 'billable' => ((string) $s->billable) === 'true', + 'hourlyRate' => (int) $s->{'hourly-rate'}, + 'note' => (string) $s->note, + 'archived' => ((string) $s->archived) === 'true', + ]; + } + + $timeEntries = []; + foreach ($doc->{'time-entries'}->{'time-entry'} ?? [] as $te) { + $timeEntries[] = [ + 'id' => (int) $te->id, + 'dateAt' => (string) $te->{'date-at'}, + 'minutes' => (int) $te->minutes, + 'projectId' => (int) $te->{'project-id'}, + 'serviceId' => (int) $te->{'service-id'}, + 'userId' => (int) $te->{'user-id'}, + 'note' => (string) $te->note, + 'billable' => ((string) $te->billable) === 'true', + 'locked' => ((string) $te->locked) === 'true', + ]; + } + + $users = []; + foreach ($doc->users->user ?? [] as $u) { + $users[] = [ + 'id' => (int) $u->id, + 'name' => (string) $u->name, + 'email' => (string) $u->email, + 'role' => (string) $u->role, + 'archived' => ((string) $u->archived) === 'true', + ]; + } + + return compact('customers', 'projects', 'services', 'timeEntries', 'users'); + } + + /** + * @return array{entities: array{{ 'app.import.desc_mite'|trans }}
+ +