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

changed web UI and API to set contact of space is optional 

Merge branch 'develop'
pull/35/head^2
13621160019@163.com 2021-03-15 13:48:27 +08:00
parent 6cbb14b03d 57b6dd3266
commit 3c5253e90a
26 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
admin/app/translations.js
View File

@ -228,6 +228,7 @@ function config($translateProvider) {
ON: 'On',
OFF: 'OFF',
OK: 'OK',
OPTIONAL: 'Optional',
ADD_SPACE: 'Add Space',
ADD_TENANT: 'Add Tenant',
ADD_STORE: 'Add Store',
@ -387,7 +388,7 @@ function config($translateProvider) {
CONTACT: {
EMAIL: 'Email',
PHONE: 'Phone',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_EMAIL: 'Please Input Email',
INPUT_PHONE: 'Please Input Phone',
INPUT_DESCRIPTION: 'Please Input Description',
@ -453,7 +454,7 @@ function config($translateProvider) {
SELECT_DISTRIBUTION_SYSTEM: 'Select Distribution System',
SVG: 'SVG',
INPUT_SVG: 'Please Input SVG',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
DISTRIBUTION_CIRCUIT: 'Distribution Circuit',
N_S_DISTRIBUTION_CIRCUIT: ' Associated Distribution Circuit',
ADD_DISTRIBUTION_CIRCUIT: 'Add Distribution Circuit',
@ -483,7 +484,7 @@ function config($translateProvider) {
SELECT_EQUIPMENT: 'Please Select Equipment',
COST_CENTER: 'Cost Center',
SELECT_COST_CENTER: 'Please Select Cost Center',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
INPUT_METER: 'Please Input Meter',
OUTPUT_METER: 'Output Meter',
@ -512,7 +513,7 @@ function config($translateProvider) {
SELECT_COMBINED_EQUIPMENT: 'Please Select Combined Equipment',
COST_CENTER: 'Cost Center',
SELECT_COST_CENTER: 'Please Select Cost Center',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
BIND_EQUIPMENT: 'Bind Equipment',
N_S_EQUIPMENT: 'Bound Equipments',
@ -549,7 +550,7 @@ function config($translateProvider) {
PARENT_SPACE: 'Parent Space',
AREA: 'Area',
INPUT_AREA: 'Please Input Area',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
CURRENT_SELECTED_SPACE: 'Current Selected Space',
CHILD_SPACES: 'Child Spaces',
@ -571,7 +572,7 @@ function config($translateProvider) {
LATITUDE: 'Latitude',
LONGITUDE: 'Longitude',
TYPE: 'Store Type',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_ADDRESS: 'Please Input Address',
INPUT_LATITUDE: 'Please Input Latitude',
INPUT_LONGITUDE: 'Please Input Longitude',
@ -587,7 +588,7 @@ function config($translateProvider) {
LEASE_START_DATETIME: 'Lease Start Datetime',
LEASE_END_DATETIME: 'Lease End Datetime',
IS_IN_LEASE: 'Is In Lease',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_BUILDINGS: 'Please Input Buildings',
INPUT_FLOORS: 'Please Input Floors',
INPUT_ROOMS: 'Rooms',
@ -600,7 +601,7 @@ function config($translateProvider) {
SELECT_SHOPFLOOR: 'Select Shopfloor',
AREA: 'Area',
INPUT_AREA: 'Please Input Area',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
BIND_EQUIPMENT: 'Bind Equipment',
N_S_EQUIPMENT: 'Bound Equipments',
@ -611,7 +612,7 @@ function config($translateProvider) {
INPUT_HOURLY_LOW_LIMIT: 'Please Input Hourly Low Limit',
HOURLY_HIGH_LIMIT: 'Hourly High Limit (Inclusive)',
INPUT_HOURLY_HIGH_LIMIT: 'Please Input Hourly High Limit',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
MASTER_METER: 'Master Meter',
SELECT_MASTER_METER: 'Select Master Meter',
@ -622,7 +623,7 @@ function config($translateProvider) {
ADD_SENSOR: 'Add Sensor',
EDIT_SENSOR: 'Edit Sensor',
DELETE_SENSOR: 'Delete Sensor',
DESCRIPTION: 'Description(Optional)',
DESCRIPTION: 'Description',
INPUT_DESCRIPTION: 'Please Input Description',
SELECT_SENSOR: 'Select Sensor',
},
@ -1275,6 +1276,7 @@ function config($translateProvider) {
ON: '打开',
OFF: '关闭',
OK: '确定',
OPTIONAL: '可选',
ADD_SPACE: '添加空间',
ADD_TENANT: '添加租户',
ADD_STORE: '添加门店',
@ -1444,7 +1446,7 @@ function config($translateProvider) {
CONTACT: {
EMAIL: '邮箱',
PHONE: '电话',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_EMAIL: '请输入邮箱',
INPUT_PHONE: '请输入电话',
INPUT_DESCRIPTION: '请输入描述',
@ -1473,7 +1475,7 @@ function config($translateProvider) {
RATIO: '比例系数',
IS_TREND: '保存趋势',
ADDRESS: '地址(JSON)',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_HIGH_LIMIT: '请输入高限',
INPUT_LOW_LIMIT: '请输入低限',
INPUT_RATIO: '请输入比例系数',
@ -1488,7 +1490,7 @@ function config($translateProvider) {
SELECT_DISTRIBUTION_SYSTEM: '请选择配电系统',
SVG: 'SVG',
INPUT_SVG: '请输入SVG',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
DISTRIBUTION_CIRCUIT: '配电回路',
N_S_DISTRIBUTION_CIRCUIT: '所属配电回路',
ADD_DISTRIBUTION_CIRCUIT: '添加配电回路',
@ -1540,7 +1542,7 @@ function config($translateProvider) {
SELECT_COMBINED_EQUIPMENT: '请选择组合设备',
COST_CENTER: '成本中心',
SELECT_COST_CENTER: '请选择成本中心',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
BIND_EQUIPMENT: '绑定设备',
N_S_EQUIPMENT: '绑定的设备',
EQUIPMENT_LIST: '设备列表',
@ -1573,7 +1575,7 @@ function config($translateProvider) {
SELECT_EQUIPMENT: '请选择设备',
COST_CENTER: '成本中心',
SELECT_COST_CENTER: '请选择成本中心',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_METER: '请输入表',
INPUT_DESCRIPTION: '请输入描述',
OUTPUT_METER: '输出表',
@ -1608,7 +1610,7 @@ function config($translateProvider) {
PARENT_SPACE: '上级',
AREA: '面积',
INPUT_AREA: '请输入面积',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_DESCRIPTION: '请输入描述',
CURRENT_SELECTED_SPACE: '当前选中空间',
CHILD_SPACES: '子空间',
@ -1641,7 +1643,7 @@ function config($translateProvider) {
LEASE_START_DATETIME: '租赁开始日期时间',
LEASE_END_DATETIME: '租赁结束日期时间',
IS_IN_LEASE: '是否在租',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_BUILDINGS: '请输入建筑',
INPUT_FLOORS: '请输入楼层',
INPUT_ROOMS: '请输入房间',
@ -1653,7 +1655,7 @@ function config($translateProvider) {
LATITUDE: '纬度',
LONGITUDE: '经度',
TYPE: '门店类型',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_ADDRESS: '请输入地址',
INPUT_LATITUDE: '请输入纬度',
INPUT_LONGITUDE: '请输入经度',
@ -1665,7 +1667,7 @@ function config($translateProvider) {
SELECT_SHOPFLOOR: '请选择车间',
AREA: '面积',
INPUT_AREA: '请输入面积',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_DESCRIPTION: '请输入描述',
BIND_EQUIPMENT: '绑定设备',
N_S_EQUIPMENT: '绑定的设备',
@ -1676,7 +1678,7 @@ function config($translateProvider) {
INPUT_HOURLY_LOW_LIMIT: '请输入每小时最小值',
HOURLY_HIGH_LIMIT: '每小时最大值（包含）',
INPUT_HOURLY_HIGH_LIMIT: '请输入每小时最大值',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_DESCRIPTION: '请输入描述',
MASTER_METER: '上级计量表',
SELECT_MASTER_METER: '选择上级计量表',
@ -1687,7 +1689,7 @@ function config($translateProvider) {
ADD_SENSOR: '添加传感器',
EDIT_SENSOR: '编辑传感器',
DELETE_SENSOR: '删除传感器',
DESCRIPTION: '描述(可选)',
DESCRIPTION: '描述',
INPUT_DESCRIPTION: '请输入描述',
SELECT_SENSOR: '选择传感器',
},
@ -2322,6 +2324,7 @@ function config($translateProvider) {
ON: 'anmachen',
OFF: 'Herunterfahren',
OK: 'bestimmen',
OPTIONAL: 'Optional',
ADD_SPACE: 'Platz hinzufügen',
ADD_TENANT: 'Mieter hinzufügen',
ADD_STORE: 'Laden hinzufügen',
@ -2491,7 +2494,7 @@ function config($translateProvider) {
CONTACT: {
EMAIL: 'Briefkasten',
PHONE: 'Telefon',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_EMAIL: 'Bitte geben Sie Ihre E-Mail-Adresse ein',
INPUT_PHONE: 'Bitte geben Sie das Telefon ein',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
@ -2520,7 +2523,7 @@ function config($translateProvider) {
RATIO: 'Skalierungsfaktor',
IS_TREND: 'Trend speichern',
ADDRESS: 'Adresse (JSON)',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_HIGH_LIMIT: 'Bitte geben Sie das obere Limit ein',
INPUT_LOW_LIMIT: 'Bitte geben Sie die Untergrenze ein',
INPUT_RATIO: 'Bitte geben Sie den Skalierungsfaktor ein',
@ -2535,7 +2538,7 @@ function config($translateProvider) {
SELECT_DISTRIBUTION_SYSTEM: 'Bitte wählen Sie das Stromverteilungssystem',
SVG: 'SVG',
INPUT_SVG: 'Bitte geben Sie SVG ein',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
DISTRIBUTION_CIRCUIT: 'Verteilerkreis',
N_S_DISTRIBUTION_CIRCUIT: 'Eigener Verteilerkreis',
ADD_DISTRIBUTION_CIRCUIT: 'Verteilerkreis hinzufügen',
@ -2587,7 +2590,7 @@ function config($translateProvider) {
SELECT_COMBINED_EQUIPMENT: 'Bitte wählen Sie ein Kombinationsgerät',
COST_CENTER: 'Kostenstelle',
SELECT_COST_CENTER: 'Bitte wählen Sie eine Kostenstelle',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
BIND_EQUIPMENT: 'Gerät binden',
N_S_EQUIPMENT: 'Gebundenes Gerät',
EQUIPMENT_LIST: 'Geräteliste',
@ -2620,7 +2623,7 @@ function config($translateProvider) {
SELECT_EQUIPMENT: 'Bitte wählen Sie ein Gerät',
COST_CENTER: 'Kostenstelle',
SELECT_COST_CENTER: 'Bitte wählen Sie eine Kostenstelle',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_METER: 'Bitte geben Sie die Tabelle ein',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
OUTPUT_METER: 'Ausgabetabelle',
@ -2655,7 +2658,7 @@ function config($translateProvider) {
PARENT_SPACE: 'Überlegen',
AREA: 'Bereich',
INPUT_AREA: 'Bitte betreten Sie den Bereich',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
CURRENT_SELECTED_SPACE: 'Derzeit ausgewählter Platz',
CHILD_SPACES: 'Unterraum',
@ -2688,7 +2691,7 @@ function config($translateProvider) {
LEASE_START_DATETIME: 'Datum und Uhrzeit des Mietbeginns',
LEASE_END_DATETIME: 'Datum und Uhrzeit des Leasingendes',
IS_IN_LEASE: 'Mieten Sie?',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibun',
INPUT_BUILDINGS: 'Bitte betreten Sie das Gebäude',
INPUT_FLOORS: 'Bitte betreten Sie den Boden',
INPUT_ROOMS: 'Bitte betreten Sie den Raum',
@ -2700,7 +2703,7 @@ function config($translateProvider) {
LATITUDE: 'Breite',
LONGITUDE: 'Längengrad',
TYPE: 'Speichertyp',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_ADDRESS: 'Bitte geben Sie die Adresse ein',
INPUT_LATITUDE: 'Bitte geben Sie den Breitengrad ein',
INPUT_LONGITUDE: 'Bitte geben Sie den Längengrad ein',
@ -2712,7 +2715,7 @@ function config($translateProvider) {
SELECT_SHOPFLOOR: 'Bitte Workshop auswählen',
AREA: 'Bereich',
INPUT_AREA: 'Bitte betreten Sie den Bereich',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
BIND_EQUIPMENT: 'Gerät binden',
N_S_EQUIPMENT: 'Gebundenes Gerät',
@ -2723,7 +2726,7 @@ function config($translateProvider) {
INPUT_HOURLY_LOW_LIMIT: 'Bitte geben Sie das stündliche Minimum ein',
HOURLY_HIGH_LIMIT: 'Stundenmaximum (inklusive)',
INPUT_HOURLY_HIGH_LIMIT: 'Bitte geben Sie das Stundenmaximum ein',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
MASTER_METER: 'Überlegenes Messgerät',
SELECT_MASTER_METER: 'Wählen Sie das übergeordnete Messgerät aus',
@ -2734,7 +2737,7 @@ function config($translateProvider) {
ADD_SENSOR: 'Sensor hinzufügen',
EDIT_SENSOR: 'Sensor bearbeiten',
DELETE_SENSOR: 'Sensor entfernen',
DESCRIPTION: 'Beschreibung (optional)',
DESCRIPTION: 'Beschreibung',
INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
SELECT_SENSOR: 'Sensor auswählen',
},

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

@ -17,7 +17,7 @@
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'COMBINED_EQUIPMENT.COST_CENTER' | translate}}</th>
<th class="text-center">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/combinedequipment/combinedequipment.model.html
View File

@ -42,7 +42,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8"><input ng-model="combinedequipment.description" type="text" name="combinedequipmentdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentdescription.$invalid && form_combinedequipment.combinedequipmentdescription.$dirty">
<small class="text-danger" ng-show="form_combinedequipment.combinedequipmentdescription.$error.required">{{'COMBINED_EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>

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

@ -15,7 +15,7 @@
<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}}</th>
<th class="text-center">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/contact/contact.model.html
View File

@ -33,7 +33,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-9"><input ng-model="contact.description" type="text" name="contactdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_contact.description.$invalid && form_contact.description.$dirty">

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

@ -71,7 +71,7 @@
<th class="text-center">{{'POINT.RATIO' | translate}}</th>
<th class="text-center">{{'POINT.IS_TREND' | translate}}</th>
<th class="text-center">{{'POINT.ADDRESS' | translate}}</th>
<th class="text-center">{{'POINT.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/datasource/point.model.html
View File

@ -82,7 +82,7 @@
</div>
</div>
</div>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<input ng-model="point.description" type="text" name="pointdescription" class="form-control">
<div class="m-t-xs" ng-show="form_point.pointdescription.$invalid && form_point.pointdescription.$dirty">

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

@ -13,7 +13,7 @@
<th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'DISTRIBUTION_SYSTEM.SVG' | translate}}</th>
<th class="text-center">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/distributionsystem/distributionsystem.model.html
View File

@ -20,7 +20,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-10"><input ng-model="distributionsystem.description" type="text" name="distributionsystemdescription" class="form-control" >
</div>
</div>

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

@ -15,7 +15,7 @@
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'EQUIPMENT.COST_CENTER' | translate}}</th>
<th class="text-center">{{'EQUIPMENT.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/equipment/equipment.model.html
View File

@ -42,7 +42,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8"><input ng-model="equipment.description" type="text" name="equipmentdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_equipment.equipmentdescription.$invalid && form_equipment.equipmentdescription.$dirty">
<small class="text-danger" ng-show="form_equipment.equipmentdescription.$error.required">{{'EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>

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

@ -21,7 +21,7 @@
<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'METER.MASTER_METER' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
@ -179,7 +179,7 @@
</th>
<th class="text-center">{{'METER.MASTER_METER' | translate}}
</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
</tr>
</thead>
<tbody>
@ -221,7 +221,7 @@
<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>
@ -264,7 +264,7 @@
<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/meter/meter.model.html
View File

@ -93,7 +93,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<input ng-model="meter.description" type="text" name="meterdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_meter.meterdescription.$invalid && form_meter.meterdescription.$dirty">

2
admin/views/settings/meter/offline-meter.model.html
View File

@ -81,7 +81,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<input ng-model="offlinemeter.description" type="text" name="offlinemeterdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_offlinemeter.meterdescription.$invalid && form_offlinemeter.offlinemeterdescription.$dirty">

2
admin/views/settings/meter/virtual-meter.model.html
View File

@ -76,7 +76,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-5 control-label">{{'METER.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-5 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<input ng-model="virtualmeter.description" type="text" name="virtualmeterdescription" class="form-control" >
<div class="m-t-xs" ng-show="form_virtualmeter.meterdescription.$invalid && form_virtualmeter.virtualmeterdescription.$dirty">

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

@ -13,7 +13,7 @@
<tr>
<th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'SENSOR.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/sensor/sensor.model.html
View File

@ -13,7 +13,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SENSOR.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<input ng-model="sensor.description" type="text" name="sensordescription" class="form-control" >
<div class="m-t-xs" ng-show="form_sensor.sensordescription.$invalid && form_sensor.sensordescription.$dirty">

2
admin/views/settings/shopfloor/shopfloor.html
View File

@ -17,7 +17,7 @@
<th class="text-center">{{'SETTING.CONTACT' | translate}}</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'SHOPFLOOR.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'SHOPFLOOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/shopfloor/shopfloor.model.html
View File

@ -54,7 +54,7 @@
</ui-select>
</div>
</div>
<div class="form-group"><label class="col-sm-2 control-label">{{'SHOPFLOOR.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-2 control-label">{{'SHOPFLOOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-10">
<input ng-model="shopfloor.description" type="text" name="shopfloordescription" class="form-control">
<div class="m-t-xs" ng-show="form_shopfloor.shopfloordescription.$invalid && form_shopfloor.shopfloordescription.$dirty">

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

@ -40,7 +40,7 @@
{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
</th>
<th class="text-center">{{'SPACE.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>
@ -94,7 +94,7 @@
{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
</th>
<th class="text-center">{{'SPACE.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

6
admin/views/settings/space/space.model.html
View File

@ -28,10 +28,10 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.CONTACT' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.CONTACT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<ui-select ng-model="space.contact.id" name="spacecontact" theme="bootstrap">
<ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">
{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="contact.id as contact in contacts | filter: $select.search">
<div ng-bind-html="contact.name | highlight: $select.search"></div>
@ -101,7 +101,7 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SPACE.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-4 control-label">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8">
<input ng-model="space.description" type="text" name="spacedescription" class="form-control">
<div class="m-t-xs"

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

@ -20,7 +20,7 @@
<th class="text-center">{{'SETTING.CONTACT' | translate}}</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'STORE.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'STORE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/store/store.model.html
View File

@ -90,7 +90,7 @@
</ui-select>
</div>
</div>
<div class="form-group"><label class="col-sm-2 control-label">{{'STORE.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-2 control-label">{{'STORE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-10">
<input ng-model="store.description" type="text" name="storedescription" class="form-control">
<div class="m-t-xs" ng-show="form_store.storedescription.$invalid && form_store.storedescription.$dirty">

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

@ -26,7 +26,7 @@
<th class="text-center">{{'TENANT.LEASE_END_DATETIME' | translate}}</th>
<th class="text-center">{{'TENANT.IS_IN_LEASE' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'TENANT.DESCRIPTION' | translate}}</th>
<th class="text-center">{{'TENANT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
</thead>

2
admin/views/settings/tenant/tenant.model.html
View File

@ -124,7 +124,7 @@
</ui-select>
</div>
</div>
<div class="form-group"><label class="col-sm-2 control-label">{{'TENANT.DESCRIPTION' | translate}}</label>
<div class="form-group"><label class="col-sm-2 control-label">{{'TENANT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-10">
<input ng-model="tenant.description" type="text" name="tenantdescription" class="form-control">
<div class="m-t-xs" ng-show="form_tenant.tenantdescription.$invalid && form_tenant.tenantdescription.$dirty">

4
myems-api/core/space.py
View File

@ -567,7 +567,7 @@ class SpaceItem:
description='API.INVALID_IS_OUTPUT_COUNTED_VALUE')
is_output_counted = new_values['data']['is_output_counted']
if 'contact_id' in new_values['data'].keys():
if 'contact_id' in new_values['data'].keys() and new_values['data']['contact_id'] is not None:
if new_values['data']['contact_id'] <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_CONTACT_ID')
@ -608,7 +608,7 @@ class SpaceItem:
if cursor.fetchone() is not None:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_404, title='API.BAD_REQUEST',
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.SPACE_NAME_IS_ALREADY_IN_USE')
if parent_space_id is not None: