From 19a9155d988dcee7698a65a45b0558aa0ff279d4 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 11 Apr 2018 14:31:42 +0500 Subject: Implement Maintenances --- web/app/view/dialog/AttributeController.js | 5 +- web/app/view/dialog/BaseEdit.js | 1 + web/app/view/dialog/Maintenance.js | 74 ++++++++++++++++++++++++++++ web/app/view/dialog/MaintenanceController.js | 70 ++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 web/app/view/dialog/Maintenance.js create mode 100644 web/app/view/dialog/MaintenanceController.js (limited to 'web/app/view/dialog') diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js index e85125d0..9fd452a4 100644 --- a/web/app/view/dialog/AttributeController.js +++ b/web/app/view/dialog/AttributeController.js @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -110,7 +110,8 @@ Ext.define('Traccar.view.dialog.AttributeController', { } break; } - if (valueField.getXType() !== config.xtype) { + if (valueField.getXType() !== config.xtype || + config.xtype === 'customNumberField' && valueField.dataType !== config.dataType) { this.getView().down('form').insert(this.getView().down('form').items.indexOf(valueField), config); this.getView().down('form').remove(valueField); } else if (config.xtype === 'customNumberField') { diff --git a/web/app/view/dialog/BaseEdit.js b/web/app/view/dialog/BaseEdit.js index 362823e3..286afba5 100644 --- a/web/app/view/dialog/BaseEdit.js +++ b/web/app/view/dialog/BaseEdit.js @@ -31,6 +31,7 @@ Ext.define('Traccar.view.dialog.BaseEdit', { xtype: 'tbfill' }, { glyph: 'xf00c@FontAwesome', + reference: 'saveButton', tooltip: Strings.sharedSave, tooltipType: 'title', minWidth: 0, diff --git a/web/app/view/dialog/Maintenance.js b/web/app/view/dialog/Maintenance.js new file mode 100644 index 00000000..e4be7b5b --- /dev/null +++ b/web/app/view/dialog/Maintenance.js @@ -0,0 +1,74 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +Ext.define('Traccar.view.dialog.Maintenance', { + extend: 'Traccar.view.dialog.BaseEdit', + + requires: [ + 'Traccar.view.dialog.MaintenanceController', + 'Traccar.view.CustomNumberField' + ], + + controller: 'maintenance', + + title: Strings.sharedMaintenance, + + items: { + xtype: 'form', + listeners: { + validitychange: 'onValidityChange' + }, + items: [{ + xtype: 'fieldset', + title: Strings.sharedRequired, + items: [{ + xtype: 'textfield', + name: 'name', + fieldLabel: Strings.sharedName, + allowBlank: false + }, { + xtype: 'combobox', + name: 'type', + reference: 'typeComboField', + fieldLabel: Strings.sharedType, + displayField: 'name', + valueField: 'key', + allowBlank: false, + queryMode: 'local', + store: 'MaintenanceTypes', + listeners: { + change: 'onNameChange' + } + }, { + xtype: 'customNumberField', + name: 'start', + reference: 'startField', + fieldLabel: Strings.maintenanceStart + }, { + xtype: 'customNumberField', + name: 'period', + reference: 'periodField', + allowBlank: false, + fieldLabel: Strings.maintenancePeriod, + validator: function (value) { + return this.parseValue(value) !== 0 ? true : 'Can\'t be zero'; + } + }] + }] + } +}); diff --git a/web/app/view/dialog/MaintenanceController.js b/web/app/view/dialog/MaintenanceController.js new file mode 100644 index 00000000..9efcec1f --- /dev/null +++ b/web/app/view/dialog/MaintenanceController.js @@ -0,0 +1,70 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +Ext.define('Traccar.view.dialog.MaintenanceController', { + extend: 'Traccar.view.dialog.BaseEditController', + alias: 'controller.maintenance', + + init: function () { + this.startConfig = Ext.clone(this.lookupReference('startField').initialConfig); + this.startConfig.value = 0; + this.periodConfig = Ext.clone(this.lookupReference('periodField').initialConfig); + this.periodConfig.value = 0; + this.lookupReference('saveButton').setDisabled(true); + }, + + onValidityChange: function (form, valid) { + this.lookupReference('saveButton').setDisabled(!valid); + }, + + onNameChange: function (combobox, newValue) { + var attribute, startField, periodField, config = {}; + attribute = combobox.getStore().getById(newValue); + if (attribute) { + if (attribute.get('allowDecimals') !== undefined) { + config.allowDecimals = attribute.get('allowDecimals'); + } else { + config.allowDecimals = true; + } + config.dataType = attribute.get('dataType'); + config.maxValue = attribute.get('maxValue'); + config.minValue = attribute.get('minValue'); + } + startField = this.lookupReference('startField'); + if (startField.dataType !== config.dataType) { + this.getView().down('fieldset').insert(this.getView().down('fieldset').items.indexOf(startField), + Ext.merge({}, this.startConfig, config)); + this.getView().down('fieldset').remove(startField); + this.lookupReference('startField').validate(); + } else { + startField.setConfig(config); + startField.validate(); + } + + periodField = this.lookupReference('periodField'); + if (periodField.dataType !== config.dataType) { + this.getView().down('fieldset').insert(this.getView().down('fieldset').items.indexOf(periodField), + Ext.merge({}, this.periodConfig, config)); + this.getView().down('fieldset').remove(periodField); + this.lookupReference('periodField').validate(); + } else { + periodField.setConfig(config); + periodField.validate(); + } + } +}); -- cgit v1.2.3