diff --git a/admin/README.md b/admin/README.md
index 774c0b10..670170c1 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -31,6 +31,7 @@ docker build -t myems/myems-admin .
 ```
 * Run a Docker container
 If run on Windows host, bind-mount a share upload file folder at c:\upload to the container
+-v parameter must be same with that in myems-api
 ```bash
 docker run -d -p 8001:8001 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-admin myems/myems-admin
 ```
diff --git a/admin/app/controllers/settings/tariff/tariff.controller.js b/admin/app/controllers/settings/tariff/tariff.controller.js
index 88ecd84c..85b570f7 100644
--- a/admin/app/controllers/settings/tariff/tariff.controller.js
+++ b/admin/app/controllers/settings/tariff/tariff.controller.js
@@ -176,6 +176,7 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
 		},
 		timePicker: true,
 		timePicker24Hour: true,
+		timePickerSeconds: true,
 		timePickerIncrement: 1,
 		singleDatePicker: true,
 	};
@@ -257,6 +258,7 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
 		},
 		timePicker: true,
 		timePicker24Hour: true,
+		timePickerSeconds: true,
 		timePickerIncrement: 1,
 		singleDatePicker: true,
 	};
diff --git a/admin/css/myems.css b/admin/css/myems.css
index 7989c893..d0b9421e 100644
--- a/admin/css/myems.css
+++ b/admin/css/myems.css
@@ -103,6 +103,7 @@ td.fontorange{
 }
 select.sm{
 	width:60px;
+	font-size: 12px;
 }
 td.action{
 	width:100px !important;
diff --git a/admin/views/settings/tariff/tariff.model.html b/admin/views/settings/tariff/tariff.model.html
index 8fb0ba3f..b901cbad 100644
--- a/admin/views/settings/tariff/tariff.model.html
+++ b/admin/views/settings/tariff/tariff.model.html
@@ -113,11 +113,16 @@
                         </tr>
                         <tr>
                             <td class="text-center sm">
-
-                                <div uib-timepicker ng-model="t.start_time_of_day"  show-meridian="false" show-seconds="true" show-spinners="false"></div>
+                                <div class="col-sm-7">
+                                    <input date-range-picker class="form-control date-picker" type="text" ng-model="t.start_time_of_day" options="dtOptions" style="width: auto"
+                                    placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
+                                </div>
                             </td>
                             <td class="text-center sm">
-                                <div uib-timepicker ng-model="t.end_time_of_day"  show-meridian="false" show-seconds="true" show-spinners="false"></div>
+                                <div class="col-sm-7">
+                                    <input date-range-picker class="form-control date-picker" type="text" ng-model="t.end_time_of_day" options="dtOptions" style="width: auto"
+                                    placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
+                                </div>
                             </td>
                             <td class="text-center sm">
                                 <select ng-model="t.peak_type" class="form-control  input-sm sm" name="peak">
diff --git a/myems-api/README.md b/myems-api/README.md
index 76547b0f..3a5a2e44 100644
--- a/myems-api/README.md
+++ b/myems-api/README.md
@@ -58,6 +58,7 @@ docker build -t myems/myems-api .
 ```
 * Run a Docker container
 If run on Windows host, bind-mount a share upload file folder at c:\upload to the container
+-v parameter must be same with that in admin
 ```bash
 docker run -d -p 8000:8000 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-api myems/myems-api
 ```
diff --git a/web/README.md b/web/README.md
index bd655a37..d79d6d89 100644
--- a/web/README.md
+++ b/web/README.md
@@ -8,7 +8,7 @@ Providing Web UI of MyEMS for viewing energy reports
 
 nginx-1.18.0 or later
 
-Node.js 16.0.0 or later
+Node.js 17.0.0 or later
 
 ## Running in Local Environment for Development
 
diff --git a/web/package-lock.json b/web/package-lock.json
index 2ffb21ac..48cae048 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -7973,9 +7973,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.35",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.35.tgz",
-      "integrity": "sha512-wzTOMh6HGFWeALMI3bif0mzgRrVGyP1BdFRx7IvWukFrSC5QVQELENuy+Fm2dCrAdQH9T3nuqr07n94nPDFBWA=="
+      "version": "1.4.36",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.36.tgz",
+      "integrity": "sha512-MbLlbF39vKrXWlFEFpCgDHwdlz4O3LmHM5W4tiLRHjSmEUXjJjz8sZkMgWgvYxlZw3N1iDTmCEtOkkESb5TMCg=="
     },
     "node_modules/element-resize-event": {
       "version": "3.0.6",
@@ -12373,9 +12373,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -20625,9 +20625,9 @@
       "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
     },
     "node_modules/sass": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.2.tgz",
-      "integrity": "sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==",
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.46.0.tgz",
+      "integrity": "sha512-Z4BYTgioAOlMmo4LU3Ky2txR8KR0GRPLXxO38kklaYxgo7qMTgy+mpNN4eKsrXDTFlwS5vdruvazG4cihxHRVQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -30639,9 +30639,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.35",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.35.tgz",
-      "integrity": "sha512-wzTOMh6HGFWeALMI3bif0mzgRrVGyP1BdFRx7IvWukFrSC5QVQELENuy+Fm2dCrAdQH9T3nuqr07n94nPDFBWA=="
+      "version": "1.4.36",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.36.tgz",
+      "integrity": "sha512-MbLlbF39vKrXWlFEFpCgDHwdlz4O3LmHM5W4tiLRHjSmEUXjJjz8sZkMgWgvYxlZw3N1iDTmCEtOkkESb5TMCg=="
     },
     "element-resize-event": {
       "version": "3.0.6",
@@ -34007,9 +34007,9 @@
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
     "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -39992,9 +39992,9 @@
       "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
     },
     "sass": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.2.tgz",
-      "integrity": "sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==",
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.46.0.tgz",
+      "integrity": "sha512-Z4BYTgioAOlMmo4LU3Ky2txR8KR0GRPLXxO38kklaYxgo7qMTgy+mpNN4eKsrXDTFlwS5vdruvazG4cihxHRVQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",