From eec9ffbf8213f1df69162131245cb3282c68ca0a Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 14 Dec 2016 17:00:25 +0500 Subject: Calendars implementation --- web/app/view/CalendarDialog.js | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 web/app/view/CalendarDialog.js (limited to 'web/app/view/CalendarDialog.js') diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js new file mode 100644 index 00000000..31d898ef --- /dev/null +++ b/web/app/view/CalendarDialog.js @@ -0,0 +1,58 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 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.CalendarDialog', { + extend: 'Traccar.view.BaseEditDialog', + + requires: [ + 'Traccar.view.CalendarDialogController' + ], + + controller: 'calendarDialog', + title: Strings.sharedCalendar, + + items: { + xtype: 'form', + items: [{ + xtype: 'textfield', + name: 'name', + fieldLabel: Strings.sharedName, + allowBlank: false + }, { + xtype: 'filefield', + name: 'file', + fieldLabel: Strings.calendarFile, + allowBlank: false, + buttonConfig: { + glyph: 'xf093@FontAwesome', + text: "", + tooltip: Strings.calendarSelect, + tooltipType: 'title', + minWidth: 0 + }, + listeners: { + change: 'onFileChange' + } + }, { + xtype: 'hiddenfield', + name: 'calendarData', + allowBlank: false, + reference: 'calendarDataField' + }] + } +}); -- cgit v1.2.3 From 917b1064c735486e37439d6d0e6d6d3642521297 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 15 Dec 2016 10:05:37 +0500 Subject: Remove variable and use single quotes. --- web/app/view/CalendarDialog.js | 2 +- web/app/view/CalendarDialogController.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'web/app/view/CalendarDialog.js') diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js index 31d898ef..793f6ab2 100644 --- a/web/app/view/CalendarDialog.js +++ b/web/app/view/CalendarDialog.js @@ -40,7 +40,7 @@ Ext.define('Traccar.view.CalendarDialog', { allowBlank: false, buttonConfig: { glyph: 'xf093@FontAwesome', - text: "", + text: '', tooltip: Strings.calendarSelect, tooltipType: 'title', minWidth: 0 diff --git a/web/app/view/CalendarDialogController.js b/web/app/view/CalendarDialogController.js index f90c811c..48400bc5 100644 --- a/web/app/view/CalendarDialogController.js +++ b/web/app/view/CalendarDialogController.js @@ -25,8 +25,8 @@ Ext.define('Traccar.view.CalendarDialogController', { if (fileField.fileInputEl.dom.files.length > 0) { reader = new FileReader(); reader.onload = function (event) { - var b64String = btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result))); - fileField.up('window').lookupReference('calendarDataField').setValue(b64String); + fileField.up('window').lookupReference('calendarDataField').setValue( + btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result)))); }; reader.onerror = function (event) { Traccar.app.showError(event.target.error); -- cgit v1.2.3 From 0ef6dfe719c7d6e491f0f05e9c7838ff7c8dbef2 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 15 Dec 2016 16:39:59 +0500 Subject: Make strings more common --- web/app/view/CalendarDialog.js | 4 ++-- web/l10n/en.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'web/app/view/CalendarDialog.js') diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js index 793f6ab2..2609a6da 100644 --- a/web/app/view/CalendarDialog.js +++ b/web/app/view/CalendarDialog.js @@ -36,12 +36,12 @@ Ext.define('Traccar.view.CalendarDialog', { }, { xtype: 'filefield', name: 'file', - fieldLabel: Strings.calendarFile, + fieldLabel: Strings.sharedFile, allowBlank: false, buttonConfig: { glyph: 'xf093@FontAwesome', text: '', - tooltip: Strings.calendarSelect, + tooltip: Strings.sharedSelectFile, tooltipType: 'title', minWidth: 0 }, diff --git a/web/l10n/en.json b/web/l10n/en.json index 174ff886..f969db40 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -43,6 +43,8 @@ "sharedTestMail": "Send Test Email", "sharedCalendar": "Calendar", "sharedCalendars": "Calendars", + "sharedFile": "File", + "sharedSelectFile": "Select File", "errorTitle": "Error", "errorUnknown": "Unknown error", "errorConnection": "Connection error", @@ -207,7 +209,5 @@ "categoryPlane": "Plane", "categoryMotorcycle": "Motorcycle", "categoryBicycle": "Bicycle", - "categoryPerson": "Person", - "calendarFile": "Calendar File", - "calendarSelect": "Select Calendar File" + "categoryPerson": "Person" } \ No newline at end of file -- cgit v1.2.3