From 80d15919ed621a3e900a7d21ff746848f14592b3 Mon Sep 17 00:00:00 2001
From: "choi.jh" <choi.jh@prime-idc.jp>
Date: Wed, 12 Nov 2025 12:22:58 +0900
Subject: [PATCH] trafficmonitor init...2

---
 app/Controllers/Admin/AdminController.php     |  2 +-
 app/Controllers/Admin/CollectorController.php |  4 ++--
 app/Controllers/Admin/MylogController.php     |  2 +-
 app/Controllers/Admin/TrafficController.php   |  2 +-
 app/Controllers/Admin/UserController.php      |  2 +-
 app/Forms/CollectorForm.php                   |  2 +-
 app/Forms/UserForm.php                        | 23 ++++++-------------
 app/Language/en/Collector.php                 |  4 ++--
 8 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php
index ec2c637..ff7fbe4 100644
--- a/app/Controllers/Admin/AdminController.php
+++ b/app/Controllers/Admin/AdminController.php
@@ -33,7 +33,7 @@ abstract class AdminController extends CommonController
     protected function getTitle(): string
     {
         if ($this->_title === null) {
-            $this->_title = lang("{$this->service->getClassPaths()}.title");
+            $this->_title = lang("{$this->service->getClassPaths(false)}.title");
         }
         return $this->_title;
     }
diff --git a/app/Controllers/Admin/CollectorController.php b/app/Controllers/Admin/CollectorController.php
index 0597a08..342b23e 100644
--- a/app/Controllers/Admin/CollectorController.php
+++ b/app/Controllers/Admin/CollectorController.php
@@ -21,11 +21,11 @@ class CollectorController extends AdminController
     }
     protected function createDTO(array $formDatas): CollectorDTO
     {
-        return parent::createDTO($formDatas);
+        return new CollectorDTO($formDatas);
     }
     protected function action_init_process(string $action): void
     {
-        $fields = ['trafficinfo_uid', 'in', 'out', 'raw_in', 'raw_out',];
+        $fields = ['trafficinfo_uid', 'in', 'out', 'raw_in', 'raw_out'];
         $filters = ['trafficinfo_uid'];
         parent::action_init_process($action);
         switch ($action) {
diff --git a/app/Controllers/Admin/MylogController.php b/app/Controllers/Admin/MylogController.php
index 6dd8d7e..d6e64a7 100644
--- a/app/Controllers/Admin/MylogController.php
+++ b/app/Controllers/Admin/MylogController.php
@@ -21,7 +21,7 @@ class MylogController extends AdminController
     }
     protected function createDTO(array $formDatas): MylogDTO
     {
-        return parent::createDTO($formDatas);
+        return new MylogDTO($formDatas);
     }
     protected function action_init_process(string $action): void
     {
diff --git a/app/Controllers/Admin/TrafficController.php b/app/Controllers/Admin/TrafficController.php
index 2bd0423..c8b7041 100644
--- a/app/Controllers/Admin/TrafficController.php
+++ b/app/Controllers/Admin/TrafficController.php
@@ -21,7 +21,7 @@ class TrafficController extends AdminController
     }
     protected function createDTO(array $formDatas): TrafficDTO
     {
-        return parent::createDTO($formDatas);
+        return new TrafficDTO($formDatas);
     }
     protected function action_init_process(string $action): void
     {
diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php
index c5e7a84..6b2cb0e 100644
--- a/app/Controllers/Admin/UserController.php
+++ b/app/Controllers/Admin/UserController.php
@@ -21,7 +21,7 @@ class UserController extends AdminController
     }
     protected function createDTO(array $formDatas): UserDTO
     {
-        return parent::createDTO($formDatas);
+        return new UserDTO($formDatas);
     }
     //Action작업관련
     protected function action_init_process(string $action): void
diff --git a/app/Forms/CollectorForm.php b/app/Forms/CollectorForm.php
index 08f4b0f..fed90ab 100644
--- a/app/Forms/CollectorForm.php
+++ b/app/Forms/CollectorForm.php
@@ -35,7 +35,7 @@ class CollectorForm extends CommonForm
         foreach (service('trafficservice')->getEntities() as $entity) {
           $tempOptions[$entity->getPK()] = $entity->getTitle();
         }
-        $options[$field]['options'] = $tempOptions;
+        $options['options'] = $tempOptions;
         break;
       default:
         $options = parent::getFormOption($field, $options);
diff --git a/app/Forms/UserForm.php b/app/Forms/UserForm.php
index db62d7b..dc9b941 100644
--- a/app/Forms/UserForm.php
+++ b/app/Forms/UserForm.php
@@ -10,26 +10,17 @@ class UserForm extends CommonForm
   {
     parent::__construct();
   }
-  protected function getValidationRule(string $field, string $rule): array
-  {
-    switch ($field) {
-      case 'role':
-        $field = "{$field}.*";
-        break;
-      default:
-        return parent::getValidationRule($field, $rule);
-        // break;
-    }
-    return array($field, $rule);
-  }
-  // public function getFormFieldLabel(string $field, ?string $label = null): string
+  // protected function getValidationRule(string $field, string $rule): array
   // {
   //   switch ($field) {
-  //     default:
-  //       $label = parent::getFormFieldLabel($field, $label);
+  //     case 'role':
+  //       $field = "{$field}.*";
   //       break;
+  //     default:
+  //       return parent::getValidationRule($field, $rule);
+  //       // break;
   //   }
-  //   return $label;
+  //   return array($field, $rule);
   // }
   public function getFormRule(string $action, string $field): string
   {
diff --git a/app/Language/en/Collector.php b/app/Language/en/Collector.php
index d201ed2..b0156b6 100644
--- a/app/Language/en/Collector.php
+++ b/app/Language/en/Collector.php
@@ -1,8 +1,8 @@
 <?php
 return [
-  'title' => "수집정보",
+  'title' => "트랙픽수집정보",
   'label' => [
-    'trafficinfo_uid' => "고객명",
+    'trafficinfo_uid' => "트래픽정보",
     'in' => "IN Kbit/s",
     'out' => "OUT Kbit/s",
     'raw_in' => "IN Octets",