From a0396cacab7408bad622878ea96a5ec1a259cd88 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 23 Apr 2025 10:07:19 +0900 Subject: [PATCH 1/5] =?UTF-8?q?change:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0=EF=BC=9E=E9=A0=85=E7=9B=AE=E8=A9=B3=E7=B4=B0=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=EF=BC=9E=E9=81=B8=E6=8A=9E=E8=82=A2=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A,=20=E8=A1=A8=E7=A4=BA=E9=A0=86=E3=82=92=E3=81=A4?= =?UTF-8?q?=E3=81=BE=E3=82=93=E3=81=A7=E7=A7=BB=E5=8B=95(=E3=83=89?= =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=AF=EF=BC=86=E3=83=89=E3=83=AD=E3=83=83?= =?UTF-8?q?=E3=83=97)=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Plugins/User/Forms/FormsPlugin.php | 34 +++++++++++++++- .../default/forms_edit_row_detail.blade.php | 40 ++++++++++++++++--- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/app/Plugins/User/Forms/FormsPlugin.php b/app/Plugins/User/Forms/FormsPlugin.php index 66b9f7716..2463c07c3 100644 --- a/app/Plugins/User/Forms/FormsPlugin.php +++ b/app/Plugins/User/Forms/FormsPlugin.php @@ -36,7 +36,6 @@ use App\Utilities\Token\TokenUtils; use App\Enums\Bs4TextColor; -use App\Enums\CsvCharacterCode; use App\Enums\FormAccessLimitType; use App\Enums\FormColumnType; use App\Enums\FormMode; @@ -58,7 +57,8 @@ * * フォームの作成＆データ収集用プラグイン。 * - * @author 永原　篤 , 井上 雅人 + * @author 永原　篤 + * @author 井上 雅人 * @author 牟田口 満 * @copyright OpenSource-WorkShop Co.,Ltd. All Rights Reserved * @category フォーム・プラグイン @@ -113,6 +113,7 @@ public function getPublicFunctions() 'copyForm', 'downloadCsvAggregate', 'registerOtherPlugins', + 'updateSelectSequenceAll', ]; return $functions; } @@ -136,6 +137,7 @@ public function declareRole() $role_check_table["aggregate"] = ['role_article']; $role_check_table["downloadCsvAggregate"] = ['role_article']; $role_check_table["registerOtherPlugins"] = ['role_article']; + $role_check_table['updateSelectSequenceAll'] = ['buckets.upColumnSequence', 'buckets.downColumnSequence']; return $role_check_table; } @@ -2378,6 +2380,34 @@ public function updateSelectSequence($request, $page_id, $frame_id) return $this->editColumnDetail($request, $page_id, $frame_id, $request->column_id, $message, null); } + /** + * つまんで移動した選択肢の表示順を更新 + */ + public function updateSelectSequenceAll($request, $page_id, $frame_id) + { + DB::beginTransaction(); + try { + foreach ($request->select_ids_order as $key => $select_id) { + $select = FormsColumnsSelects::where('id', $select_id)->first(); + if ($select) { + // display_sequenceを1から順に全選択肢を振り直し + $select->display_sequence = $key + 1; + $select->save(); + } + } + + DB::commit(); + } catch (\Exception $e) { + DB::rollBack(); + throw $e; + } + + $message = '選択肢の表示順を更新しました。'; + + // 編集画面を呼び出す + return $this->editColumnDetail($request, $page_id, $frame_id, $request->column_id, $message, null); + } + /** * 項目に紐づく選択肢の削除 */ diff --git a/resources/views/plugins/user/forms/default/forms_edit_row_detail.blade.php b/resources/views/plugins/user/forms/default/forms_edit_row_detail.blade.php index 1a25fb3b8..77f9c04a7 100644 --- a/resources/views/plugins/user/forms/default/forms_edit_row_detail.blade.php +++ b/resources/views/plugins/user/forms/default/forms_edit_row_detail.blade.php @@ -70,6 +70,11 @@ function submit_update_column_detail() { form_column_detail.action = "{{url('/')}}/plugin/forms/updateColumnDetail/{{$page->id}}/{{$frame_id}}#frame-{{$frame_id}}"; form_column_detail.submit(); } + + $(function () { + // ツールチップ有効化 + $('[data-toggle="tooltip"]').tooltip() + })
@@ -126,30 +131,38 @@ function submit_update_column_detail() {
{{-- 選択項目の一覧 --}} - +
@if (count($selects) > 0) - + @endif - + {{-- 更新用の行 --}} @foreach($selects as $select) - hide_flag)) class="table-secondary" @endif> + {{-- 表示順操作 --}} @@ -179,6 +192,8 @@ class="btn btn-danger cc-font-90 text-nowrap" @endforeach + + @@ -210,6 +225,19 @@ class="btn btn-danger cc-font-90 text-nowrap" + +
@endif From dd496c212bc70cdb6791b015e9123383873b8c14 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 23 Apr 2025 11:31:40 +0900 Subject: [PATCH 2/5] =?UTF-8?q?change:=20=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=B9=EF=BC=9E=E9=A0=85=E7=9B=AE=E8=A9=B3?= =?UTF-8?q?=E7=B4=B0=E8=A8=AD=E5=AE=9A=EF=BC=9E=E9=81=B8=E6=8A=9E=E8=82=A2?= =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A,=20=E8=A1=A8=E7=A4=BA=E9=A0=86?= =?UTF-8?q?=E3=82=92=E3=81=A4=E3=81=BE=E3=82=93=E3=81=A7=E7=A7=BB=E5=8B=95?= =?UTF-8?q?(=E3=83=89=E3=83=A9=E3=83=83=E3=82=AF=EF=BC=86=E3=83=89?= =?UTF-8?q?=E3=83=AD=E3=83=83=E3=83=97)=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../User/Databases/DatabasesPlugin.php | 33 +++++++++++++- .../databases_edit_row_detail.blade.php | 43 +++++++++++++++---- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/app/Plugins/User/Databases/DatabasesPlugin.php b/app/Plugins/User/Databases/DatabasesPlugin.php index 89bd7608f..026f4fa3e 100644 --- a/app/Plugins/User/Databases/DatabasesPlugin.php +++ b/app/Plugins/User/Databases/DatabasesPlugin.php @@ -111,6 +111,7 @@ public function getPublicFunctions() 'addPref', 'search', 'indexCount', + 'updateSelectSequenceAll', ]; return $functions; } @@ -136,9 +137,9 @@ public function declareRole() $role_check_table["input"] = array('posts.create', 'posts.update'); $role_check_table["publicConfirm"] = array('posts.create', 'posts.update'); $role_check_table["publicStore"] = array('posts.create', 'posts.update'); - $role_check_table["trendWords"] = array('frames.edit'); - + $role_check_table["trendWords"] = array('frames.edit'); $role_check_table["addPref"] = array('buckets.addColumn'); + $role_check_table['updateSelectSequenceAll'] = ['buckets.upColumnSequence', 'buckets.downColumnSequence']; return $role_check_table; } @@ -2974,6 +2975,34 @@ public function updateSelectSequence($request, $page_id, $frame_id) return $this->editColumnDetail($request, $page_id, $frame_id, $request->column_id, $message, null); } + /** + * つまんで移動した選択肢の表示順を更新 + */ + public function updateSelectSequenceAll($request, $page_id, $frame_id) + { + DB::beginTransaction(); + try { + foreach ($request->select_ids_order as $key => $select_id) { + $select = DatabasesColumnsSelects::where('id', $select_id)->first(); + if ($select) { + // display_sequenceを1から順に全選択肢を振り直し + $select->display_sequence = $key + 1; + $select->save(); + } + } + + DB::commit(); + } catch (\Exception $e) { + DB::rollBack(); + throw $e; + } + + $message = '選択肢の表示順を更新しました。'; + + // 編集画面を呼び出す + return $this->editColumnDetail($request, $page_id, $frame_id, $request->column_id, $message, null); + } + /** * 項目に紐づく選択肢の削除 */ diff --git a/resources/views/plugins/user/databases/default/databases_edit_row_detail.blade.php b/resources/views/plugins/user/databases/default/databases_edit_row_detail.blade.php index 5fe9dfbf6..9b1bc5309 100644 --- a/resources/views/plugins/user/databases/default/databases_edit_row_detail.blade.php +++ b/resources/views/plugins/user/databases/default/databases_edit_row_detail.blade.php @@ -79,6 +79,11 @@ function submit_update_column_detail() { database_column_detail.action = "{{url('/')}}/plugin/databases/updateColumnDetail/{{$page->id}}/{{$frame_id}}#frame-{{$frame_id}}"; database_column_detail.submit(); } + + $(function () { + // ツールチップ有効化 + $('[data-toggle="tooltip"]').tooltip() + }) @@ -174,31 +179,39 @@ function submit_update_column_detail() { @endif
-
表示順 + 表示順 + 選択肢名 更新 削除
+ {{-- つまんで移動 --}} + + + {{-- 上移動 --}} - {{-- 下移動 --}} -
【選択肢の追加行】
+
{{-- 選択項目の一覧 --}} @if (count($selects) > 0) - + @endif - + {{-- 更新用の行 --}} @foreach($selects as $select) - hide_flag)) class="table-secondary" @endif> + + {{-- 表示順操作 --}} @@ -229,7 +242,8 @@ class="btn btn-danger cc-font-90 text-nowrap" @endforeach - + + @@ -271,6 +285,19 @@ class="btn btn-danger cc-font-90 text-nowrap" + + @endif @if ($column->column_type == DatabaseColumnType::time) From 91d3626e782a8748dc88b4d8fc40173aef830bf1 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Fri, 25 Apr 2025 09:01:46 +0900 Subject: [PATCH 3/5] =?UTF-8?q?change:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0=EF=BC=9E=E9=A0=85=E7=9B=AE=E8=A8=AD=E5=AE=9A,=20?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E9=A0=86=E3=82=92=E3=81=A4=E3=81=BE=E3=82=93?= =?UTF-8?q?=E3=81=A7=E7=A7=BB=E5=8B=95(=E3=83=89=E3=83=A9=E3=83=83?= =?UTF-8?q?=E3=82=AF=EF=BC=86=E3=83=89=E3=83=AD=E3=83=83=E3=83=97)?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/forms/default/forms_edit.blade.php | 49 +++++++++++++------ .../forms/default/forms_edit_row.blade.php | 7 +++ .../forms/default/forms_edit_row2.blade.php | 6 +++ 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/resources/views/plugins/user/forms/default/forms_edit.blade.php b/resources/views/plugins/user/forms/default/forms_edit.blade.php index 55f3bef20..b74bbbfae 100644 --- a/resources/views/plugins/user/forms/default/forms_edit.blade.php +++ b/resources/views/plugins/user/forms/default/forms_edit.blade.php @@ -126,10 +126,12 @@ function submit_display_sequence(column_id, display_sequence, display_sequence_o {{-- フォームの場合 --}}
{{-- 項目の一覧 --}} -
表示順 + 表示順 + 選択肢名 更新 削除
- {{-- 表示順操作 --}} + {{-- つまんで移動 --}} + + + {{-- 上移動 --}} - {{-- 下移動 --}} -
【選択肢の追加行】
+
- + @@ -139,27 +141,31 @@ function submit_display_sequence(column_id, display_sequence, display_sequence_o - - {{-- 更新用の行 --}} - @foreach($columns as $column) + {{-- 更新用の行 --}} + @foreach($columns as $column) + @include('plugins.user.forms.default.forms_edit_row') - @endforeach + + @endforeach + {{-- 新規登録用の行 --}} @include('plugins.user.forms.default.forms_edit_row_add') - +
表示順 + 表示順 + 項目名 型 必須削除
【項目の追加行】
@else {{-- アンケートの場合 --}}
{{-- 項目の一覧 --}} - +
- + @@ -172,21 +178,36 @@ function submit_display_sequence(column_id, display_sequence, display_sequence_o - - {{-- 更新用の行 --}} - @foreach($columns as $column) + {{-- 更新用の行 --}} + @foreach($columns as $column) + @include('plugins.user.forms.default.forms_edit_row2') - @endforeach + + @endforeach + {{-- 新規登録用の行 --}} @include('plugins.user.forms.default.forms_edit_row2_add') - +
表示順 + 表示順 + 項目名
削除
【項目の追加行】
@endif + + {{-- ボタンエリア --}}
{{-- キャンセルボタン --}} diff --git a/resources/views/plugins/user/forms/default/forms_edit_row.blade.php b/resources/views/plugins/user/forms/default/forms_edit_row.blade.php index 78d19270a..e8a4ac803 100644 --- a/resources/views/plugins/user/forms/default/forms_edit_row.blade.php +++ b/resources/views/plugins/user/forms/default/forms_edit_row.blade.php @@ -2,12 +2,19 @@ * 項目の設定行テンプレート * * @author 永原　篤 , 井上 雅人 + * @author 牟田口 満 * @copyright OpenSource-WorkShop Co.,Ltd. All Rights Reserved * @category フォーム・プラグイン --}} {{-- 表示順 --}} + {{-- つまんで移動 --}} + + + {{-- 上移動 --}} + + {{-- 上移動 --}} + + {{-- 上移動 --}}