Account Statements: Enable adding manual statements

src/main/frontend/generated/flow/generated-flow-imports.js

@@ -14,19 +14,27 @@ import '@vaadin/checkbox-group/src/vaadin-checkbox-group.js';
 import '@vaadin/combo-box/src/vaadin-combo-box.js';
 import 'Frontend/generated/jar-resources/flow-component-renderer.js';
 import 'Frontend/generated/jar-resources/flow-component-directive.js';
+import 'lit';
 import 'Frontend/generated/jar-resources/comboBoxConnector.js';
+import '@vaadin/component-base/src/debounce.js';
+import '@vaadin/component-base/src/async.js';
+import '@vaadin/combo-box/src/vaadin-combo-box-placeholder.js';
 import '@vaadin/multi-select-combo-box/src/vaadin-multi-select-combo-box.js';
 import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js';
 import '@vaadin/context-menu/src/vaadin-context-menu.js';
 import 'Frontend/generated/jar-resources/contextMenuConnector.js';
 import 'Frontend/generated/jar-resources/contextMenuTargetConnector.js';
+import '@vaadin/component-base/src/gestures.js';
 import '@vaadin/custom-field/src/vaadin-custom-field.js';
 import '@vaadin/date-picker/src/vaadin-date-picker.js';
 import 'Frontend/generated/jar-resources/datepickerConnector.js';
+import 'date-fns/parse';
+import '@vaadin/date-picker/src/vaadin-date-picker-helper.js';
 import '@vaadin/date-time-picker/src/vaadin-date-time-picker.js';
 import '@vaadin/time-picker/src/vaadin-time-picker.js';
 import 'Frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js';
 import 'Frontend/generated/jar-resources/vaadin-time-picker/helpers.js';
+import '@vaadin/time-picker/src/vaadin-time-picker-helper.js';
 import '@vaadin/dialog/src/vaadin-dialog.js';
 import 'Frontend/generated/jar-resources/dndConnector.js';
 import '@vaadin/form-layout/src/vaadin-form-layout.js';
@@ -37,6 +45,7 @@ import '@vaadin/grid/src/vaadin-grid.js';
 import '@vaadin/grid/src/vaadin-grid-column.js';
 import '@vaadin/grid/src/vaadin-grid-sorter.js';
 import 'Frontend/generated/jar-resources/gridConnector.ts';
+import '@vaadin/grid/src/vaadin-grid-active-item-mixin.js';
 import 'Frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js';
 import '@vaadin/tooltip/src/vaadin-tooltip.js';
 import '@vaadin/icon/src/vaadin-icon.js';
@@ -61,6 +70,8 @@ import '@vaadin/progress-bar/src/vaadin-progress-bar.js';
 import '@vaadin/radio-group/src/vaadin-radio-button.js';
 import '@vaadin/radio-group/src/vaadin-radio-group.js';
 import 'Frontend/generated/jar-resources/ReactRouterOutletElement.tsx';
+import 'react-router';
+import 'react';
 import '@vaadin/select/src/vaadin-select.js';
 import 'Frontend/generated/jar-resources/selectConnector.js';
 import 'Frontend/generated/jar-resources/tooltip.ts';
@@ -72,13 +83,15 @@ import '@vaadin/tabs/src/vaadin-tab.js';
 import '@vaadin/tabsheet/src/vaadin-tabsheet.js';
 import '@vaadin/tabs/src/vaadin-tabs.js';
 import 'Frontend/generated/jar-resources/vaadin-big-decimal-field.js';
+import '@vaadin/text-field/src/vaadin-text-field.js';
+import '@vaadin/component-base/src/define.js';
 import '@vaadin/email-field/src/vaadin-email-field.js';
 import '@vaadin/integer-field/src/vaadin-integer-field.js';
 import '@vaadin/number-field/src/vaadin-number-field.js';
 import '@vaadin/password-field/src/vaadin-password-field.js';
 import '@vaadin/text-area/src/vaadin-text-area.js';
-import '@vaadin/text-field/src/vaadin-text-field.js';
 import 'Frontend/generated/jar-resources/lit-renderer.ts';
+import 'lit/directives/live.js';
 import '@vaadin/grid/src/vaadin-grid-tree-toggle.js';
 import 'Frontend/generated/jar-resources/treeGridConnector.ts';
 import '@vaadin/upload/src/vaadin-upload.js';

src/main/frontend/generated/flow/generated-flow-webcomponent-imports.js

@@ -21,19 +21,27 @@ import '@vaadin/checkbox-group/src/vaadin-checkbox-group.js';
 import '@vaadin/combo-box/src/vaadin-combo-box.js';
 import 'Frontend/generated/jar-resources/flow-component-renderer.js';
 import 'Frontend/generated/jar-resources/flow-component-directive.js';
+import 'lit';
 import 'Frontend/generated/jar-resources/comboBoxConnector.js';
+import '@vaadin/component-base/src/debounce.js';
+import '@vaadin/component-base/src/async.js';
+import '@vaadin/combo-box/src/vaadin-combo-box-placeholder.js';
 import '@vaadin/multi-select-combo-box/src/vaadin-multi-select-combo-box.js';
 import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js';
 import '@vaadin/context-menu/src/vaadin-context-menu.js';
 import 'Frontend/generated/jar-resources/contextMenuConnector.js';
 import 'Frontend/generated/jar-resources/contextMenuTargetConnector.js';
+import '@vaadin/component-base/src/gestures.js';
 import '@vaadin/custom-field/src/vaadin-custom-field.js';
 import '@vaadin/date-picker/src/vaadin-date-picker.js';
 import 'Frontend/generated/jar-resources/datepickerConnector.js';
+import 'date-fns/parse';
+import '@vaadin/date-picker/src/vaadin-date-picker-helper.js';
 import '@vaadin/date-time-picker/src/vaadin-date-time-picker.js';
 import '@vaadin/time-picker/src/vaadin-time-picker.js';
 import 'Frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js';
 import 'Frontend/generated/jar-resources/vaadin-time-picker/helpers.js';
+import '@vaadin/time-picker/src/vaadin-time-picker-helper.js';
 import '@vaadin/dialog/src/vaadin-dialog.js';
 import 'Frontend/generated/jar-resources/dndConnector.js';
 import '@vaadin/form-layout/src/vaadin-form-layout.js';
@@ -44,6 +52,7 @@ import '@vaadin/grid/src/vaadin-grid.js';
 import '@vaadin/grid/src/vaadin-grid-column.js';
 import '@vaadin/grid/src/vaadin-grid-sorter.js';
 import 'Frontend/generated/jar-resources/gridConnector.ts';
+import '@vaadin/grid/src/vaadin-grid-active-item-mixin.js';
 import 'Frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js';
 import '@vaadin/tooltip/src/vaadin-tooltip.js';
 import '@vaadin/icon/src/vaadin-icon.js';
@@ -68,6 +77,8 @@ import '@vaadin/progress-bar/src/vaadin-progress-bar.js';
 import '@vaadin/radio-group/src/vaadin-radio-button.js';
 import '@vaadin/radio-group/src/vaadin-radio-group.js';
 import 'Frontend/generated/jar-resources/ReactRouterOutletElement.tsx';
+import 'react-router';
+import 'react';
 import '@vaadin/select/src/vaadin-select.js';
 import 'Frontend/generated/jar-resources/selectConnector.js';
 import 'Frontend/generated/jar-resources/tooltip.ts';
@@ -79,13 +90,15 @@ import '@vaadin/tabs/src/vaadin-tab.js';
 import '@vaadin/tabsheet/src/vaadin-tabsheet.js';
 import '@vaadin/tabs/src/vaadin-tabs.js';
 import 'Frontend/generated/jar-resources/vaadin-big-decimal-field.js';
+import '@vaadin/text-field/src/vaadin-text-field.js';
+import '@vaadin/component-base/src/define.js';
 import '@vaadin/email-field/src/vaadin-email-field.js';
 import '@vaadin/integer-field/src/vaadin-integer-field.js';
 import '@vaadin/number-field/src/vaadin-number-field.js';
 import '@vaadin/password-field/src/vaadin-password-field.js';
 import '@vaadin/text-area/src/vaadin-text-area.js';
-import '@vaadin/text-field/src/vaadin-text-field.js';
 import 'Frontend/generated/jar-resources/lit-renderer.ts';
+import 'lit/directives/live.js';
 import '@vaadin/grid/src/vaadin-grid-tree-toggle.js';
 import 'Frontend/generated/jar-resources/treeGridConnector.ts';
 import '@vaadin/upload/src/vaadin-upload.js';

src/main/frontend/generated/theme-midas-theme.generated.js

@@ -2,7 +2,6 @@ import { injectGlobalCss } from 'Frontend/generated/jar-resources/theme-util.js'
 import { webcomponentGlobalCssInjector } from 'Frontend/generated/jar-resources/theme-util.js';
 import './theme-midas-theme.components.generated.js';
 let needsReloadOnChanges = false;
-import stylesCss from 'themes/midas-theme/styles.css?inline';
 
   let themeRemovers = new WeakMap();
   let targets = [];
@@ -11,8 +10,7 @@ import stylesCss from 'themes/midas-theme/styles.css?inline';
   export const applyTheme = (target) => {
     const removers = [];
     if (target !== document) {
-      removers.push(injectGlobalCss(stylesCss.toString(), '', target));
-
+
 
         webcomponentGlobalCssInjector((css) => {
           removers.push(injectGlobalCss(css, '', target));

src/main/frontend/generated/theme-midas-theme.global.generated.js

@@ -1,4 +1,3 @@
 // When this file is imported, global styles are automatically applied
 
-import 'themes/midas-theme/styles.css';
 

src/main/frontend/generated/vaadin.ts

@@ -56,3 +56,9 @@ import './app-shell-imports.js';
 import './theme-midas-theme.global.generated.js';
 import { applyTheme } from './theme.js';
 applyTheme(document);
+
+import { Outlet } from 'react-router';
+(window as any).Vaadin ??= {};
+(window as any).Vaadin.copilot ??= {};
+(window as any).Vaadin.copilot._ref ??= {};
+(window as any).Vaadin.copilot._ref.Outlet = Outlet;

src/main/frontend/themes/midas-theme/styles.css

@@ -27,6 +27,15 @@ vaadin-grid::part(no-separator-column) {
   border-bottom: none !important;
 }
 
+vaadin-grid::part(hidden) {
+  background: var(--lumo-contrast-10pct) !important;
+  color: var(--lumo-secondary-text-color) !important;
+}
+
+vaadin-grid::part(manual-extra) {
+  background-color: var(--lumo-success-color-10pct) !important;
+}
+
 vaadin-grid::part(single-separator) {
   border-top: none !important;
   border-bottom: 1px solid var(--lumo-contrast-10pct) !important;

src/main/java/de/nihas101/midas/accountstatement/dto/AccountStatements.java

@@ -3,8 +3,14 @@
 import de.nihas101.midas.bookings.entity.BookingType;
 import de.nihas101.midas.openingbalance.dto.OpeningBalance;
 
+import java.util.List;
+
 public interface AccountStatements {
     OpeningBalance openingBalance();
 
     LabeledAccountStatement forType(BookingType bookingType);
+
+    default List<LabeledAccountStatement> manualStatements() {
+        return List.of();
+    }
 }

src/main/java/de/nihas101/midas/accountstatement/dto/DefaultAccountStatement.java

@@ -2,6 +2,7 @@
 
 import de.nihas101.midas.accountstatement.repository.AccountStatementEntity;
 import de.nihas101.midas.bookings.entity.BookingType;
+import de.nihas101.midas.bookings.entity.Source;
 import de.nihas101.midas.money.MoneyAmount;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
@@ -23,6 +24,8 @@ public final class DefaultAccountStatement implements LabeledAccountStatement {
     private final BookingType type;
     private final MoneyAmount amount;
     private final String label;
+    private final boolean hidden;
+    private final Source source;
 
     public DefaultAccountStatement(
             final AccountStatementEntity accountStatementEntity,
@@ -58,7 +61,27 @@ public DefaultAccountStatement(
                 amount,
                 type != null && messageSource != null
                         ? messageSource.getMessage(type.getAccountStatementI18nKey(), null, locale)
-                        : null
+                        : null,
+                MoneyAmount.ZERO.equals(amount), // Hide zero amounts by default, unless the user overrides this
+                Source.SYSTEM
+        );
+    }
+
+    public DefaultAccountStatement(
+            final Integer id,
+            final Year year,
+            final BookingType type,
+            final MoneyAmount amount,
+            final String label
+    ) {
+        this(
+                id,
+                year,
+                type,
+                amount,
+                label,
+                false,
+                Source.SYSTEM
         );
     }
 
@@ -82,4 +105,18 @@ public MoneyAmount amount() {
         return amount;
     }
 
+    @Override
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    @Override
+    public boolean isManualExtra() {
+        return source == Source.USER;
+    }
+
+    @Override
+    public BookingType bookingType() {
+        return type;
+    }
 }