tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2023-11-09 17:25:21 +07:00
parent cea8b476e0 b8b308a89f
commit 10e1dc72d7
4 changed files with 15 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Linksehat/Http/Controllers/Api/ProfileController.php
View File

@@ -79,7 +79,7 @@ class ProfileController extends Controller
'first_name' => 'required',
'last_name' => 'required',
'date_of_birth' => 'required',
'email' => 'required',
// 'email' => 'required',
]);

50
Modules/Linksehat/Transformers/User/ShowProfileResource.php
View File

@@ -47,51 +47,11 @@ class ShowProfileResource extends JsonResource
}
// Marital Status
switch ($this->detail->sMartialStatus) {
case "1":
$maritalStatus = 'Single';
break;
case "2":
$maritalStatus = 'Married';
break;
case "3":
$maritalStatus = 'Widowed';
break;
default:
$maritalStatus = '-';
break;
}
$maritalStatus = DB::connection('oldlms')->table('tm_status_pernikahan')->where('nID', $this->detail->sMartialStatus)->first('sStatusPernikahan');
// Hubungan Keluarga
switch ($this->detail->nIDHubunganKeluarga) {
case 1:
$relationship = 'Father';
break;
case 2:
$relationship = 'Mother';
break;
case 3:
$relationship = 'Husband';
break;
case 4:
$relationship = 'Wife';
break;
case 5:
$relationship = 'Child';
break;
case 6:
$relationship = 'Grandmother';
break;
case 7:
$relationship = 'Grandfather';
break;
case 8:
$relationship = 'Sibling';
break;
default:
$relationship = '-';
break;
}
$relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $this->nIDHubunganKeluarga)->first('sHubunganKeluarga');
// dd( $this->detail->nIDGolonganDarah);
return [
'id' => $this->nID,
@@ -103,8 +63,8 @@ class ShowProfileResource extends JsonResource
'phone' => $this->sPhone,
'email' => $this->sEmail,
'blood_type' => $goldar,
'marital_status' => $maritalStatus,
'relationship' => $relationship,
'marital_status' => $maritalStatus ? $maritalStatus->sStatusPernikahan : '-',
'relationship' => $relationship ? $relationship->sHubunganKeluarga : '-',
'weight' => $this->detail->sWeight,
'height' => $this->detail->sHeight,
];

5
Modules/Linksehat/Transformers/User/UserProfileResource.php
View File

@@ -43,13 +43,12 @@ class UserProfileResource extends JsonResource
$urlAvatarDefault = $m['detail']['nIDJenisKelamin'] == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/male-avatar.png';
$avatarMember = $m['detail']['sImage'] ?? $urlAvatarDefault;
$relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $m['nIDHubunganKeluarga'])->first('sHubunganKeluarga');
$data = [
'id' => $m['nID'],
'name' => $m['full_name'],
'relationship' => $relationship->sHubunganKeluarga,
'relationship' => $relationship ? $relationship->sHubunganKeluarga : '-',
'avatar' => $avatarMember,
];
array_push( $dataMemberProfile, $data);

9
app/Models/OLDLMS/User.php
View File

@@ -13,9 +13,9 @@ use Spatie\Permission\Traits\HasRoles;
use Illuminate\Notifications\Notifiable;
class User extends Model
class User extends Authenticatable
{
use HasFactory, SoftDeletes, HasApiTokens, HasRoles, Notifiable;
use HasFactory, SoftDeletes, HasApiTokens, HasRoles, Notifiable, Notifiable;
const CREATED_AT = 'dCreateOn';
const UPDATED_AT = 'dUpdateOn';
@@ -66,4 +66,9 @@ class User extends Model
{
return $this->hasMany(UserInsurance::class, 'nIDUser', 'nID');
}
public function notificationTokens()
{
return $this->morphMany(NotificationToken::class, 'notifiabletoken');
}
}