1625: Add verein360 logo to applications view

digitalfabrik · Dec 3, 2024 · 62e1ae5 · 62e1ae5
1 parent ded340f
commit 62e1ae5
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 32 deletions.
diff --git a/administration/src/assets/verein360.svg b/administration/src/assets/verein360.svg
diff --git a/administration/src/bp-modules/applications/ApplicationCard.tsx b/administration/src/bp-modules/applications/ApplicationCard.tsx
@@ -8,7 +8,7 @@ import {
   Icon,
   Section,
   SectionCard,
-  Tooltip,
+  Tooltip
 } from '@blueprintjs/core'
 import React, { ReactElement, memo, useContext, useMemo, useState } from 'react'
 import styled, { css } from 'styled-components'
@@ -21,10 +21,10 @@ import getApiBaseUrl from '../../util/getApiBaseUrl'
 import { useAppToaster } from '../AppToaster'
 import { Application } from './ApplicationsOverview'
 import JsonFieldView, { JsonField, findValue } from './JsonFieldView'
-import JuleicaVerificationQuickIndicator from './JuleicaVerificationQuickIndicator'
 import NoteDialogController from './NoteDialogController'
 import VerificationsQuickIndicator from './VerificationsQuickIndicator'
 import VerificationsView from './VerificationsView'
+import PreVerifiedQuickIndicator, { PreVerifiedQuickIndicatorType } from './PreVerifiedQuickIndicator'
 
 export const printAwareCss = css`
   @media print {
@@ -58,6 +58,7 @@ export const CollapseIcon = styled(Icon)`
   align-self: center;
   padding: 2px;
   ${printAwareCss};
+
   :hover {
     cursor: pointer;
     color: ${Colors.GRAY1};
@@ -113,14 +114,31 @@ const RightElement = ({ jsonField, application }: RightElementProps): ReactEleme
     return !!blueCardJuleicaEntitlement
   }
 
+  const isPreverified = (): boolean => {
+    const applicationDetails = findValue(jsonField, 'applicationDetails', 'Array') ?? jsonField;
+    const workAtOrganizationsEntitlement = findValue(applicationDetails, 'blueCardWorkAtOrganizationsEntitlement', 'Array')?.value ?? [];
+
+    const isAlreadyVerified = workAtOrganizationsEntitlement.some((entitlement: any) =>
+      entitlement.value.some((organization: any) =>
+        organization.name === 'isAlreadyVerified' && organization.value === true
+      )
+    )
+    return isAlreadyVerified
+  }
+
+  let quickIndicator;
+  if (isJuleicaEntitlementType()) {
+    quickIndicator = <PreVerifiedQuickIndicator type={PreVerifiedQuickIndicatorType.Juleica} />;
+  } else if (isPreverified()) {
+    quickIndicator = <PreVerifiedQuickIndicator type={PreVerifiedQuickIndicatorType.Verein360} />;
+  } else {
+    quickIndicator = <VerificationsQuickIndicator verifications={application.verifications} />;
+  }
+
   return (
     <RightElementContainer>
-      {!!application.note && application.note.trim() && <Icon icon='annotation' intent='none' />}
-      {isJuleicaEntitlementType() ? (
-        <JuleicaVerificationQuickIndicator />
-      ) : (
-        <VerificationsQuickIndicator verifications={application.verifications} />
-      )}
+      {!!application.note && application.note.trim() && <Icon icon="annotation" intent="none" />}
+      {quickIndicator}
     </RightElementContainer>
   )
 }
@@ -134,12 +152,12 @@ export type ApplicationCardProps = {
 }
 
 const ApplicationCard = ({
-  application,
-  onDelete,
-  printApplicationById,
-  isSelectedForPrint,
-  onChange,
-}: ApplicationCardProps) => {
+                           application,
+                           onDelete,
+                           printApplicationById,
+                           isSelectedForPrint,
+                           onChange
+                         }: ApplicationCardProps) => {
   const [isExpanded, setIsExpanded] = useState(false)
   const { createdDate: createdDateString, jsonValue, id, withdrawalDate, cardCreated } = application
   const jsonField: JsonField<'Array'> = JSON.parse(jsonValue)
@@ -160,7 +178,7 @@ const ApplicationCard = ({
         console.error('Delete operation returned false.')
         appToaster?.show({ intent: 'danger', message: 'Etwas ist schief gelaufen.' })
       }
-    },
+    }
   })
 
   const createCardQuery = useMemo(
@@ -187,7 +205,7 @@ const ApplicationCard = ({
       }
       rightElement={<RightElement jsonField={jsonField} application={application} />}
       elevation={1}
-      icon={withdrawalDate ? <Icon icon='warning-sign' intent='warning' /> : undefined}
+      icon={withdrawalDate ? <Icon icon="warning-sign" intent="warning" /> : undefined}
       collapseProps={{ isOpen: isExpanded, onToggle: () => setIsExpanded(!isExpanded), keepChildrenMounted: true }}
       collapsible={!isSelectedForPrint}
       $hideInPrintMode={!isSelectedForPrint}>
@@ -201,7 +219,7 @@ const ApplicationCard = ({
           />
 
           {!!withdrawalDate && (
-            <WithdrawAlert intent='warning'>
+            <WithdrawAlert intent="warning">
               Der Antrag wurde vom Antragsteller am {formatDateWithTimezone(withdrawalDate, config.timezone)}{' '}
               zurückgezogen. <br />
               Bitte löschen Sie den Antrag zeitnah.
@@ -224,28 +242,28 @@ const ApplicationCard = ({
         <ButtonContainer>
           <Tooltip
             disabled={!!createCardQuery}
-            content='Es existiert kein passendes Mapping, um aus diesem Antrag das Kartenformular vollständig auszufüllen.'>
+            content="Es existiert kein passendes Mapping, um aus diesem Antrag das Kartenformular vollständig auszufüllen.">
             <PrintAwareAnchorButton
               disabled={!createCardQuery}
               href={createCardQuery ? `./cards/add${createCardQuery}` : undefined}
-              icon='id-number'
-              intent='primary'>
+              icon="id-number"
+              intent="primary">
               {cardCreated ? 'Karte erneut erstellen' : 'Karte erstellen'}
             </PrintAwareAnchorButton>
           </Tooltip>
-          <PrintAwareButton onClick={() => setDeleteDialogOpen(true)} intent='danger' icon='trash'>
+          <PrintAwareButton onClick={() => setDeleteDialogOpen(true)} intent="danger" icon="trash">
             Antrag löschen
           </PrintAwareButton>
-          <PrintAwareButton onClick={() => printApplicationById(id)} intent='none' icon='print'>
+          <PrintAwareButton onClick={() => printApplicationById(id)} intent="none" icon="print">
             PDF exportieren
           </PrintAwareButton>
-          <CollapseIcon icon='chevron-up' onClick={() => setIsExpanded(!isExpanded)} style={{ marginLeft: 'auto' }} />
+          <CollapseIcon icon="chevron-up" onClick={() => setIsExpanded(!isExpanded)} style={{ marginLeft: 'auto' }} />
         </ButtonContainer>
         <Alert
-          cancelButtonText='Abbrechen'
-          confirmButtonText='Antrag löschen'
-          icon='trash'
-          intent='danger'
+          cancelButtonText="Abbrechen"
+          confirmButtonText="Antrag löschen"
+          icon="trash"
+          intent="danger"
           isOpen={deleteDialogOpen}
           loading={loading}
           onCancel={() => setDeleteDialogOpen(false)}

diff --git a/...ons/JuleicaVerificationQuickIndicator.tsx → ...pplications/PreVerifiedQuickIndicator.tsx b/...ons/JuleicaVerificationQuickIndicator.tsx → ...pplications/PreVerifiedQuickIndicator.tsx
@@ -2,10 +2,18 @@ import { Tooltip } from '@blueprintjs/core'
 import React, { memo } from 'react'
 
 import JuleicaLogo from '../../assets/juleica.svg'
+import Verein360Logo from '../../assets/verein360.svg'
 import { UnFocusedDiv } from './VerificationsQuickIndicator'
 import { Indicator, VerificationStatus } from './VerificationsView'
 
-const JuleicaVerificationQuickIndicator = memo(() => (
+export enum PreVerifiedQuickIndicatorType {
+  Juleica,
+  Verein360,
+}
+
+const PreVerifiedQuickIndicator = memo(({type}: {type: PreVerifiedQuickIndicatorType}) => {
+  const logo = type == PreVerifiedQuickIndicatorType.Juleica ? JuleicaLogo : Verein360Logo
+  return (
   <Tooltip
     content={
       <div>
@@ -16,9 +24,9 @@ const JuleicaVerificationQuickIndicator = memo(() => (
     }>
     <UnFocusedDiv>
       <Indicator status={VerificationStatus.Verified} />
-      <img src={JuleicaLogo} alt='juleica' height='100%' />
+      <img src={logo} alt={type.toString()} height='100%' />
     </UnFocusedDiv>
   </Tooltip>
-))
+)})
 
-export default memo(JuleicaVerificationQuickIndicator)
+export default memo(PreVerifiedQuickIndicator)
diff --git a/administration/src/util/translations/de.json b/administration/src/util/translations/de.json
@@ -41,6 +41,7 @@
     "responsibility": "Tätigkeit",
     "amountOfWork": "Arbeitsstunden pro Woche (Durchschnitt)",
     "workSinceDate": "Tätig seit",
+    "isAlreadyVerified": "Die Angaben wurden bereits durch den zuständigen Verein bei Beantragung verifiziert",
     "payment": "Für diese ehrenamtliche Tätigkeit wurde eine Aufwandsentschädigung gewährt, die über den jährlichen Freibetrag hinaus geht (840 Euro Ehrenamtspauschale bzw. 3000 Euro Übungsleiterpauschale):",
     "certificate": "Tätigkeitsnachweis",
     "hasAcceptedPrivacyPolicy": "Ich erkläre mich damit einverstanden, dass meine Daten zum Zwecke der Antragsverarbeitung gespeichert werden und akzeptiere die Datenschutzerklärung",

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/Utils.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/Utils.kt
@@ -12,7 +12,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
 import java.time.LocalDate
 
 class Utils {
-    companion object utils {
+    companion object Utils {
         private fun authenticateToken(header: String?, neededType: ApiTokenType): ApiTokenEntity {
             val authHeader = header?.takeIf { it.startsWith("Bearer ") }
                 ?: throw UnauthorizedException()