From 76e73c4af9d46a4697c5b52e73bda26f7883dbe5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 9 Jul 2019 10:48:22 +0300 Subject: [PATCH] [PE] Set default format for date-time --- .../main/app/controller/Main.js | 2 + .../main/app/view/DateTimeDialog.js | 64 +++++++++++++++---- apps/presentationeditor/main/locale/en.json | 2 + 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index cc8c8df46..763d5cc0a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -634,6 +634,8 @@ define([ me.hidePreloader(); me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + Common.Utils.InternalSettings.set("pe-settings-datetime-default", Common.localStorage.getItem("pe-settings-datetime-default")); + value = Common.localStorage.getItem("pe-settings-zoom"); Common.Utils.InternalSettings.set("pe-settings-zoom", value); var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -1); diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js index d130baa41..367b9a45c 100644 --- a/apps/presentationeditor/main/app/view/DateTimeDialog.js +++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js @@ -47,7 +47,7 @@ define([ PE.Views.DateTimeDialog = Common.UI.Window.extend(_.extend({ options: { - width: 300, + width: 350, style: 'min-width: 230px;', cls: 'modal-dlg' }, @@ -61,7 +61,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -69,9 +69,10 @@ define([ '
', '', '
', - '
', + '
', '
', - '
', + '
', + '', '
', '
', '
', @@ -130,20 +131,56 @@ define([ this.listFormats.on('entervalue', _.bind(this.onPrimary, this)); this.listFormats.$el.find('.listview').focus(); + this.btnDefault = new Common.UI.Button({ + el: $('#datetime-dlg-default') + }); + this.btnDefault.on('click', _.bind(function(btn, e) { + var rec = this.listFormats.getSelectedRec(); + Common.UI.warning({ + msg: Common.Utils.String.format(this.confirmDefault, Common.util.LanguageInfo.getLocalLanguageName(this.cmbLang.getValue())[1], rec ? rec.get('value') : ''), + buttons: ['yes', 'no'], + primary: 'yes', + callback: _.bind(function(btn) { + if (btn == 'yes') { + this.defaultFormats[this.cmbLang.getValue()] = rec ? rec.get('format') : ''; + this.api.asc_setDefaultDateTimeFormat(this.defaultFormats); + var arr = []; + for (var name in this.defaultFormats) { + if (name) { + arr.push(name + ' ' + this.defaultFormats[name]); + } + } + var value = arr.join(';'); + Common.localStorage.setItem("pe-settings-datetime-default", value); + Common.Utils.InternalSettings.set("pe-settings-datetime-default", value); + } + }, this) + }); + }, this)); + this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.afterRender(); }, afterRender: function() { + var me = this, + value = Common.Utils.InternalSettings.get("pe-settings-datetime-default"), + arr = (value) ? value.split(';') : []; + this.defaultFormats = []; + arr.forEach(function(item){ + var pair = item.split(' '); + me.defaultFormats[parseInt(pair[0])] = pair[1]; + }); + this._setDefaults(); }, _setDefaults: function () { this.props = new AscCommonSlide.CAscDateTime(); - if (this.lang) { var item = this.cmbLang.store.findWhere({value: this.lang}); - this.cmbLang.setValue(item ? item.get('value') : 0x0409); + item = item ? item.get('value') : 0x0409; + this.cmbLang.setValue(item) } this.updateFormats(this.cmbLang.getValue()); }, @@ -167,9 +204,12 @@ define([ arr.push(rec); } } - this.listFormats.store.reset(arr); - this.listFormats.selectByIndex(0); - this.onSelectFormat(this.listFormats, null, this.listFormats.getSelectedRec()); + store.reset(arr); + var format = this.defaultFormats[lang]; + format ? this.listFormats.selectRecord(store.findWhere({format: format})) : this.listFormats.selectByIndex(0); + var rec = this.listFormats.getSelectedRec(); + this.listFormats.scrollToRecord(rec); + this.onSelectFormat(this.listFormats, null, rec); }, onSelectFormat: function(lisvView, itemView, record) { @@ -205,11 +245,13 @@ define([ // cancelButtonText: 'Cancel', - okButtonText: 'Ok', + okButtonText: 'OK', txtTitle: 'Date & Time', textLang: 'Language', textFormat: 'Formats', - textUpdate: 'Update automatically' + textUpdate: 'Update automatically', + textDefault: 'Set as default', + confirmDefault: 'Set default format for {0}: "{1}"' }, PE.Views.DateTimeDialog || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 969610cc7..52a92cd6f 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -951,6 +951,8 @@ "PE.Views.DateTimeDialog.textLang": "Language", "PE.Views.DateTimeDialog.textFormat": "Formats", "PE.Views.DateTimeDialog.textUpdate": "Update automatically", + "PE.Views.DateTimeDialog.textDefault": "Set as default", + "PE.Views.DateTimeDialog.confirmDefault": "Set default format for {0}: \"{1}\"", "PE.Views.DocumentHolder.aboveText": "Above", "PE.Views.DocumentHolder.addCommentText": "Add Comment", "PE.Views.DocumentHolder.advancedImageText": "Image Advanced Settings",