rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-19 08:52:25 +01:00
Code Issues Releases Activity

user and admin can edit organization field

Browse Source
This commit is contained in:
Du Peng 2022-05-11 12:10:46 +02:00
parent 798941c349
commit 78076b7fba
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/members_controller.rb
View File

@ -269,7 +269,7 @@ class API::MembersController < API::ApiController
:id,
address_attributes: %i[id address],
organization_attributes: [:id, :name, address_attributes: %i[id address]],
user_profile_custom_fields_attributes: %i[id value]
user_profile_custom_fields_attributes: %i[id value invoicing_profile_id profile_custom_field_id]
],
statistic_profile_attributes: %i[id gender birthday])
@ -284,7 +284,7 @@ class API::MembersController < API::ApiController
:id,
address_attributes: %i[id address],
organization_attributes: [:id, :name, address_attributes: %i[id address]],
user_profile_custom_fields_attributes: %i[id value]
user_profile_custom_fields_attributes: %i[id value invoicing_profile_id profile_custom_field_id]
],
statistic_profile_attributes: [:id, :gender, :birthday, training_ids: []])

19
app/frontend/src/javascript/components/user/user-profile-form.tsx
View File

@ -60,7 +60,7 @@ export const UserProfileForm: React.FC<UserProfileFormProps> = ({ action, size,
const phoneRegex = /^((00|\+)\d{2,3})?\d{4,14}$/;
const urlRegex = /^(https?:\/\/)([\da-z.-]+)\.([-a-z\d.]{2,30})([/\w .-]*)*\/?$/;
const { handleSubmit, register, control, formState, setValue } = useForm<User>({ defaultValues: { ...user } });
const { handleSubmit, register, control, formState, setValue, reset } = useForm<User>({ defaultValues: { ...user } });
const output = useWatch<User>({ control });
const [isOrganization, setIsOrganization] = useState<boolean>(!_isNil(user.invoicing_profile_attributes.organization_attributes));
@ -94,7 +94,17 @@ export const UserProfileForm: React.FC<UserProfileFormProps> = ({ action, size,
}).catch(error => onError(error));
}
ProfileCustomFieldAPI.index().then(data => {
setProfileCustomFields(data.filter(f => f.actived));
const fData = data.filter(f => f.actived);
setProfileCustomFields(fData);
const userProfileCustomFields = fData.map(f => {
const upcf = user.invoicing_profile_attributes.user_profile_custom_fields_attributes.find(uf => uf.profile_custom_field_id === f.id);
return upcf || {
value: '',
invoicing_profile_id: user.invoicing_profile_attributes.id,
profile_custom_field_id: f.id
};
});
setValue('invoicing_profile_attributes.user_profile_custom_fields_attributes', userProfileCustomFields);
}).catch(error => onError(error));
}, []);
@ -119,7 +129,10 @@ export const UserProfileForm: React.FC<UserProfileFormProps> = ({ action, size,
return handleSubmit((data: User) => {
MemberAPI[action](data)
.then(res => { onSuccess(res); })
.then(res => {
reset(res);
onSuccess(res);
})
.catch((error) => { onError(error); });
})(event);
};

6
app/frontend/src/javascript/models/user.ts
View File

@ -52,6 +52,12 @@ export interface User {
id: number,
address: string
}
},
user_profile_custom_fields_attributes: {
id: number,
value: string,
invoicing_profile_id: number,
profile_custom_field_id: number
}
},
statistic_profile_attributes: {