amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Better edit contact screen (#890)

Browse Source
This commit is contained in:
Régis Freyd
2018-02-11 11:23:20 -05:00
committed by GitHub
parent f35346146d
commit b46fa4631c
24 changed files with 4216 additions and 3627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ContactsController.php
+37 -4
View File
@@ -199,8 +199,20 @@ class ContactsController extends Controller
*/
public function edit(Contact $contact)
{
$age = (string) (! is_null($contact->birthdate) ? $contact->birthdate->getAge() : 0);
$birthdate = ! is_null($contact->birthdate) ? $contact->birthdate->date->format('Y-m-d') : \Carbon\Carbon::now()->format('Y-m-d');
$day = ! is_null($contact->birthdate) ? $contact->birthdate->date->day : \Carbon\Carbon::now()->day;
$month = ! is_null($contact->birthdate) ? $contact->birthdate->date->month : \Carbon\Carbon::now()->month;
return view('people.edit')
->withContact($contact)
->withDays(\App\Helpers\DateHelper::getListOfDays())
->withMonths(\App\Helpers\DateHelper::getListOfMonths())
->withBirthdayState($contact->getBirthdayState())
->withBirthdate($birthdate)
->withDay($day)
->withMonth($month)
->withAge($age)
->withGenders(auth()->user()->account->genders);
}
@@ -218,6 +230,7 @@ class ContactsController extends Controller
'lastname' => 'max:100',
'gender' => 'required',
'file' => 'max:10240',
'birthdate' => 'required|string',
]);
if ($validator->fails()) {
@@ -226,9 +239,13 @@ class ContactsController extends Controller
->withErrors($validator);
}
if ($contact->setName($request->input('firstname'), null, $request->input('lastname')) == false) {
return back()
->withInput()
->withErrors('There has been a problem with saving the name.');
}
$contact->gender_id = $request->input('gender');
$contact->first_name = $request->input('firstname');
$contact->last_name = $request->input('lastname');
if ($request->file('avatar') != '') {
$contact->has_avatar = true;
@@ -254,7 +271,7 @@ class ContactsController extends Controller
$contact->save();
// Saves birthdate if defined
// Handling the case of the birthday
$contact->removeSpecialDate('birthdate');
switch ($request->input('birthdate')) {
case 'unknown':
@@ -262,8 +279,24 @@ class ContactsController extends Controller
case 'approximate':
$specialDate = $contact->setSpecialDateFromAge('birthdate', $request->input('age'));
break;
case 'almost':
$specialDate = $contact->setSpecialDate(
'birthdate',
0,
$request->input('month'),
$request->input('day')
);
$newReminder = $specialDate->setReminder('year', 1, trans('people.people_add_birthday_reminder', ['name' => $contact->first_name]));
break;
case 'exact':
$specialDate = $contact->setSpecialDate('birthdate', $request->input('birthdate_year'), $request->input('birthdate_month'), $request->input('birthdate_day'));
$birthdate = $request->input('birthdayDate');
$birthdate = new \Carbon\Carbon($birthdate);
$specialDate = $contact->setSpecialDate(
'birthdate',
$birthdate->year,
$birthdate->month,
$birthdate->day
);
$newReminder = $specialDate->setReminder('year', 1, trans('people.people_add_birthday_reminder', ['name' => $contact->first_name]));
break;
}