@myclub_se/data-access 1.5.2 → 1.5.3

package/fesm2020/myclub_se-data-access.mjs

@@ -807,10 +807,19 @@ class MemberAttribute {
         this.value = value;
     }
     static asFormGroup(attribute = null) {
+        const attributeOptions = new FormArray(attribute?.options?.map((option) => new FormGroup({
+            text: new FormControl(option.text),
+            value: new FormControl(option.value)
+        })) || []);
         return new FormGroup({
             field_id: new FormControl(attribute?.field_id || ''),
             member_id: new FormControl(attribute?.member_id || ''),
-            value: new FormControl(attribute?.value || '')
+            leader_editable: new FormControl(attribute?.leader_editable || false),
+            member_editable: new FormControl(attribute?.member_editable || false),
+            name: new FormControl(attribute?.name || ''),
+            options: attributeOptions,
+            type: new FormControl(attribute?.type || 'text'),
+            value: new FormControl(attribute?.type === 'bool' ? attribute?.value : attribute?.value || '')
         });
     }
 }
@@ -1179,7 +1188,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.11", ngImpo
 
 const searchMemberFactory = (apiSearchMember) => new SearchMember(apiSearchMember.id, apiSearchMember.club_id, apiSearchMember.team_id, apiSearchMember.address1, apiSearchMember.address2, apiSearchMember.calendar_url, apiSearchMember.country, apiSearchMember.district, apiSearchMember.email, apiSearchMember.first_name, apiSearchMember.image, apiSearchMember.last_name, apiSearchMember.mobile_phone, apiSearchMember.name, apiSearchMember.zip);
 
-const memberAttributeFactory = (attribute) => new MemberAttribute(attribute.display_value, attribute.field, attribute.leader_editable, attribute.member_id, attribute.member_editable, attribute.name, attribute.options, attribute.order, attribute.section_id, attribute.type, attribute.value);
+const memberAttributeFactory = (attribute) => new MemberAttribute(attribute.display_value, attribute.field_id, attribute.leader_editable, attribute.member_id, attribute.member_editable, attribute.name, attribute.options, attribute.order, attribute.section_id, attribute.type, attribute.value);
 
 const contactFactory = (contact) => new Contact(contact.id, contact.club_id, contact.member_id, contact.address1, contact.address2, contact.address3, contact.country, contact.district, contact.email, contact.first_name, contact.home_phone, contact.last_name, contact.mobile_phone, contact.work_phone, contact.zip);
 
@@ -1403,19 +1412,10 @@ class ActivityService {
         });
     }
     createTeamActivity(teamId, data) {
-        if (typeof data.id !== 'undefined') {
-            delete data.id;
-        }
-        if (typeof data.file !== 'undefined' && !data.file) {
-            delete data.file;
-        }
-        if (typeof data.invite_last_response_date !== 'undefined' && !data.invite_last_response_date) {
-            delete data.invite_last_response_date;
-        }
         return this.apiService
             .postResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITIES_PATH, {
             teamId
-        }, data);
+        }, this.removeUnusedActivityFields(data));
     }
     deleteTeamActivity(teamId, id) {
         return this.apiService
@@ -1547,7 +1547,7 @@ class ActivityService {
             .updateResource(activityFactory, Role.TeamAdmin, TEAM_ACTIVITY_PATH, {
             teamId,
             id: activity.id
-        }, activity);
+        }, this.removeUnusedActivityFields(activity));
     }
     updateTeamActivityInvite(teamId, activityId, activityInviteId, activityInvite) {
         return this.apiService
@@ -1566,6 +1566,18 @@ class ActivityService {
             members
         });
     }
+    removeUnusedActivityFields(activity) {
+        if (typeof activity.id !== 'undefined') {
+            delete activity.id;
+        }
+        if (typeof activity.file !== 'undefined' && !activity.file) {
+            delete activity.file;
+        }
+        if (typeof activity.invite_last_response_date !== 'undefined' && !activity.invite_last_response_date) {
+            delete activity.invite_last_response_date;
+        }
+        return activity;
+    }
 }
 ActivityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: ActivityService, deps: [{ token: ApiService }], target: i0.ɵɵFactoryTarget.Injectable });
 ActivityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: ActivityService, providedIn: 'root' });