From e873ae7aa0140344eebfad8bbf94c512df7687b2 Mon Sep 17 00:00:00 2001 From: Slime-hatena Date: Wed, 1 May 2024 01:05:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=AE=E8=A8=88=E7=AE=97?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/components/user/song_status_battlescore.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OngekiScoreLog/resources/views/layouts/components/user/song_status_battlescore.blade.php b/OngekiScoreLog/resources/views/layouts/components/user/song_status_battlescore.blade.php index 33beb6e..9324420 100644 --- a/OngekiScoreLog/resources/views/layouts/components/user/song_status_battlescore.blade.php +++ b/OngekiScoreLog/resources/views/layouts/components/user/song_status_battlescore.blade.php @@ -60,7 +60,7 @@ 0.00% @else {{-- １位ではないので計算 --}} - {{number_format((floor((($s->over_damage_high_score) / ($topRankerScore[$s->song_id . "_" . $s->difficulty])) * 100) / 100), 2)}}% + {{number_format(($s->battle_high_score / $topRankerScore[$s->song_id . "_" . $s->difficulty]) * 100, 2)}}% @endif @else ?% From e15cc3e25883f70cb4fdffd94e23e3714c4e6ae1 Mon Sep 17 00:00:00 2001 From: Slime-hatena Date: Wed, 1 May 2024 01:06:33 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=AE=A1=E7=90=86=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=ABbattlescore=E3=81=AE=E9=9B=86?= =?UTF-8?q?=E8=A8=88=E5=86=85=E5=AE=B9=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Http/Controllers/AdminController.php | 23 +++++++- .../resources/views/admin/_submenu.blade.php | 11 +++- .../resources/views/admin/battle.blade.php | 52 +++++++++++++++++++ ...gregate.blade.php => overdamage.blade.php} | 2 +- OngekiScoreLog/routes/web.php | 3 +- 5 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 OngekiScoreLog/resources/views/admin/battle.blade.php rename OngekiScoreLog/resources/views/admin/{aggregate.blade.php => overdamage.blade.php} (97%) diff --git a/OngekiScoreLog/app/Http/Controllers/AdminController.php b/OngekiScoreLog/app/Http/Controllers/AdminController.php index 4e88c4a..d148878 100644 --- a/OngekiScoreLog/app/Http/Controllers/AdminController.php +++ b/OngekiScoreLog/app/Http/Controllers/AdminController.php @@ -69,7 +69,26 @@ public function GetConfig(){ return view('admin/config', compact(['result'])); } - public function GetAggregate(){ + public function GetBattle(){ + $result = \App\AggregateBattleScore::all(); + $difficultyToStr = [ + 0 => 'Basic', + 1 => 'Advanced', + 2 => 'Expert', + 3 => 'Master', + 10 => 'Lunatic', + ]; + + $musics = []; + $temp = \App\MusicData::all(); + foreach ($temp as $value) { + $musics[$value->id] = $value->title; + } + return view('admin/battle', compact(['result', 'musics', 'difficultyToStr'])); + } + + + public function GetOverDamage(){ $result = \App\AggregateOverdamage::all(); $difficultyToStr = [ 0 => 'Basic', @@ -84,7 +103,7 @@ public function GetAggregate(){ foreach ($temp as $value) { $musics[$value->id] = $value->title; } - return view('admin/aggregate', compact(['result', 'musics', 'difficultyToStr'])); + return view('admin/overdamage', compact(['result', 'musics', 'difficultyToStr'])); } /** diff --git a/OngekiScoreLog/resources/views/admin/_submenu.blade.php b/OngekiScoreLog/resources/views/admin/_submenu.blade.php index 54f4825..efa36de 100644 --- a/OngekiScoreLog/resources/views/admin/_submenu.blade.php +++ b/OngekiScoreLog/resources/views/admin/_submenu.blade.php @@ -12,9 +12,16 @@ @endif config -@if (isset($active) && $active === 'aggregate') +@if (isset($active) && $active === 'battle')
  • @else
  • @endif -aggregate
    • +battle + +@if (isset($active) && $active === 'overdamage') +
  • +@else +
  • +@endif +overdamage
    • diff --git a/OngekiScoreLog/resources/views/admin/battle.blade.php b/OngekiScoreLog/resources/views/admin/battle.blade.php new file mode 100644 index 0000000..3ec9f11 --- /dev/null +++ b/OngekiScoreLog/resources/views/admin/battle.blade.php @@ -0,0 +1,52 @@ +@extends('layouts.app') + +@section('title', '管理ページ') +@section('hero_title', "管理ページ") +@section('hero_subtitle', "config") + +@section('submenu') + @include('admin/_submenu', ['active' => 'battle']) +@endsection + +@section('additional_footer') + +@endsection + +@section('content') +
    +

    集計一覧

    +
    + + + + + + + + + + + + + + + + + + + + + @foreach ($result as $key => $value) + + + + + + + + @endforeach + +
    idtitle難易度maxupdated_at
    idtitle難易度maxupdated_at
    {{$value->id}}{{$musics[$value->song_id]}}{{substr($difficultyToStr[$value->difficulty], 0, 3)}}{{$value->max}}{{number_format($value->max)}}{{$value->updated_at}}
    +
    +
    +@endsection diff --git a/OngekiScoreLog/resources/views/admin/aggregate.blade.php b/OngekiScoreLog/resources/views/admin/overdamage.blade.php similarity index 97% rename from OngekiScoreLog/resources/views/admin/aggregate.blade.php rename to OngekiScoreLog/resources/views/admin/overdamage.blade.php index 76151a6..39c3825 100644 --- a/OngekiScoreLog/resources/views/admin/aggregate.blade.php +++ b/OngekiScoreLog/resources/views/admin/overdamage.blade.php @@ -5,7 +5,7 @@ @section('hero_subtitle', "config") @section('submenu') - @include('admin/_submenu', ['active' => 'aggregate']) + @include('admin/_submenu', ['active' => 'overdamage']) @endsection @section('additional_footer') diff --git a/OngekiScoreLog/routes/web.php b/OngekiScoreLog/routes/web.php index 67cb5bd..bbc3399 100644 --- a/OngekiScoreLog/routes/web.php +++ b/OngekiScoreLog/routes/web.php @@ -58,7 +58,8 @@ Route::group(['middleware' => ['auth', 'can:admin']], function () { Route::get('/admin', 'AdminController@GetIndex'); Route::get('/admin/config', 'AdminController@GetConfig'); - Route::get('/admin/aggregate', 'AdminController@GetAggregate'); + Route::get('/admin/battle', 'AdminController@GetBattle'); + Route::get('/admin/overdamage', 'AdminController@GetOverDamage'); Route::get('/admin/apply/{type}/{action?}', 'AdminController@GetApply'); Route::get('/admin/generate/battle-score', 'AdminController@GetGenerateBattleScore'); Route::get('/admin/generate/over-damage', 'AdminController@GetGenerateOverDamage');