diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/education.js b/addons/default/visiosoft/profile-module/resources/assets/js/education.js index 78dc044bb..22c8f6e13 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/js/education.js +++ b/addons/default/visiosoft/profile-module/resources/assets/js/education.js @@ -12,7 +12,7 @@ $(() => { $('#education').on('change', () => { $.ajax({ - url: '/ajax/setEducation', + url: '/api/setEducation', data: { info: 'education', education: $('#education').val() @@ -31,14 +31,10 @@ $(() => { $('#education_part').on('change', () => { $.ajax({ - url: '/ajax/setEducation', + url: '/api/setEducation', data: { info: 'education_part', education: $('#education_part').val() - }, beforeSend: function (){ - $('#education_part_option').html(''); - }, success: function (response) { - } }) }) diff --git a/addons/default/visiosoft/profile-module/resources/config/permissions.php b/addons/default/visiosoft/profile-module/resources/config/permissions.php index e4abd05b1..934599af3 100644 --- a/addons/default/visiosoft/profile-module/resources/config/permissions.php +++ b/addons/default/visiosoft/profile-module/resources/config/permissions.php @@ -11,19 +11,9 @@ return [ 'write', 'delete', ], - 'education' => [ - 'read', - 'write', - 'delete', - ], 'education_part' => [ 'read', 'write', 'delete', ], - 'education_part_option' => [ - 'read', - 'write', - 'delete', - ], ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/button.php b/addons/default/visiosoft/profile-module/resources/lang/en/button.php index a8af9e732..1d8634703 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/button.php @@ -16,7 +16,5 @@ return [ 'corporate' => 'Corporate', 'export' => 'Export', 'new_education' => 'New Education', - 'new_education' => 'New Education', 'new_education_part' => 'New Education part', - 'new_education_part_option' => 'New Education part option', ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/permission.php b/addons/default/visiosoft/profile-module/resources/lang/en/permission.php index c7ddc6128..f4631292c 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/permission.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/permission.php @@ -25,14 +25,6 @@ return [ 'delete' => 'Can delete education?', ], ], - 'education' => [ - 'name' => 'Education', - 'option' => [ - 'read' => 'Can read education?', - 'write' => 'Can create/edit education?', - 'delete' => 'Can delete education?', - ], - ], 'education_part' => [ 'name' => 'Education part', 'option' => [ @@ -41,12 +33,4 @@ return [ 'delete' => 'Can delete education part?', ], ], - 'education_part_option' => [ - 'name' => 'Education part option', - 'option' => [ - 'read' => 'Can read education part option?', - 'write' => 'Can create/edit education part option?', - 'delete' => 'Can delete education part option?', - ], - ], ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/section.php b/addons/default/visiosoft/profile-module/resources/lang/en/section.php index b6df27826..6a5bce6b9 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/section.php @@ -12,13 +12,7 @@ return [ 'education' => [ 'title' => 'Education', ], - 'education' => [ - 'title' => 'Education', - ], 'education_part' => [ 'title' => 'Education part', ], - 'education_part_option' => [ - 'title' => 'Education part option', - ], ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/stream.php b/addons/default/visiosoft/profile-module/resources/lang/en/stream.php index 30aa34db7..7f43711b2 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/stream.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/stream.php @@ -10,13 +10,7 @@ return [ 'education' => [ 'name' => 'Education', ], - 'education' => [ - 'name' => 'Education', - ], 'education_part' => [ 'name' => 'Education part', ], - 'education_part_option' => [ - 'name' => 'Education part option', - ], ]; diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index 60017932a..0d76779e4 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -171,7 +171,7 @@ - {{ profileForm.fields.education.input|raw }} + {{ profileForm.fields.education.setPlaceholder(trans('visiosoft.module.profile::field.choose_an_option')).input|raw }}
@@ -179,7 +179,7 @@ - {{ profileForm.fields.education_part.input|raw }} + {{ profileForm.fields.education_part.setPlaceholder(trans('visiosoft.module.profile::field.choose_an_option')).input|raw }}
diff --git a/addons/default/visiosoft/profile-module/src/Education/Form/EducationFormBuilder.php b/addons/default/visiosoft/profile-module/src/Education/Form/EducationFormBuilder.php index 6500c3c22..e590597f0 100644 --- a/addons/default/visiosoft/profile-module/src/Education/Form/EducationFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Education/Form/EducationFormBuilder.php @@ -4,35 +4,6 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder; class EducationFormBuilder extends FormBuilder { - - /** - * The form fields. - * - * @var array|string - */ - protected $fields = []; - - /** - * Additional validation rules. - * - * @var array|string - */ - protected $rules = []; - - /** - * Fields to skip. - * - * @var array|string - */ - protected $skips = []; - - /** - * The form actions. - * - * @var array|string - */ - protected $actions = []; - /** * The form buttons. * @@ -41,26 +12,4 @@ class EducationFormBuilder extends FormBuilder protected $buttons = [ 'cancel', ]; - - /** - * The form options. - * - * @var array - */ - protected $options = []; - - /** - * The form sections. - * - * @var array - */ - protected $sections = []; - - /** - * The form assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/Education/Table/EducationTableBuilder.php b/addons/default/visiosoft/profile-module/src/Education/Table/EducationTableBuilder.php index 6e8c5d55e..eece942ed 100644 --- a/addons/default/visiosoft/profile-module/src/Education/Table/EducationTableBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Education/Table/EducationTableBuilder.php @@ -4,28 +4,6 @@ use Anomaly\Streams\Platform\Ui\Table\TableBuilder; class EducationTableBuilder extends TableBuilder { - - /** - * The table views. - * - * @var array|string - */ - protected $views = []; - - /** - * The table filters. - * - * @var array|string - */ - protected $filters = []; - - /** - * The table columns. - * - * @var array|string - */ - protected $columns = []; - /** * The table buttons. * @@ -43,19 +21,4 @@ class EducationTableBuilder extends TableBuilder protected $actions = [ 'delete' ]; - - /** - * The table options. - * - * @var array - */ - protected $options = []; - - /** - * The table assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/EducationPart/Form/EducationPartFormBuilder.php b/addons/default/visiosoft/profile-module/src/EducationPart/Form/EducationPartFormBuilder.php index 8473648dd..845cc15c3 100644 --- a/addons/default/visiosoft/profile-module/src/EducationPart/Form/EducationPartFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/EducationPart/Form/EducationPartFormBuilder.php @@ -4,35 +4,6 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder; class EducationPartFormBuilder extends FormBuilder { - - /** - * The form fields. - * - * @var array|string - */ - protected $fields = []; - - /** - * Additional validation rules. - * - * @var array|string - */ - protected $rules = []; - - /** - * Fields to skip. - * - * @var array|string - */ - protected $skips = []; - - /** - * The form actions. - * - * @var array|string - */ - protected $actions = []; - /** * The form buttons. * @@ -41,26 +12,4 @@ class EducationPartFormBuilder extends FormBuilder protected $buttons = [ 'cancel', ]; - - /** - * The form options. - * - * @var array - */ - protected $options = []; - - /** - * The form sections. - * - * @var array - */ - protected $sections = []; - - /** - * The form assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/EducationPart/Table/EducationPartTableBuilder.php b/addons/default/visiosoft/profile-module/src/EducationPart/Table/EducationPartTableBuilder.php index bfed87fed..dd8d7783a 100644 --- a/addons/default/visiosoft/profile-module/src/EducationPart/Table/EducationPartTableBuilder.php +++ b/addons/default/visiosoft/profile-module/src/EducationPart/Table/EducationPartTableBuilder.php @@ -4,28 +4,6 @@ use Anomaly\Streams\Platform\Ui\Table\TableBuilder; class EducationPartTableBuilder extends TableBuilder { - - /** - * The table views. - * - * @var array|string - */ - protected $views = []; - - /** - * The table filters. - * - * @var array|string - */ - protected $filters = []; - - /** - * The table columns. - * - * @var array|string - */ - protected $columns = []; - /** * The table buttons. * @@ -43,19 +21,4 @@ class EducationPartTableBuilder extends TableBuilder protected $actions = [ 'delete' ]; - - /** - * The table options. - * - * @var array - */ - protected $options = []; - - /** - * The table assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index c64324b82..ed7317f64 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -251,7 +251,7 @@ class MyProfileController extends PublicController public function getEducation(Request $request) { - $user = $this->userRepository->find(auth()->user()->getAuthIdentifier()); + $user = $this->userRepository->find(auth()->id()); $education = EducationModel::all(); $educationPart = EducationPartModel::query()->where('education_id', $user->education)->get(); return response()->json(['user' => $user, 'education' => $education, 'education-part' => $educationPart], 200); @@ -259,7 +259,7 @@ class MyProfileController extends PublicController public function setEducation(Request $request) { - $user_id = auth()->user()->getAuthIdentifier(); + $user_id = auth()->id(); if ($request->info == 'education') { $user = $this->userRepository->find($user_id)->update(['education' => $request->education]); $education = EducationPartModel::query()->where('education_id', $request->education)->get(); diff --git a/addons/default/visiosoft/profile-module/src/ProfileModule.php b/addons/default/visiosoft/profile-module/src/ProfileModule.php index a6ad6ee88..20ec78a93 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModule.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModule.php @@ -37,7 +37,7 @@ class ProfileModule extends Module ], 'education_part' => [ 'buttons' => [ - 'new_education', + 'new_education_part', ] ], ]; diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 6d1817c5b..7880c51d5 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -105,6 +105,8 @@ class ProfileModuleServiceProvider extends AddonServiceProvider ], 'profile/notification' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@notification', 'ajax/update-user-info' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@updateAjaxProfile', + 'api/setEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@setEducation', + 'api/getEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@getEducation', // UserAuthenticator 'login-in' => 'Visiosoft\ProfileModule\Http\Controller\UserAuthenticator@attempt', @@ -143,8 +145,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider // CacheController 'ajax/get-user-info' => 'Visiosoft\ProfileModule\Http\Controller\CacheController@getUserInfo', - 'ajax/setEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@setEducation', - 'ajax/getEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@getEducation', ]; /** diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index 4b7f734ed..497108c1e 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -144,11 +144,6 @@ class UsersFieldsSeeder extends Seeder 'slug' => 'education_part', 'type' => 'anomaly.field_type.select', ], - [ - 'name' => trans('visiosoft.module.profile::field.education_part_option.name'), - 'slug' => 'education_part_option', - 'type' => 'anomaly.field_type.select', - ], [ 'name' => trans('visiosoft.module.profile::field.facebook_address.name'), 'slug' => 'facebook_address',