diff --git a/config/params.php b/config/params.php index 15815c50..caf9b4c2 100644 --- a/config/params.php +++ b/config/params.php @@ -2,6 +2,7 @@ return [ 'adminEmail' => 'admin@example.com', + "type" => "BiFace", // BiFace, BiTable "maxLogs" => 50000, "maxPicture" => 9999, "version" => "1.0.7", diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php index 2a2103d0..4054df30 100644 --- a/controllers/ConfigController.php +++ b/controllers/ConfigController.php @@ -159,6 +159,8 @@ class ConfigController extends Controller { public function actionIndex() { $this->view->title = Yii::t("app", "CAU_HINH_MAY_CHU"); + if (Yii::$app->params['type'] != "BiFace") + return $this->redirect(['cau-hinh-ip']); $options = [ 'http' => [ 'header' => "Content-Type: application/json", @@ -260,6 +262,8 @@ class ConfigController extends Controller { return true; } else { $this->view->title = Yii::t("app", "CAU_HINH_NHAN_DIEN"); + if (Yii::$app->params['type'] != "BiFace") + return $this->redirect(['cau-hinh-ip']); $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", @@ -424,6 +428,8 @@ class ConfigController extends Controller { public function actionCauHinhThietBi() { $this->view->title = Yii::t("app", "CAU_HINH_THIET_BI"); + if (Yii::$app->params['type'] != "BiFace") + return $this->redirect(['cau-hinh-ip']); $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ 'http' => [ @@ -529,9 +535,9 @@ class ConfigController extends Controller { if (Yii::$app->request->post()) { Yii::$app->response->format = "json"; $post = Yii::$app->request->post(); - if (!isset($this->subnet[$post['subnet_mask']])) + if (!$post['dhcp'] && !isset($this->subnet[$post['subnet_mask']])) return ["status" => false]; - $post['subnet_mask'] = $this->subnet[$post['subnet_mask']]; + $post['subnet_mask'] = isset($this->subnet[$post['subnet_mask']]) ? $this->subnet[$post['subnet_mask']] : ""; $options = [ 'http' => [ 'header' => "Content-Type: application/json", diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php index 739149f6..a5c8cc03 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php @@ -41,26 +41,28 @@ use yii\widgets\ActiveForm; -
  • - - - -
    • -
  • "> - - - -
    • -
  • "> - - -
    • + params['type'] === "BiFace") { ?> +
  • + + + +
    • +
  • "> + + + +
    • +
  • "> + + +
    • +
    diff --git a/views/config/ip.tpl b/views/config/ip.tpl index 799bfe0c..1697e9e4 100644 --- a/views/config/ip.tpl +++ b/views/config/ip.tpl @@ -23,6 +23,9 @@
    +
    + DHCP +
    {Yii::t("app", "IP Address")}
    @@ -44,13 +47,13 @@
    {Yii::t("app", "DNS1")}
    - +
    {Yii::t("app", "DNS2")}
    - +
    diff --git a/views/config/menu.tpl b/views/config/menu.tpl index 41f144b3..d8d7bc96 100644 --- a/views/config/menu.tpl +++ b/views/config/menu.tpl @@ -1,33 +1,35 @@ {use class="yii\helpers\Url"} -
    -
    -
    -
    1
    -
    - {Yii::t("app", "CAU_HINH_THIET_BI")} +{if Yii::$app->params["type"]==="BiFace"} +
    +
    +
    +
    1
    +
    + {Yii::t("app", "CAU_HINH_THIET_BI")} +
    +
    {Yii::t("app", "DEVICE_CONFIG")}
    -
    {Yii::t("app", "DEVICE_CONFIG")}
    -
    -
    -
    2
    -
    - {Yii::t("app", "CAU_HINH_MAY_CHU")} +
    +
    2
    +
    + {Yii::t("app", "CAU_HINH_MAY_CHU")} +
    +
    {Yii::t("app", "SERVER_CONFIG")}
    -
    {Yii::t("app", "SERVER_CONFIG")}
    -
    -
    -
    3
    -
    - {Yii::t("app", "CAU_HINH_NHAN_DIEN")} +
    +
    3
    +
    + {Yii::t("app", "CAU_HINH_NHAN_DIEN")} +
    +
    {Yii::t("app", "ENGINE_CONFIG")}
    -
    {Yii::t("app", "ENGINE_CONFIG")}
    -
    -
    -
    4
    -
    - {Yii::t("app", "CAU_HINH_IP")} +
    +
    4
    +
    + {Yii::t("app", "CAU_HINH_IP")} +
    +
    {Yii::t("app", "IP_CONFIG")}
    -
    {Yii::t("app", "IP_CONFIG")}
    -
    \ No newline at end of file +{/if} \ No newline at end of file diff --git a/web/js/config.js b/web/js/config.js index 76149e9f..2a9a0d7f 100644 --- a/web/js/config.js +++ b/web/js/config.js @@ -125,6 +125,8 @@ function ValidateIPaddress(ipaddress) { function validData(inputName) { var ip = $("input[name='" + inputName + "']").val(); + if (ip == "" && document.getElementById('dhcp_check').checked) + return true; if (!ValidateIPaddress(ip)) { common.error(inputName, ""); return false; @@ -160,6 +162,7 @@ function changeIP(e) { gateway: $("input[name='gateway']").val(), dns1: $("input[name='dns1']").val(), dns2: $("input[name='dns2']").val(), + dhcp: document.getElementById('dhcp_check').checked }, success: function (data) { common.modalBlock(false);