Datenschutz vollmacht fixed, two time counter added

frontend/src/pages/contracts/ContractForm.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams, useSearchParams, useLocation } from 'react-router-dom';
+import { popHistory } from '../../utils/navigation';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { useForm } from 'react-hook-form';
 import { contractApi, customerApi, platformApi, cancellationPeriodApi, contractDurationApi, providerApi, contractCategoryApi } from '../../services/api';
@@ -64,7 +65,7 @@ export default function ContractForm() {
   const location = useLocation();
   const queryClient = useQueryClient();
   const isEdit = !!id;
-  const backTo = (location.state as any)?.from as string | undefined;
+  const back = popHistory(location.state, isEdit ? `/contracts/${id}` : '/contracts');
 
   const preselectedCustomerId = searchParams.get('customerId');
 
@@ -80,6 +81,7 @@ export default function ContractForm() {
   const contractType = watch('type') as ContractType;
   const customerId = watch('customerId');
   const previousContractId = watch('previousContractId');
+  const selectedMeterId = watch('meterId');
 
   // Fetch existing contract for edit
   const { data: contract } = useQuery({
@@ -276,6 +278,7 @@ export default function ContractForm() {
         annualConsumptionKwh: c.energyDetails?.annualConsumptionKwh || '',
         basePrice: c.energyDetails?.basePrice || '',
         unitPrice: c.energyDetails?.unitPrice || '',
+        unitPriceNt: c.energyDetails?.unitPriceNt || '',
         bonus: c.energyDetails?.bonus || '',
         // Internet details
         downloadSpeed: c.internetDetails?.downloadSpeed || '',
@@ -512,6 +515,7 @@ export default function ContractForm() {
         annualConsumptionKwh: data.annualConsumptionKwh ? parseFloat(data.annualConsumptionKwh) : null,
         basePrice: data.basePrice ? parseFloat(data.basePrice) : null,
         unitPrice: data.unitPrice ? parseFloat(data.unitPrice) : null,
+        unitPriceNt: data.unitPriceNt ? parseFloat(data.unitPriceNt) : null,
         bonus: data.bonus ? parseFloat(data.bonus) : null,
       };
     }
@@ -605,7 +609,8 @@ export default function ContractForm() {
   const addresses = customer?.addresses || [];
   const bankCards = customer?.bankCards?.filter((c) => c.isActive) || [];
   const documents = customer?.identityDocuments?.filter((d) => d.isActive) || [];
-  const meters = customer?.meters?.filter((m) => m.isActive) || [];
+  const meters = customer?.meters || [];
+  const selectedMeter = meters.find(m => m.id.toString() === selectedMeterId);
   const stressfreiEmails = customer?.stressfreiEmails?.filter((e: { isActive: boolean }) => e.isActive) || [];
   const platforms = platformsData?.data || [];
   const cancellationPeriods = cancellationPeriodsData?.data || [];
@@ -658,7 +663,7 @@ export default function ContractForm() {
   return (
     <div>
       <div className="flex items-center gap-4 mb-6">
-        <Button variant="ghost" size="sm" onClick={() => navigate(backTo || (isEdit ? `/contracts/${id}` : '/contracts'))}>
+        <Button variant="ghost" size="sm" onClick={() => navigate(back.to, { state: back.state })}>
           <ArrowLeft className="w-4 h-4" />
         </Button>
         <h1 className="text-2xl font-bold">
@@ -951,10 +956,10 @@ export default function ContractForm() {
                 label="Zähler"
                 {...register('meterId')}
                 options={meters
-                  .filter((m) => m.type === contractType)
+                  .filter((m) => m.type === contractType && (m.isActive || m.id.toString() === watch('meterId')))
                   .map((m) => ({
                     value: m.id,
-                    label: `${m.meterNumber}${m.location ? ` (${m.location})` : ''}`,
+                    label: `${m.meterNumber}${m.location ? ` (${m.location})` : ''}${!m.isActive ? ' (deaktiviert)' : ''}`,
                   }))}
               />
               <Input
@@ -975,11 +980,19 @@ export default function ContractForm() {
               )}
               <Input label="Grundpreis (€/Monat)" type="number" step="any" {...register('basePrice')} />
               <Input
-                label="Arbeitspreis (€/kWh)"
+                label={selectedMeter?.tariffModel === 'DUAL' ? 'HT-Arbeitspreis (€/kWh)' : 'Arbeitspreis (€/kWh)'}
                 type="number"
                 step="any"
                 {...register('unitPrice')}
               />
+              {selectedMeter?.tariffModel === 'DUAL' && (
+                <Input
+                  label="NT-Arbeitspreis (€/kWh)"
+                  type="number"
+                  step="any"
+                  {...register('unitPriceNt')}
+                />
+              )}
               <Input label="Bonus (€)" type="number" step="0.01" {...register('bonus')} />
             </div>
 
@@ -1409,7 +1422,7 @@ export default function ContractForm() {
         </Card>
 
         <div className="flex justify-end gap-4">
-          <Button type="button" variant="secondary" onClick={() => navigate(backTo || (isEdit ? `/contracts/${id}` : '/contracts'))}>
+          <Button type="button" variant="secondary" onClick={() => navigate(back.to, { state: back.state })}>
             Abbrechen
           </Button>
           <Button type="submit" disabled={isLoading}>