wip

app/Contact.php

@@ -1103,10 +1103,13 @@ public function setRelationship(self $otherContact, $relationshipTypeId)
         $relationship->contact_id_secondary = $otherContact->id;
         $relationship->save();
 
+        // Get the reverse relationship
+        $reverseRelationshipType =  $this->account->getRelationshipTypeByType($relationshipType->name_reverse_relationship);
+
         // Contact B is linked to Contact A
         $relationship = new Relationship;
         $relationship->account_id = $this->account_id;
-        $relationship->relationship_type_id = $relationshipType->id;
+        $relationship->relationship_type_id = $reverseRelationshipType->id;
         $relationship->contact_id_main = $otherContact->id;
         $relationship->relationship_type_name = $relationshipType->name_reverse_relationship;
         $relationship->contact_id_secondary = $this->id;
@@ -1143,9 +1146,12 @@ public function deleteRelationship(self $otherContact, $relationshipTypeId)
 
         $relationship->delete();
 
+        $relationshipType = RelationshipType::find($relationshipTypeId);
+        $reverseRelationshipType = $this->account->getRelationshipTypeByType($relationshipType->name_reverse_relationship);
+
         $relationship = Relationship::where('contact_id_main', $otherContact->id)
                                     ->where('contact_id_secondary', $this->id)
-                                    ->where('relationship_type_id', $relationshipTypeId)
+                                    ->where('relationship_type_id', $reverseRelationshipType->id)
                                     ->first();
 
         $relationship->delete();

app/Http/Controllers/ContactsController.php

@@ -193,8 +193,26 @@ public function show(Contact $contact)
             return $item->relationshipType->relationshipTypeGroup->name == 'love';
         });
 
+        // get family relationship type
+        $familyRelationships = $relationships->filter(function ($item) {
+            return $item->relationshipType->relationshipTypeGroup->name == 'family';
+        });
+
+        // get friend relationship type
+        $friendRelationships = $relationships->filter(function ($item) {
+            return $item->relationshipType->relationshipTypeGroup->name == 'friend';
+        });
+
+         // get work relationship type
+        $workRelationships = $relationships->filter(function ($item) {
+            return $item->relationshipType->relationshipTypeGroup->name == 'work';
+        });
+
         return view('people.profile')
             ->withLoveRelationships($loveRelationships)
+            ->withFamilyRelationships($familyRelationships)
+            ->withFriendRelationships($friendRelationships)
+            ->withWorkRelationships($workRelationships)
             ->withContact($contact);
     }
 

app/RelationshipType.php

@@ -50,7 +50,7 @@ public function relationshipTypeGroup()
      *
      * @return string
      */
-    public function getLocalizedName(Contact $contact = null, bool $includeReverse = false)
+    public function getLocalizedName(Contact $contact = null, bool $includeReverse = false, string $gender = 'man')
     {
         // include the reverse of the relation in the string (masculine/feminine)
         if (! is_null($contact) && $includeReverse) {
@@ -72,10 +72,18 @@ public function getLocalizedName(Contact $contact = null, bool $includeReverse =
 
         // `Regis Freyd's uncle`
         if (! is_null($contact)) {
+            if (strtolower($gender) == 'woman') {
+                return trans('app.relationship_type_'.$this->name.'_female_with_name', ["name" => $contact->getCompleteName()]);
+            }
+
             return trans('app.relationship_type_'.$this->name.'_with_name', ["name" => $contact->getCompleteName()]);
         }
 
         // `uncle`
+        if (strtolower($gender) == 'woman') {
+            return trans('app.relationship_type_'.$this->name.'_female');
+        }
+
         return trans('app.relationship_type_'.$this->name);
     }
 

resources/lang/en/app.php

@@ -80,6 +80,12 @@
     // and then, the feminine version of the string. Finally, in some sentences
     // in the UI, we need to include the name of the person we add the relationship
     // to.
+    'relationship_type_group_love' => 'Love relationships',
+    'relationship_type_group_family' => 'Family relationships',
+    'relationship_type_group_friend' => 'Friend relationships',
+    'relationship_type_group_work' => 'Work relationships',
+    'relationship_type_group_other' => 'Other kind of relationships',
+
     'relationship_type_partner' => 'significant other',
     'relationship_type_partner_female' => 'significant other',
     'relationship_type_partner_reverse' => 'significant other',

resources/views/people/profile.blade.php

@@ -39,7 +39,7 @@
           <div class="col-xs-12 col-sm-3 profile-sidebar">
 
             {{-- Significant Other --}}
-            @include('people.relationship.love')
+            @include('people.relationship.index')
 
             @include('people.dashboard.index')
 

resources/views/people/relationship/_relationship.blade.php

@@ -0,0 +1,38 @@
+@foreach ($relationships as $relationship)
+  <div>
+    <span class="silver fw3">[{{ $relationship->relationshipType->getLocalizedName(null, false, $relationship->withContact->gender->name) }}]</span>
+
+    {{-- NAME --}}
+    @if ($relationship->withContact->is_partial)
+    <span>{{ $relationship->withContact->getCompleteName(auth()->user()->name_order) }}</span>
+    @else
+    <a href="{{ route('people.show', $relationship->withContact) }}">{{ $relationship->withContact->getCompleteName(auth()->user()->name_order) }}</a>
+    @endif
+
+    {{-- AGE --}}
+    @if ($relationship->withContact->birthday_special_date_id)
+      @if ($relationship->withContact->birthdate->getAge())
+        ({{ $relationship->withContact->birthdate->getAge() }})
+      @endif
+    @endif
+
+    {{-- ACTIONS: EDIT/DELETE --}}
+    @if ($relationship->withContact->is_partial)
+    <a href="{{ route('people.relationships.edit', [$contact, $relationship->withContact]) }}" class="action-link {{ $contact->id }}-edit-relationship">
+      {{ trans('app.edit') }}
+    </a>
+    <a href="#" onclick="if (confirm('{{ trans('people.relationship_delete_confirmation') }}')) { $(this).closest('.sidebar-box-paragraph').find('.entry-delete-form').submit(); } return false;" class="action-link">
+      {{ trans('app.delete') }}
+    </a>
+    @else
+    <a href="#" onclick="if (confirm('{{ trans('people.relationship_unlink_confirmation') }}')) { $(this).closest('.sidebar-box-paragraph').find('.entry-delete-form').submit(); } return false;" class="action-link">
+      {{ trans('app.delete') }}
+    </a>
+    @endif
+
+    <form method="POST" action="/people/{{ $contact->id }}/relationships/{{ $relationship->withContact->id }}" class="entry-delete-form hidden">
+      {{ method_field('DELETE') }}
+      {{ csrf_field() }}
+    </form>
+  </div>
+@endforeach

resources/views/people/relationship/index.blade.php

@@ -0,0 +1,43 @@
+<div class="ba b--near-white br2 bg-gray-monica pa3 mb3 f6">
+  <div class="w-100 dt">
+    <div class="dtc">
+      <h3 class="f6 ttu normal">{{ trans('app.relationship_type_group_'.auth()->user()->account->getRelationshipTypeGroupByType('love')->name) }}</h3>
+    </div>
+  </div>
+
+   @include('people.relationship._relationship', ['relationships' => $loveRelationships])
+
+  <p class="mb0">
+    <a href="/people/{{ $contact->id }}/relationships/new?type={{ $contact->account->getRelationshipTypeByType('partner')->id }}">Add</a>
+  </p>
+</div>
+
+<div class="ba b--near-white br2 bg-gray-monica pa3 mb3 f6">
+  <div class="w-100 dt">
+    <div class="dtc">
+      <h3 class="f6 ttu normal">{{ trans('app.relationship_type_group_'.auth()->user()->account->getRelationshipTypeGroupByType('family')->name) }}</h3>
+    </div>
+  </div>
+
+   @include('people.relationship._relationship', ['relationships' => $familyRelationships])
+
+   <p class="mb0">
+    <a href="/people/{{ $contact->id }}/relationships/new?type={{ $contact->account->getRelationshipTypeByType('child')->id }}">Add</a>
+  </p>
+</div>
+
+<div class="ba b--near-white br2 bg-gray-monica pa3 mb3 f6">
+  <div class="w-100 dt">
+    <div class="dtc">
+      <h3 class="f6 ttu normal">{{ trans('app.relationship_type_group_other') }}</h3>
+    </div>
+  </div>
+
+   @include('people.relationship._relationship', ['relationships' => $friendRelationships])
+
+   @include('people.relationship._relationship', ['relationships' => $workRelationships])
+
+   <p class="mb0">
+    <a href="/people/{{ $contact->id }}/relationships/new?type={{ $contact->account->getRelationshipTypeByType('friend')->id }}">Add</a>
+  </p>
+</div>