Merge pull request #26 from t29mato/develop

Develop

README.md

@@ -7,8 +7,8 @@
 ```
 $ docker-compose up --build
 $ docker-compose exec app composer install
-$ docker-compose exec app php artisan migrate
 $ touch database/database.sqlite
+$ docker-compose exec app php artisan migrate
 ```
 
 ## cron設定

app/Http/Controllers/OceanController.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Http\Request;
 use App\Ocean;
+use App\OceanHistory;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
 
 class OceanController extends Controller
 {
@@ -16,6 +18,7 @@ public function index()
         $dtNow = new Carbon();
         foreach ($oceans as $index => $ocean) {
             array_push($oceanFormated, [
+                'id' => $ocean->id,
                 'name' => $ocean->nickname ? $ocean->nickname : $ocean->name,
                 'transparency' => $ocean->transparency,
                 'transparencyLevel' => $this->calculateTransparencyLevel(
@@ -34,6 +37,24 @@ public function index()
         ]);
     }
 
+    public function ocean($ocean_id)
+    {
+        $now = new Carbon();
+        $oceans = OceanHistory::where('ocean_histories.ocean_id', '=', $ocean_id)
+            ->where('ocean_histories.created_at', '>', $now->subYear()->format('Y-m-d'))
+            ->join('oceans', 'ocean_id', '=', 'oceans.id')
+            ->select('oceans.name', 'ocean_histories.transparency', 'oceans.id', 'ocean_histories.created_at')
+            ->orderBy('ocean_histories.created_at', 'desc')
+            ->get();
+        foreach ($oceans as $index => $ocean) {
+            // var_dump($ocean->name, $ocean->transparency, $ocean->created_at->format('Y-m-d'));
+            // var_dump($ocean->created_at->format('Y-m-d') . ': ' . $ocean->transparency . '<br>');
+        }
+        return view('ocean', [
+            'oceans' => $oceans
+        ]);
+    }
+
     private function calculateTransparencyInt(string $transparency): int
     {
         $result = 0;

composer.json

@@ -17,6 +17,7 @@
         "predis/predis": "^1.1"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.4",
         "facade/ignition": "^1.4",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",