20220920 新增可搜尋欄位(trackNo)

app/Http/Controllers/Backend/DataManagement/SignupManagementController.php

@@ -45,14 +45,17 @@ class SignupManagementController extends Controller
         $searchValue = $param["search"]["value"];
         //客製化搜尋欄位
         $keyword = $param["columns"][1]["search"]["value"];
-        $createDateStart = $param["columns"][2]["search"]["value"];
-        $createDateFinal = $param["columns"][3]["search"]["value"];
+        $trackNo = $param["columns"][2]["search"]["value"];
+        $createDateStart = $param["columns"][3]["search"]["value"];
+        $createDateFinal = $param["columns"][4]["search"]["value"];
         
         // \Log::info('createDateStart: '.$createDateStart);
         // \Log::info('createDateFinal: '.$createDateFinal);
         // 驗證
         if ($keyword != filter_var($keyword, FILTER_SANITIZE_SPECIAL_CHARS)) $keyword = "___CANNOT_FIND_STRING___";
         if (!$this->checkParamSv->LenMToN($keyword, 0, 50)) $keyword = "___CANNOT_FIND_STRING___";
+        if ($trackNo != filter_var($trackNo, FILTER_SANITIZE_SPECIAL_CHARS)) $trackNo = "___CANNOT_FIND_STRING___";
+        if (!$this->checkParamSv->LenMToN($trackNo, 0, 50)) $trackNo = "___CANNOT_FIND_STRING___";
         if ($createDateStart != filter_var($createDateStart, FILTER_SANITIZE_SPECIAL_CHARS)) $createDateStart = "___CANNOT_FIND_STRING___";
         if (!$this->checkParamSv->LenMToN($createDateStart, 0, 50)) $createDateStart = "___CANNOT_FIND_STRING___";
         if ($createDateFinal != filter_var($createDateFinal, FILTER_SANITIZE_SPECIAL_CHARS)) $createDateFinal = "___CANNOT_FIND_STRING___";
@@ -78,9 +81,9 @@ class SignupManagementController extends Controller
         //資料庫
         $recordsTotal = 0;
         if ($keyword) {
-            $result=$this->signupManagementSv->getList($recordsTotal, $orderColumn, $orderDir, $start, $length, $searchValue, $this->safeEncrypt(($keyword), 'arm'), $createDateStart, $createDateFinal);
+            $result=$this->signupManagementSv->getList($recordsTotal, $orderColumn, $orderDir, $start, $length, $searchValue, $this->safeEncrypt(($keyword), 'arm'), $trackNo, $createDateStart, $createDateFinal);
         } else {
-            $result=$this->signupManagementSv->getList($recordsTotal, $orderColumn, $orderDir, $start, $length, $searchValue, '', $createDateStart, $createDateFinal);
+            $result=$this->signupManagementSv->getList($recordsTotal, $orderColumn, $orderDir, $start, $length, $searchValue, '', $trackNo, $createDateStart, $createDateFinal);
         }
         
         // 外部短網址系統串接
@@ -127,9 +130,9 @@ class SignupManagementController extends Controller
         }
         */
         if ($request->keyword) {
-            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'));
+            $datas = $this->signupManagementSv->getExportList($this->safeEncrypt(($request->keyword), 'arm'), $trackNo);
         } else {
-            $datas = $this->signupManagementSv->getExportList('');
+            $datas = $this->signupManagementSv->getExportList('', $trackNo);
         }
         
         $rows = [];

app/Http/Services/Backend/DataManagement/SignupManagementService.php

@@ -19,7 +19,7 @@ class SignupManagementService
         // 建構 model 調用器
         $this->signupDb=new SignupData();
     }
-    public function getList(&$cnt = 0, $orderColumn, $orderDir, $start, $length, $searchValue, $keyword, $createDateStart, $createDateFinal)
+    public function getList(&$cnt = 0, $orderColumn, $orderDir, $start, $length, $searchValue, $keyword, $trackNo, $createDateStart, $createDateFinal)
     {
         // 調用資料庫(或者其他業務邏輯)
         $res = $this->signupDb
@@ -40,7 +40,8 @@ class SignupManagementService
                 ->orWhere('jobTitle', $keyword);
         }
 
-        $res->where('createDate', '>', $createDateStart)
+        $res->where('trackNo','LIKE', $trackNo.'%')
+            ->where('createDate', '>', $createDateStart)
             ->where('createDate', '<', $createDateFinal);
                         
         // 取總筆數

resources/views/admin/DataManagement/SignupManagement.blade.php

@@ -30,15 +30,20 @@
                                     <label for="keyword">關鍵字(可搜尋欄位：first name, last name, company name, company email, backup email, phone number)</label>
                                     <input type="text" class="form-control input-sm" id="keyword" name="keyword" maxlength="50">
                                 </div>
+                                <!-- trackNo -->
+                                <div class="form-group _form-group col-sm-12 col-md-6 col-xl-3">
+                                    <label for="trackNo">trackNo(可搜尋範圍：TPE, HSC, KR, JP)</label>
+                                    <input type="text" class="form-control input-sm" id="trackNo" name="trackNo" maxlength="50">
+                                </div>
                                 <!-- 起 -->
                                 <div class="form-group _form-group col-sm-12 col-md-6 col-xl-2">
-                                    <label for="createDateStart">建立時間(起)</label>
+                                    <label for="createDateStart">建立時間(起)(eg. 2022-09-14)</label>
                                     <input type="text" class="form-control input-sm" id="createDateStart"
                                            maxlength="10">
                                 </div>
                                 <!-- 訖 -->
                                 <div class="form-group _form-group col-sm-12 col-md-6 col-xl-2">
-                                    <label for="createDateFinal">建立時間(迄)</label>
+                                    <label for="createDateFinal">建立時間(迄)(eg. 2022-09-14)</label>
                                     <input type="text" class="form-control input-sm" id="createDateFinal"
                                            maxlength="10">
                                 </div>
@@ -69,7 +74,6 @@
                                     <th>session(TW only)</th>
                                     <th>lunch(TW only)</th>
                                     <th>報名時間</th>
-                                    
                                 </tr>
                                 </thead>
                             </table>
@@ -118,8 +122,9 @@
         function custom_search() {
             $('#GridView1').DataTable()
                 .column(1).search($('#keyword').val())
-                .column(2).search($('#createDateStart').val())
-                .column(3).search($('#createDateFinal').val())
+                .column(2).search($('#trackNo').val())
+                .column(3).search($('#createDateStart').val())trackNo
+                .column(4).search($('#createDateFinal').val())
             ;
             $('#GridView1').dataTable().fnDraw(true);
         }