npm - @stamhoofd/structures - Versions diffs - 2.4.0 → 2.6.0 - Mend

@stamhoofd/structures 2.4.0 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (275) hide show

package/esm/dist/src/members/MemberDetails.js CHANGED Viewed

@@ -47,6 +47,13 @@ export class MemberDetails extends AutoEncoder {
         this.phone = null;
         this.email = null;
         this.alternativeEmails = [];
+        /**
+         * These emails will get access to the member if parentsHaveAccess is true
+         */
+        this.uncategorizedEmails = [];
+        this.uncategorizedPhones = [];
+        this.uncategorizedAddresses = [];
+        this.notes = null;
         this.birthDay = null;
         this.address = null;
         this.parents = [];
@@ -66,7 +73,7 @@ export class MemberDetails extends AutoEncoder {
      * Call this to clean up capitals in all the available data
      */
     cleanData() {
-        var _a;
+        var _a, _b;
         if (StringCompare.isFullCaps(this.firstName)) {
             this.firstName = Formatter.capitalizeWords(Formatter.removeDuplicateSpaces(this.firstName.toLowerCase()));
         }
@@ -99,7 +106,9 @@ export class MemberDetails extends AutoEncoder {
                 this.email = null;
             }
         }
-        this.alternativeEmails = this.alternativeEmails.map(e => e.toLowerCase().trim()).filter(email => {
+        const filterUsedAndInvalidEmails = (emails) => emails
+            .map(e => e.toLowerCase().trim())
+            .filter(email => {
             if (this.email && email === this.email) {
                 return false;
             }
@@ -113,6 +122,65 @@ export class MemberDetails extends AutoEncoder {
             }
             return true;
         });
+        this.alternativeEmails = filterUsedAndInvalidEmails(this.alternativeEmails);
+        if (this.phone) {
+            const formattedPhone = Formatter.removeDuplicateSpaces(this.phone.trim());
+            if (formattedPhone !== this.phone) {
+                this.phone = formattedPhone;
+            }
+        }
+        //#region uncategorized data
+        if (this.hasUncategorizedData) {
+            const lastReviewed = this.reviewTimes.getLastReview("parents") && this.reviewTimes.getLastReview("details");
+            if (lastReviewed) {
+                // clear uncategorized data
+                this.uncategorizedAddresses = [];
+                this.uncategorizedEmails = [];
+                this.uncategorizedPhones = [];
+            }
+            else {
+                //#region filter used uncategorized addresses
+                const usedAddressIds = new Set();
+                if (this.uncategorizedAddresses.length > 0) {
+                    const memberAddressId = (_b = this.address) === null || _b === void 0 ? void 0 : _b.id;
+                    const parentAddressIds = this.parents.filter(parent => parent.address).map(parent => parent.address.id);
+                    for (const uncategorizedAddress of this.uncategorizedAddresses) {
+                        uncategorizedAddress.cleanData();
+                        const addressId = uncategorizedAddress.id;
+                        const isUsed = addressId === memberAddressId || parentAddressIds.includes(addressId);
+                        if (isUsed) {
+                            usedAddressIds.add(addressId);
+                        }
+                    }
+                    if (usedAddressIds.size > 0) {
+                        this.uncategorizedAddresses = this.uncategorizedAddresses.filter(address => !usedAddressIds.has(address.id));
+                    }
+                }
+                //#endregion
+                // filter uncatetorized emails
+                this.uncategorizedEmails = filterUsedAndInvalidEmails(this.uncategorizedEmails);
+                //#region filter uncategorized phones
+                if (this.uncategorizedPhones.length > 0) {
+                    const parentPhones = new Set();
+                    for (const parent of this.parents) {
+                        const parentPhone = parent.phone;
+                        if (parentPhone)
+                            parentPhones.add(parentPhone);
+                    }
+                    this.uncategorizedPhones = this.uncategorizedPhones
+                        .map(phone => Formatter.removeDuplicateSpaces(phone.trim()))
+                        .filter(uncategorizedPhone => {
+                        if (this.phone === uncategorizedPhone)
+                            return false;
+                        if (parentPhones.has(uncategorizedPhone))
+                            return false;
+                        return true;
+                    });
+                }
+                //#endregion
+            }
+        }
+        //#endregion
     }
     isEqual(other) {
         if (!this.firstName || !other.firstName) {
@@ -185,6 +253,9 @@ export class MemberDetails extends AutoEncoder {
         }
         return Formatter.date(this.birthDay, true);
     }
+    get hasUncategorizedData() {
+        return this.uncategorizedEmails.length > 0 || this.uncategorizedAddresses.length > 0 || this.uncategorizedPhones.length > 0;
+    }
     matchQuery(query) {
         if (StringCompare.typoCount(this.firstName, query) < 2 ||
             StringCompare.typoCount(this.lastName, query) < 2 ||
@@ -388,46 +459,6 @@ export class MemberDetails extends AutoEncoder {
     get parentsHaveAccess() {
         return (this.age && (this.age < 18));
     }
-    /**
-     * Return all the e-mail addresses that should have access to this user
-     */
-    getManagerEmails() {
-        const emails = new Set();
-        if (this.email && this.canHaveOwnAccount) {
-            emails.add(this.email);
-        }
-        if (this.canHaveOwnAccount) {
-            for (const email of this.alternativeEmails) {
-                emails.add(email);
-            }
-        }
-        if (this.parentsHaveAccess) {
-            for (const parent of this.parents) {
-                if (parent.email) {
-                    emails.add(parent.email);
-                }
-                for (const email of parent.alternativeEmails) {
-                    emails.add(email);
-                }
-            }
-        }
-        return [...emails];
-    }
-    /**
-     * Return all the e-mail addresses that should have access to this user
-     */
-    getAllEmails() {
-        const emails = new Set();
-        if (this.email) {
-            emails.add(this.email);
-        }
-        for (const parent of this.parents) {
-            if (parent.email) {
-                emails.add(parent.email);
-            }
-        }
-        return [...emails];
-    }
     /**
      * Apply newer details without deleting data or replacing filled in data with empty data
      */
@@ -533,6 +564,18 @@ __decorate([
 __decorate([
     field({ decoder: new ArrayDecoder(StringDecoder), version: 277 })
 ], MemberDetails.prototype, "alternativeEmails", void 0);
+__decorate([
+    field({ decoder: new ArrayDecoder(StringDecoder), version: 296 })
+], MemberDetails.prototype, "uncategorizedEmails", void 0);
+__decorate([
+    field({ decoder: new ArrayDecoder(StringDecoder), version: 296 })
+], MemberDetails.prototype, "uncategorizedPhones", void 0);
+__decorate([
+    field({ decoder: new ArrayDecoder(Address), version: 296 })
+], MemberDetails.prototype, "uncategorizedAddresses", void 0);
+__decorate([
+    field({ decoder: StringDecoder, nullable: true, version: 301 })
+], MemberDetails.prototype, "notes", void 0);
 __decorate([
     field({ decoder: DateDecoder }),
     field({ decoder: DateDecoder, nullable: true, version: 52, downgrade: (old) => old !== null && old !== void 0 ? old : new Date("1970-01-01") })

package/esm/dist/src/members/MemberDetails.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberDetails.js","sourceRoot":"","sources":["../../../../src/members/MemberDetails.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"MemberDetails.js","sourceRoot":"","sources":["../../../../src/members/MemberDetails.ts"],"names":[],"mappings":"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"}

package/esm/dist/src/members/MemberPlatformMembership.d.ts CHANGED Viewed

@@ -14,5 +14,6 @@ export declare class MemberPlatformMembership extends AutoEncoder {
     generated: boolean;
     createdAt: Date;
     updatedAt: Date;
+    isActive(date?: Date): boolean;
 }
 //# sourceMappingURL=MemberPlatformMembership.d.ts.map

package/esm/dist/src/members/MemberPlatformMembership.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberPlatformMembership.d.ts","sourceRoot":"","sources":["../../../../src/members/MemberPlatformMembership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqE,MAAM,6BAA6B,CAAC;AAG7H,qBAAa,wBAAyB,SAAQ,WAAW;IAErD,EAAE,EAAE,MAAM,CAAC;IAGX,QAAQ,EAAE,MAAM,CAAC;IAGjB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,OAAa;IAGtB,OAAO,OAAa;IAGpB,UAAU,EAAE,IAAI,GAAC,IAAI,CAAO;IAG5B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,KAAK,SAAK;IAGV,SAAS,UAAS;IAGlB,SAAS,OAAa;IAGtB,SAAS,OAAa;~~CACzB~~"}
1	+ {"version":3,"file":"MemberPlatformMembership.d.ts","sourceRoot":"","sources":["../../../../src/members/MemberPlatformMembership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqE,MAAM,6BAA6B,CAAC;AAG7H,qBAAa,wBAAyB,SAAQ,WAAW;IAErD,EAAE,EAAE,MAAM,CAAC;IAGX,QAAQ,EAAE,MAAM,CAAC;IAGjB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,OAAa;IAGtB,OAAO,OAAa;IAGpB,UAAU,EAAE,IAAI,GAAC,IAAI,CAAO;IAG5B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,KAAK,SAAK;IAGV,SAAS,UAAS;IAGlB,SAAS,OAAa;IAGtB,SAAS,OAAa;IAEtB,QAAQ,CAAC,IAAI,GAAE,IAAiB;CAGnC"}

package/esm/dist/src/members/MemberPlatformMembership.js CHANGED Viewed

@@ -14,6 +14,9 @@ export class MemberPlatformMembership extends AutoEncoder {
         this.createdAt = new Date();
         this.updatedAt = new Date();
     }
+    isActive(date = new Date()) {
+        return this.startDate <= date && this.endDate >= date;
+    }
 }
 __decorate([
     field({ decoder: StringDecoder, defaultValue: () => uuidv4() })

package/esm/dist/src/members/MemberPlatformMembership.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberPlatformMembership.js","sourceRoot":"","sources":["../../../../src/members/MemberPlatformMembership.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC7H,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IAAzD;;QAiBI,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAGtB,YAAO,GAAG,IAAI,IAAI,EAAE,CAAA;QAGpB,eAAU,GAAc,IAAI,CAAA;QAG5B,wBAAmB,GAAkB,IAAI,CAAC;QAG1C,cAAS,GAAkB,IAAI,CAAC;QAGhC,UAAK,GAAG,CAAC,CAAC;QAGV,cAAS,GAAG,KAAK,CAAC;QAGlB,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAGtB,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;~~IAC1B~~,CAAC;CAAA;~~AAxCG~~;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;oDACrD;AAGX;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;0DACjB;AAGjB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;kEACT;AAGzB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;gEACX;AAGvB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;0DACjB;AAGjB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV;AAGtB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;yDACZ;AAGpB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4DACpB;AAG5B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qEACR;AAG1C;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DAClB;AAGhC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;uDACzB;AAGV;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;2DACjB;AAGlB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV;AAGtB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV"}
1	+ {"version":3,"file":"MemberPlatformMembership.js","sourceRoot":"","sources":["../../../../src/members/MemberPlatformMembership.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC7H,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IAAzD;;QAiBI,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAGtB,YAAO,GAAG,IAAI,IAAI,EAAE,CAAA;QAGpB,eAAU,GAAc,IAAI,CAAA;QAG5B,wBAAmB,GAAkB,IAAI,CAAC;QAG1C,cAAS,GAAkB,IAAI,CAAC;QAGhC,UAAK,GAAG,CAAC,CAAC;QAGV,cAAS,GAAG,KAAK,CAAC;QAGlB,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAGtB,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;IAK1B,CAAC;IAHG,QAAQ,CAAC,OAAa,IAAI,IAAI,EAAE;QAC5B,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAA;IACzD,CAAC;CACJ;AA5CG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;oDACrD;AAGX;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;0DACjB;AAGjB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;kEACT;AAGzB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;gEACX;AAGvB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;0DACjB;AAGjB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV;AAGtB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;yDACZ;AAGpB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4DACpB;AAG5B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qEACR;AAG1C;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DAClB;AAGhC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;uDACzB;AAGV;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;2DACjB;AAGlB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV;AAGtB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;2DACV"}

package/esm/dist/src/members/OrganizationRecordsConfiguration.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
 import { AutoEncoder } from "@simonbackx/simple-encoding";
 import { PropertyFilter } from "../filters/PropertyFilter";
 import { RecordCategory } from "./records/RecordCategory";
+import { Platform } from "../Platform";
+import { Organization } from "../Organization";
+import { Group } from "../Group";
 export declare enum AskRequirement {
     NotAsked = "NotAsked",
     Optional = "Optional",
@@ -81,6 +84,16 @@ export declare class OrganizationRecordsConfiguration extends AutoEncoder {
      */
     inheritedRecordCategories: Map<string, PropertyFilter>;
     freeContribution: FreeContributionSettings | null;
+    static build(options: {
+        platform: Platform;
+        organization?: Organization | null;
+        group?: Group | null;
+        /**
+         * Whether the group itself should be included
+         */
+        includeGroup?: boolean;
+    }): any;
+    static mergeChildren(...configs: OrganizationRecordsConfiguration[]): any;
     /**
      * Note: best to not use this visually
      */

package/esm/dist/src/members/OrganizationRecordsConfiguration.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OrganizationRecordsConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/members/OrganizationRecordsConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAA0E,MAAM,6BAA6B,CAAA;AAE/I,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;~~AAEzD~~,oBAAY,cAAc;IACtB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,QAAQ,aAAa;CACxB;AAED,qBAAa,wBAAyB,SAAQ,WAAW;IAErD,WAAW,SAAK;IAGhB,OAAO,EAAE,MAAM,EAAE,CAAoB;CACxC;AAED,qBAAa,wBAAyB,SAAQ,WAAW;IACrD;;OAEG;IAEH,KAAK,SAAwC;IAE7C;;OAEG;IAEH,WAAW,SAA8C;IAEzD;;OAEG;IAEH,aAAa,SAAgD;IAE7D;;MAEE;IAEF,SAAS,SAA4C;IAErD;;OAEG;IAEH,WAAW,SAA8C;IAEzD,MAAM,KAAK,kBAAkB,WAE5B;IAED,MAAM,KAAK,YAAY,WAEtB;IAED,MAAM,KAAK,gBAAgB,WAE1B;IAED,MAAM,KAAK,oBAAoB,WAE9B;IAED,MAAM,KAAK,kBAAkB,WAE5B;CACJ;AAED,qBAAa,uBAAwB,SAAQ,WAAW;IACpD;;OAEG;IAEH,KAAK,SAAuC;IAE5C;;OAEG;IAEH,WAAW,SAA6C;IAExD;;OAEG;IAEH,aAAa,SAA+C;IAE5D;;OAEG;IAEH,WAAW,SAA6C;IAExD,MAAM,KAAK,kBAAkB,WAE5B;IAED,MAAM,KAAK,YAAY,WAEtB;IAED,MAAM,KAAK,oBAAoB,WAE9B;IAED,MAAM,KAAK,kBAAkB,WAE5B;CACJ;AAED,qBAAa,gCAAiC,SAAQ,WAAW;IAG7D;;OAEG;IAEH,gBAAgB,EAAE,wBAAwB,GAAG,IAAI,CAAO;IAExD;;OAEG;IAEH,cAAc,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAGrD,YAAY,EAAE,cAAc,GAAG,IAAI,CAAO;IAG1C,KAAK,EAAE,cAAc,GAAG,IAAI,CAAO;IAGnC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAO;IAGpC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAO;IAGtC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAO;IAGrC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAO;IAGrC,iBAAiB,EAAE,cAAc,GAAG,IAAI,CAAO;IAG/C,gBAAgB,EAAE,cAAc,EAAE,CAAK;IAEvC;;OAEG;IAEH,yBAAyB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAY;IAIlE,gBAAgB,EAAE,wBAAwB,GAAG,IAAI,CAAO;IAExD;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,gCAAgC,EAAE,KAAK,EAAE,gCAAgC,GAAG,gCAAgC;CA6DzI"}
1	+ {"version":3,"file":"OrganizationRecordsConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/members/OrganizationRecordsConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAA0E,MAAM,6BAA6B,CAAA;AAE/I,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,KAAK,EAAa,MAAM,UAAU,CAAA;AAG3C,oBAAY,cAAc;IACtB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,QAAQ,aAAa;CACxB;AAED,qBAAa,wBAAyB,SAAQ,WAAW;IAErD,WAAW,SAAK;IAGhB,OAAO,EAAE,MAAM,EAAE,CAAoB;CACxC;AAED,qBAAa,wBAAyB,SAAQ,WAAW;IACrD;;OAEG;IAEH,KAAK,SAAwC;IAE7C;;OAEG;IAEH,WAAW,SAA8C;IAEzD;;OAEG;IAEH,aAAa,SAAgD;IAE7D;;MAEE;IAEF,SAAS,SAA4C;IAErD;;OAEG;IAEH,WAAW,SAA8C;IAEzD,MAAM,KAAK,kBAAkB,WAE5B;IAED,MAAM,KAAK,YAAY,WAEtB;IAED,MAAM,KAAK,gBAAgB,WAE1B;IAED,MAAM,KAAK,oBAAoB,WAE9B;IAED,MAAM,KAAK,kBAAkB,WAE5B;CACJ;AAED,qBAAa,uBAAwB,SAAQ,WAAW;IACpD;;OAEG;IAEH,KAAK,SAAuC;IAE5C;;OAEG;IAEH,WAAW,SAA6C;IAExD;;OAEG;IAEH,aAAa,SAA+C;IAE5D;;OAEG;IAEH,WAAW,SAA6C;IAExD,MAAM,KAAK,kBAAkB,WAE5B;IAED,MAAM,KAAK,YAAY,WAEtB;IAED,MAAM,KAAK,oBAAoB,WAE9B;IAED,MAAM,KAAK,kBAAkB,WAE5B;CACJ;AAED,qBAAa,gCAAiC,SAAQ,WAAW;IAG7D;;OAEG;IAEH,gBAAgB,EAAE,wBAAwB,GAAG,IAAI,CAAO;IAExD;;OAEG;IAEH,cAAc,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAGrD,YAAY,EAAE,cAAc,GAAG,IAAI,CAAO;IAG1C,KAAK,EAAE,cAAc,GAAG,IAAI,CAAO;IAGnC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAO;IAGpC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAO;IAGtC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAO;IAGrC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAO;IAGrC,iBAAiB,EAAE,cAAc,GAAG,IAAI,CAAO;IAG/C,gBAAgB,EAAE,cAAc,EAAE,CAAK;IAEvC;;OAEG;IAEH,yBAAyB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAY;IAIlE,gBAAgB,EAAE,wBAAwB,GAAG,IAAI,CAAO;IAExD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,CAAC,EAAE,YAAY,GAAC,IAAI,CAAC;QACjC,KAAK,CAAC,EAAE,KAAK,GAAC,IAAI,CAAC;QAEnB;;WAEG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KAC1B;IA4CD,MAAM,CAAC,aAAa,CAAC,GAAG,OAAO,EAAE,gCAAgC,EAAE;IAenE;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,gCAAgC,EAAE,KAAK,EAAE,gCAAgC,GAAG,gCAAgC;CA6DzI"}

package/esm/dist/src/members/OrganizationRecordsConfiguration.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { __decorate } from "tslib";
 import { ArrayDecoder, AutoEncoder, field, IntegerDecoder, MapDecoder, StringDecoder } from "@simonbackx/simple-encoding";
 import { PropertyFilter } from "../filters/PropertyFilter";
 import { RecordCategory } from "./records/RecordCategory";
+import { GroupType } from "../Group";
 export var AskRequirement;
 (function (AskRequirement) {
     AskRequirement["NotAsked"] = "NotAsked";
@@ -148,6 +149,54 @@ export class OrganizationRecordsConfiguration extends AutoEncoder {
         // General configurations
         this.freeContribution = null;
     }
+    static build(options) {
+        var _a, _b, _c;
+        // If not a default-age-group: disable enabled record categories in platform
+        const platformConfig = options.platform.config.recordsConfiguration.clone();
+        if (!options.group || !options.group.defaultAgeGroupId) {
+            for (const c of platformConfig.recordCategories) {
+                c.defaultEnabled = false;
+            }
+        }
+        let organizationConfig = null;
+        let defaultGroupConfig = null;
+        let groupConfig = null;
+        if (options.organization) {
+            organizationConfig = options.organization.meta.recordsConfiguration.clone();
+            if (options.group && options.group.type !== GroupType.Membership) {
+                // Specifically delete all the record categories, as those are only enabled for normal memberships
+                for (const c of organizationConfig.recordCategories) {
+                    c.defaultEnabled = false;
+                }
+            }
+            if (options.group && options.group.type === GroupType.WaitingList) {
+                // Disable default organization - BUT still keep the record categories (to know which ones are available)
+                organizationConfig = OrganizationRecordsConfiguration.create({
+                    recordCategories: organizationConfig.recordCategories
+                });
+            }
+        }
+        // Group config
+        if (options.group && options.includeGroup) {
+            groupConfig = options.group.settings.recordsConfiguration.clone();
+        }
+        if (options.group && ((_a = options.group) === null || _a === void 0 ? void 0 : _a.defaultAgeGroupId)) {
+            const defaultAgeGroupId = options.group.defaultAgeGroupId;
+            defaultGroupConfig = (_c = (_b = options.platform.config.defaultAgeGroups.find(g => g.id === defaultAgeGroupId)) === null || _b === void 0 ? void 0 : _b.recordsConfiguration.clone()) !== null && _c !== void 0 ? _c : null;
+        }
+        return this.mergeChildren(...[platformConfig, defaultGroupConfig, organizationConfig, groupConfig].filter(f => f !== null));
+    }
+    static mergeChildren(...configs) {
+        if (configs.length === 0) {
+            throw new Error("At least one configuration is required");
+        }
+        if (configs.length === 1) {
+            return configs[0];
+        }
+        const first = configs[0].clone();
+        const second = configs[1].clone();
+        return this.mergeChildren(this.mergeChild(first, second), ...configs.slice(2));
+    }
     /**
      * Note: best to not use this visually
      */

package/esm/dist/src/members/OrganizationRecordsConfiguration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OrganizationRecordsConfiguration.js","sourceRoot":"","sources":["../../../../src/members/OrganizationRecordsConfiguration.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwB,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE/I,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;~~AAEzD~~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~~IAkE5D~~,CAAC;~~IAhEG~~;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAwC,EAAE,KAAuC;QAC/F,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YACnC,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACrD,CAAC;QAED,IAAI,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YACjC,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QACjD,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC/B,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QAC7C,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC/B,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAChC,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QACpC,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAClC,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAClC,CAAC;QAED,IAAI,MAAM,CAAC,iBAAiB,KAAK,IAAI,EAAE,CAAC;YACpC,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;QACtD,CAAC;QAED,IAAI,MAAM,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YACnC,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;QACpD,CAAC;QAED,KAAK,CAAC,gBAAgB,GAAG,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACzD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;gBACpB,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,OAAO,CAAC,CAAC;gBACb,CAAC;gBACD,MAAM,eAAe,GAAG,KAAK,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;oBAChC,CAAC,CAAC,MAAM,GAAG,eAAe,CAAC;oBAC3B,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC;gBAC5B,CAAC;gBAED,OAAO,CAAC,CAAC;YACb,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAE9B,wBAAwB;QACxB,KAAK,CAAC,yBAAyB,GAAG,IAAI,GAAG,EAAE,CAAA;QAE3C,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;~~AA1GG~~;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;0EACnB;AAMxD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;wEACrB;AAGrD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;sEACvB;AAG1C;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;+DAC9B;AAGnC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;gEAC7B;AAGpC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;kEAC3B;AAGtC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iEAC5B;AAGrC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iEAC5B;AAGrC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;2EAClB;AAG/C;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,cAAyC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;0EACvD;AAMvC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,UAAU,CAAC,aAAa,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;mFACd;AAIlE;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;0EAClB"}
1	+ {"version":3,"file":"OrganizationRecordsConfiguration.js","sourceRoot":"","sources":["../../../../src/members/OrganizationRecordsConfiguration.ts"],"names":[],"mappings":"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"}

package/esm/dist/src/members/PaymentDetailed.d.ts CHANGED Viewed

@@ -7,6 +7,9 @@ export declare class PaymentDetailed extends Payment {
     getMemberFirstNames(): string;
     getMemberLastNames(): string;
     getRegistrationList(): string;
+    /**
+     * @deprecated
+     */
     matchQuery(query: string): boolean;
     getDetailsHTMLTable(): string;
 }

package/esm/dist/src/members/PaymentDetailed.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PaymentDetailed.d.ts","sourceRoot":"","sources":["../../../../src/members/PaymentDetailed.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,eAAgB,SAAQ,OAAO;IAExC,aAAa,EAAE,sBAAsB,EAAE,CAAA;IAEvC,mBAAmB;IAInB,cAAc;IAId,mBAAmB;IAInB,kBAAkB;IAIlB,mBAAmB;~~IAIV~~,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;~~IAU3C~~,mBAAmB,IAAI,MAAM;CAShC"}
1	+ {"version":3,"file":"PaymentDetailed.d.ts","sourceRoot":"","sources":["../../../../src/members/PaymentDetailed.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,qBAAa,eAAgB,SAAQ,OAAO;IAExC,aAAa,EAAE,sBAAsB,EAAE,CAAA;IAEvC,mBAAmB;IAInB,cAAc;IAId,mBAAmB;IAInB,kBAAkB;IAIlB,mBAAmB;IAInB;;OAEG;IACM,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI3C,mBAAmB,IAAI,MAAM;CAShC"}

package/esm/dist/src/members/PaymentDetailed.js CHANGED Viewed

@@ -5,25 +5,24 @@ import { Payment } from './Payment';
 import { RegistrationWithMember } from './RegistrationWithMember';
 export class PaymentDetailed extends Payment {
     getMemberNamesArray() {
-        return Formatter.uniqueArray(this.registrations.map(r => r.member.details.name));
+        return Formatter.uniqueArray(this.registrations.map(r => r.member.name));
     }
     getMemberNames() {
         return Formatter.joinLast(this.getMemberNamesArray(), ", ", " en ");
     }
     getMemberFirstNames() {
-        return Formatter.joinLast(Formatter.uniqueArray(this.registrations.map(r => r.member.details.firstName)), ", ", " en ");
+        return Formatter.joinLast(Formatter.uniqueArray(this.registrations.map(r => r.member.firstName)), ", ", " en ");
     }
     getMemberLastNames() {
-        return Formatter.uniqueArray(this.registrations.map(r => { var _a, _b; return (_b = (_a = r.member.details) === null || _a === void 0 ? void 0 : _a.lastName) !== null && _b !== void 0 ? _b : "Onbekend"; })).join(", ");
+        return Formatter.uniqueArray(this.registrations.map(r => { var _a; return (_a = r.member.lastName) !== null && _a !== void 0 ? _a : "Onbekend"; })).join(", ");
     }
     getRegistrationList() {
-        return this.registrations.map(r => { var _a, _b; return ((_b = (_a = r.member.details) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : "Onbekend") + " voor " + r.group.settings.name; }).join(", ");
+        return this.registrations.map(r => { var _a, _b; return ((_b = (_a = r.member) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : "Onbekend") + " voor " + r.group.settings.name; }).join(", ");
     }
+    /**
+     * @deprecated
+     */
     matchQuery(query) {
-        if (super.matchQuery(query) ||
-            this.registrations.find(r => r.member.details && r.member.details.matchQuery(query))) {
-            return true;
-        }
         return false;
     }
     getDetailsHTMLTable() {

package/esm/dist/src/members/PaymentDetailed.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PaymentDetailed.js","sourceRoot":"","sources":["../../../../src/members/PaymentDetailed.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAC,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,eAAgB,SAAQ,OAAO;IAIxC,mBAAmB;QACf,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,~~OAAO,CAAC,~~IAAI,CAAC,CAAC,CAAA;~~IACpF~~,CAAC;IAED,cAAc;QACV,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAED,mBAAmB;QACf,OAAO,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,~~OAAO,CAAC,~~SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;~~IAC3H~~,CAAC;IAED,kBAAkB;QACd,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,~~eAAC~~,OAAA,MAAA,~~MAAA,~~CAAC,CAAC,MAAM,CAAC,~~OAAO,0CAAE,~~QAAQ,mCAAI,UAAU,CAAA,EAAA,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;~~IAClH~~,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAAC,OAAA,CAAC,MAAA,MAAA,CAAC,CAAC,MAAM,~~CAAC,OAAO,~~0CAAE,IAAI,mCAAI,UAAU,CAAC,GAAC,QAAQ,GAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA,EAAA,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;~~IACxH~~,CAAC;~~IAEQ~~,UAAU,CAAC,KAAa;QAC7B,~~IACI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,~~OAAO,~~IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,~~KAAK,CAAC~~,CAAC,EACtF,CAAC~~;~~YACC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;~~IACjB,CAAC;IAED,mBAAmB;QACf,IAAI,GAAG,GAAG,qJAAqJ,CAAA;QAE/J,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,GAAG,IAAI,eAAe,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAA;QAC3J,CAAC;QAED,OAAO,GAAG,GAAC,kBAAkB,CAAC;IAClC,CAAC;CACJ;~~AAzCG~~;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC;sDACtB"}
1	+ {"version":3,"file":"PaymentDetailed.js","sourceRoot":"","sources":["../../../../src/members/PaymentDetailed.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAC,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,eAAgB,SAAQ,OAAO;IAIxC,mBAAmB;QACf,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,cAAc;QACV,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAED,mBAAmB;QACf,OAAO,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACnH,CAAC;IAED,kBAAkB;QACd,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,MAAM,CAAC,QAAQ,mCAAI,UAAU,CAAA,EAAA,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzG,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAAC,OAAA,CAAC,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,mCAAI,UAAU,CAAC,GAAC,QAAQ,GAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA,EAAA,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChH,CAAC;IAED;;OAEG;IACM,UAAU,CAAC,KAAa;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,mBAAmB;QACf,IAAI,GAAG,GAAG,qJAAqJ,CAAA;QAE/J,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,GAAG,IAAI,eAAe,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAA;QAC3J,CAAC;QAED,OAAO,GAAG,GAAC,kBAAkB,CAAC;IAClC,CAAC;CACJ;AAtCG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE,CAAC;sDACtB"}

package/esm/dist/src/members/PaymentGeneral.d.ts CHANGED Viewed

@@ -16,11 +16,14 @@ export declare class PaymentGeneral extends Payment {
     * Only set for administrators with the correct permissions
     */
     stripeAccountId: string | null;
-    get registrations(): import("./Registration").Registration[];
-    get members(): import("./Member").Member[];
+    get registrations(): import("./RegistrationWithMember").RegistrationWithMember[];
+    get members(): import("./Member").TinyMember[];
     get memberNames(): string;
     get memberFirstNames(): string;
     get orders(): import("../..").Order[];
+    /**
+     * @deprecated
+     */
     matchQuery(query: string): boolean;
     getDetailsHTMLTable(): string;
 }

package/esm/dist/src/members/PaymentGeneral.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PaymentGeneral.d.ts","sourceRoot":"","sources":["../../../../src/members/PaymentGeneral.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE/C,qBAAa,cAAe,SAAQ,OAAO;IAEvC,mBAAmB,EAAE,0BAA0B,EAAE,CAAK;IAGtD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAO;IAG1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAE9B;;OAEG;IAEH,UAAU,EAAE,UAAU,GAAG,IAAI,CAAO;IAEpC;;OAEG;IAEH,WAAW,SAAI;IAEd;;MAEE;IAEH,eAAe,EAAE,MAAM,GAAC,IAAI,CAAO;IAEnC,IAAI,aAAa,~~4CAKhB~~;IAED,IAAI,OAAO,~~gCAKV~~;IAED,IAAI,WAAW,WAEd;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,MAAM,4BAET;~~IAEQ~~,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;~~IAW3C~~,mBAAmB,IAAI,MAAM;CAmBhC"}
1	+ {"version":3,"file":"PaymentGeneral.d.ts","sourceRoot":"","sources":["../../../../src/members/PaymentGeneral.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE/C,qBAAa,cAAe,SAAQ,OAAO;IAEvC,mBAAmB,EAAE,0BAA0B,EAAE,CAAK;IAGtD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAO;IAG1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAE9B;;OAEG;IAEH,UAAU,EAAE,UAAU,GAAG,IAAI,CAAO;IAEpC;;OAEG;IAEH,WAAW,SAAI;IAEd;;MAEE;IAEH,eAAe,EAAE,MAAM,GAAC,IAAI,CAAO;IAEnC,IAAI,aAAa,gEAKhB;IAED,IAAI,OAAO,oCAKV;IAED,IAAI,WAAW,WAEd;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,MAAM,4BAET;IAED;;OAEG;IACM,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI3C,mBAAmB,IAAI,MAAM;CAmBhC"}

package/esm/dist/src/members/PaymentGeneral.js CHANGED Viewed

@@ -41,12 +41,10 @@ export class PaymentGeneral extends Payment {
     get orders() {
         return this.balanceItemPayments.flatMap(p => p.balanceItem.order ? [p.balanceItem.order] : []);
     }
+    /**
+     * @deprecated
+     */
     matchQuery(query) {
-        if (super.matchQuery(query)
-            || !!this.members.find(member => member.details.matchQuery(query))
-            || !!this.orders.find(o => o.matchQuery(query))) {
-            return true;
-        }
         return false;
     }
     getDetailsHTMLTable() {

package/esm/dist/src/members/PaymentGeneral.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PaymentGeneral.js","sourceRoot":"","sources":["../../../../src/members/PaymentGeneral.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE/C,MAAM,OAAO,cAAe,SAAQ,OAAO;IAA3C;;QAEI,wBAAmB,GAAiC,EAAE,CAAA;QAGtD,SAAI,GAAkB,IAAI,CAAA;QAG1B,aAAQ,GAAkB,IAAI,CAAA;QAE9B;;WAEG;QAEH,eAAU,GAAsB,IAAI,CAAA;QAEpC;;WAEG;QAEH,gBAAW,GAAG,CAAC,CAAA;QAEd;;UAEE;QAEH,oBAAe,GAAgB,IAAI,CAAA;~~IA0DvC~~,CAAC;~~IAxDG~~,IAAI,aAAa;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAE3H,0BAA0B;QAC1B,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAA;IACrG,CAAC;IAED,IAAI,OAAO;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAEzG,0BAA0B;QAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAA;IACzF,CAAC;IAED,IAAI,WAAW;QACX,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC/E,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAClG,CAAC;~~IAEQ~~,UAAU,CAAC,KAAa;QAC7B,~~IACI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;eACpB,CAAC,CAAC,IAAI,CAAC,~~OAAO,~~CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,~~KAAK,CAAC~~,CAAC~~;~~eAC/D,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EACjD,CAAC;YACC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;~~IACjB,CAAC;IAED,mBAAmB;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC3E,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,GAAG,IAAI,iJAAiJ,CAAA;YAExJ,KAAK,MAAM,kBAAkB,IAAI,QAAQ,EAAE,CAAC;gBACxC,GAAG,IAAI,eAAe,SAAS,CAAC,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,iBAAiB,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,YAAY,CAAA;YACtL,CAAC;YAED,OAAO,GAAG,GAAC,kBAAkB,CAAC;QAClC,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,GAAG,IAAI,KAAK,CAAC,YAAY,EAAE,CAAA;QAC/B,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;~~AAlFG~~;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC;2DACX;AAGtD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4CACxB;AAG1B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gDACpB;AAM9B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACX;AAMpC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;mDAClC;AAMf;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;uDAC7B"}
1	+ {"version":3,"file":"PaymentGeneral.js","sourceRoot":"","sources":["../../../../src/members/PaymentGeneral.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE/C,MAAM,OAAO,cAAe,SAAQ,OAAO;IAA3C;;QAEI,wBAAmB,GAAiC,EAAE,CAAA;QAGtD,SAAI,GAAkB,IAAI,CAAA;QAG1B,aAAQ,GAAkB,IAAI,CAAA;QAE9B;;WAEG;QAEH,eAAU,GAAsB,IAAI,CAAA;QAEpC;;WAEG;QAEH,gBAAW,GAAG,CAAC,CAAA;QAEd;;UAEE;QAEH,oBAAe,GAAgB,IAAI,CAAA;IAsDvC,CAAC;IApDG,IAAI,aAAa;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAE3H,0BAA0B;QAC1B,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAA;IACrG,CAAC;IAED,IAAI,OAAO;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAEzG,0BAA0B;QAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAA;IACzF,CAAC;IAED,IAAI,WAAW;QACX,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC/E,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAClG,CAAC;IAED;;OAEG;IACM,UAAU,CAAC,KAAa;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,mBAAmB;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC3E,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,GAAG,IAAI,iJAAiJ,CAAA;YAExJ,KAAK,MAAM,kBAAkB,IAAI,QAAQ,EAAE,CAAC;gBACxC,GAAG,IAAI,eAAe,SAAS,CAAC,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,iBAAiB,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,YAAY,CAAA;YACtL,CAAC;YAED,OAAO,GAAG,GAAC,kBAAkB,CAAC;QAClC,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,GAAG,IAAI,KAAK,CAAC,YAAY,EAAE,CAAA;QAC/B,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AA9EG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC;2DACX;AAGtD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4CACxB;AAG1B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gDACpB;AAM9B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACX;AAMpC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;mDAClC;AAMf;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;uDAC7B"}

package/esm/dist/src/members/PlatformMember.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { AutoEncoderPatchType, PartialWithoutMethods } from "@simonbackx/simple-encoding";
-import { Group } from "../Group";
+import { Group, GroupType } from "../Group";
 import { Organization } from "../Organization";
 import { PermissionLevel } from "../Permissions";
 import { Platform } from "../Platform";
@@ -12,10 +12,10 @@ import { MemberWithRegistrationsBlob, MembersBlob } from "./MemberWithRegistrati
 import { ObjectWithRecords } from "./ObjectWithRecords";
 import { Parent } from "./Parent";
 import { RegisterCheckout } from "./checkout/RegisterCheckout";
+import { RegisterItem } from "./checkout/RegisterItem";
 import { RecordAnswer } from "./records/RecordAnswer";
 import { RecordCategory } from "./records/RecordCategory";
 import { RecordSettings } from "./records/RecordSettings";
-import { RegisterItem } from "./checkout/RegisterItem";
 export declare class PlatformFamily {
     members: PlatformMember[];
     /**
@@ -39,6 +39,10 @@ export declare class PlatformFamily {
         platform: Platform;
     }): PlatformFamily;
     insertFromBlob(blob: MembersBlob): void;
+    /**
+     * Same as insertFromBlob, but doesn't add new members, only updates existing members
+     */
+    updateFromBlob(blob: MembersBlob): void;
     newMember(): PlatformMember;
     static createSingles(blob: MembersBlob, context: {
         contextOrganization?: Organization | null;
@@ -116,28 +120,27 @@ export declare class PlatformMember implements ObjectWithRecords {
     markFailedSave(): void;
     filterRegistrations(filters: {
         groups?: Group[] | null;
-        waitingList?: boolean;
         canRegister?: boolean;
         periodId?: string;
         currentPeriod?: boolean;
+        types?: GroupType[];
     }): import("./Registration").Registration[];
     filterGroups(filters: {
         groups?: Group[] | null;
-        waitingList?: boolean;
         canRegister?: boolean;
         periodId?: string;
         currentPeriod?: boolean;
     }): Group[];
     filterOrganizations(filters: {
         groups?: Group[] | null;
-        waitingList?: boolean;
         canRegister?: boolean;
         periodId?: string;
         currentPeriod?: boolean;
+        types?: GroupType[];
     }): Organization[];
     get groups(): Group[];
     insertOrganization(organization: Organization): void;
-    canRegister(group: Group): boolean;
+    canRegister(group: Group, organization: Organization): boolean;
     get patchedMember(): MemberWithRegistrationsBlob;
     doesMatchFilter(filter: StamhoofdFilter): boolean;
     getAllRecordCategories(): RecordCategory[];