miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-release' into 'main'

Browse Source 
Release bugfix version 0.9.1

See merge request games-club/rbrecruiter-gc!28
This commit is contained in:
Miguel Nogueira 2022-10-28 23:13:05 +00:00
commit 0cfbfd5260
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
database/migrations/2014_04_02_193005_create_translations_table.php Normal file
View File

@ -0,0 +1,38 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateTranslationsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('ltm_translations', function(Blueprint $table)
{
$table->collation = 'utf8mb4_bin';
$table->bigIncrements('id');
$table->integer('status')->default(0);
$table->string('locale');
$table->string('group');
$table->text('key');
$table->text('value')->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('ltm_translations');
}
}

4
database/seeders/PermissionSeeder.php
View File

@ -124,7 +124,7 @@ class PermissionSeeder extends Seeder
'applications.vote'
]);
$hiringManager->givePermissionTo('appointments.*', 'applications.*', 'admin.hiring.*');
$hiringManager->givePermissionTo('admin.viewAllAbsences', 'admin.manageAbsences', 'appointments.*', 'applications.*', 'admin.hiring.*');
$admin->givePermissionTo([
'appointments.*',
@ -134,8 +134,6 @@ class PermissionSeeder extends Seeder
'admin.notificationsettings.*',
'profiles.view.others',
'profiles.edit.others',
'admin.viewAllAbsences',
'admin.manageAbsences',
]);
}
}

5
resources/views/dashboard/user/manage.blade.php
View File

@ -270,6 +270,11 @@
</div>
<div class="row">
<div class="col">
<label for="uage">{{ __(' Age') }}</label>
<input id="uage" class="form-control" type="text" value="{{ (is_null($user->dob)) ? __('Age not provided yet') : __(':age years old', ['age' => \Carbon\Carbon::parse($user->dob)->age]) }}" disabled>
</div>
<div class="col">
<label for="uregdate">{{ __(' Registered at') }}</label>
<input id="uregdate" class="form-control" type="text" value="{{ $user->created_at }} ({{ $user->created_at->diffForHumans() }})" disabled>

6
resources/views/dashboard/user/viewapp.blade.php
View File

@ -161,6 +161,8 @@
<p><b>{{ __('Discord tag: ') }}</b><i class="fab fa-discord"> </i> {{ __(':discordUsername (Connected account)', ['discordUsername' => $application->user->username]) }} </p>
@endif
<p><b>{{ __('Age: ') }}</b>{{ __(':age years old', ['age' => \Carbon\Carbon::parse($application->user->dob)->age]) }}</p>
@if (Auth::user()->hasRole('hiringManager'))
<p><b>{{__('Applicant IP Address')}}</b> <span class="badge badge-primary">{{ (!$shouldCollect) ? __('0.0.0.0 (censored)') : $application->user->registrationIp }}</span></p>
@endif
@ -484,7 +486,7 @@
@if($application->user->avatarPreference == 'gravatar')
<img class="profile-user-img img-fluid img-circle" src="https://gravatar.com/avatar/{{md5(Auth::user()->email)}}" alt="{{__("User profile picture")}}">
@else
<img class="profile-user-img img-fluid img-circle" src="https://crafatar.com/avatars/{{Auth::user()->uuid}}" alt="{{__("User profile picture")}}>
<img class="profile-user-img img-fluid img-circle" src="https://crafatar.com/avatars/{{Auth::user()->uuid}}" alt="{{__("User profile picture")}}">
@endif
</div>
@ -512,7 +514,7 @@
<div class="col text-right">
<p class="text-sm text-muted"><span id="charcount">0</span>/600 {{__(' max characters')}}</p>
<p class="text-sm text-muted">{!! __('<span id="charcount">0</span>/600 max characters') !!}</p>
</div>