diff --git a/admin/views/settings/costcenter/costcenter.html b/admin/views/settings/costcenter/costcenter.html
index 28b717ce..2853bacd 100644
--- a/admin/views/settings/costcenter/costcenter.html
+++ b/admin/views/settings/costcenter/costcenter.html
@@ -120,12 +120,11 @@
download="{{costfile.file_name}}">{{ costfile.file_name }}
{{ costfile.status }} |
-
{{ costfile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} |
-
+
{{ costfile.upload_datetime}} |
{{'SETTING.RESTORE' | translate}}
- {{'SETTING.DELETE' | translate}}
|
diff --git a/admin/views/settings/datasource/datasource.html b/admin/views/settings/datasource/datasource.html
index e83bb3d4..b4583f82 100644
--- a/admin/views/settings/datasource/datasource.html
+++ b/admin/views/settings/datasource/datasource.html
@@ -28,7 +28,7 @@
{{ datasource.gateway.name }} |
{{ datasource.protocol }} |
{{ datasource.connection }} |
-
{{ datasource.last_seen_datetime | date:'yyyy-MM-dd HH:mm:ss'}} |
+
{{ datasource.last_seen_datetime }} |
{{'SETTING.EDIT' | translate}}
diff --git a/admin/views/settings/gateway/gateway.html b/admin/views/settings/gateway/gateway.html
index 5ba5a4ed..8cec459b 100644
--- a/admin/views/settings/gateway/gateway.html
+++ b/admin/views/settings/gateway/gateway.html
@@ -23,7 +23,7 @@
| {{ gateway.id }} |
{{ gateway.name }} |
{{ gateway.token}} |
-
{{ gateway.last_seen_datetime | date:'yyyy-MM-dd HH:mm:ss'}} |
+
{{ gateway.last_seen_datetime }} |
{{'SETTING.EDIT' | translate}}
{{'SETTING.DELETE' | translate}}
diff --git a/admin/views/settings/gsmmodem/gsmmodem.html b/admin/views/settings/gsmmodem/gsmmodem.html
deleted file mode 100644
index 91f336f6..00000000
--- a/admin/views/settings/gsmmodem/gsmmodem.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{'SETTING.ID' | translate}} |
- {{'SETTING.SERIAL_PORT' | translate}} |
- {{'SETTING.BAUD_RATE' | translate}} |
- {{'SETTING.ACTION' | translate}} |
-
-
-
-
- {{ gsmmodem.id }} |
- {{ gsmmodem.serial_port }} |
- {{ gsmmodem.baud_rate }} |
-
- {{'SETTING.EDIT' | translate}}
-
- |
-
-
-
-
-
-
-
-
-
-
diff --git a/admin/views/settings/gsmmodem/gsmmodem.model.html b/admin/views/settings/gsmmodem/gsmmodem.model.html
deleted file mode 100644
index 0e166e0f..00000000
--- a/admin/views/settings/gsmmodem/gsmmodem.model.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/admin/views/settings/knowledgefile/knowledgefile.html b/admin/views/settings/knowledgefile/knowledgefile.html
index 2e0240d2..01c1fbdc 100644
--- a/admin/views/settings/knowledgefile/knowledgefile.html
+++ b/admin/views/settings/knowledgefile/knowledgefile.html
@@ -22,7 +22,7 @@
| {{ knowledgefile.id }} |
{{ knowledgefile.file_name }} |
{{ knowledgefile.user_display_name }} |
-
{{ knowledgefile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} |
+
{{ knowledgefile.upload_datetime }} |
{{'SETTING.RESTORE' | translate}}
diff --git a/admin/views/settings/meter/meter.html b/admin/views/settings/meter/meter.html
index 99c613ea..6c8de40d 100644
--- a/admin/views/settings/meter/meter.html
+++ b/admin/views/settings/meter/meter.html
@@ -310,7 +310,7 @@
|
{{ offlinemeterfile.status }} |
- {{ offlinemeterfile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} |
+ {{ offlinemeterfile.upload_datetime }}
{{'SETTING.START_DATETIME' | translate}}
| {{'SETTING.END_DATETIME' | translate}} |
{{'SETTING.ACTION' | translate}} |
-
@@ -29,8 +28,8 @@
{{ tariff.energy_category.name }} |
{{showTariffType(tariff.tariff_type) | translate}} |
{{ tariff.unit_of_price }} |
- {{ tariff.valid_from | date:'yyyy-MM-ddTHH:mm:ss' }} |
- {{ tariff.valid_through | date:'yyyy-MM-ddTHH:mm:ss' }} |
+ {{ tariff.valid_from }} |
+ {{ tariff.valid_through }} |
{{'SETTING.EDIT' | translate}}
{{'SETTING.DELETE' | translate}}
diff --git a/admin/views/settings/tenant/tenant.html b/admin/views/settings/tenant/tenant.html
index 712425a3..90d831b2 100644
--- a/admin/views/settings/tenant/tenant.html
+++ b/admin/views/settings/tenant/tenant.html
@@ -48,9 +48,9 @@
|
{{ tenant.lease_number }} |
- {{ tenant.lease_start_datetime_utc | date:'yyyy-MM-ddTHH:mm:ss' }} |
+ {{ tenant.lease_start_datetime }}
- {{ tenant.lease_end_datetime_utc | date:'yyyy-MM-ddTHH:mm:ss' }} |
+ {{ tenant.lease_end_datetime }}
{{ tenant.is_in_lease==false?'SETTING.NO':'SETTING.YES' | translate }} |
{{tenant.cost_center.name}} |
diff --git a/admin/views/settings/tenant/tenant.model.html b/admin/views/settings/tenant/tenant.model.html
index 486047bd..cc69506b 100644
--- a/admin/views/settings/tenant/tenant.model.html
+++ b/admin/views/settings/tenant/tenant.model.html
@@ -96,13 +96,13 @@
diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html
index 6ea0da29..9ea9b675 100644
--- a/admin/views/users/user/user.html
+++ b/admin/views/users/user/user.html
@@ -17,8 +17,9 @@
{{'USER.EMAIL' | translate}} |
{{'USER.IS_ADMIN' | translate}} |
{{'USER.PRIVILEGE' | translate}} |
+ {{'USER.ACCOUNT_EXPIRATION_DATETIME' | translate}} |
+ {{'USER.PASSWORD_EXPIRATION_DATETIME' | translate}} |
{{'SETTING.ACTION' | translate}} |
-
@@ -27,8 +28,10 @@
{{ user.name }} |
{{ user.display_name }} |
{{ user.email }} |
- {{ user.is_admin==1?'是':'否' }} |
+ {{ user.is_admin==1?'Y':'N' }} |
{{ user.privilege.name }} |
+ {{ user.account_expiration_datetime }} |
+ {{ user.password_expiration_datetime }} |
{{'SETTING.EDIT' | translate}}
{{'USER.RESET_PASSWORD' | translate}}
diff --git a/admin/views/users/user/user.model.html b/admin/views/users/user/user.model.html
index 1c539970..13239e82 100644
--- a/admin/views/users/user/user.model.html
+++ b/admin/views/users/user/user.model.html
@@ -6,16 +6,16 @@
|