Skip to content

Dev #3221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernardhanna merged 2 commits into from
Jan 27, 2026
+46 −28
Merged

Dev #3221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8840c12
matchmalking bulk
bernardhanna Jan 27, 2026
ff5a8a3
Merge pull request #3220 from codeeu/week4_26
bernardhanna Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions app/Imports/MatchmakingProfileImport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,18 @@ public function model(array $row): ?Model
'new_country' => $countryIso,
'current_email' => $existingProfile->email,
'new_email' => $email,
'profile_data_keys' => array_keys($profileData),
'country_in_data' => isset($profileData['country']),
'country_value' => $profileData['country'] ?? 'NOT SET',
]);

// Fill the model with all data
$existingProfile->fill($profileData);

// Explicitly set country to ensure it updates (even if null)
// This ensures the field is updated even if it was previously null
$existingProfile->country = $countryIso;

$existingProfile->save();

// Refresh to get updated values
Expand All @@ -557,9 +566,9 @@ public function model(array $row): ?Model
'slug' => $existingProfile->slug,
'email' => $existingProfile->email,
'organisation_name' => $existingProfile->organisation_name,
'country' => $existingProfile->country,
'country_after_update' => $existingProfile->country,
'country_was_set_to' => $countryIso,
'updated_fields' => array_keys($profileData),
'profile_data' => $profileData,
]);

return $existingProfile;
Expand Down
61 changes: 35 additions & 26 deletions app/Nova/MatchmakingProfile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,71 +33,80 @@ public function fields(Request $request)

Select::make('Type')
->options(array_combine(MatchmakingProfileModel::getValidTypes(), MatchmakingProfileModel::getValidTypes()))
->displayUsingLabels(),
->displayUsingLabels()
->sortable(),

Text::make('Slug')
->sortable()
->rules('required', 'max:255'),
->rules('required', 'max:255')
->hideFromIndex(),

Text::make('Avatar')->hideFromIndex(),

Text::make('Email')->sortable(),
Text::make('First Name')->hideFromIndex(),
Text::make('Last Name')->hideFromIndex(),
Text::make('Job Title')->hideFromIndex(),
Text::make('First Name')->sortable(),
Text::make('Last Name')->sortable(),
Text::make('Job Title'),
Text::make('Linkedin')->hideFromIndex(),
Text::make('Facebook')->hideFromIndex(),
Text::make('Website')->hideFromIndex(),
Text::make('Website'),
Text::make('Organisation Name')->sortable(),

// Array fields as JSON textareas
Textarea::make('Languages')
->resolveUsing(fn($v) => is_array($v) ? json_encode($v) : $v)
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true)),
->resolveUsing(fn($v) => is_array($v) ? implode(', ', $v) : ($v ?: ''))
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true))
->alwaysShow(),

Textarea::make('Organisation Type')
->resolveUsing(fn($v) => is_array($v) ? json_encode($v) : $v)
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true)),
->resolveUsing(fn($v) => is_array($v) ? implode(', ', $v) : ($v ?: ''))
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true))
->alwaysShow(),

Textarea::make('Organisation Mission')->hideFromIndex(),
Textarea::make('Organisation Mission')->alwaysShow(),

Text::make('Location')->hideFromIndex(),
BelongsTo::make('Country', 'countryModel', \App\Nova\Country::class)->nullable(),
Text::make('Location'),
BelongsTo::make('Country', 'countryModel', \App\Nova\Country::class)
->nullable()
->sortable()
->searchable(),

Textarea::make('Support Activities')
->resolveUsing(fn($v) => is_array($v) ? json_encode($v) : $v)
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true)),
->resolveUsing(fn($v) => is_array($v) ? implode(', ', $v) : ($v ?: ''))
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true))
->alwaysShow(),

Text::make('Interested In School Collaboration')->hideFromIndex(),
Text::make('Interested In School Collaboration')->sortable(),

Textarea::make('Target School Types')
->resolveUsing(fn($v) => is_array($v) ? json_encode($v) : $v)
->resolveUsing(fn($v) => is_array($v) ? implode(', ', $v) : ($v ?: ''))
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true))
->hideFromIndex(),
->alwaysShow(),

Textarea::make('Time Commitment')
->resolveUsing(fn($v) => is_array($v) ? json_encode($v) : $v)
->resolveUsing(fn($v) => is_array($v) ? implode(', ', $v) : ($v ?: ''))
->fillUsing(fn($req, $mdl, $attr, $reqAttr) => $mdl->{$attr} = json_decode($req->{$reqAttr}, true))
->hideFromIndex(),
->alwaysShow(),

Boolean::make('Dark Avatar', 'avatar_dark')->hideFromIndex(),
Boolean::make('Can Start Immediately'),
Textarea::make('Why Volunteering')->hideFromIndex(),
Textarea::make('Why Volunteering')->alwaysShow(),

Select::make('Format')
->options(MatchmakingProfileModel::getValidFormats())
->displayUsingLabels(),
->displayUsingLabels()
->sortable(),

Boolean::make('Is Use Resource'),
Boolean::make('Want Updates'),
Boolean::make('Agree To Be Contacted For Feedback'),
Textarea::make('Description')->hideFromIndex(),
Textarea::make('Description')->alwaysShow(),

DateTime::make('Start Time')->hideFromIndex(),
DateTime::make('Completion Time')->hideFromIndex(),
DateTime::make('Start Time')->sortable(),
DateTime::make('Completion Time')->sortable(),

Boolean::make('Email Via Linkedin'),
Text::make('Get Email From')->hideFromIndex(),
Text::make('Get Email From'),
];
}

Expand Down
Loading