seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated Tariff Editor in Admin UI

pull/134/head
13621160019@163.com 2022-03-03 22:10:40 +08:00
parent e981e7f175
commit 1f4749ea7c
20 changed files with 603 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/app/controllers/settings/tariff/tariff.controller.js
View File

@ -151,7 +151,8 @@ app.controller('TariffController', function(
} }
}); });
} }
}); }
);
}; };
$scope.getAllTariffs(); $scope.getAllTariffs();

5
admin/views/login/login.html
View File

@ -1,7 +1,6 @@
<div class="" ng-controller="LoginController"> <div class="" ng-controller="LoginController">
<div class=""> <div class="">
<div class="row"> <div class="row">
<div class="paddingtop"> <div class="paddingtop">
<div class="margincenter"> <div class="margincenter">
<div class="panel panel-warning loginform"> <div class="panel panel-warning loginform">
@ -39,9 +38,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

127
admin/views/settings/category/category.html
View File

@ -1,68 +1,67 @@
<div class="wrapper wrapper-content" ng-controller="EnergyCategoryMasterController"> <div class="wrapper wrapper-content" ng-controller="EnergyCategoryMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
<div class="row"> <uib-tabset>
<div class="col-lg-12"> <uib-tab heading="{{'SETTING.CATEGORY' | translate}}">
<div class="tabs-container"> <div class="panel-body" ng-controller="EnergyCategoryController">
<a ng-click="addCategory()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_CATEGORY' | translate}}</a>
<uib-tabset> <table class="table table-bordered table-hover" >
<uib-tab heading="{{'SETTING.CATEGORY' | translate}}"> <thead>
<div class="panel-body" ng-controller="EnergyCategoryController"> <tr>
<a ng-click="addCategory()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_CATEGORY' | translate}}</a> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<table class="table table-bordered table-hover" > <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<thead> <th class="text-center">{{'SETTING.UNIT' | translate}}</th>
<tr> <th class="text-center">{{'SETTING.KGCE' | translate}}</th>
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.KGCO2E' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
<th class="text-center">{{'SETTING.UNIT' | translate}}</th> </tr>
<th class="text-center">{{'SETTING.KGCE' | translate}}</th> </thead>
<th class="text-center">{{'SETTING.KGCO2E' | translate}}</th> <tbody>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <tr ng-repeat="category in categories">
</tr> <td class="text-center">{{ category.id }}</td>
</thead> <td class="text-center">{{ category.name }}</td>
<tbody> <td class="text-center">{{ category.unit_of_measure }}</td>
<tr ng-repeat="category in categories"> <td class="text-center">{{ category.kgce }}</td>
<td class="text-center">{{ category.id }}</td> <td class="text-center">{{ category.kgco2e }}</td>
<td class="text-center">{{ category.name }}</td> <td class="text-center">
<td class="text-center">{{ category.unit_of_measure }}</td> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editCategory(category)" >{{'SETTING.EDIT' | translate}}</a>
<td class="text-center">{{ category.kgce }}</td> <a ng-click="deleteCategory(category)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<td class="text-center">{{ category.kgco2e }}</td> </td>
<td class="text-center"> </tr>
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editCategory(category)" >{{'SETTING.EDIT' | translate}}</a> </tbody>
<a ng-click="deleteCategory(category)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> </table>
</td> </div>
</tr> </uib-tab>
</tbody> <uib-tab heading="{{'SETTING.ENERGY_ITEM' | translate}}">
</table> <div class="panel-body" ng-controller="EnergyItemController">
</div> <a ng-click="addEnergyItem()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_ENERGY_ITEM' | translate}}</a>
</uib-tab> <table class="table table-bordered table-hover" >
<uib-tab heading="{{'SETTING.ENERGY_ITEM' | translate}}"> <thead>
<div class="panel-body" ng-controller="EnergyItemController"> <tr>
<a ng-click="addEnergyItem()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_ENERGY_ITEM' | translate}}</a> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<table class="table table-bordered table-hover" > <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<thead> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<tr> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
<th class="text-center">{{'SETTING.ID' | translate}}</th> </tr>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> </thead>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <tbody>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <tr ng-repeat="energyItem in energyItems">
</tr> <td class="text-center">{{ energyItem.id }}</td>
</thead> <td class="text-center">{{ energyItem.name }}</td>
<tbody> <td class="text-center">{{ energyItem.energy_category.name }}</td>
<tr ng-repeat="energyItem in energyItems"> <td class="text-center">
<td class="text-center">{{ energyItem.id }}</td> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editEnergyItem(energyItem)" >{{'SETTING.EDIT' | translate}}</a>
<td class="text-center">{{ energyItem.name }}</td> <a ng-click="deleteEnergyItem(energyItem)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<td class="text-center">{{ energyItem.energy_category.name }}</td> </td>
<td class="text-center"> </tr>
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editEnergyItem(energyItem)" >{{'SETTING.EDIT' | translate}}</a> </tbody>
<a ng-click="deleteEnergyItem(energyItem)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> </table>
</td> </div>
</tr> </uib-tab>
</tbody> </uib-tabset>
</table>
</div>
</uib-tab>
</uib-tabset>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>

1
admin/views/settings/combinedequipment/combinedequipment.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="CombinedEquipmentMasterController"> <div class="wrapper wrapper-content" ng-controller="CombinedEquipmentMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

78
admin/views/settings/contact/contact.html
View File

@ -1,49 +1,45 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
<div class="row"> <uib-tabset>
<div class="col-lg-12"> <uib-tab heading="{{'SETTING.CONTACT' | translate}}">
<div class="tabs-container"> <div class="panel-body" ng-controller="ContactController">
<a ng-click="addContact()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_CONTACT' | translate}}</a>
<table class="table table-bordered table-hover" >
<thead>
<tr>
<th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'CONTACT.EMAIL' | translate}}</th>
<th class="text-center">{{'CONTACT.PHONE' | translate}}</th>
<th class="text-center">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="contact in contacts">
<td class="text-center">{{ contact.id }}</td>
<td class="text-center">{{ contact.name }}</td>
<td class="text-center">{{ contact.email }}</td>
<td class="text-center">{{ contact.phone }}</td>
<td class="text-center">{{ contact.description }}</td>
<td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editContact(contact)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-click="deleteContact(contact)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<uib-tabset> </td>
<uib-tab heading="{{'SETTING.CONTACT' | translate}}"> </tr>
<div class="panel-body" ng-controller="ContactController"> </tbody>
<a ng-click="addContact()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_CONTACT' | translate}}</a> </table>
<table class="table table-bordered table-hover" > </div>
<thead> </uib-tab>
<tr>
<th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'CONTACT.EMAIL' | translate}}</th>
<th class="text-center">{{'CONTACT.PHONE' | translate}}</th>
<th class="text-center">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="contact in contacts">
<td class="text-center">{{ contact.id }}</td>
<td class="text-center">{{ contact.name }}</td>
<td class="text-center">{{ contact.email }}</td>
<td class="text-center">{{ contact.phone }}</td>
<td class="text-center">{{ contact.description }}</td>
<td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editContact(contact)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-click="deleteContact(contact)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td>
</tr>
</tbody>
</table>
</div>
</uib-tab>
</uib-tabset> </uib-tabset>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>

1
admin/views/settings/costcenter/costcenter.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="CostCenterMasterController" > <div class="wrapper wrapper-content" ng-controller="CostCenterMasterController" >
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

4
admin/views/settings/datasource/datasource.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="DataSourceMasterController"> <div class="wrapper wrapper-content" ng-controller="DataSourceMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">
@ -109,7 +108,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

1
admin/views/settings/distributionsystem/distributionsystem.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="DistributionSystemMasterController"> <div class="wrapper wrapper-content" ng-controller="DistributionSystemMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

81
admin/views/settings/emailserver/emailserver.html
View File

@ -1,42 +1,43 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">
<uib-tabset> <uib-tabset>
<uib-tab heading="{{'SETTING.EMAIL_SERVER' | translate}}"> <uib-tab heading="{{'SETTING.EMAIL_SERVER' | translate}}">
<div class="panel-body" ng-controller="EmailServerController"> <div class="panel-body" ng-controller="EmailServerController">
<!-- <a ng-click="addEmailServer()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_EMAIL_SERVER' | translate}}</a> --> <!-- <a ng-click="addEmailServer()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_EMAIL_SERVER' | translate}}</a> -->
<table class="table table-bordered table-hover" > <table class="table table-bordered table-hover" >
<thead> <thead>
<tr> <tr>
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.HOST' | translate}}</th> <th class="text-center">{{'SETTING.HOST' | translate}}</th>
<th class="text-center">{{'SETTING.PORT' | translate}}</th> <th class="text-center">{{'SETTING.PORT' | translate}}</th>
<th class="text-center">{{'SETTING.REQUIRES_AUTHENTICATION' | translate}}</th> <th class="text-center">{{'SETTING.REQUIRES_AUTHENTICATION' | translate}}</th>
<th class="text-center">{{'SETTING.USER_NAME' | translate}}</th> <th class="text-center">{{'SETTING.USER_NAME' | translate}}</th>
<th class="text-center">{{'SETTING.FROM_ADDR' | translate}}</th> <th class="text-center">{{'SETTING.FROM_ADDR' | translate}}</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="emailserver in emailservers"> <tr ng-repeat="emailserver in emailservers">
<td class="text-center">{{ emailserver.id }}</td> <td class="text-center">{{ emailserver.id }}</td>
<td class="text-center">{{ emailserver.host }}</td> <td class="text-center">{{ emailserver.host }}</td>
<td class="text-center">{{ emailserver.port }}</td> <td class="text-center">{{ emailserver.port }}</td>
<td class="text-center">{{ emailserver.requires_authentication }}</td> <td class="text-center">{{ emailserver.requires_authentication }}</td>
<td class="text-center">{{ emailserver.user_name }}</td> <td class="text-center">{{ emailserver.user_name }}</td>
<td class="text-center">{{ emailserver.from_addr }}</td> <td class="text-center">{{ emailserver.from_addr }}</td>
<td class="text-center"> <td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editEmailServer(emailserver)" >{{'SETTING.EDIT' | translate}}</a> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editEmailServer(emailserver)" >{{'SETTING.EDIT' | translate}}</a>
<!-- <a ng-click="deleteEmailServer(emailserver)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> --> <!-- <a ng-click="deleteEmailServer(emailserver)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</uib-tab> </uib-tab>
</uib-tabset> </uib-tabset>
</div>
</div>
</div> </div>
</div> </div>
</div>
</div>

1
admin/views/settings/energyflowdiagram/energyflowdiagram.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="EnergyFlowDiagramMasterController"> <div class="wrapper wrapper-content" ng-controller="EnergyFlowDiagramMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

1
admin/views/settings/equipment/equipment.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="EquipmentMasterController"> <div class="wrapper wrapper-content" ng-controller="EquipmentMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

71
admin/views/settings/gateway/gateway.html
View File

@ -1,40 +1,39 @@
<div class="wrapper wrapper-content" ng-controller="GatewayMasterController"> <div class="wrapper wrapper-content" ng-controller="GatewayMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
<div class="row"> <uib-tabset>
<div class="col-lg-12"> <uib-tab heading="{{'GATEWAY.GATEWAY' | translate}}" >
<div class="tabs-container"> <div class="panel-body" ng-controller="GatewayController">
<a ng-click="addGateway()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'GATEWAY.ADD_GATEWAY' | translate}}</a>
<uib-tabset> <table class="table table-bordered table-hover" >
<uib-tab heading="{{'GATEWAY.GATEWAY' | translate}}" > <thead>
<div class="panel-body" ng-controller="GatewayController"> <tr>
<a ng-click="addGateway()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'GATEWAY.ADD_GATEWAY' | translate}}</a> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<table class="table table-bordered table-hover" > <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<thead> <th class="text-center">{{'GATEWAY.TOKEN' | translate}}</th>
<tr> <th class="text-center">{{'GATEWAY.LAST_SEEN_DATETIME' | translate}}</th>
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> </tr>
<th class="text-center">{{'GATEWAY.TOKEN' | translate}}</th> </thead>
<th class="text-center">{{'GATEWAY.LAST_SEEN_DATETIME' | translate}}</th> <tbody>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <tr ng-repeat="gateway in gateways">
</tr> <td class="text-center">{{ gateway.id }}</td>
</thead> <td class="text-center">{{ gateway.name }}</td>
<tbody> <td class="text-center">{{ gateway.token}}</td>
<tr ng-repeat="gateway in gateways"> <td class="text-center">{{ gateway.last_seen_datetime }}</td>
<td class="text-center">{{ gateway.id }}</td> <td class="text-center">
<td class="text-center">{{ gateway.name }}</td> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editGateway(gateway)" >{{'SETTING.EDIT' | translate}}</a>
<td class="text-center">{{ gateway.token}}</td> <a ng-click="deleteGateway(gateway)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<td class="text-center">{{ gateway.last_seen_datetime }}</td> </td>
<td class="text-center"> </tr>
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editGateway(gateway)" >{{'SETTING.EDIT' | translate}}</a> </tbody>
<a ng-click="deleteGateway(gateway)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> </table>
</td> </div>
</tr> </uib-tab>
</tbody> </uib-tabset>
</table>
</div>
</uib-tab>
</uib-tabset>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>

1
admin/views/settings/menu/menu.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="MenuMasterController"> <div class="wrapper wrapper-content" ng-controller="MenuMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

1
admin/views/settings/meter/meter.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="MeterMasterController"> <div class="wrapper wrapper-content" ng-controller="MeterMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

205
admin/views/settings/sensor/sensor.html
View File

@ -1,118 +1,117 @@
<div class="wrapper wrapper-content" ng-controller="SensorMasterController"> <div class="wrapper wrapper-content" ng-controller="SensorMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
<div class="row"> <uib-tabset>
<div class="col-lg-12"> <uib-tab heading="{{'COMMON.SENSOR' | translate}}" >
<div class="tabs-container"> <div class="panel-body" ng-controller="SensorController">
<a ng-click="addSensor()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SENSOR.ADD_SENSOR' | translate}}</a>
<uib-tabset> <table class="table table-bordered table-hover" >
<uib-tab heading="{{'COMMON.SENSOR' | translate}}" > <thead>
<div class="panel-body" ng-controller="SensorController"> <tr>
<a ng-click="addSensor()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SENSOR.ADD_SENSOR' | translate}}</a> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<table class="table table-bordered table-hover" > <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<thead> <th class="text-center">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<tr> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
<th class="text-center">{{'SETTING.ID' | translate}}</th> </tr>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> </thead>
<th class="text-center">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th> <tbody>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <tr ng-repeat="sensor in sensors">
</tr> <td class="text-center">{{ sensor.id }}</td>
</thead> <td class="text-center">{{ sensor.name }}</td>
<tbody> <td class="text-center">{{ sensor.description}}</td>
<tr ng-repeat="sensor in sensors"> <td class="text-center">
<td class="text-center">{{ sensor.id }}</td> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editSensor(sensor)" >{{'SETTING.EDIT' | translate}}</a>
<td class="text-center">{{ sensor.name }}</td> <a ng-click="deleteSensor(sensor)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<td class="text-center">{{ sensor.description}}</td> </td>
<td class="text-center"> </tr>
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editSensor(sensor)" >{{'SETTING.EDIT' | translate}}</a> </tbody>
<a ng-click="deleteSensor(sensor)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> </table>
</td> </div>
</tr> </uib-tab>
</tbody> <uib-tab heading="{{'SETTING.BIND_POINT' | translate}}">
</table> <div class="panel-body" ng-controller="SensorPointController">
</div> <div class="row">
</uib-tab> <div class="col-lg-3">
<uib-tab heading="{{'SETTING.BIND_POINT' | translate}}"> <div class="panel panel-info">
<div class="panel-body" ng-controller="SensorPointController">
<div class="row">
<div class="col-lg-3">
<div class="panel panel-info">
<div class="panel-heading">
{{'COMMON.SENSOR' | translate}}
</div>
<div class="panel-body" slim-scroll box-height="600px">
<form role="form">
<div class="form-group no-margin"><label>{{'SENSOR.SELECT_SENSOR' | translate}}</label>
<ui-select on-select="changeSensor($item,$model)" ng-model="currentSensor.selected" theme="bootstrap">
<ui-select-match placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="sensor.id as sensor in sensors | filter: $select.search">
<div ng-bind-html="sensor.name | highlight: $select.search"></div>
</ui-select-choices>
</ui-select>
</div>
</form>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentSensor.name}}{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
<div class="btn btn-primary btn-rounded btn-block"
title="DataSource:{{sensorpoint.data_source.name}}"
ng-repeat="sensorpoint in sensorpoints"
x-hjc-draggable="true"> {{sensorpoint.name}}</div>
</div>
</div>
<div class="panel panel-danger">
<div class="panel-heading"> <div class="panel-heading">
{{'SETTING.TRASH' | translate}} {{'COMMON.SENSOR' | translate}}
</div> </div>
<div class="panel-body trash" > <div class="panel-body" slim-scroll box-height="600px">
<img class="trashcan" <form role="form">
src="img/trashcan.png" <div class="form-group no-margin"><label>{{'SENSOR.SELECT_SENSOR' | translate}}</label>
x-hjc-drop-target="true" <ui-select on-select="changeSensor($item,$model)" ng-model="currentSensor.selected" theme="bootstrap">
x-on-drop="deletePointPair(dragEl,dropEl)"> <ui-select-match placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="sensor.id as sensor in sensors | filter: $select.search">
<div ng-bind-html="sensor.name | highlight: $select.search"></div>
</ui-select-choices>
</ui-select>
</div>
</form>
</div> </div>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentSensor.name}}{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
<div class="btn btn-primary btn-rounded btn-block"
title="DataSource:{{sensorpoint.data_source.name}}"
ng-repeat="sensorpoint in sensorpoints"
x-hjc-draggable="true"> {{sensorpoint.name}}</div>
</div> </div>
</div> </div>
<div class="panel panel-danger">
<div class="panel-heading">
{{'SETTING.TRASH' | translate}}
</div>
<div class="panel-body trash" >
<img class="trashcan"
src="img/trashcan.png"
x-hjc-drop-target="true"
x-on-drop="deletePointPair(dragEl,dropEl)">
</div>
<div class="col-lg-4"> </div>
<div class="panel panel-info"> </div>
<div class="panel-heading">
{{'SETTING.POINT_LIST' | translate}} <div class="col-lg-4">
</div> <div class="panel panel-info">
<div class="panel-body" slim-scroll box-height="600px" <div class="panel-heading">
uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}"> {{'SETTING.POINT_LIST' | translate}}
<form role="form"> </div>
<div class="form-group no-margin"><label>{{'DATA_SOURCE.SELECT_DATA_SOURCE' | translate}}</label> <div class="panel-body" slim-scroll box-height="600px"
<ui-select on-select="changeDataSource($item, $model)" ng-model="currentDataSource" theme="bootstrap"> uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}">
<ui-select-match placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match> <form role="form">
<ui-select-choices repeat="datasource.id as datasource in datasources | filter: $select.search"> <div class="form-group no-margin"><label>{{'DATA_SOURCE.SELECT_DATA_SOURCE' | translate}}</label>
<div ng-bind-html="datasource.name | highlight: $select.search"></div> <ui-select on-select="changeDataSource($item, $model)" ng-model="currentDataSource" theme="bootstrap">
</ui-select-choices> <ui-select-match placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
</ui-select> <ui-select-choices repeat="datasource.id as datasource in datasources | filter: $select.search">
</div> <div ng-bind-html="datasource.name | highlight: $select.search"></div>
</form> </ui-select-choices>
<h5>{{'SETTING.POINT_LIST' | translate}}</h5> </ui-select>
<div class="source btn btn-info btn-rounded btn-block" </div>
ng-repeat="point in points" </form>
x-hjc-draggable="true"> {{point.name}}</div> <h5>{{'SETTING.POINT_LIST' | translate}}</h5>
</div> <div class="source btn btn-info btn-rounded btn-block"
ng-repeat="point in points"
x-hjc-draggable="true"> {{point.name}}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</uib-tab> </div>
</uib-tabset> </uib-tab>
</div> </uib-tabset>
</div> </div>
</div> </div>
</div> </div>
</div>

1
admin/views/settings/space/space.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="SpaceMasterController"> <div class="wrapper wrapper-content" ng-controller="SpaceMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

1
admin/views/settings/store/store.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="StoreMasterController"> <div class="wrapper wrapper-content" ng-controller="StoreMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">

89
admin/views/settings/tariff/tariff.html
View File

@ -1,51 +1,44 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="row">
<div class="row"> <div class="col-lg-12">
<div class="col-lg-12"> <div class="tabs-container">
<div class="tabs-container"> <uib-tabset>
<uib-tab heading="{{'SETTING.TARIFF_LIST' | translate}}" >
<uib-tabset> <div class="panel-body" ng-controller="TariffController">
<uib-tab heading="{{'SETTING.TARIFF_LIST' | translate}}" > <a ng-click="addTariff()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_TARIFF' | translate}}</a>
<div class="panel-body" ng-controller="TariffController"> <table class="table table-bordered table-hover" >
<a ng-click="addTariff()" class="btn btn-primary btn-rounded btn-outline" href=""><i class="fa fa-plus-circle"></i> {{'SETTING.ADD_TARIFF' | translate}}</a> <thead>
<table class="table table-bordered table-hover" > <tr>
<thead> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<tr> <th class="text-center">{{'SETTING.TARIFF_NAME' | translate}}</th>
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<th class="text-center">{{'SETTING.TARIFF_NAME' | translate}}</th> <th class="text-center">{{'SETTING.TARIFF_TYPE' | translate}}</th>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <th class="text-center">{{'SETTING.UNIT' | translate}}</th>
<th class="text-center">{{'SETTING.TARIFF_TYPE' | translate}}</th> <th class="text-center">{{'SETTING.START_DATETIME' | translate}}</th>
<th class="text-center">{{'SETTING.UNIT' | translate}}</th> <th class="text-center">{{'SETTING.END_DATETIME' | translate}}</th>
<th class="text-center">{{'SETTING.START_DATETIME' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
<th class="text-center">{{'SETTING.END_DATETIME' | translate}}</th> </tr>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> </thead>
</tr> <tbody>
</thead> <tr ng-repeat="tariff in tariffs">
<tbody> <td class="text-center">{{ tariff.id }}</td>
<tr ng-repeat="tariff in tariffs"> <td class="text-center">{{ tariff.name }}</td>
<td class="text-center">{{ tariff.id }}</td> <td class="text-center">{{ tariff.energy_category.name }}</td>
<td class="text-center">{{ tariff.name }}</td> <td class="text-center">{{showTariffType(tariff.tariff_type) | translate}}</td>
<td class="text-center">{{ tariff.energy_category.name }}</td> <td class="text-center">{{ tariff.unit_of_price }}</td>
<td class="text-center">{{showTariffType(tariff.tariff_type) | translate}}</td> <td class="text-center">{{ tariff.valid_from }}</td>
<td class="text-center">{{ tariff.unit_of_price }}</td> <td class="text-center">{{ tariff.valid_through }}</td>
<td class="text-center">{{ tariff.valid_from }}</td> <td class="text-center">
<td class="text-center">{{ tariff.valid_through }}</td> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editTariff(tariff)" >{{'SETTING.EDIT' | translate}}</a>
<td class="text-center"> <a ng-click="deleteTariff(tariff)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editTariff(tariff)" >{{'SETTING.EDIT' | translate}}</a> </td>
<a ng-click="deleteTariff(tariff)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> </tr>
</tbody>
</td> </table>
</tr> </div>
</tbody> </uib-tab>
</table>
</div>
</uib-tab>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>

390
admin/views/settings/tariff/tariff.model.html
View File

@ -7,7 +7,6 @@
<div class="col-sm-4 b-r"> <div class="col-sm-4 b-r">
<form method="get" class="form-horizontal"> <form method="get" class="form-horizontal">
<div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.TARIFF_NAME' | translate}}</label> <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.TARIFF_NAME' | translate}}</label>
<div class="col-sm-7"><input ng-model="tariff.name" type="text" class="form-control"></div> <div class="col-sm-7"><input ng-model="tariff.name" type="text" class="form-control"></div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
@ -32,7 +31,6 @@
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.UNIT' | translate}}</label> <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.UNIT' | translate}}</label>
<div class="col-sm-7"><input ng-model="tariff.unit_of_price" type="text" class="form-control"></div> <div class="col-sm-7"><input ng-model="tariff.unit_of_price" type="text" class="form-control"></div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
@ -49,11 +47,9 @@
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" /> placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<table id="blockTable" ng-show="tariff.tariff_type=='block'" class="footable table table-bordered table-hover" data-sort="false" data-page-size="10" > <table id="blockTable" ng-show="tariff.tariff_type=='block'" class="footable table table-bordered table-hover" data-sort="false" data-page-size="10" >
<thead> <thead>
<tr> <tr>
@ -61,7 +57,6 @@
<th class="text-center">{{'SETTING.END_AMOUNT' | translate}}</th> <th class="text-center">{{'SETTING.END_AMOUNT' | translate}}</th>
<th class="text-center">{{'SETTING.PRICE' | translate}}</th> <th class="text-center">{{'SETTING.PRICE' | translate}}</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr> </tr>
<tr> <tr>
<td class="text-center sm "> <td class="text-center sm ">
@ -73,7 +68,6 @@
<td class="text-center sm"> <td class="text-center sm">
<input ng-model="b.price" class="form-control input-sm"> <input ng-model="b.price" class="form-control input-sm">
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="add(b)" >{{'SETTING.ADD' | translate}}</a> <a class="btn btn-primary btn-rounded btn-xs" ng-click="add(b)" >{{'SETTING.ADD' | translate}}</a>
</td> </td>
@ -85,10 +79,8 @@
<td class="text-center sm">{{ bl.start_amount }}</td> <td class="text-center sm">{{ bl.start_amount }}</td>
<td class="text-center sm">{{ bl.end_amount }}</td> <td class="text-center sm">{{ bl.end_amount }}</td>
<td class="text-center sm">{{ bl.price }}</td> <td class="text-center sm">{{ bl.price }}</td>
<td class="text-center sm"> <td class="text-center sm">
<a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> <a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -109,69 +101,161 @@
<th class="text-center">{{'SETTING.PEAK_TYPE' | translate}}</th> <th class="text-center">{{'SETTING.PEAK_TYPE' | translate}}</th>
<th class="text-center">{{'SETTING.PRICE' | translate}}</th> <th class="text-center">{{'SETTING.PRICE' | translate}}</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr> </tr>
<tr> <tr>
<td class="text-center sm"> <td class="text-center sm">
<div> <div>
<select ng-model="t.start_hour" style="background-color: #FFF; border-radius:4px;border:1px solid"> <select ng-model="t.start_hour" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option> <option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
</select> </select>
: :
<select ng-model="t.start_min" style="background-color: #FFF; border-radius:4px;border:1px solid"> <select ng-model="t.start_min" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option> <option value="08">08</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option> <option value="09">09</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option> <option value="10">10</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option> <option value="11">11</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option> <option value="12">12</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option> <option value="13">13</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option> <option value="14">14</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option> <option value="15">15</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option> <option value="16">16</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option> <option value="17">17</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option> <option value="18">18</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option> <option value="19">19</option>
<option value="58">58</option><option value="59">59</option> <option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="50">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="58">58</option>
<option value="59">59</option>
</select> </select>
: :
<select ng-model="t.start_second" style="background-color: #FFF; border-radius:4px;border:1px solid"> <select ng-model="t.start_second" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option> <option value="08">08</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option> <option value="09">09</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option> <option value="10">10</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option> <option value="11">11</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option> <option value="12">12</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option> <option value="13">13</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option> <option value="14">14</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option> <option value="15">15</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option> <option value="16">16</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option> <option value="17">17</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option> <option value="18">18</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option> <option value="19">19</option>
<option value="58">58</option><option value="59">59</option> <option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="50">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="58">58</option>
<option value="59">59</option>
</select> </select>
</div> </div>
</td> </td>
@ -179,62 +263,155 @@
<div> <div>
<select ng-model="t.end_hour" style="background-color: #FFF; border-radius:4px;border:1px solid" > <select ng-model="t.end_hour" style="background-color: #FFF; border-radius:4px;border:1px solid" >
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option> <option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
</select> </select>
: :
<select ng-model="t.end_min" style="background-color: #FFF; border-radius:4px;border:1px solid"> <select ng-model="t.end_min" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option> <option value="08">08</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option> <option value="09">09</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option> <option value="10">10</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option> <option value="11">11</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option> <option value="12">12</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option> <option value="13">13</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option> <option value="14">14</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option> <option value="15">15</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option> <option value="16">16</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option> <option value="17">17</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option> <option value="18">18</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option> <option value="19">19</option>
<option value="58">58</option><option value="59">59</option> <option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="50">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="58">58</option>
<option value="59">59</option>
</select> </select>
: :
<select ng-model="t.end_second" style="background-color: #FFF; border-radius:4px;border:1px solid"> <select ng-model="t.end_second" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option> <option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option> <option value="01">01</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option> <option value="02">02</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option> <option value="03">03</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option> <option value="04">04</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option> <option value="05">05</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option> <option value="06">06</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option> <option value="07">07</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option> <option value="08">08</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option> <option value="09">09</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option> <option value="10">10</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option> <option value="11">11</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option> <option value="12">12</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option> <option value="13">13</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option> <option value="14">14</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option> <option value="15">15</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option> <option value="16">16</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option> <option value="17">17</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option> <option value="18">18</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option> <option value="19">19</option>
<option value="58">58</option><option value="59">59</option> <option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="50">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="58">58</option>
<option value="59">59</option>
</select> </select>
</div> </div>
</td> </td>
@ -262,10 +439,8 @@
<td class="text-center sm">{{ tou.end_time_of_day }}</td> <td class="text-center sm">{{ tou.end_time_of_day }}</td>
<td class="text-center sm">{{ showPeakType(tou.peak_type) | translate }}</td> <td class="text-center sm">{{ showPeakType(tou.peak_type) | translate }}</td>
<td class="text-center sm">{{ tou.price }}</td> <td class="text-center sm">{{ tou.price }}</td>
<td class="text-center sm"> <td class="text-center sm">
<a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> <a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -279,7 +454,6 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button> <button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button>

1
admin/views/settings/tenant/tenant.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="TenantMasterController"> <div class="wrapper wrapper-content" ng-controller="TenantMasterController">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="tabs-container"> <div class="tabs-container">