Merge pull request #1969 from opensource-workshop/2.17.1

Merge v1.17.1 into 2

Author: akagane99

app/Plugins/Manage/UserManage/UserManage.php

@@ -1927,6 +1927,8 @@ public function uploadCsv($request, $page_id = null)
             // 状態
             $status_col_no = array_search('status', $import_column_col_no);
             $user->status = $csv_columns[$status_col_no];
+            // 項目セットID
+            $user->columns_set_id = $request->columns_set_id;
 
             $user->save();
 

app/Plugins/User/Calendars/CalendarsPlugin.php

@@ -5,11 +5,8 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 
-//use Carbon\Carbon;
-
 use App\Enums\StatusType;
 
 use App\Models\Common\Buckets;
@@ -37,12 +34,6 @@
  */
 class CalendarsPlugin extends UserPluginBase
 {
-    /* DB migrate
-       php artisan make:migration create_calendars --create=calendars
-       php artisan make:migration create_calendar_posts --create=calendar_posts
-       php artisan make:migration create_calendar_frames --create=calendar_frames
-    */
-
     /* オブジェクト変数 */
 
     /**
@@ -65,7 +56,7 @@ public function getPublicFunctions()
     }
 
     /**
-     *  権限定義
+     * 権限定義
      */
     public function declareRole()
     {
@@ -130,18 +121,20 @@ private function getPluginBucket($bucket_id)
     }
 
     /**
-     *  POST一覧取得
+     * POST一覧取得
      */
     private function getPosts($from_date, $to_date)
     {
         // データ取得
         $posts_query = CalendarPost::select('calendar_posts.*')
-                                   ->join('calendars', function ($join) {
-                                       $join->on('calendars.id', '=', 'calendar_posts.calendar_id')
-                                          ->where('calendars.bucket_id', '=', $this->frame->bucket_id);
-                                   })
-                                   ->where('calendar_posts.start_date', '<=', $to_date)
-                                   ->where('calendar_posts.end_date', '>=', $from_date);
+            ->join('calendars', function ($join) {
+                $join->on('calendars.id', '=', 'calendar_posts.calendar_id')
+                    ->where('calendars.bucket_id', '=', $this->frame->bucket_id);
+            })
+            ->where('calendar_posts.start_date', '<=', $to_date)
+            ->where('calendar_posts.end_date', '>=', $from_date)
+            ->orderBy('calendar_posts.start_date')
+            ->orderBy('calendar_posts.start_time');
 
         // 権限によって表示する記事を絞る
         $posts_query = $this->appendAuthWhereBase($posts_query, 'calendar_posts');
@@ -316,7 +309,6 @@ public function index($request, $page_id, $frame_id)
         return $this->view('index', [
             'dates'            => $dates,
             'posts'            => $posts,
-            // 'current_ym_first' => strtotime(session('calendar_year') . "/" . session('calendar_month') . "/01"),
             'current_ym_first' => strtotime(session($session_year_name) . "/" . session($session_month_name) . "/" . session($session_day_name)),
             'current_month'    => session($session_month_name),
             'plugin_frame'     => $plugin_frame,

config/version.php

@@ -12,7 +12,7 @@
     |
     */
 
-    'cc_version' => '2.17.0',
+    'cc_version' => '2.17.1',
 
     'show_cc_version' => true,
 ];