Merge branch 'jhipster-generated'

src/main/java/org/hostsharing/hsadminng/domain/Asset.java

@@ -50,8 +50,8 @@ public class Asset implements Serializable {
     @Column(name = "remark", length = 160)
     private String remark;
 
-    @NotNull
     @ManyToOne(optional = false)
+    @NotNull
     @JsonIgnoreProperties("assets")
     private Membership membership;
 

src/main/java/org/hostsharing/hsadminng/domain/Customer.java

@@ -7,10 +7,15 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Objects;
 
+import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
+
+import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
+
 /**
  * A Customer.
  */
@@ -42,6 +47,35 @@ public class Customer implements Serializable {
     @Column(name = "name", length = 80, nullable = false)
     private String name;
 
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    @Column(name = "kind", nullable = false)
+    private CustomerKind kind;
+
+    @Column(name = "birth_date")
+    private LocalDate birthDate;
+
+    @Size(max = 80)
+    @Column(name = "birth_place", length = 80)
+    private String birthPlace;
+
+    @Size(max = 80)
+    @Column(name = "registration_court", length = 80)
+    private String registrationCourt;
+
+    @Size(max = 80)
+    @Column(name = "registration_number", length = 80)
+    private String registrationNumber;
+
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    @Column(name = "vat_region", nullable = false)
+    private VatRegion vatRegion;
+
+    @Size(max = 40)
+    @Column(name = "vat_number", length = 40)
+    private String vatNumber;
+
     @Size(max = 80)
     @Column(name = "contractual_salutation", length = 80)
     private String contractualSalutation;
@@ -115,6 +149,97 @@ public class Customer implements Serializable {
         this.name = name;
     }
 
+    public CustomerKind getKind() {
+        return kind;
+    }
+
+    public Customer kind(CustomerKind kind) {
+        this.kind = kind;
+        return this;
+    }
+
+    public void setKind(CustomerKind kind) {
+        this.kind = kind;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public Customer birthDate(LocalDate birthDate) {
+        this.birthDate = birthDate;
+        return this;
+    }
+
+    public void setBirthDate(LocalDate birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public String getBirthPlace() {
+        return birthPlace;
+    }
+
+    public Customer birthPlace(String birthPlace) {
+        this.birthPlace = birthPlace;
+        return this;
+    }
+
+    public void setBirthPlace(String birthPlace) {
+        this.birthPlace = birthPlace;
+    }
+
+    public String getRegistrationCourt() {
+        return registrationCourt;
+    }
+
+    public Customer registrationCourt(String registrationCourt) {
+        this.registrationCourt = registrationCourt;
+        return this;
+    }
+
+    public void setRegistrationCourt(String registrationCourt) {
+        this.registrationCourt = registrationCourt;
+    }
+
+    public String getRegistrationNumber() {
+        return registrationNumber;
+    }
+
+    public Customer registrationNumber(String registrationNumber) {
+        this.registrationNumber = registrationNumber;
+        return this;
+    }
+
+    public void setRegistrationNumber(String registrationNumber) {
+        this.registrationNumber = registrationNumber;
+    }
+
+    public VatRegion getVatRegion() {
+        return vatRegion;
+    }
+
+    public Customer vatRegion(VatRegion vatRegion) {
+        this.vatRegion = vatRegion;
+        return this;
+    }
+
+    public void setVatRegion(VatRegion vatRegion) {
+        this.vatRegion = vatRegion;
+    }
+
+    public String getVatNumber() {
+        return vatNumber;
+    }
+
+    public Customer vatNumber(String vatNumber) {
+        this.vatNumber = vatNumber;
+        return this;
+    }
+
+    public void setVatNumber(String vatNumber) {
+        this.vatNumber = vatNumber;
+    }
+
     public String getContractualSalutation() {
         return contractualSalutation;
     }
@@ -195,6 +320,16 @@ public class Customer implements Serializable {
         return this;
     }
 
+    public Customer removeMembership(Membership membership) {
+        this.memberships.remove(membership);
+        membership.setCustomer(null);
+        return this;
+    }
+
+    public void setMemberships(Set<Membership> memberships) {
+        this.memberships = memberships;
+    }
+
     public Set<SepaMandate> getSepamandates() {
         return sepamandates;
     }
@@ -210,6 +345,15 @@ public class Customer implements Serializable {
         return this;
     }
 
+    public Customer removeSepamandate(SepaMandate sepaMandate) {
+        this.sepamandates.remove(sepaMandate);
+        sepaMandate.setCustomer(null);
+        return this;
+    }
+
+    public void setSepamandates(Set<SepaMandate> sepaMandates) {
+        this.sepamandates = sepaMandates;
+    }
     // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here, do not remove
 
     @Override
@@ -239,6 +383,13 @@ public class Customer implements Serializable {
             ", reference=" + getReference() +
             ", prefix='" + getPrefix() + "'" +
             ", name='" + getName() + "'" +
+            ", kind='" + getKind() + "'" +
+            ", birthDate='" + getBirthDate() + "'" +
+            ", birthPlace='" + getBirthPlace() + "'" +
+            ", registrationCourt='" + getRegistrationCourt() + "'" +
+            ", registrationNumber='" + getRegistrationNumber() + "'" +
+            ", vatRegion='" + getVatRegion() + "'" +
+            ", vatNumber='" + getVatNumber() + "'" +
             ", contractualSalutation='" + getContractualSalutation() + "'" +
             ", contractualAddress='" + getContractualAddress() + "'" +
             ", billingSalutation='" + getBillingSalutation() + "'" +

src/main/java/org/hostsharing/hsadminng/domain/Membership.java

@@ -30,15 +30,18 @@ public class Membership implements Serializable {
     private Long id;
 
     @NotNull
-    @Column(name = "document_date", nullable = false)
-    private LocalDate documentDate;
+    @Column(name = "admission_document_date", nullable = false)
+    private LocalDate admissionDocumentDate;
+
+    @Column(name = "cancellation_document_date")
+    private LocalDate cancellationDocumentDate;
 
     @NotNull
-    @Column(name = "member_from", nullable = false)
-    private LocalDate memberFrom;
+    @Column(name = "member_from_date", nullable = false)
+    private LocalDate memberFromDate;
 
-    @Column(name = "member_until")
-    private LocalDate memberUntil;
+    @Column(name = "member_until_date")
+    private LocalDate memberUntilDate;
 
     @Size(max = 160)
     @Column(name = "remark", length = 160)
@@ -62,43 +65,56 @@ public class Membership implements Serializable {
         this.id = id;
     }
 
-    public LocalDate getDocumentDate() {
-        return documentDate;
+    public LocalDate getAdmissionDocumentDate() {
+        return admissionDocumentDate;
     }
 
-    public Membership documentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public Membership admissionDocumentDate(LocalDate admissionDocumentDate) {
+        this.admissionDocumentDate = admissionDocumentDate;
         return this;
     }
 
-    public void setDocumentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public void setAdmissionDocumentDate(LocalDate admissionDocumentDate) {
+        this.admissionDocumentDate = admissionDocumentDate;
     }
 
-    public LocalDate getMemberFrom() {
-        return memberFrom;
+    public LocalDate getCancellationDocumentDate() {
+        return cancellationDocumentDate;
     }
 
-    public Membership memberFrom(LocalDate memberFrom) {
-        this.memberFrom = memberFrom;
+    public Membership cancellationDocumentDate(LocalDate cancellationDocumentDate) {
+        this.cancellationDocumentDate = cancellationDocumentDate;
         return this;
     }
 
-    public void setMemberFrom(LocalDate memberFrom) {
-        this.memberFrom = memberFrom;
+    public void setCancellationDocumentDate(LocalDate cancellationDocumentDate) {
+        this.cancellationDocumentDate = cancellationDocumentDate;
     }
 
-    public LocalDate getMemberUntil() {
-        return memberUntil;
+    public LocalDate getMemberFromDate() {
+        return memberFromDate;
     }
 
-    public Membership memberUntil(LocalDate memberUntil) {
-        this.memberUntil = memberUntil;
+    public Membership memberFromDate(LocalDate memberFromDate) {
+        this.memberFromDate = memberFromDate;
         return this;
     }
 
-    public void setMemberUntil(LocalDate memberUntil) {
-        this.memberUntil = memberUntil;
+    public void setMemberFromDate(LocalDate memberFromDate) {
+        this.memberFromDate = memberFromDate;
+    }
+
+    public LocalDate getMemberUntilDate() {
+        return memberUntilDate;
+    }
+
+    public Membership memberUntilDate(LocalDate memberUntilDate) {
+        this.memberUntilDate = memberUntilDate;
+        return this;
+    }
+
+    public void setMemberUntilDate(LocalDate memberUntilDate) {
+        this.memberUntilDate = memberUntilDate;
     }
 
     public String getRemark() {
@@ -129,6 +145,16 @@ public class Membership implements Serializable {
         return this;
     }
 
+    public Membership removeShare(Share share) {
+        this.shares.remove(share);
+        share.setMembership(null);
+        return this;
+    }
+
+    public void setShares(Set<Share> shares) {
+        this.shares = shares;
+    }
+
     public Set<Asset> getAssets() {
         return assets;
     }
@@ -144,6 +170,16 @@ public class Membership implements Serializable {
         return this;
     }
 
+    public Membership removeAsset(Asset asset) {
+        this.assets.remove(asset);
+        asset.setMembership(null);
+        return this;
+    }
+
+    public void setAssets(Set<Asset> assets) {
+        this.assets = assets;
+    }
+
     public Customer getCustomer() {
         return customer;
     }
@@ -182,9 +218,10 @@ public class Membership implements Serializable {
     public String toString() {
         return "Membership{" +
             "id=" + getId() +
-            ", documentDate='" + getDocumentDate() + "'" +
-            ", memberFrom='" + getMemberFrom() + "'" +
-            ", memberUntil='" + getMemberUntil() + "'" +
+            ", admissionDocumentDate='" + getAdmissionDocumentDate() + "'" +
+            ", cancellationDocumentDate='" + getCancellationDocumentDate() + "'" +
+            ", memberFromDate='" + getMemberFromDate() + "'" +
+            ", memberUntilDate='" + getMemberUntilDate() + "'" +
             ", remark='" + getRemark() + "'" +
             "}";
     }

src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java

@@ -38,21 +38,21 @@ public class SepaMandate implements Serializable {
     private String bic;
 
     @NotNull
-    @Column(name = "document_date", nullable = false)
-    private LocalDate documentDate;
+    @Column(name = "granting_document_date", nullable = false)
+    private LocalDate grantingDocumentDate;
+
+    @Column(name = "revokation_document_date")
+    private LocalDate revokationDocumentDate;
 
     @NotNull
-    @Column(name = "valid_from", nullable = false)
-    private LocalDate validFrom;
+    @Column(name = "valid_from_date", nullable = false)
+    private LocalDate validFromDate;
 
-    @Column(name = "valid_until")
-    private LocalDate validUntil;
+    @Column(name = "valid_until_date")
+    private LocalDate validUntilDate;
 
-    @Column(name = "last_used")
-    private LocalDate lastUsed;
-
-    @Column(name = "cancellation_date")
-    private LocalDate cancellationDate;
+    @Column(name = "last_used_date")
+    private LocalDate lastUsedDate;
 
     @Size(max = 160)
     @Column(name = "remark", length = 160)
@@ -111,69 +111,69 @@ public class SepaMandate implements Serializable {
         this.bic = bic;
     }
 
-    public LocalDate getDocumentDate() {
-        return documentDate;
+    public LocalDate getGrantingDocumentDate() {
+        return grantingDocumentDate;
     }
 
-    public SepaMandate documentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public SepaMandate grantingDocumentDate(LocalDate grantingDocumentDate) {
+        this.grantingDocumentDate = grantingDocumentDate;
         return this;
     }
 
-    public void setDocumentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public void setGrantingDocumentDate(LocalDate grantingDocumentDate) {
+        this.grantingDocumentDate = grantingDocumentDate;
     }
 
-    public LocalDate getValidFrom() {
-        return validFrom;
+    public LocalDate getRevokationDocumentDate() {
+        return revokationDocumentDate;
     }
 
-    public SepaMandate validFrom(LocalDate validFrom) {
-        this.validFrom = validFrom;
+    public SepaMandate revokationDocumentDate(LocalDate revokationDocumentDate) {
+        this.revokationDocumentDate = revokationDocumentDate;
         return this;
     }
 
-    public void setValidFrom(LocalDate validFrom) {
-        this.validFrom = validFrom;
+    public void setRevokationDocumentDate(LocalDate revokationDocumentDate) {
+        this.revokationDocumentDate = revokationDocumentDate;
     }
 
-    public LocalDate getValidUntil() {
-        return validUntil;
+    public LocalDate getValidFromDate() {
+        return validFromDate;
     }
 
-    public SepaMandate validUntil(LocalDate validUntil) {
-        this.validUntil = validUntil;
+    public SepaMandate validFromDate(LocalDate validFromDate) {
+        this.validFromDate = validFromDate;
         return this;
     }
 
-    public void setValidUntil(LocalDate validUntil) {
-        this.validUntil = validUntil;
+    public void setValidFromDate(LocalDate validFromDate) {
+        this.validFromDate = validFromDate;
     }
 
-    public LocalDate getLastUsed() {
-        return lastUsed;
+    public LocalDate getValidUntilDate() {
+        return validUntilDate;
     }
 
-    public SepaMandate lastUsed(LocalDate lastUsed) {
-        this.lastUsed = lastUsed;
+    public SepaMandate validUntilDate(LocalDate validUntilDate) {
+        this.validUntilDate = validUntilDate;
         return this;
     }
 
-    public void setLastUsed(LocalDate lastUsed) {
-        this.lastUsed = lastUsed;
+    public void setValidUntilDate(LocalDate validUntilDate) {
+        this.validUntilDate = validUntilDate;
     }
 
-    public LocalDate getCancellationDate() {
-        return cancellationDate;
+    public LocalDate getLastUsedDate() {
+        return lastUsedDate;
     }
 
-    public SepaMandate cancellationDate(LocalDate cancellationDate) {
-        this.cancellationDate = cancellationDate;
+    public SepaMandate lastUsedDate(LocalDate lastUsedDate) {
+        this.lastUsedDate = lastUsedDate;
         return this;
     }
 
-    public void setCancellationDate(LocalDate cancellationDate) {
-        this.cancellationDate = cancellationDate;
+    public void setLastUsedDate(LocalDate lastUsedDate) {
+        this.lastUsedDate = lastUsedDate;
     }
 
     public String getRemark() {
@@ -230,11 +230,11 @@ public class SepaMandate implements Serializable {
             ", reference='" + getReference() + "'" +
             ", iban='" + getIban() + "'" +
             ", bic='" + getBic() + "'" +
-            ", documentDate='" + getDocumentDate() + "'" +
-            ", validFrom='" + getValidFrom() + "'" +
-            ", validUntil='" + getValidUntil() + "'" +
-            ", lastUsed='" + getLastUsed() + "'" +
-            ", cancellationDate='" + getCancellationDate() + "'" +
+            ", grantingDocumentDate='" + getGrantingDocumentDate() + "'" +
+            ", revokationDocumentDate='" + getRevokationDocumentDate() + "'" +
+            ", validFromDate='" + getValidFromDate() + "'" +
+            ", validUntilDate='" + getValidUntilDate() + "'" +
+            ", lastUsedDate='" + getLastUsedDate() + "'" +
             ", remark='" + getRemark() + "'" +
             "}";
     }

src/main/java/org/hostsharing/hsadminng/domain/Share.java

@@ -49,8 +49,8 @@ public class Share implements Serializable {
     @Column(name = "remark", length = 160)
     private String remark;
 
-    @NotNull
     @ManyToOne(optional = false)
+    @NotNull
     @JsonIgnoreProperties("shares")
     private Membership membership;
 

src/main/java/org/hostsharing/hsadminng/domain/enumeration/CustomerKind.java

@@ -0,0 +1,8 @@
+package org.hostsharing.hsadminng.domain.enumeration;
+
+/**
+ * The CustomerKind enumeration.
+ */
+public enum CustomerKind {
+    NATURAL, LEGAL
+}

src/main/java/org/hostsharing/hsadminng/domain/enumeration/VatRegion.java

@@ -0,0 +1,8 @@
+package org.hostsharing.hsadminng.domain.enumeration;
+
+/**
+ * The VatRegion enumeration.
+ */
+public enum VatRegion {
+    DOMESTIC, EU, OTHER
+}

src/main/java/org/hostsharing/hsadminng/service/AssetService.java

@@ -42,9 +42,7 @@ public class AssetService {
      */
     public AssetDTO save(AssetDTO assetDTO) {
         log.debug("Request to save Asset : {}", assetDTO);
-
         assetValidator.validate(assetDTO);
-
         Asset asset = assetMapper.toEntity(assetDTO);
         asset = assetRepository.save(asset);
         return assetMapper.toDto(asset);

src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java

@@ -98,6 +98,27 @@ public class CustomerQueryService extends QueryService<Customer> {
             if (criteria.getName() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getName(), Customer_.name));
             }
+            if (criteria.getKind() != null) {
+                specification = specification.and(buildSpecification(criteria.getKind(), Customer_.kind));
+            }
+            if (criteria.getBirthDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getBirthDate(), Customer_.birthDate));
+            }
+            if (criteria.getBirthPlace() != null) {
+                specification = specification.and(buildStringSpecification(criteria.getBirthPlace(), Customer_.birthPlace));
+            }
+            if (criteria.getRegistrationCourt() != null) {
+                specification = specification.and(buildStringSpecification(criteria.getRegistrationCourt(), Customer_.registrationCourt));
+            }
+            if (criteria.getRegistrationNumber() != null) {
+                specification = specification.and(buildStringSpecification(criteria.getRegistrationNumber(), Customer_.registrationNumber));
+            }
+            if (criteria.getVatRegion() != null) {
+                specification = specification.and(buildSpecification(criteria.getVatRegion(), Customer_.vatRegion));
+            }
+            if (criteria.getVatNumber() != null) {
+                specification = specification.and(buildStringSpecification(criteria.getVatNumber(), Customer_.vatNumber));
+            }
             if (criteria.getContractualSalutation() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getContractualSalutation(), Customer_.contractualSalutation));
             }

src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java

@@ -89,14 +89,17 @@ public class MembershipQueryService extends QueryService<Membership> {
             if (criteria.getId() != null) {
                 specification = specification.and(buildSpecification(criteria.getId(), Membership_.id));
             }
-            if (criteria.getDocumentDate() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Membership_.documentDate));
+            if (criteria.getAdmissionDocumentDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getAdmissionDocumentDate(), Membership_.admissionDocumentDate));
             }
-            if (criteria.getMemberFrom() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getMemberFrom(), Membership_.memberFrom));
+            if (criteria.getCancellationDocumentDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getCancellationDocumentDate(), Membership_.cancellationDocumentDate));
             }
-            if (criteria.getMemberUntil() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getMemberUntil(), Membership_.memberUntil));
+            if (criteria.getMemberFromDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getMemberFromDate(), Membership_.memberFromDate));
+            }
+            if (criteria.getMemberUntilDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getMemberUntilDate(), Membership_.memberUntilDate));
             }
             if (criteria.getRemark() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getRemark(), Membership_.remark));

src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java

@@ -98,20 +98,20 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
             if (criteria.getBic() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getBic(), SepaMandate_.bic));
             }
-            if (criteria.getDocumentDate() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), SepaMandate_.documentDate));
+            if (criteria.getGrantingDocumentDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getGrantingDocumentDate(), SepaMandate_.grantingDocumentDate));
             }
-            if (criteria.getValidFrom() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getValidFrom(), SepaMandate_.validFrom));
+            if (criteria.getRevokationDocumentDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getRevokationDocumentDate(), SepaMandate_.revokationDocumentDate));
             }
-            if (criteria.getValidUntil() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getValidUntil(), SepaMandate_.validUntil));
+            if (criteria.getValidFromDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getValidFromDate(), SepaMandate_.validFromDate));
             }
-            if (criteria.getLastUsed() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getLastUsed(), SepaMandate_.lastUsed));
+            if (criteria.getValidUntilDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getValidUntilDate(), SepaMandate_.validUntilDate));
             }
-            if (criteria.getCancellationDate() != null) {
-                specification = specification.and(buildRangeSpecification(criteria.getCancellationDate(), SepaMandate_.cancellationDate));
+            if (criteria.getLastUsedDate() != null) {
+                specification = specification.and(buildRangeSpecification(criteria.getLastUsedDate(), SepaMandate_.lastUsedDate));
             }
             if (criteria.getRemark() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getRemark(), SepaMandate_.remark));

src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java

@@ -31,7 +31,7 @@ public class AssetDTO implements Serializable {
 
     private Long membershipId;
 
-    private String membershipDocumentDate;
+    private String membershipAdmissionDocumentDate;
 
     public Long getId() {
         return id;
@@ -89,12 +89,12 @@ public class AssetDTO implements Serializable {
         this.membershipId = membershipId;
     }
 
-    public String getMembershipDocumentDate() {
-        return membershipDocumentDate;
+    public String getMembershipAdmissionDocumentDate() {
+        return membershipAdmissionDocumentDate;
     }
 
-    public void setMembershipDocumentDate(String membershipDocumentDate) {
-        this.membershipDocumentDate = membershipDocumentDate;
+    public void setMembershipAdmissionDocumentDate(String membershipAdmissionDocumentDate) {
+        this.membershipAdmissionDocumentDate = membershipAdmissionDocumentDate;
     }
 
     @Override
@@ -128,7 +128,7 @@ public class AssetDTO implements Serializable {
             ", amount=" + getAmount() +
             ", remark='" + getRemark() + "'" +
             ", membership=" + getMembershipId() +
-            ", membership='" + getMembershipDocumentDate() + "'" +
+            ", membership='" + getMembershipAdmissionDocumentDate() + "'" +
             "}";
     }
 }

src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java

@@ -2,6 +2,8 @@ package org.hostsharing.hsadminng.service.dto;
 
 import java.io.Serializable;
 import java.util.Objects;
+import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
+import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
 import io.github.jhipster.service.filter.BooleanFilter;
 import io.github.jhipster.service.filter.DoubleFilter;
 import io.github.jhipster.service.filter.Filter;
@@ -9,6 +11,7 @@ import io.github.jhipster.service.filter.FloatFilter;
 import io.github.jhipster.service.filter.IntegerFilter;
 import io.github.jhipster.service.filter.LongFilter;
 import io.github.jhipster.service.filter.StringFilter;
+import io.github.jhipster.service.filter.LocalDateFilter;
 
 /**
  * Criteria class for the Customer entity. This class is used in CustomerResource to
@@ -19,6 +22,16 @@ import io.github.jhipster.service.filter.StringFilter;
  * fix type specific filters.
  */
 public class CustomerCriteria implements Serializable {
+    /**
+     * Class for filtering CustomerKind
+     */
+    public static class CustomerKindFilter extends Filter<CustomerKind> {
+    }
+    /**
+     * Class for filtering VatRegion
+     */
+    public static class VatRegionFilter extends Filter<VatRegion> {
+    }
 
     private static final long serialVersionUID = 1L;
 
@@ -30,6 +43,20 @@ public class CustomerCriteria implements Serializable {
 
     private StringFilter name;
 
+    private CustomerKindFilter kind;
+
+    private LocalDateFilter birthDate;
+
+    private StringFilter birthPlace;
+
+    private StringFilter registrationCourt;
+
+    private StringFilter registrationNumber;
+
+    private VatRegionFilter vatRegion;
+
+    private StringFilter vatNumber;
+
     private StringFilter contractualSalutation;
 
     private StringFilter contractualAddress;
@@ -76,6 +103,62 @@ public class CustomerCriteria implements Serializable {
         this.name = name;
     }
 
+    public CustomerKindFilter getKind() {
+        return kind;
+    }
+
+    public void setKind(CustomerKindFilter kind) {
+        this.kind = kind;
+    }
+
+    public LocalDateFilter getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(LocalDateFilter birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public StringFilter getBirthPlace() {
+        return birthPlace;
+    }
+
+    public void setBirthPlace(StringFilter birthPlace) {
+        this.birthPlace = birthPlace;
+    }
+
+    public StringFilter getRegistrationCourt() {
+        return registrationCourt;
+    }
+
+    public void setRegistrationCourt(StringFilter registrationCourt) {
+        this.registrationCourt = registrationCourt;
+    }
+
+    public StringFilter getRegistrationNumber() {
+        return registrationNumber;
+    }
+
+    public void setRegistrationNumber(StringFilter registrationNumber) {
+        this.registrationNumber = registrationNumber;
+    }
+
+    public VatRegionFilter getVatRegion() {
+        return vatRegion;
+    }
+
+    public void setVatRegion(VatRegionFilter vatRegion) {
+        this.vatRegion = vatRegion;
+    }
+
+    public StringFilter getVatNumber() {
+        return vatNumber;
+    }
+
+    public void setVatNumber(StringFilter vatNumber) {
+        this.vatNumber = vatNumber;
+    }
+
     public StringFilter getContractualSalutation() {
         return contractualSalutation;
     }
@@ -147,6 +230,13 @@ public class CustomerCriteria implements Serializable {
             Objects.equals(reference, that.reference) &&
             Objects.equals(prefix, that.prefix) &&
             Objects.equals(name, that.name) &&
+            Objects.equals(kind, that.kind) &&
+            Objects.equals(birthDate, that.birthDate) &&
+            Objects.equals(birthPlace, that.birthPlace) &&
+            Objects.equals(registrationCourt, that.registrationCourt) &&
+            Objects.equals(registrationNumber, that.registrationNumber) &&
+            Objects.equals(vatRegion, that.vatRegion) &&
+            Objects.equals(vatNumber, that.vatNumber) &&
             Objects.equals(contractualSalutation, that.contractualSalutation) &&
             Objects.equals(contractualAddress, that.contractualAddress) &&
             Objects.equals(billingSalutation, that.billingSalutation) &&
@@ -163,6 +253,13 @@ public class CustomerCriteria implements Serializable {
         reference,
         prefix,
         name,
+        kind,
+        birthDate,
+        birthPlace,
+        registrationCourt,
+        registrationNumber,
+        vatRegion,
+        vatNumber,
         contractualSalutation,
         contractualAddress,
         billingSalutation,
@@ -180,6 +277,13 @@ public class CustomerCriteria implements Serializable {
                 (reference != null ? "reference=" + reference + ", " : "") +
                 (prefix != null ? "prefix=" + prefix + ", " : "") +
                 (name != null ? "name=" + name + ", " : "") +
+                (kind != null ? "kind=" + kind + ", " : "") +
+                (birthDate != null ? "birthDate=" + birthDate + ", " : "") +
+                (birthPlace != null ? "birthPlace=" + birthPlace + ", " : "") +
+                (registrationCourt != null ? "registrationCourt=" + registrationCourt + ", " : "") +
+                (registrationNumber != null ? "registrationNumber=" + registrationNumber + ", " : "") +
+                (vatRegion != null ? "vatRegion=" + vatRegion + ", " : "") +
+                (vatNumber != null ? "vatNumber=" + vatNumber + ", " : "") +
                 (contractualSalutation != null ? "contractualSalutation=" + contractualSalutation + ", " : "") +
                 (contractualAddress != null ? "contractualAddress=" + contractualAddress + ", " : "") +
                 (billingSalutation != null ? "billingSalutation=" + billingSalutation + ", " : "") +

src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java

@@ -1,7 +1,10 @@
 package org.hostsharing.hsadminng.service.dto;
+import java.time.LocalDate;
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.util.Objects;
+import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
+import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
 
 /**
  * A DTO for the Customer entity.
@@ -24,6 +27,26 @@ public class CustomerDTO implements Serializable {
     @Size(max = 80)
     private String name;
 
+    @NotNull
+    private CustomerKind kind;
+
+    private LocalDate birthDate;
+
+    @Size(max = 80)
+    private String birthPlace;
+
+    @Size(max = 80)
+    private String registrationCourt;
+
+    @Size(max = 80)
+    private String registrationNumber;
+
+    @NotNull
+    private VatRegion vatRegion;
+
+    @Size(max = 40)
+    private String vatNumber;
+
     @Size(max = 80)
     private String contractualSalutation;
 
@@ -73,6 +96,62 @@ public class CustomerDTO implements Serializable {
         this.name = name;
     }
 
+    public CustomerKind getKind() {
+        return kind;
+    }
+
+    public void setKind(CustomerKind kind) {
+        this.kind = kind;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(LocalDate birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public String getBirthPlace() {
+        return birthPlace;
+    }
+
+    public void setBirthPlace(String birthPlace) {
+        this.birthPlace = birthPlace;
+    }
+
+    public String getRegistrationCourt() {
+        return registrationCourt;
+    }
+
+    public void setRegistrationCourt(String registrationCourt) {
+        this.registrationCourt = registrationCourt;
+    }
+
+    public String getRegistrationNumber() {
+        return registrationNumber;
+    }
+
+    public void setRegistrationNumber(String registrationNumber) {
+        this.registrationNumber = registrationNumber;
+    }
+
+    public VatRegion getVatRegion() {
+        return vatRegion;
+    }
+
+    public void setVatRegion(VatRegion vatRegion) {
+        this.vatRegion = vatRegion;
+    }
+
+    public String getVatNumber() {
+        return vatNumber;
+    }
+
+    public void setVatNumber(String vatNumber) {
+        this.vatNumber = vatNumber;
+    }
+
     public String getContractualSalutation() {
         return contractualSalutation;
     }
@@ -141,6 +220,13 @@ public class CustomerDTO implements Serializable {
             ", reference=" + getReference() +
             ", prefix='" + getPrefix() + "'" +
             ", name='" + getName() + "'" +
+            ", kind='" + getKind() + "'" +
+            ", birthDate='" + getBirthDate() + "'" +
+            ", birthPlace='" + getBirthPlace() + "'" +
+            ", registrationCourt='" + getRegistrationCourt() + "'" +
+            ", registrationNumber='" + getRegistrationNumber() + "'" +
+            ", vatRegion='" + getVatRegion() + "'" +
+            ", vatNumber='" + getVatNumber() + "'" +
             ", contractualSalutation='" + getContractualSalutation() + "'" +
             ", contractualAddress='" + getContractualAddress() + "'" +
             ", billingSalutation='" + getBillingSalutation() + "'" +

src/main/java/org/hostsharing/hsadminng/service/dto/MembershipCriteria.java

@@ -25,11 +25,13 @@ public class MembershipCriteria implements Serializable {
 
     private LongFilter id;
 
-    private LocalDateFilter documentDate;
+    private LocalDateFilter admissionDocumentDate;
 
-    private LocalDateFilter memberFrom;
+    private LocalDateFilter cancellationDocumentDate;
 
-    private LocalDateFilter memberUntil;
+    private LocalDateFilter memberFromDate;
+
+    private LocalDateFilter memberUntilDate;
 
     private StringFilter remark;
 
@@ -47,28 +49,36 @@ public class MembershipCriteria implements Serializable {
         this.id = id;
     }
 
-    public LocalDateFilter getDocumentDate() {
-        return documentDate;
+    public LocalDateFilter getAdmissionDocumentDate() {
+        return admissionDocumentDate;
     }
 
-    public void setDocumentDate(LocalDateFilter documentDate) {
-        this.documentDate = documentDate;
+    public void setAdmissionDocumentDate(LocalDateFilter admissionDocumentDate) {
+        this.admissionDocumentDate = admissionDocumentDate;
     }
 
-    public LocalDateFilter getMemberFrom() {
-        return memberFrom;
+    public LocalDateFilter getCancellationDocumentDate() {
+        return cancellationDocumentDate;
     }
 
-    public void setMemberFrom(LocalDateFilter memberFrom) {
-        this.memberFrom = memberFrom;
+    public void setCancellationDocumentDate(LocalDateFilter cancellationDocumentDate) {
+        this.cancellationDocumentDate = cancellationDocumentDate;
     }
 
-    public LocalDateFilter getMemberUntil() {
-        return memberUntil;
+    public LocalDateFilter getMemberFromDate() {
+        return memberFromDate;
     }
 
-    public void setMemberUntil(LocalDateFilter memberUntil) {
-        this.memberUntil = memberUntil;
+    public void setMemberFromDate(LocalDateFilter memberFromDate) {
+        this.memberFromDate = memberFromDate;
+    }
+
+    public LocalDateFilter getMemberUntilDate() {
+        return memberUntilDate;
+    }
+
+    public void setMemberUntilDate(LocalDateFilter memberUntilDate) {
+        this.memberUntilDate = memberUntilDate;
     }
 
     public StringFilter getRemark() {
@@ -115,9 +125,10 @@ public class MembershipCriteria implements Serializable {
         final MembershipCriteria that = (MembershipCriteria) o;
         return
             Objects.equals(id, that.id) &&
-            Objects.equals(documentDate, that.documentDate) &&
-            Objects.equals(memberFrom, that.memberFrom) &&
-            Objects.equals(memberUntil, that.memberUntil) &&
+            Objects.equals(admissionDocumentDate, that.admissionDocumentDate) &&
+            Objects.equals(cancellationDocumentDate, that.cancellationDocumentDate) &&
+            Objects.equals(memberFromDate, that.memberFromDate) &&
+            Objects.equals(memberUntilDate, that.memberUntilDate) &&
             Objects.equals(remark, that.remark) &&
             Objects.equals(shareId, that.shareId) &&
             Objects.equals(assetId, that.assetId) &&
@@ -128,9 +139,10 @@ public class MembershipCriteria implements Serializable {
     public int hashCode() {
         return Objects.hash(
         id,
-        documentDate,
-        memberFrom,
-        memberUntil,
+        admissionDocumentDate,
+        cancellationDocumentDate,
+        memberFromDate,
+        memberUntilDate,
         remark,
         shareId,
         assetId,
@@ -142,9 +154,10 @@ public class MembershipCriteria implements Serializable {
     public String toString() {
         return "MembershipCriteria{" +
                 (id != null ? "id=" + id + ", " : "") +
-                (documentDate != null ? "documentDate=" + documentDate + ", " : "") +
-                (memberFrom != null ? "memberFrom=" + memberFrom + ", " : "") +
-                (memberUntil != null ? "memberUntil=" + memberUntil + ", " : "") +
+                (admissionDocumentDate != null ? "admissionDocumentDate=" + admissionDocumentDate + ", " : "") +
+                (cancellationDocumentDate != null ? "cancellationDocumentDate=" + cancellationDocumentDate + ", " : "") +
+                (memberFromDate != null ? "memberFromDate=" + memberFromDate + ", " : "") +
+                (memberUntilDate != null ? "memberUntilDate=" + memberUntilDate + ", " : "") +
                 (remark != null ? "remark=" + remark + ", " : "") +
                 (shareId != null ? "shareId=" + shareId + ", " : "") +
                 (assetId != null ? "assetId=" + assetId + ", " : "") +

src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java

@@ -3,7 +3,6 @@ import java.time.LocalDate;
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.util.Objects;
-import java.util.function.Consumer;
 
 /**
  * A DTO for the Membership entity.
@@ -13,12 +12,14 @@ public class MembershipDTO implements Serializable {
     private Long id;
 
     @NotNull
-    private LocalDate documentDate;
+    private LocalDate admissionDocumentDate;
+
+    private LocalDate cancellationDocumentDate;
 
     @NotNull
-    private LocalDate memberFrom;
+    private LocalDate memberFromDate;
 
-    private LocalDate memberUntil;
+    private LocalDate memberUntilDate;
 
     @Size(max = 160)
     private String remark;
@@ -28,12 +29,6 @@ public class MembershipDTO implements Serializable {
 
     private String customerPrefix;
 
-    public MembershipDTO with(
-        Consumer<MembershipDTO> builderFunction) {
-        builderFunction.accept(this);
-        return this;
-    }
-
     public Long getId() {
         return id;
     }
@@ -42,28 +37,36 @@ public class MembershipDTO implements Serializable {
         this.id = id;
     }
 
-    public LocalDate getDocumentDate() {
-        return documentDate;
+    public LocalDate getAdmissionDocumentDate() {
+        return admissionDocumentDate;
     }
 
-    public void setDocumentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public void setAdmissionDocumentDate(LocalDate admissionDocumentDate) {
+        this.admissionDocumentDate = admissionDocumentDate;
     }
 
-    public LocalDate getMemberFrom() {
-        return memberFrom;
+    public LocalDate getCancellationDocumentDate() {
+        return cancellationDocumentDate;
     }
 
-    public void setMemberFrom(LocalDate memberFrom) {
-        this.memberFrom = memberFrom;
+    public void setCancellationDocumentDate(LocalDate cancellationDocumentDate) {
+        this.cancellationDocumentDate = cancellationDocumentDate;
     }
 
-    public LocalDate getMemberUntil() {
-        return memberUntil;
+    public LocalDate getMemberFromDate() {
+        return memberFromDate;
     }
 
-    public void setMemberUntil(LocalDate memberUntil) {
-        this.memberUntil = memberUntil;
+    public void setMemberFromDate(LocalDate memberFromDate) {
+        this.memberFromDate = memberFromDate;
+    }
+
+    public LocalDate getMemberUntilDate() {
+        return memberUntilDate;
+    }
+
+    public void setMemberUntilDate(LocalDate memberUntilDate) {
+        this.memberUntilDate = memberUntilDate;
     }
 
     public String getRemark() {
@@ -115,9 +118,10 @@ public class MembershipDTO implements Serializable {
     public String toString() {
         return "MembershipDTO{" +
             "id=" + getId() +
-            ", documentDate='" + getDocumentDate() + "'" +
-            ", memberFrom='" + getMemberFrom() + "'" +
-            ", memberUntil='" + getMemberUntil() + "'" +
+            ", admissionDocumentDate='" + getAdmissionDocumentDate() + "'" +
+            ", cancellationDocumentDate='" + getCancellationDocumentDate() + "'" +
+            ", memberFromDate='" + getMemberFromDate() + "'" +
+            ", memberUntilDate='" + getMemberUntilDate() + "'" +
             ", remark='" + getRemark() + "'" +
             ", customer=" + getCustomerId() +
             ", customer='" + getCustomerPrefix() + "'" +

src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateCriteria.java

@@ -31,15 +31,15 @@ public class SepaMandateCriteria implements Serializable {
 
     private StringFilter bic;
 
-    private LocalDateFilter documentDate;
+    private LocalDateFilter grantingDocumentDate;
 
-    private LocalDateFilter validFrom;
+    private LocalDateFilter revokationDocumentDate;
 
-    private LocalDateFilter validUntil;
+    private LocalDateFilter validFromDate;
 
-    private LocalDateFilter lastUsed;
+    private LocalDateFilter validUntilDate;
 
-    private LocalDateFilter cancellationDate;
+    private LocalDateFilter lastUsedDate;
 
     private StringFilter remark;
 
@@ -77,44 +77,44 @@ public class SepaMandateCriteria implements Serializable {
         this.bic = bic;
     }
 
-    public LocalDateFilter getDocumentDate() {
-        return documentDate;
+    public LocalDateFilter getGrantingDocumentDate() {
+        return grantingDocumentDate;
     }
 
-    public void setDocumentDate(LocalDateFilter documentDate) {
-        this.documentDate = documentDate;
+    public void setGrantingDocumentDate(LocalDateFilter grantingDocumentDate) {
+        this.grantingDocumentDate = grantingDocumentDate;
     }
 
-    public LocalDateFilter getValidFrom() {
-        return validFrom;
+    public LocalDateFilter getRevokationDocumentDate() {
+        return revokationDocumentDate;
     }
 
-    public void setValidFrom(LocalDateFilter validFrom) {
-        this.validFrom = validFrom;
+    public void setRevokationDocumentDate(LocalDateFilter revokationDocumentDate) {
+        this.revokationDocumentDate = revokationDocumentDate;
     }
 
-    public LocalDateFilter getValidUntil() {
-        return validUntil;
+    public LocalDateFilter getValidFromDate() {
+        return validFromDate;
     }
 
-    public void setValidUntil(LocalDateFilter validUntil) {
-        this.validUntil = validUntil;
+    public void setValidFromDate(LocalDateFilter validFromDate) {
+        this.validFromDate = validFromDate;
     }
 
-    public LocalDateFilter getLastUsed() {
-        return lastUsed;
+    public LocalDateFilter getValidUntilDate() {
+        return validUntilDate;
     }
 
-    public void setLastUsed(LocalDateFilter lastUsed) {
-        this.lastUsed = lastUsed;
+    public void setValidUntilDate(LocalDateFilter validUntilDate) {
+        this.validUntilDate = validUntilDate;
     }
 
-    public LocalDateFilter getCancellationDate() {
-        return cancellationDate;
+    public LocalDateFilter getLastUsedDate() {
+        return lastUsedDate;
     }
 
-    public void setCancellationDate(LocalDateFilter cancellationDate) {
-        this.cancellationDate = cancellationDate;
+    public void setLastUsedDate(LocalDateFilter lastUsedDate) {
+        this.lastUsedDate = lastUsedDate;
     }
 
     public StringFilter getRemark() {
@@ -148,11 +148,11 @@ public class SepaMandateCriteria implements Serializable {
             Objects.equals(reference, that.reference) &&
             Objects.equals(iban, that.iban) &&
             Objects.equals(bic, that.bic) &&
-            Objects.equals(documentDate, that.documentDate) &&
-            Objects.equals(validFrom, that.validFrom) &&
-            Objects.equals(validUntil, that.validUntil) &&
-            Objects.equals(lastUsed, that.lastUsed) &&
-            Objects.equals(cancellationDate, that.cancellationDate) &&
+            Objects.equals(grantingDocumentDate, that.grantingDocumentDate) &&
+            Objects.equals(revokationDocumentDate, that.revokationDocumentDate) &&
+            Objects.equals(validFromDate, that.validFromDate) &&
+            Objects.equals(validUntilDate, that.validUntilDate) &&
+            Objects.equals(lastUsedDate, that.lastUsedDate) &&
             Objects.equals(remark, that.remark) &&
             Objects.equals(customerId, that.customerId);
     }
@@ -164,11 +164,11 @@ public class SepaMandateCriteria implements Serializable {
         reference,
         iban,
         bic,
-        documentDate,
-        validFrom,
-        validUntil,
-        lastUsed,
-        cancellationDate,
+        grantingDocumentDate,
+        revokationDocumentDate,
+        validFromDate,
+        validUntilDate,
+        lastUsedDate,
         remark,
         customerId
         );
@@ -181,11 +181,11 @@ public class SepaMandateCriteria implements Serializable {
                 (reference != null ? "reference=" + reference + ", " : "") +
                 (iban != null ? "iban=" + iban + ", " : "") +
                 (bic != null ? "bic=" + bic + ", " : "") +
-                (documentDate != null ? "documentDate=" + documentDate + ", " : "") +
-                (validFrom != null ? "validFrom=" + validFrom + ", " : "") +
-                (validUntil != null ? "validUntil=" + validUntil + ", " : "") +
-                (lastUsed != null ? "lastUsed=" + lastUsed + ", " : "") +
-                (cancellationDate != null ? "cancellationDate=" + cancellationDate + ", " : "") +
+                (grantingDocumentDate != null ? "grantingDocumentDate=" + grantingDocumentDate + ", " : "") +
+                (revokationDocumentDate != null ? "revokationDocumentDate=" + revokationDocumentDate + ", " : "") +
+                (validFromDate != null ? "validFromDate=" + validFromDate + ", " : "") +
+                (validUntilDate != null ? "validUntilDate=" + validUntilDate + ", " : "") +
+                (lastUsedDate != null ? "lastUsedDate=" + lastUsedDate + ", " : "") +
                 (remark != null ? "remark=" + remark + ", " : "") +
                 (customerId != null ? "customerId=" + customerId + ", " : "") +
             "}";

src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java

@@ -22,16 +22,16 @@ public class SepaMandateDTO implements Serializable {
     private String bic;
 
     @NotNull
-    private LocalDate documentDate;
+    private LocalDate grantingDocumentDate;
+
+    private LocalDate revokationDocumentDate;
 
     @NotNull
-    private LocalDate validFrom;
+    private LocalDate validFromDate;
 
-    private LocalDate validUntil;
+    private LocalDate validUntilDate;
 
-    private LocalDate lastUsed;
-
-    private LocalDate cancellationDate;
+    private LocalDate lastUsedDate;
 
     @Size(max = 160)
     private String remark;
@@ -73,44 +73,44 @@ public class SepaMandateDTO implements Serializable {
         this.bic = bic;
     }
 
-    public LocalDate getDocumentDate() {
-        return documentDate;
+    public LocalDate getGrantingDocumentDate() {
+        return grantingDocumentDate;
     }
 
-    public void setDocumentDate(LocalDate documentDate) {
-        this.documentDate = documentDate;
+    public void setGrantingDocumentDate(LocalDate grantingDocumentDate) {
+        this.grantingDocumentDate = grantingDocumentDate;
     }
 
-    public LocalDate getValidFrom() {
-        return validFrom;
+    public LocalDate getRevokationDocumentDate() {
+        return revokationDocumentDate;
     }
 
-    public void setValidFrom(LocalDate validFrom) {
-        this.validFrom = validFrom;
+    public void setRevokationDocumentDate(LocalDate revokationDocumentDate) {
+        this.revokationDocumentDate = revokationDocumentDate;
     }
 
-    public LocalDate getValidUntil() {
-        return validUntil;
+    public LocalDate getValidFromDate() {
+        return validFromDate;
     }
 
-    public void setValidUntil(LocalDate validUntil) {
-        this.validUntil = validUntil;
+    public void setValidFromDate(LocalDate validFromDate) {
+        this.validFromDate = validFromDate;
     }
 
-    public LocalDate getLastUsed() {
-        return lastUsed;
+    public LocalDate getValidUntilDate() {
+        return validUntilDate;
     }
 
-    public void setLastUsed(LocalDate lastUsed) {
-        this.lastUsed = lastUsed;
+    public void setValidUntilDate(LocalDate validUntilDate) {
+        this.validUntilDate = validUntilDate;
     }
 
-    public LocalDate getCancellationDate() {
-        return cancellationDate;
+    public LocalDate getLastUsedDate() {
+        return lastUsedDate;
     }
 
-    public void setCancellationDate(LocalDate cancellationDate) {
-        this.cancellationDate = cancellationDate;
+    public void setLastUsedDate(LocalDate lastUsedDate) {
+        this.lastUsedDate = lastUsedDate;
     }
 
     public String getRemark() {
@@ -165,11 +165,11 @@ public class SepaMandateDTO implements Serializable {
             ", reference='" + getReference() + "'" +
             ", iban='" + getIban() + "'" +
             ", bic='" + getBic() + "'" +
-            ", documentDate='" + getDocumentDate() + "'" +
-            ", validFrom='" + getValidFrom() + "'" +
-            ", validUntil='" + getValidUntil() + "'" +
-            ", lastUsed='" + getLastUsed() + "'" +
-            ", cancellationDate='" + getCancellationDate() + "'" +
+            ", grantingDocumentDate='" + getGrantingDocumentDate() + "'" +
+            ", revokationDocumentDate='" + getRevokationDocumentDate() + "'" +
+            ", validFromDate='" + getValidFromDate() + "'" +
+            ", validUntilDate='" + getValidUntilDate() + "'" +
+            ", lastUsedDate='" + getLastUsedDate() + "'" +
             ", remark='" + getRemark() + "'" +
             ", customer=" + getCustomerId() +
             ", customer='" + getCustomerPrefix() + "'" +

src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java

@@ -30,7 +30,7 @@ public class ShareDTO implements Serializable {
 
     private Long membershipId;
 
-    private String membershipDocumentDate;
+    private String membershipAdmissionDocumentDate;
 
     public Long getId() {
         return id;
@@ -88,12 +88,12 @@ public class ShareDTO implements Serializable {
         this.membershipId = membershipId;
     }
 
-    public String getMembershipDocumentDate() {
-        return membershipDocumentDate;
+    public String getMembershipAdmissionDocumentDate() {
+        return membershipAdmissionDocumentDate;
     }
 
-    public void setMembershipDocumentDate(String membershipDocumentDate) {
-        this.membershipDocumentDate = membershipDocumentDate;
+    public void setMembershipAdmissionDocumentDate(String membershipAdmissionDocumentDate) {
+        this.membershipAdmissionDocumentDate = membershipAdmissionDocumentDate;
     }
 
     @Override
@@ -127,7 +127,7 @@ public class ShareDTO implements Serializable {
             ", quantity=" + getQuantity() +
             ", remark='" + getRemark() + "'" +
             ", membership=" + getMembershipId() +
-            ", membership='" + getMembershipDocumentDate() + "'" +
+            ", membership='" + getMembershipAdmissionDocumentDate() + "'" +
             "}";
     }
 }

src/main/java/org/hostsharing/hsadminng/service/mapper/AssetMapper.java

@@ -12,7 +12,7 @@ import org.mapstruct.*;
 public interface AssetMapper extends EntityMapper<AssetDTO, Asset> {
 
     @Mapping(source = "membership.id", target = "membershipId")
-    @Mapping(source = "membership.documentDate", target = "membershipDocumentDate")
+    @Mapping(source = "membership.admissionDocumentDate", target = "membershipAdmissionDocumentDate")
     AssetDTO toDto(Asset asset);
 
     @Mapping(source = "membershipId", target = "membership")

src/main/java/org/hostsharing/hsadminng/service/mapper/ShareMapper.java

@@ -12,7 +12,7 @@ import org.mapstruct.*;
 public interface ShareMapper extends EntityMapper<ShareDTO, Share> {
 
     @Mapping(source = "membership.id", target = "membershipId")
-    @Mapping(source = "membership.documentDate", target = "membershipDocumentDate")
+    @Mapping(source = "membership.admissionDocumentDate", target = "membershipAdmissionDocumentDate")
     ShareDTO toDto(Share share);
 
     @Mapping(source = "membershipId", target = "membership")

src/main/jdl/customer.jdl

@@ -3,10 +3,28 @@ dto all with mapstruct
 service all with serviceClass
 paginate all with infinite-scroll
 
+enum CustomerKind {
+    NATURAL,
+    LEGAL
+}
+
+enum VatRegion {
+    DOMESTIC,
+    EU,
+    OTHER
+}
+
 entity Customer {
     reference Integer required unique min(10000) max(99999),
     prefix String required maxlength(3) unique pattern(/[a-z][a-z0-9]+/),
     name String required maxlength(80),
+    kind CustomerKind required,
+    birthDate LocalDate,
+    birthPlace String maxlength(80),
+    registrationCourt String maxlength(80),
+    registrationNumber String maxlength(80),
+    vatRegion VatRegion required,
+    vatNumber String maxlength(40),
     contractualSalutation String maxlength(80),
     contractualAddress String required maxlength(400),
     billingSalutation String maxlength(80),
@@ -15,9 +33,10 @@ entity Customer {
 }
 
 entity Membership {
-    documentDate LocalDate required,
-    memberFrom LocalDate required,
-    memberUntil LocalDate,
+    admissionDocumentDate LocalDate required,
+    cancellationDocumentDate LocalDate,
+    memberFromDate LocalDate required,
+    memberUntilDate LocalDate,
     remark String maxlength(160)
 }
 
@@ -55,17 +74,17 @@ entity SepaMandate {
     reference String maxlength(40) unique required,
     iban String maxlength(34),
     bic String maxlength(11),
-    documentDate LocalDate required,
-    validFrom LocalDate required,
-    validUntil LocalDate,
-    lastUsed LocalDate,
-    cancellationDate LocalDate,
+    grantingDocumentDate LocalDate required,
+    revokationDocumentDate LocalDate,
+    validFromDate LocalDate required,
+    validUntilDate LocalDate,
+    lastUsedDate LocalDate,
     remark String maxlength(160)
 }
 
 relationship OneToMany {
     Customer{membership} to Membership{customer(prefix) required},
     Customer{sepamandate} to SepaMandate{customer(prefix) required},
-    Membership{share} to Share{membership(documentDate) required},
-    Membership{asset} to Asset{membership(documentDate) required}
+    Membership{share} to Share{membership(admissionDocumentDate) required},
+    Membership{asset} to Asset{membership(admissionDocumentDate) required}
 }

src/main/resources/config/liquibase/changelog/20190424123255_added_entity_Customer.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="now" value="now()" dbms="h2"/>
+    
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <!--
+        Added the entity Customer.
+    -->
+    <changeSet id="20190424123255-1" author="jhipster">
+        <createTable tableName="customer">
+            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="reference" type="integer">
+                <constraints nullable="false" unique="true" uniqueConstraintName="ux_customer_reference" />
+            </column>
+
+            <column name="prefix" type="varchar(3)">
+                <constraints nullable="false" unique="true" uniqueConstraintName="ux_customer_prefix" />
+            </column>
+
+            <column name="name" type="varchar(80)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="kind" type="varchar(255)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="birth_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="birth_place" type="varchar(80)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="registration_court" type="varchar(80)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="registration_number" type="varchar(80)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="vat_region" type="varchar(255)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="vat_number" type="varchar(40)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="contractual_salutation" type="varchar(80)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="contractual_address" type="varchar(400)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="billing_salutation" type="varchar(80)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="billing_address" type="varchar(400)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="remark" type="varchar(160)">
+                <constraints nullable="true" />
+            </column>
+
+            <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
+        </createTable>
+        
+    </changeSet>
+    <!-- jhipster-needle-liquibase-add-changeset - JHipster will add changesets here, do not remove-->
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123256_added_entity_Membership.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="now" value="now()" dbms="h2"/>
+    
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <!--
+        Added the entity Membership.
+    -->
+    <changeSet id="20190424123256-1" author="jhipster">
+        <createTable tableName="membership">
+            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="admission_document_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="cancellation_document_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="member_from_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="member_until_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="remark" type="varchar(160)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="customer_id" type="bigint">
+                <constraints nullable="false" />
+            </column>
+
+            <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
+        </createTable>
+        
+    </changeSet>
+    <!-- jhipster-needle-liquibase-add-changeset - JHipster will add changesets here, do not remove-->
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123256_added_entity_constraints_Membership.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+    <!--
+        Added the constraints for entity Membership.
+    -->
+    <changeSet id="20190424123256-2" author="jhipster">
+        
+        <addForeignKeyConstraint baseColumnNames="customer_id"
+                                 baseTableName="membership"
+                                 constraintName="fk_membership_customer_id"
+                                 referencedColumnNames="id"
+                                 referencedTableName="customer"/>
+
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123257_added_entity_Share.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="now" value="now()" dbms="h2"/>
+    
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <!--
+        Added the entity Share.
+    -->
+    <changeSet id="20190424123257-1" author="jhipster">
+        <createTable tableName="share">
+            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="document_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="value_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="action" type="varchar(255)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="quantity" type="integer">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="remark" type="varchar(160)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="membership_id" type="bigint">
+                <constraints nullable="false" />
+            </column>
+
+            <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
+        </createTable>
+        
+    </changeSet>
+    <!-- jhipster-needle-liquibase-add-changeset - JHipster will add changesets here, do not remove-->
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123257_added_entity_constraints_Share.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+    <!--
+        Added the constraints for entity Share.
+    -->
+    <changeSet id="20190424123257-2" author="jhipster">
+        
+        <addForeignKeyConstraint baseColumnNames="membership_id"
+                                 baseTableName="share"
+                                 constraintName="fk_share_membership_id"
+                                 referencedColumnNames="id"
+                                 referencedTableName="membership"/>
+
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123258_added_entity_Asset.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="now" value="now()" dbms="h2"/>
+    
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <!--
+        Added the entity Asset.
+    -->
+    <changeSet id="20190424123258-1" author="jhipster">
+        <createTable tableName="asset">
+            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="document_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="value_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="action" type="varchar(255)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="amount" type="decimal(10,2)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="remark" type="varchar(160)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="membership_id" type="bigint">
+                <constraints nullable="false" />
+            </column>
+
+            <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
+        </createTable>
+        
+    </changeSet>
+    <!-- jhipster-needle-liquibase-add-changeset - JHipster will add changesets here, do not remove-->
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123258_added_entity_constraints_Asset.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+    <!--
+        Added the constraints for entity Asset.
+    -->
+    <changeSet id="20190424123258-2" author="jhipster">
+        
+        <addForeignKeyConstraint baseColumnNames="membership_id"
+                                 baseTableName="asset"
+                                 constraintName="fk_asset_membership_id"
+                                 referencedColumnNames="id"
+                                 referencedTableName="membership"/>
+
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123259_added_entity_SepaMandate.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="now" value="now()" dbms="h2"/>
+    
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <!--
+        Added the entity SepaMandate.
+    -->
+    <changeSet id="20190424123259-1" author="jhipster">
+        <createTable tableName="sepa_mandate">
+            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="reference" type="varchar(40)">
+                <constraints nullable="false" unique="true" uniqueConstraintName="ux_sepa_mandate_reference" />
+            </column>
+
+            <column name="iban" type="varchar(34)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="bic" type="varchar(11)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="granting_document_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="revokation_document_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="valid_from_date" type="date">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="valid_until_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="last_used_date" type="date">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="remark" type="varchar(160)">
+                <constraints nullable="true" />
+            </column>
+
+            <column name="customer_id" type="bigint">
+                <constraints nullable="false" />
+            </column>
+
+            <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
+        </createTable>
+        
+    </changeSet>
+    <!-- jhipster-needle-liquibase-add-changeset - JHipster will add changesets here, do not remove-->
+</databaseChangeLog>

src/main/resources/config/liquibase/changelog/20190424123259_added_entity_constraints_SepaMandate.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+    <!--
+        Added the constraints for entity SepaMandate.
+    -->
+    <changeSet id="20190424123259-2" author="jhipster">
+        
+        <addForeignKeyConstraint baseColumnNames="customer_id"
+                                 baseTableName="sepa_mandate"
+                                 constraintName="fk_sepa_mandate_customer_id"
+                                 referencedColumnNames="id"
+                                 referencedTableName="customer"/>
+
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/master.xml

@@ -5,15 +5,15 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143050_added_entity_Customer.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143051_added_entity_Membership.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143052_added_entity_Share.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143053_added_entity_Asset.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143054_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123255_added_entity_Customer.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123256_added_entity_Membership.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123257_added_entity_Share.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123258_added_entity_Asset.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123259_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
-    <include file="config/liquibase/changelog/20190418143051_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143052_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143053_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
-    <include file="config/liquibase/changelog/20190418143054_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123256_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123257_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123258_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20190424123259_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
 </databaseChangeLog>

src/main/webapp/app/entities/asset/asset-detail.component.html

@@ -28,7 +28,7 @@
                 <dt><span jhiTranslate="hsadminNgApp.asset.membership">Membership</span></dt>
                 <dd>
                     <div *ngIf="asset.membershipId">
-                        <a [routerLink]="['/membership', asset.membershipId, 'view']">{{asset.membershipDocumentDate}}</a>
+                        <a [routerLink]="['/membership', asset.membershipId, 'view']">{{asset.membershipAdmissionDocumentDate}}</a>
                     </div>
                 </dd>
             </dl>

src/main/webapp/app/entities/asset/asset-update.component.html

@@ -89,7 +89,7 @@
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.asset.membership" for="field_membership">Membership</label>
                     <select class="form-control" id="field_membership" name="membership" [(ngModel)]="asset.membershipId"  required>
                         <option *ngIf="!editForm.value.membership" [ngValue]="null" selected></option>
-                        <option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.documentDate}}</option>
+                        <option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.admissionDocumentDate}}</option>
                     </select>
                 </div>
                 <div [hidden]="!(editForm.controls.membership?.dirty && editForm.controls.membership?.invalid)">

src/main/webapp/app/entities/asset/asset.component.html

@@ -20,7 +20,7 @@
             <th jhiSortBy="action"><span jhiTranslate="hsadminNgApp.asset.action">Action</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="amount"><span jhiTranslate="hsadminNgApp.asset.amount">Amount</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="remark"><span jhiTranslate="hsadminNgApp.asset.remark">Remark</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="membershipDocumentDate"><span jhiTranslate="hsadminNgApp.asset.membership">Membership</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="membershipAdmissionDocumentDate"><span jhiTranslate="hsadminNgApp.asset.membership">Membership</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
             </tr>
             </thead>
@@ -34,7 +34,7 @@
                 <td>{{asset.remark}}</td>
                 <td>
                     <div *ngIf="asset.membershipId">
-                        <a [routerLink]="['../membership', asset.membershipId , 'view' ]" >{{asset.membershipDocumentDate}}</a>
+                        <a [routerLink]="['../membership', asset.membershipId , 'view' ]" >{{asset.membershipAdmissionDocumentDate}}</a>
                     </div>
                 </td>
                 <td class="text-right">

src/main/webapp/app/entities/customer/customer-detail.component.html

@@ -17,6 +17,34 @@
                 <dd>
                     <span>{{customer.name}}</span>
                 </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.kind">Kind</span></dt>
+                <dd>
+                    <span jhiTranslate="{{'hsadminNgApp.CustomerKind.' + customer.kind}}">{{customer.kind}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.birthDate">Birth Date</span></dt>
+                <dd>
+                    <span>{{customer.birthDate}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.birthPlace">Birth Place</span></dt>
+                <dd>
+                    <span>{{customer.birthPlace}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.registrationCourt">Registration Court</span></dt>
+                <dd>
+                    <span>{{customer.registrationCourt}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.registrationNumber">Registration Number</span></dt>
+                <dd>
+                    <span>{{customer.registrationNumber}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.vatRegion">Vat Region</span></dt>
+                <dd>
+                    <span jhiTranslate="{{'hsadminNgApp.VatRegion.' + customer.vatRegion}}">{{customer.vatRegion}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.customer.vatNumber">Vat Number</span></dt>
+                <dd>
+                    <span>{{customer.vatNumber}}</span>
+                </dd>
                 <dt><span jhiTranslate="hsadminNgApp.customer.contractualSalutation">Contractual Salutation</span></dt>
                 <dd>
                     <span>{{customer.contractualSalutation}}</span>

src/main/webapp/app/entities/customer/customer-update.component.html

@@ -66,6 +66,87 @@
                         </small>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.kind" for="field_kind">Kind</label>
+                    <select class="form-control" name="kind" [(ngModel)]="customer.kind" id="field_kind"  required>
+                        <option value="NATURAL">{{'hsadminNgApp.CustomerKind.NATURAL' | translate}}</option>
+                        <option value="LEGAL">{{'hsadminNgApp.CustomerKind.LEGAL' | translate}}</option>
+                    </select>
+                    <div [hidden]="!(editForm.controls.kind?.dirty && editForm.controls.kind?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.kind?.errors?.required" jhiTranslate="entity.validation.required">
+                        This field is required.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.birthDate" for="field_birthDate">Birth Date</label>
+                    <div class="input-group">
+                        <input id="field_birthDate" type="text" class="form-control" name="birthDate" ngbDatepicker  #birthDateDp="ngbDatepicker" [(ngModel)]="customer.birthDate"
+                        />
+                        <span class="input-group-append">
+                            <button type="button" class="btn btn-secondary" (click)="birthDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                        </span>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.birthPlace" for="field_birthPlace">Birth Place</label>
+                    <input type="text" class="form-control" name="birthPlace" id="field_birthPlace"
+                        [(ngModel)]="customer.birthPlace" maxlength="80"/>
+                    <div [hidden]="!(editForm.controls.birthPlace?.dirty && editForm.controls.birthPlace?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.birthPlace?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
+                        This field cannot be longer than 80 characters.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.registrationCourt" for="field_registrationCourt">Registration Court</label>
+                    <input type="text" class="form-control" name="registrationCourt" id="field_registrationCourt"
+                        [(ngModel)]="customer.registrationCourt" maxlength="80"/>
+                    <div [hidden]="!(editForm.controls.registrationCourt?.dirty && editForm.controls.registrationCourt?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.registrationCourt?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
+                        This field cannot be longer than 80 characters.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.registrationNumber" for="field_registrationNumber">Registration Number</label>
+                    <input type="text" class="form-control" name="registrationNumber" id="field_registrationNumber"
+                        [(ngModel)]="customer.registrationNumber" maxlength="80"/>
+                    <div [hidden]="!(editForm.controls.registrationNumber?.dirty && editForm.controls.registrationNumber?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.registrationNumber?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }">
+                        This field cannot be longer than 80 characters.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.vatRegion" for="field_vatRegion">Vat Region</label>
+                    <select class="form-control" name="vatRegion" [(ngModel)]="customer.vatRegion" id="field_vatRegion"  required>
+                        <option value="DOMESTIC">{{'hsadminNgApp.VatRegion.DOMESTIC' | translate}}</option>
+                        <option value="EU">{{'hsadminNgApp.VatRegion.EU' | translate}}</option>
+                        <option value="OTHER">{{'hsadminNgApp.VatRegion.OTHER' | translate}}</option>
+                    </select>
+                    <div [hidden]="!(editForm.controls.vatRegion?.dirty && editForm.controls.vatRegion?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.vatRegion?.errors?.required" jhiTranslate="entity.validation.required">
+                        This field is required.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.vatNumber" for="field_vatNumber">Vat Number</label>
+                    <input type="text" class="form-control" name="vatNumber" id="field_vatNumber"
+                        [(ngModel)]="customer.vatNumber" maxlength="40"/>
+                    <div [hidden]="!(editForm.controls.vatNumber?.dirty && editForm.controls.vatNumber?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.vatNumber?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 40 }">
+                        This field cannot be longer than 40 characters.
+                        </small>
+                    </div>
+                </div>
                 <div class="form-group">
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.customer.contractualSalutation" for="field_contractualSalutation">Contractual Salutation</label>
                     <input type="text" class="form-control" name="contractualSalutation" id="field_contractualSalutation"

src/main/webapp/app/entities/customer/customer-update.component.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { HttpResponse, HttpErrorResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
+import * as moment from 'moment';
 import { ICustomer } from 'app/shared/model/customer.model';
 import { CustomerService } from './customer.service';
 
@@ -13,6 +14,7 @@ import { CustomerService } from './customer.service';
 export class CustomerUpdateComponent implements OnInit {
     customer: ICustomer;
     isSaving: boolean;
+    birthDateDp: any;
 
     constructor(protected customerService: CustomerService, protected activatedRoute: ActivatedRoute) {}
 

src/main/webapp/app/entities/customer/customer.component.html

@@ -18,6 +18,13 @@
             <th jhiSortBy="reference"><span jhiTranslate="hsadminNgApp.customer.reference">Reference</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="prefix"><span jhiTranslate="hsadminNgApp.customer.prefix">Prefix</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="name"><span jhiTranslate="hsadminNgApp.customer.name">Name</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="kind"><span jhiTranslate="hsadminNgApp.customer.kind">Kind</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="birthDate"><span jhiTranslate="hsadminNgApp.customer.birthDate">Birth Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="birthPlace"><span jhiTranslate="hsadminNgApp.customer.birthPlace">Birth Place</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="registrationCourt"><span jhiTranslate="hsadminNgApp.customer.registrationCourt">Registration Court</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="registrationNumber"><span jhiTranslate="hsadminNgApp.customer.registrationNumber">Registration Number</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="vatRegion"><span jhiTranslate="hsadminNgApp.customer.vatRegion">Vat Region</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="vatNumber"><span jhiTranslate="hsadminNgApp.customer.vatNumber">Vat Number</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="contractualSalutation"><span jhiTranslate="hsadminNgApp.customer.contractualSalutation">Contractual Salutation</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="contractualAddress"><span jhiTranslate="hsadminNgApp.customer.contractualAddress">Contractual Address</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="billingSalutation"><span jhiTranslate="hsadminNgApp.customer.billingSalutation">Billing Salutation</span> <fa-icon [icon]="'sort'"></fa-icon></th>
@@ -32,6 +39,13 @@
                 <td>{{customer.reference}}</td>
                 <td>{{customer.prefix}}</td>
                 <td>{{customer.name}}</td>
+                <td jhiTranslate="{{'hsadminNgApp.CustomerKind.' + customer.kind}}">{{customer.kind}}</td>
+                <td>{{customer.birthDate | date:'mediumDate'}}</td>
+                <td>{{customer.birthPlace}}</td>
+                <td>{{customer.registrationCourt}}</td>
+                <td>{{customer.registrationNumber}}</td>
+                <td jhiTranslate="{{'hsadminNgApp.VatRegion.' + customer.vatRegion}}">{{customer.vatRegion}}</td>
+                <td>{{customer.vatNumber}}</td>
                 <td>{{customer.contractualSalutation}}</td>
                 <td>{{customer.contractualAddress}}</td>
                 <td>{{customer.billingSalutation}}</td>

src/main/webapp/app/entities/customer/customer.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Subscription, Subject } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 import { JhiEventManager, JhiParseLinks, JhiAlertService } from 'ng-jhipster';
 
 import { ICustomer } from 'app/shared/model/customer.model';
@@ -24,9 +24,6 @@ export class CustomerComponent implements OnInit, OnDestroy {
     predicate: any;
     reverse: any;
     totalItems: number;
-    filterValue: any;
-    filterValueChanged = new Subject<string>();
-    subscription: Subscription;
 
     constructor(
         protected customerService: CustomerService,
@@ -43,25 +40,11 @@ export class CustomerComponent implements OnInit, OnDestroy {
         };
         this.predicate = 'id';
         this.reverse = true;
-        this.resetFilter();
-    }
-
-    resetFilter() {
-        this.filterValue = {
-            number: null,
-            prefix: null
-        };
-        this.loadAll();
     }
 
     loadAll() {
-        const criteria = {
-            ...(this.filterValue.number && { 'number.equals': this.filterValue.number }),
-            ...(this.filterValue.prefix && { 'prefix.contains': this.filterValue.prefix })
-        };
         this.customerService
             .query({
-                ...criteria,
                 page: this.page,
                 size: this.itemsPerPage,
                 sort: this.sort()
@@ -72,10 +55,6 @@ export class CustomerComponent implements OnInit, OnDestroy {
             );
     }
 
-    filter($event) {
-        this.filterValueChanged.next($event.target.value);
-    }
-
     reset() {
         this.page = 0;
         this.customers = [];
@@ -93,15 +72,6 @@ export class CustomerComponent implements OnInit, OnDestroy {
             this.currentAccount = account;
         });
         this.registerChangeInCustomers();
-
-        this.subscription = this.filterValueChanged
-            .pipe(
-                debounceTime(500),
-                distinctUntilChanged((previous: any, current: any) => previous === current)
-            )
-            .subscribe(() => {
-                this.loadAll();
-            });
     }
 
     ngOnDestroy() {
@@ -127,8 +97,6 @@ export class CustomerComponent implements OnInit, OnDestroy {
     protected paginateCustomers(data: ICustomer[], headers: HttpHeaders) {
         this.links = this.parseLinks.parse(headers.get('link'));
         this.totalItems = parseInt(headers.get('X-Total-Count'), 10);
-        this.page = 0;
-        this.customers = [];
         for (let i = 0; i < data.length; i++) {
             this.customers.push(data[i]);
         }

src/main/webapp/app/entities/customer/customer.service.ts

@@ -1,6 +1,9 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import * as moment from 'moment';
+import { DATE_FORMAT } from 'app/shared/constants/input.constants';
+import { map } from 'rxjs/operators';
 
 import { SERVER_API_URL } from 'app/app.constants';
 import { createRequestOption } from 'app/shared';
@@ -16,23 +19,56 @@ export class CustomerService {
     constructor(protected http: HttpClient) {}
 
     create(customer: ICustomer): Observable<EntityResponseType> {
-        return this.http.post<ICustomer>(this.resourceUrl, customer, { observe: 'response' });
+        const copy = this.convertDateFromClient(customer);
+        return this.http
+            .post<ICustomer>(this.resourceUrl, copy, { observe: 'response' })
+            .pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
     }
 
     update(customer: ICustomer): Observable<EntityResponseType> {
-        return this.http.put<ICustomer>(this.resourceUrl, customer, { observe: 'response' });
+        const copy = this.convertDateFromClient(customer);
+        return this.http
+            .put<ICustomer>(this.resourceUrl, copy, { observe: 'response' })
+            .pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
     }
 
     find(id: number): Observable<EntityResponseType> {
-        return this.http.get<ICustomer>(`${this.resourceUrl}/${id}`, { observe: 'response' });
+        return this.http
+            .get<ICustomer>(`${this.resourceUrl}/${id}`, { observe: 'response' })
+            .pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
     }
 
     query(req?: any): Observable<EntityArrayResponseType> {
         const options = createRequestOption(req);
-        return this.http.get<ICustomer[]>(this.resourceUrl, { params: options, observe: 'response' });
+        return this.http
+            .get<ICustomer[]>(this.resourceUrl, { params: options, observe: 'response' })
+            .pipe(map((res: EntityArrayResponseType) => this.convertDateArrayFromServer(res)));
     }
 
     delete(id: number): Observable<HttpResponse<any>> {
         return this.http.delete<any>(`${this.resourceUrl}/${id}`, { observe: 'response' });
     }
+
+    protected convertDateFromClient(customer: ICustomer): ICustomer {
+        const copy: ICustomer = Object.assign({}, customer, {
+            birthDate: customer.birthDate != null && customer.birthDate.isValid() ? customer.birthDate.format(DATE_FORMAT) : null
+        });
+        return copy;
+    }
+
+    protected convertDateFromServer(res: EntityResponseType): EntityResponseType {
+        if (res.body) {
+            res.body.birthDate = res.body.birthDate != null ? moment(res.body.birthDate) : null;
+        }
+        return res;
+    }
+
+    protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType {
+        if (res.body) {
+            res.body.forEach((customer: ICustomer) => {
+                customer.birthDate = customer.birthDate != null ? moment(customer.birthDate) : null;
+            });
+        }
+        return res;
+    }
 }

src/main/webapp/app/entities/membership/membership-detail.component.html

@@ -5,17 +5,21 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="hsadminNgApp.membership.documentDate">Document Date</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.membership.admissionDocumentDate">Admission Document Date</span></dt>
                 <dd>
-                    <span>{{membership.documentDate}}</span>
+                    <span>{{membership.admissionDocumentDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.membership.memberFrom">Member From</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.membership.cancellationDocumentDate">Cancellation Document Date</span></dt>
                 <dd>
-                    <span>{{membership.memberFrom}}</span>
+                    <span>{{membership.cancellationDocumentDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.membership.memberUntil">Member Until</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.membership.memberFromDate">Member From Date</span></dt>
                 <dd>
-                    <span>{{membership.memberUntil}}</span>
+                    <span>{{membership.memberFromDate}}</span>
+                </dd>
+                <dt><span jhiTranslate="hsadminNgApp.membership.memberUntilDate">Member Until Date</span></dt>
+                <dd>
+                    <span>{{membership.memberUntilDate}}</span>
                 </dd>
                 <dt><span jhiTranslate="hsadminNgApp.membership.remark">Remark</span></dt>
                 <dd>

src/main/webapp/app/entities/membership/membership-update.component.html

@@ -10,44 +10,54 @@
                         [(ngModel)]="membership.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.documentDate" for="field_documentDate">Document Date</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.admissionDocumentDate" for="field_admissionDocumentDate">Admission Document Date</label>
                     <div class="input-group">
-                        <input id="field_documentDate" type="text" class="form-control" name="documentDate" ngbDatepicker  #documentDateDp="ngbDatepicker" [(ngModel)]="membership.documentDate"
+                        <input id="field_admissionDocumentDate" type="text" class="form-control" name="admissionDocumentDate" ngbDatepicker  #admissionDocumentDateDp="ngbDatepicker" [(ngModel)]="membership.admissionDocumentDate"
                         required/>
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="documentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="admissionDocumentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
-                    <div [hidden]="!(editForm.controls.documentDate?.dirty && editForm.controls.documentDate?.invalid)">
+                    <div [hidden]="!(editForm.controls.admissionDocumentDate?.dirty && editForm.controls.admissionDocumentDate?.invalid)">
                         <small class="form-text text-danger"
-                        [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required">
+                        [hidden]="!editForm.controls.admissionDocumentDate?.errors?.required" jhiTranslate="entity.validation.required">
                         This field is required.
                         </small>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.memberFrom" for="field_memberFrom">Member From</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.cancellationDocumentDate" for="field_cancellationDocumentDate">Cancellation Document Date</label>
                     <div class="input-group">
-                        <input id="field_memberFrom" type="text" class="form-control" name="memberFrom" ngbDatepicker  #memberFromDp="ngbDatepicker" [(ngModel)]="membership.memberFrom"
-                        required/>
-                        <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="memberFromDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
-                        </span>
-                    </div>
-                    <div [hidden]="!(editForm.controls.memberFrom?.dirty && editForm.controls.memberFrom?.invalid)">
-                        <small class="form-text text-danger"
-                        [hidden]="!editForm.controls.memberFrom?.errors?.required" jhiTranslate="entity.validation.required">
-                        This field is required.
-                        </small>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.memberUntil" for="field_memberUntil">Member Until</label>
-                    <div class="input-group">
-                        <input id="field_memberUntil" type="text" class="form-control" name="memberUntil" ngbDatepicker  #memberUntilDp="ngbDatepicker" [(ngModel)]="membership.memberUntil"
+                        <input id="field_cancellationDocumentDate" type="text" class="form-control" name="cancellationDocumentDate" ngbDatepicker  #cancellationDocumentDateDp="ngbDatepicker" [(ngModel)]="membership.cancellationDocumentDate"
                         />
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="memberUntilDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="cancellationDocumentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                        </span>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.memberFromDate" for="field_memberFromDate">Member From Date</label>
+                    <div class="input-group">
+                        <input id="field_memberFromDate" type="text" class="form-control" name="memberFromDate" ngbDatepicker  #memberFromDateDp="ngbDatepicker" [(ngModel)]="membership.memberFromDate"
+                        required/>
+                        <span class="input-group-append">
+                            <button type="button" class="btn btn-secondary" (click)="memberFromDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                        </span>
+                    </div>
+                    <div [hidden]="!(editForm.controls.memberFromDate?.dirty && editForm.controls.memberFromDate?.invalid)">
+                        <small class="form-text text-danger"
+                        [hidden]="!editForm.controls.memberFromDate?.errors?.required" jhiTranslate="entity.validation.required">
+                        This field is required.
+                        </small>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.membership.memberUntilDate" for="field_memberUntilDate">Member Until Date</label>
+                    <div class="input-group">
+                        <input id="field_memberUntilDate" type="text" class="form-control" name="memberUntilDate" ngbDatepicker  #memberUntilDateDp="ngbDatepicker" [(ngModel)]="membership.memberUntilDate"
+                        />
+                        <span class="input-group-append">
+                            <button type="button" class="btn btn-secondary" (click)="memberUntilDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
                 </div>

src/main/webapp/app/entities/membership/membership-update.component.ts

@@ -19,9 +19,10 @@ export class MembershipUpdateComponent implements OnInit {
     isSaving: boolean;
 
     customers: ICustomer[];
-    documentDateDp: any;
-    memberFromDp: any;
-    memberUntilDp: any;
+    admissionDocumentDateDp: any;
+    cancellationDocumentDateDp: any;
+    memberFromDateDp: any;
+    memberUntilDateDp: any;
 
     constructor(
         protected jhiAlertService: JhiAlertService,

src/main/webapp/app/entities/membership/membership.component.html

@@ -15,9 +15,10 @@
             <thead>
             <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" [callback]="reset.bind(this)">
             <th jhiSortBy="id"><span jhiTranslate="global.field.id">ID</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="documentDate"><span jhiTranslate="hsadminNgApp.membership.documentDate">Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="memberFrom"><span jhiTranslate="hsadminNgApp.membership.memberFrom">Member From</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="memberUntil"><span jhiTranslate="hsadminNgApp.membership.memberUntil">Member Until</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="admissionDocumentDate"><span jhiTranslate="hsadminNgApp.membership.admissionDocumentDate">Admission Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="cancellationDocumentDate"><span jhiTranslate="hsadminNgApp.membership.cancellationDocumentDate">Cancellation Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="memberFromDate"><span jhiTranslate="hsadminNgApp.membership.memberFromDate">Member From Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="memberUntilDate"><span jhiTranslate="hsadminNgApp.membership.memberUntilDate">Member Until Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="remark"><span jhiTranslate="hsadminNgApp.membership.remark">Remark</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="customerPrefix"><span jhiTranslate="hsadminNgApp.membership.customer">Customer</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
@@ -26,9 +27,10 @@
             <tbody infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page >= links['last']" [infiniteScrollDistance]="0">
             <tr *ngFor="let membership of memberships ;trackBy: trackId">
                 <td><a [routerLink]="['/membership', membership.id, 'view' ]">{{membership.id}}</a></td>
-                <td>{{membership.documentDate | date:'mediumDate'}}</td>
-                <td>{{membership.memberFrom | date:'mediumDate'}}</td>
-                <td>{{membership.memberUntil | date:'mediumDate'}}</td>
+                <td>{{membership.admissionDocumentDate | date:'mediumDate'}}</td>
+                <td>{{membership.cancellationDocumentDate | date:'mediumDate'}}</td>
+                <td>{{membership.memberFromDate | date:'mediumDate'}}</td>
+                <td>{{membership.memberUntilDate | date:'mediumDate'}}</td>
                 <td>{{membership.remark}}</td>
                 <td>
                     <div *ngIf="membership.customerId">

src/main/webapp/app/entities/membership/membership.service.ts

@@ -51,20 +51,33 @@ export class MembershipService {
 
     protected convertDateFromClient(membership: IMembership): IMembership {
         const copy: IMembership = Object.assign({}, membership, {
-            documentDate:
-                membership.documentDate != null && membership.documentDate.isValid() ? membership.documentDate.format(DATE_FORMAT) : null,
-            memberFrom: membership.memberFrom != null && membership.memberFrom.isValid() ? membership.memberFrom.format(DATE_FORMAT) : null,
-            memberUntil:
-                membership.memberUntil != null && membership.memberUntil.isValid() ? membership.memberUntil.format(DATE_FORMAT) : null
+            admissionDocumentDate:
+                membership.admissionDocumentDate != null && membership.admissionDocumentDate.isValid()
+                    ? membership.admissionDocumentDate.format(DATE_FORMAT)
+                    : null,
+            cancellationDocumentDate:
+                membership.cancellationDocumentDate != null && membership.cancellationDocumentDate.isValid()
+                    ? membership.cancellationDocumentDate.format(DATE_FORMAT)
+                    : null,
+            memberFromDate:
+                membership.memberFromDate != null && membership.memberFromDate.isValid()
+                    ? membership.memberFromDate.format(DATE_FORMAT)
+                    : null,
+            memberUntilDate:
+                membership.memberUntilDate != null && membership.memberUntilDate.isValid()
+                    ? membership.memberUntilDate.format(DATE_FORMAT)
+                    : null
         });
         return copy;
     }
 
     protected convertDateFromServer(res: EntityResponseType): EntityResponseType {
         if (res.body) {
-            res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null;
-            res.body.memberFrom = res.body.memberFrom != null ? moment(res.body.memberFrom) : null;
-            res.body.memberUntil = res.body.memberUntil != null ? moment(res.body.memberUntil) : null;
+            res.body.admissionDocumentDate = res.body.admissionDocumentDate != null ? moment(res.body.admissionDocumentDate) : null;
+            res.body.cancellationDocumentDate =
+                res.body.cancellationDocumentDate != null ? moment(res.body.cancellationDocumentDate) : null;
+            res.body.memberFromDate = res.body.memberFromDate != null ? moment(res.body.memberFromDate) : null;
+            res.body.memberUntilDate = res.body.memberUntilDate != null ? moment(res.body.memberUntilDate) : null;
         }
         return res;
     }
@@ -72,9 +85,12 @@ export class MembershipService {
     protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType {
         if (res.body) {
             res.body.forEach((membership: IMembership) => {
-                membership.documentDate = membership.documentDate != null ? moment(membership.documentDate) : null;
-                membership.memberFrom = membership.memberFrom != null ? moment(membership.memberFrom) : null;
-                membership.memberUntil = membership.memberUntil != null ? moment(membership.memberUntil) : null;
+                membership.admissionDocumentDate =
+                    membership.admissionDocumentDate != null ? moment(membership.admissionDocumentDate) : null;
+                membership.cancellationDocumentDate =
+                    membership.cancellationDocumentDate != null ? moment(membership.cancellationDocumentDate) : null;
+                membership.memberFromDate = membership.memberFromDate != null ? moment(membership.memberFromDate) : null;
+                membership.memberUntilDate = membership.memberUntilDate != null ? moment(membership.memberUntilDate) : null;
             });
         }
         return res;

src/main/webapp/app/entities/sepa-mandate/sepa-mandate-detail.component.html

@@ -17,25 +17,25 @@
                 <dd>
                     <span>{{sepaMandate.bic}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.documentDate">Document Date</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.grantingDocumentDate">Granting Document Date</span></dt>
                 <dd>
-                    <span>{{sepaMandate.documentDate}}</span>
+                    <span>{{sepaMandate.grantingDocumentDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.validFrom">Valid From</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.revokationDocumentDate">Revokation Document Date</span></dt>
                 <dd>
-                    <span>{{sepaMandate.validFrom}}</span>
+                    <span>{{sepaMandate.revokationDocumentDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.validUntil">Valid Until</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.validFromDate">Valid From Date</span></dt>
                 <dd>
-                    <span>{{sepaMandate.validUntil}}</span>
+                    <span>{{sepaMandate.validFromDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.lastUsed">Last Used</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.validUntilDate">Valid Until Date</span></dt>
                 <dd>
-                    <span>{{sepaMandate.lastUsed}}</span>
+                    <span>{{sepaMandate.validUntilDate}}</span>
                 </dd>
-                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.cancellationDate">Cancellation Date</span></dt>
+                <dt><span jhiTranslate="hsadminNgApp.sepaMandate.lastUsedDate">Last Used Date</span></dt>
                 <dd>
-                    <span>{{sepaMandate.cancellationDate}}</span>
+                    <span>{{sepaMandate.lastUsedDate}}</span>
                 </dd>
                 <dt><span jhiTranslate="hsadminNgApp.sepaMandate.remark">Remark</span></dt>
                 <dd>

src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.html

@@ -47,64 +47,64 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.documentDate" for="field_documentDate">Document Date</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.grantingDocumentDate" for="field_grantingDocumentDate">Granting Document Date</label>
                     <div class="input-group">
-                        <input id="field_documentDate" type="text" class="form-control" name="documentDate" ngbDatepicker  #documentDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.documentDate"
+                        <input id="field_grantingDocumentDate" type="text" class="form-control" name="grantingDocumentDate" ngbDatepicker  #grantingDocumentDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.grantingDocumentDate"
                         required/>
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="documentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="grantingDocumentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
-                    <div [hidden]="!(editForm.controls.documentDate?.dirty && editForm.controls.documentDate?.invalid)">
+                    <div [hidden]="!(editForm.controls.grantingDocumentDate?.dirty && editForm.controls.grantingDocumentDate?.invalid)">
                         <small class="form-text text-danger"
-                        [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required">
+                        [hidden]="!editForm.controls.grantingDocumentDate?.errors?.required" jhiTranslate="entity.validation.required">
                         This field is required.
                         </small>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.validFrom" for="field_validFrom">Valid From</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.revokationDocumentDate" for="field_revokationDocumentDate">Revokation Document Date</label>
                     <div class="input-group">
-                        <input id="field_validFrom" type="text" class="form-control" name="validFrom" ngbDatepicker  #validFromDp="ngbDatepicker" [(ngModel)]="sepaMandate.validFrom"
-                        required/>
+                        <input id="field_revokationDocumentDate" type="text" class="form-control" name="revokationDocumentDate" ngbDatepicker  #revokationDocumentDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.revokationDocumentDate"
+                        />
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="validFromDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="revokationDocumentDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
-                    <div [hidden]="!(editForm.controls.validFrom?.dirty && editForm.controls.validFrom?.invalid)">
+                </div>
+                <div class="form-group">
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.validFromDate" for="field_validFromDate">Valid From Date</label>
+                    <div class="input-group">
+                        <input id="field_validFromDate" type="text" class="form-control" name="validFromDate" ngbDatepicker  #validFromDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.validFromDate"
+                        required/>
+                        <span class="input-group-append">
+                            <button type="button" class="btn btn-secondary" (click)="validFromDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                        </span>
+                    </div>
+                    <div [hidden]="!(editForm.controls.validFromDate?.dirty && editForm.controls.validFromDate?.invalid)">
                         <small class="form-text text-danger"
-                        [hidden]="!editForm.controls.validFrom?.errors?.required" jhiTranslate="entity.validation.required">
+                        [hidden]="!editForm.controls.validFromDate?.errors?.required" jhiTranslate="entity.validation.required">
                         This field is required.
                         </small>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.validUntil" for="field_validUntil">Valid Until</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.validUntilDate" for="field_validUntilDate">Valid Until Date</label>
                     <div class="input-group">
-                        <input id="field_validUntil" type="text" class="form-control" name="validUntil" ngbDatepicker  #validUntilDp="ngbDatepicker" [(ngModel)]="sepaMandate.validUntil"
+                        <input id="field_validUntilDate" type="text" class="form-control" name="validUntilDate" ngbDatepicker  #validUntilDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.validUntilDate"
                         />
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="validUntilDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="validUntilDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.lastUsed" for="field_lastUsed">Last Used</label>
+                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.lastUsedDate" for="field_lastUsedDate">Last Used Date</label>
                     <div class="input-group">
-                        <input id="field_lastUsed" type="text" class="form-control" name="lastUsed" ngbDatepicker  #lastUsedDp="ngbDatepicker" [(ngModel)]="sepaMandate.lastUsed"
+                        <input id="field_lastUsedDate" type="text" class="form-control" name="lastUsedDate" ngbDatepicker  #lastUsedDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.lastUsedDate"
                         />
                         <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="lastUsedDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
-                        </span>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="hsadminNgApp.sepaMandate.cancellationDate" for="field_cancellationDate">Cancellation Date</label>
-                    <div class="input-group">
-                        <input id="field_cancellationDate" type="text" class="form-control" name="cancellationDate" ngbDatepicker  #cancellationDateDp="ngbDatepicker" [(ngModel)]="sepaMandate.cancellationDate"
-                        />
-                        <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="cancellationDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
+                            <button type="button" class="btn btn-secondary" (click)="lastUsedDateDp.toggle()"><fa-icon [icon]="'calendar-alt'"></fa-icon></button>
                         </span>
                     </div>
                 </div>

src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.ts

@@ -19,11 +19,11 @@ export class SepaMandateUpdateComponent implements OnInit {
     isSaving: boolean;
 
     customers: ICustomer[];
-    documentDateDp: any;
-    validFromDp: any;
-    validUntilDp: any;
-    lastUsedDp: any;
-    cancellationDateDp: any;
+    grantingDocumentDateDp: any;
+    revokationDocumentDateDp: any;
+    validFromDateDp: any;
+    validUntilDateDp: any;
+    lastUsedDateDp: any;
 
     constructor(
         protected jhiAlertService: JhiAlertService,

src/main/webapp/app/entities/sepa-mandate/sepa-mandate.component.html

@@ -18,11 +18,11 @@
             <th jhiSortBy="reference"><span jhiTranslate="hsadminNgApp.sepaMandate.reference">Reference</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="iban"><span jhiTranslate="hsadminNgApp.sepaMandate.iban">Iban</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="bic"><span jhiTranslate="hsadminNgApp.sepaMandate.bic">Bic</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="documentDate"><span jhiTranslate="hsadminNgApp.sepaMandate.documentDate">Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="validFrom"><span jhiTranslate="hsadminNgApp.sepaMandate.validFrom">Valid From</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="validUntil"><span jhiTranslate="hsadminNgApp.sepaMandate.validUntil">Valid Until</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="lastUsed"><span jhiTranslate="hsadminNgApp.sepaMandate.lastUsed">Last Used</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="cancellationDate"><span jhiTranslate="hsadminNgApp.sepaMandate.cancellationDate">Cancellation Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="grantingDocumentDate"><span jhiTranslate="hsadminNgApp.sepaMandate.grantingDocumentDate">Granting Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="revokationDocumentDate"><span jhiTranslate="hsadminNgApp.sepaMandate.revokationDocumentDate">Revokation Document Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="validFromDate"><span jhiTranslate="hsadminNgApp.sepaMandate.validFromDate">Valid From Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="validUntilDate"><span jhiTranslate="hsadminNgApp.sepaMandate.validUntilDate">Valid Until Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="lastUsedDate"><span jhiTranslate="hsadminNgApp.sepaMandate.lastUsedDate">Last Used Date</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="remark"><span jhiTranslate="hsadminNgApp.sepaMandate.remark">Remark</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="customerPrefix"><span jhiTranslate="hsadminNgApp.sepaMandate.customer">Customer</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
@@ -34,11 +34,11 @@
                 <td>{{sepaMandate.reference}}</td>
                 <td>{{sepaMandate.iban}}</td>
                 <td>{{sepaMandate.bic}}</td>
-                <td>{{sepaMandate.documentDate | date:'mediumDate'}}</td>
-                <td>{{sepaMandate.validFrom | date:'mediumDate'}}</td>
-                <td>{{sepaMandate.validUntil | date:'mediumDate'}}</td>
-                <td>{{sepaMandate.lastUsed | date:'mediumDate'}}</td>
-                <td>{{sepaMandate.cancellationDate | date:'mediumDate'}}</td>
+                <td>{{sepaMandate.grantingDocumentDate | date:'mediumDate'}}</td>
+                <td>{{sepaMandate.revokationDocumentDate | date:'mediumDate'}}</td>
+                <td>{{sepaMandate.validFromDate | date:'mediumDate'}}</td>
+                <td>{{sepaMandate.validUntilDate | date:'mediumDate'}}</td>
+                <td>{{sepaMandate.lastUsedDate | date:'mediumDate'}}</td>
                 <td>{{sepaMandate.remark}}</td>
                 <td>
                     <div *ngIf="sepaMandate.customerId">

src/main/webapp/app/entities/sepa-mandate/sepa-mandate.service.ts

@@ -51,29 +51,35 @@ export class SepaMandateService {
 
     protected convertDateFromClient(sepaMandate: ISepaMandate): ISepaMandate {
         const copy: ISepaMandate = Object.assign({}, sepaMandate, {
-            documentDate:
-                sepaMandate.documentDate != null && sepaMandate.documentDate.isValid()
-                    ? sepaMandate.documentDate.format(DATE_FORMAT)
+            grantingDocumentDate:
+                sepaMandate.grantingDocumentDate != null && sepaMandate.grantingDocumentDate.isValid()
+                    ? sepaMandate.grantingDocumentDate.format(DATE_FORMAT)
                     : null,
-            validFrom: sepaMandate.validFrom != null && sepaMandate.validFrom.isValid() ? sepaMandate.validFrom.format(DATE_FORMAT) : null,
-            validUntil:
-                sepaMandate.validUntil != null && sepaMandate.validUntil.isValid() ? sepaMandate.validUntil.format(DATE_FORMAT) : null,
-            lastUsed: sepaMandate.lastUsed != null && sepaMandate.lastUsed.isValid() ? sepaMandate.lastUsed.format(DATE_FORMAT) : null,
-            cancellationDate:
-                sepaMandate.cancellationDate != null && sepaMandate.cancellationDate.isValid()
-                    ? sepaMandate.cancellationDate.format(DATE_FORMAT)
-                    : null
+            revokationDocumentDate:
+                sepaMandate.revokationDocumentDate != null && sepaMandate.revokationDocumentDate.isValid()
+                    ? sepaMandate.revokationDocumentDate.format(DATE_FORMAT)
+                    : null,
+            validFromDate:
+                sepaMandate.validFromDate != null && sepaMandate.validFromDate.isValid()
+                    ? sepaMandate.validFromDate.format(DATE_FORMAT)
+                    : null,
+            validUntilDate:
+                sepaMandate.validUntilDate != null && sepaMandate.validUntilDate.isValid()
+                    ? sepaMandate.validUntilDate.format(DATE_FORMAT)
+                    : null,
+            lastUsedDate:
+                sepaMandate.lastUsedDate != null && sepaMandate.lastUsedDate.isValid() ? sepaMandate.lastUsedDate.format(DATE_FORMAT) : null
         });
         return copy;
     }
 
     protected convertDateFromServer(res: EntityResponseType): EntityResponseType {
         if (res.body) {
-            res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null;
-            res.body.validFrom = res.body.validFrom != null ? moment(res.body.validFrom) : null;
-            res.body.validUntil = res.body.validUntil != null ? moment(res.body.validUntil) : null;
-            res.body.lastUsed = res.body.lastUsed != null ? moment(res.body.lastUsed) : null;
-            res.body.cancellationDate = res.body.cancellationDate != null ? moment(res.body.cancellationDate) : null;
+            res.body.grantingDocumentDate = res.body.grantingDocumentDate != null ? moment(res.body.grantingDocumentDate) : null;
+            res.body.revokationDocumentDate = res.body.revokationDocumentDate != null ? moment(res.body.revokationDocumentDate) : null;
+            res.body.validFromDate = res.body.validFromDate != null ? moment(res.body.validFromDate) : null;
+            res.body.validUntilDate = res.body.validUntilDate != null ? moment(res.body.validUntilDate) : null;
+            res.body.lastUsedDate = res.body.lastUsedDate != null ? moment(res.body.lastUsedDate) : null;
         }
         return res;
     }
@@ -81,11 +87,13 @@ export class SepaMandateService {
     protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType {
         if (res.body) {
             res.body.forEach((sepaMandate: ISepaMandate) => {
-                sepaMandate.documentDate = sepaMandate.documentDate != null ? moment(sepaMandate.documentDate) : null;
-                sepaMandate.validFrom = sepaMandate.validFrom != null ? moment(sepaMandate.validFrom) : null;
-                sepaMandate.validUntil = sepaMandate.validUntil != null ? moment(sepaMandate.validUntil) : null;
-                sepaMandate.lastUsed = sepaMandate.lastUsed != null ? moment(sepaMandate.lastUsed) : null;
-                sepaMandate.cancellationDate = sepaMandate.cancellationDate != null ? moment(sepaMandate.cancellationDate) : null;
+                sepaMandate.grantingDocumentDate =
+                    sepaMandate.grantingDocumentDate != null ? moment(sepaMandate.grantingDocumentDate) : null;
+                sepaMandate.revokationDocumentDate =
+                    sepaMandate.revokationDocumentDate != null ? moment(sepaMandate.revokationDocumentDate) : null;
+                sepaMandate.validFromDate = sepaMandate.validFromDate != null ? moment(sepaMandate.validFromDate) : null;
+                sepaMandate.validUntilDate = sepaMandate.validUntilDate != null ? moment(sepaMandate.validUntilDate) : null;
+                sepaMandate.lastUsedDate = sepaMandate.lastUsedDate != null ? moment(sepaMandate.lastUsedDate) : null;
             });
         }
         return res;

src/main/webapp/app/entities/share/share-detail.component.html

@@ -28,7 +28,7 @@
                 <dt><span jhiTranslate="hsadminNgApp.share.membership">Membership</span></dt>
                 <dd>
                     <div *ngIf="share.membershipId">
-                        <a [routerLink]="['/membership', share.membershipId, 'view']">{{share.membershipDocumentDate}}</a>
+                        <a [routerLink]="['/membership', share.membershipId, 'view']">{{share.membershipAdmissionDocumentDate}}</a>
                     </div>
                 </dd>
             </dl>

src/main/webapp/app/entities/share/share-update.component.html

@@ -85,7 +85,7 @@
                     <label class="form-control-label" jhiTranslate="hsadminNgApp.share.membership" for="field_membership">Membership</label>
                     <select class="form-control" id="field_membership" name="membership" [(ngModel)]="share.membershipId"  required>
                         <option *ngIf="!editForm.value.membership" [ngValue]="null" selected></option>
-                        <option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.documentDate}}</option>
+                        <option [ngValue]="membershipOption.id" *ngFor="let membershipOption of memberships; trackBy: trackMembershipById">{{membershipOption.admissionDocumentDate}}</option>
                     </select>
                 </div>
                 <div [hidden]="!(editForm.controls.membership?.dirty && editForm.controls.membership?.invalid)">

src/main/webapp/app/entities/share/share.component.html

@@ -20,7 +20,7 @@
             <th jhiSortBy="action"><span jhiTranslate="hsadminNgApp.share.action">Action</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="quantity"><span jhiTranslate="hsadminNgApp.share.quantity">Quantity</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th jhiSortBy="remark"><span jhiTranslate="hsadminNgApp.share.remark">Remark</span> <fa-icon [icon]="'sort'"></fa-icon></th>
-            <th jhiSortBy="membershipDocumentDate"><span jhiTranslate="hsadminNgApp.share.membership">Membership</span> <fa-icon [icon]="'sort'"></fa-icon></th>
+            <th jhiSortBy="membershipAdmissionDocumentDate"><span jhiTranslate="hsadminNgApp.share.membership">Membership</span> <fa-icon [icon]="'sort'"></fa-icon></th>
             <th></th>
             </tr>
             </thead>
@@ -34,7 +34,7 @@
                 <td>{{share.remark}}</td>
                 <td>
                     <div *ngIf="share.membershipId">
-                        <a [routerLink]="['../membership', share.membershipId , 'view' ]" >{{share.membershipDocumentDate}}</a>
+                        <a [routerLink]="['../membership', share.membershipId , 'view' ]" >{{share.membershipAdmissionDocumentDate}}</a>
                     </div>
                 </td>
                 <td class="text-right">

src/main/webapp/app/shared/model/asset.model.ts

@@ -16,7 +16,7 @@ export interface IAsset {
     action?: AssetAction;
     amount?: number;
     remark?: string;
-    membershipDocumentDate?: string;
+    membershipAdmissionDocumentDate?: string;
     membershipId?: number;
 }
 
@@ -28,7 +28,7 @@ export class Asset implements IAsset {
         public action?: AssetAction,
         public amount?: number,
         public remark?: string,
-        public membershipDocumentDate?: string,
+        public membershipAdmissionDocumentDate?: string,
         public membershipId?: number
     ) {}
 }

src/main/webapp/app/shared/model/customer.model.ts

@@ -1,11 +1,30 @@
+import { Moment } from 'moment';
 import { IMembership } from 'app/shared/model/membership.model';
 import { ISepaMandate } from 'app/shared/model/sepa-mandate.model';
 
+export const enum CustomerKind {
+    NATURAL = 'NATURAL',
+    LEGAL = 'LEGAL'
+}
+
+export const enum VatRegion {
+    DOMESTIC = 'DOMESTIC',
+    EU = 'EU',
+    OTHER = 'OTHER'
+}
+
 export interface ICustomer {
     id?: number;
     reference?: number;
     prefix?: string;
     name?: string;
+    kind?: CustomerKind;
+    birthDate?: Moment;
+    birthPlace?: string;
+    registrationCourt?: string;
+    registrationNumber?: string;
+    vatRegion?: VatRegion;
+    vatNumber?: string;
     contractualSalutation?: string;
     contractualAddress?: string;
     billingSalutation?: string;
@@ -21,6 +40,13 @@ export class Customer implements ICustomer {
         public reference?: number,
         public prefix?: string,
         public name?: string,
+        public kind?: CustomerKind,
+        public birthDate?: Moment,
+        public birthPlace?: string,
+        public registrationCourt?: string,
+        public registrationNumber?: string,
+        public vatRegion?: VatRegion,
+        public vatNumber?: string,
         public contractualSalutation?: string,
         public contractualAddress?: string,
         public billingSalutation?: string,

src/main/webapp/app/shared/model/membership.model.ts

@@ -4,9 +4,10 @@ import { IAsset } from 'app/shared/model/asset.model';
 
 export interface IMembership {
     id?: number;
-    documentDate?: Moment;
-    memberFrom?: Moment;
-    memberUntil?: Moment;
+    admissionDocumentDate?: Moment;
+    cancellationDocumentDate?: Moment;
+    memberFromDate?: Moment;
+    memberUntilDate?: Moment;
     remark?: string;
     shares?: IShare[];
     assets?: IAsset[];
@@ -17,9 +18,10 @@ export interface IMembership {
 export class Membership implements IMembership {
     constructor(
         public id?: number,
-        public documentDate?: Moment,
-        public memberFrom?: Moment,
-        public memberUntil?: Moment,
+        public admissionDocumentDate?: Moment,
+        public cancellationDocumentDate?: Moment,
+        public memberFromDate?: Moment,
+        public memberUntilDate?: Moment,
         public remark?: string,
         public shares?: IShare[],
         public assets?: IAsset[],

src/main/webapp/app/shared/model/sepa-mandate.model.ts

@@ -5,11 +5,11 @@ export interface ISepaMandate {
     reference?: string;
     iban?: string;
     bic?: string;
-    documentDate?: Moment;
-    validFrom?: Moment;
-    validUntil?: Moment;
-    lastUsed?: Moment;
-    cancellationDate?: Moment;
+    grantingDocumentDate?: Moment;
+    revokationDocumentDate?: Moment;
+    validFromDate?: Moment;
+    validUntilDate?: Moment;
+    lastUsedDate?: Moment;
     remark?: string;
     customerPrefix?: string;
     customerId?: number;
@@ -21,11 +21,11 @@ export class SepaMandate implements ISepaMandate {
         public reference?: string,
         public iban?: string,
         public bic?: string,
-        public documentDate?: Moment,
-        public validFrom?: Moment,
-        public validUntil?: Moment,
-        public lastUsed?: Moment,
-        public cancellationDate?: Moment,
+        public grantingDocumentDate?: Moment,
+        public revokationDocumentDate?: Moment,
+        public validFromDate?: Moment,
+        public validUntilDate?: Moment,
+        public lastUsedDate?: Moment,
         public remark?: string,
         public customerPrefix?: string,
         public customerId?: number

src/main/webapp/app/shared/model/share.model.ts

@@ -12,7 +12,7 @@ export interface IShare {
     action?: ShareAction;
     quantity?: number;
     remark?: string;
-    membershipDocumentDate?: string;
+    membershipAdmissionDocumentDate?: string;
     membershipId?: number;
 }
 
@@ -24,7 +24,7 @@ export class Share implements IShare {
         public action?: ShareAction,
         public quantity?: number,
         public remark?: string,
-        public membershipDocumentDate?: string,
+        public membershipAdmissionDocumentDate?: string,
         public membershipId?: number
     ) {}
 }

src/main/webapp/i18n/de/customer.json

@@ -18,6 +18,13 @@
             "reference": "Reference",
             "prefix": "Prefix",
             "name": "Name",
+            "kind": "Kind",
+            "birthDate": "Birth Date",
+            "birthPlace": "Birth Place",
+            "registrationCourt": "Registration Court",
+            "registrationNumber": "Registration Number",
+            "vatRegion": "Vat Region",
+            "vatNumber": "Vat Number",
             "contractualSalutation": "Contractual Salutation",
             "contractualAddress": "Contractual Address",
             "billingSalutation": "Billing Salutation",

src/main/webapp/i18n/de/customerKind.json

@@ -0,0 +1,9 @@
+{
+    "hsadminNgApp": {
+        "CustomerKind": {
+            "null": "",
+            "NATURAL": "NATURAL",
+            "LEGAL": "LEGAL"
+        }
+    }
+}

src/main/webapp/i18n/de/membership.json

@@ -2,26 +2,27 @@
     "hsadminNgApp": {
         "membership": {
             "home": {
-                "title": "Mitgliedschaften",
-                "createLabel": "Mitgliedschaft erfassen",
-                "createOrEditLabel": "Mitgliedschaft erfassen oder bearbeiten"
+                "title": "Memberships",
+                "createLabel": "Membership erstellen",
+                "createOrEditLabel": "Membership erstellen oder bearbeiten"
             },
-            "created": "Mitgliedschaft erfasst mit ID {{ param }}",
-            "updated": "Mitgliedschaft aktualisiert mit ID {{ param }}",
-            "deleted": "Mitgliedschaft gelöscht mit ID {{ param }}",
+            "created": "Membership erstellt mit ID {{ param }}",
+            "updated": "Membership aktualisiert mit ID {{ param }}",
+            "deleted": "Membership gelöscht mit ID {{ param }}",
             "delete": {
-                "question": "Soll die Mitgliedschaft {{ id }} wirklich dauerhaft gelöscht werden?"
+                "question": "Soll Membership {{ id }} wirklich dauerhaft gelöscht werden?"
             },
             "detail": {
-                "title": "Mitgliedschaft"
+                "title": "Membership"
             },
-            "documentDate": "Belegdatum",
-            "memberFrom": "Mitglied ab",
-            "memberUntil": "Mitglied bis",
-            "remark": "Bemerkung",
-            "share": "Geschäftsanteile",
-            "asset": "Geschäftsguthaben",
-            "customer": "Kunde/Kundin"
+            "admissionDocumentDate": "Admission Document Date",
+            "cancellationDocumentDate": "Cancellation Document Date",
+            "memberFromDate": "Member From Date",
+            "memberUntilDate": "Member Until Date",
+            "remark": "Remark",
+            "share": "Share",
+            "asset": "Asset",
+            "customer": "Customer"
         }
     }
 }

src/main/webapp/i18n/de/sepaMandate.json

@@ -18,11 +18,11 @@
             "reference": "Reference",
             "iban": "Iban",
             "bic": "Bic",
-            "documentDate": "Document Date",
-            "validFrom": "Valid From",
-            "validUntil": "Valid Until",
-            "lastUsed": "Last Used",
-            "cancellationDate": "Cancellation Date",
+            "grantingDocumentDate": "Granting Document Date",
+            "revokationDocumentDate": "Revokation Document Date",
+            "validFromDate": "Valid From Date",
+            "validUntilDate": "Valid Until Date",
+            "lastUsedDate": "Last Used Date",
             "remark": "Remark",
             "customer": "Customer"
         }

src/main/webapp/i18n/de/vatRegion.json

@@ -0,0 +1,10 @@
+{
+    "hsadminNgApp": {
+        "VatRegion": {
+            "null": "",
+            "DOMESTIC": "DOMESTIC",
+            "EU": "EU",
+            "OTHER": "OTHER"
+        }
+    }
+}

src/main/webapp/i18n/en/customer.json

@@ -18,6 +18,13 @@
             "reference": "Reference",
             "prefix": "Prefix",
             "name": "Name",
+            "kind": "Kind",
+            "birthDate": "Birth Date",
+            "birthPlace": "Birth Place",
+            "registrationCourt": "Registration Court",
+            "registrationNumber": "Registration Number",
+            "vatRegion": "Vat Region",
+            "vatNumber": "Vat Number",
             "contractualSalutation": "Contractual Salutation",
             "contractualAddress": "Contractual Address",
             "billingSalutation": "Billing Salutation",

src/main/webapp/i18n/en/customerKind.json

@@ -0,0 +1,9 @@
+{
+    "hsadminNgApp": {
+        "CustomerKind": {
+            "null": "",
+            "NATURAL": "NATURAL",
+            "LEGAL": "LEGAL"
+        }
+    }
+}

src/main/webapp/i18n/en/membership.json

@@ -3,24 +3,25 @@
         "membership": {
             "home": {
                 "title": "Memberships",
-                "createLabel": "Register a new Membership",
-                "createOrEditLabel": "Register or edit a Membership"
+                "createLabel": "Create a new Membership",
+                "createOrEditLabel": "Create or edit a Membership"
             },
-            "created": "A new membership is registered with identifier {{ param }}",
-            "updated": "A membership is updated with identifier {{ param }}",
-            "deleted": "A membership is deleted with identifier {{ param }}",
+            "created": "A new Membership is created with identifier {{ param }}",
+            "updated": "A Membership is updated with identifier {{ param }}",
+            "deleted": "A Membership is deleted with identifier {{ param }}",
             "delete": {
-                "question": "Are you sure you want to delete membership {{ id }}?"
+                "question": "Are you sure you want to delete Membership {{ id }}?"
             },
             "detail": {
                 "title": "Membership"
             },
-            "documentDate": "Document date",
-            "memberFrom": "Member from",
-            "memberUntil": "Member until",
+            "admissionDocumentDate": "Admission Document Date",
+            "cancellationDocumentDate": "Cancellation Document Date",
+            "memberFromDate": "Member From Date",
+            "memberUntilDate": "Member Until Date",
             "remark": "Remark",
-            "share": "Shares",
-            "asset": "Assets",
+            "share": "Share",
+            "asset": "Asset",
             "customer": "Customer"
         }
     }

src/main/webapp/i18n/en/sepaMandate.json

@@ -18,11 +18,11 @@
             "reference": "Reference",
             "iban": "Iban",
             "bic": "Bic",
-            "documentDate": "Document Date",
-            "validFrom": "Valid From",
-            "validUntil": "Valid Until",
-            "lastUsed": "Last Used",
-            "cancellationDate": "Cancellation Date",
+            "grantingDocumentDate": "Granting Document Date",
+            "revokationDocumentDate": "Revokation Document Date",
+            "validFromDate": "Valid From Date",
+            "validUntilDate": "Valid Until Date",
+            "lastUsedDate": "Last Used Date",
             "remark": "Remark",
             "customer": "Customer"
         }

src/main/webapp/i18n/en/vatRegion.json

@@ -0,0 +1,10 @@
+{
+    "hsadminNgApp": {
+        "VatRegion": {
+            "null": "",
+            "DOMESTIC": "DOMESTIC",
+            "EU": "EU",
+            "OTHER": "OTHER"
+        }
+    }
+}