EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov79f7243e707a
diff --git a/application/Espo/Modules/Crm/Resources/i18n/en_US/Calendar.json b/application/Espo/Modules/Crm/Resources/i18n/en_US/Calendar.jsonindex ecd3f72c5f..dbc24fc91e 100644--- a/application/Espo/Modules/Crm/Resources/i18n/en_US/Calendar.json+++ b/application/Espo/Modules/Crm/Resources/i18n/en_US/Calendar.json@@ -17,6 +17,7 @@"User List": "User List","View Calendar": "View Calendar","Create Shared View": "Create Shared View",+ "Edit Shared View": "Edit Shared View","Shared Mode Options": "Shared Mode Options"}}diff --git a/client/modules/crm/src/views/calendar/calendar-page.js b/client/modules/crm/src/views/calendar/calendar-page.jsindex 920562a61b..606b3e81c5 100644--- a/client/modules/crm/src/views/calendar/calendar-page.js+++ b/client/modules/crm/src/views/calendar/calendar-page.js@@ -27,6 +27,7 @@************************************************************************/import View from 'view';+import CalendarEditViewModal from 'crm:views/calendar/modals/edit-view';class CalendarPage extends View {@@ -290,48 +291,44 @@ class CalendarPage extends View {this.setPageTitle(this.translate('Calendar', 'scopeNames'));}- createCustomView() {- this.createView('createCustomView', 'crm:views/calendar/modals/edit-view', {}, view => {- view.render();-- this.listenToOnce(view, 'after:save', data => {- view.close();- this.mode = 'view-' + data.id;+ async createCustomView() {+ const view = new CalendarEditViewModal({+ afterSave: data => {+ this.mode = `view-${data.id}`;this.date = null;this.updateUrl(true);- });+ },});++ await this.assignView('modal', view);++ await view.render();}- editCustomView() {+ async editCustomView() {const viewId = this.getCalendarView().viewId;if (!viewId) {return;}-- this.createView('createCustomView', 'crm:views/calendar/modals/edit-view', {id: viewId}, view => {- view.render();-- this.listenToOnce(view, 'after:save', () => {- view.close();-- const calendarView = this.getCalendarView();-- calendarView.setupMode();- calendarView.reRender();- });-- this.listenToOnce(view, 'after:remove', () => {- view.close();-+ const view = new CalendarEditViewModal({+ id: viewId,+ afterSave: () => {+ this.getCalendarView().setupMode();+ this.getCalendarView().reRender();+ },+ afterRemove: () => {this.mode = null;this.date = null;this.updateUrl(true);- });+ },});++ await this.assignView('modal', view);++ await view.render();}/**diff --git a/client/modules/crm/src/views/calendar/modals/edit-view.js b/client/modules/crm/src/views/calendar/modals/edit-view.jsindex 640564df50..19325156c3 100644--- a/client/modules/crm/src/views/calendar/modals/edit-view.js+++ b/client/modules/crm/src/views/calendar/modals/edit-view.js@@ -26,188 +26,231 @@* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.************************************************************************/-define('crm:views/calendar/modals/edit-view', ['views/modal', 'model'], function (Dep, Model) {+import ModalView from 'views/modal';+import Model from 'model';++export default class CalendarEditViewModal extends ModalView {++ // language=Handlebars+ templateContent = `+ <div class="panel panel-default no-side-margin">+ <div class="panel-body">+ <div class="record-container">{{{record}}}</div>+ </div>+ </div>+ `++ className ='dialog dialog-record'++ /**+ *+ * @param {{+ * afterSave?: function({id: string}): void,+ * afterRemove?: function(): void,+ * id?: string,+ * }} options+ */+ constructor(options) {+ super();++ this.options = options;+ }++ setup() {+ const id = this.options.id;++ this.buttonList = [+ {+ name: 'cancel',+ label: 'Cancel',+ onClick: () => this.actionCancel(),+ },+ ];- return Dep.extend({+ this.isNew = !id;- // language=Handlebars- templateContent: '' +- '<div class="panel panel-default no-side-margin"><div class="panel-body">' +- '<div class="record-container">{{{record}}}</div>' +- '</div></div>',+ const calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];- className: 'dialog dialog-record',+ if (this.isNew) {+ this.buttonList.unshift({+ name: 'save',+ label: 'Create',+ style: 'danger',+ onClick: () => this.actionSave(),+ });+ } else {+ this.dropdownItemList.push({+ name: 'remove',+ label: 'Remove',+ onClick: () => this.actionRemove(),+ });- buttonList: [- {- name: 'cancel',- label: 'Cancel',- }- ],+ this.buttonList.unshift({+ name: 'save',+ label: 'Save',+ style: 'primary',+ onClick: () => this.actionSave(),+ });+ }- setup: function () {- var id = this.options.id;+ const model = new Model();- this.isNew = !id;+ model.name = 'CalendarView';- var calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];+ const modelData = {};- if (this.isNew) {- this.buttonList.unshift({- name: 'save',- label: 'Create',- style: 'danger'- });- }- else {- this.buttonList.unshift({- name: 'remove',- label: 'Remove'- });-- this.buttonList.unshift({- name: 'save',- label: 'Save',- style: 'primary'- });+ if (!this.isNew) {+ calendarViewDataList.forEach(item => {+ if (id === item.id) {+ modelData.teamsIds = item.teamIdList || [];+ modelData.teamsNames = item.teamNames || {};+ modelData.id = item.id;+ modelData.name = item.name;+ modelData.mode = item.mode;+ }+ });+ } else {+ modelData.name = this.translate('Shared', 'labels', 'Calendar');++ let foundCount = 0;++ calendarViewDataList.forEach(item => {+ if (item.name.indexOf(modelData.name) === 0) {+ foundCount++;+ }+ });++ if (foundCount) {+ modelData.name += ' ' + foundCount;}- var model = new Model();+ modelData.id = id;- model.name = 'CalendarView';+ modelData.teamsIds = this.getUser().get('teamsIds') || [];+ modelData.teamsNames = this.getUser().get('teamsNames') || {};+ }- var modelData = {};+ model.set(modelData);- if (!this.isNew) {- calendarViewDataList.forEach(item => {- if (id === item.id) {- modelData.teamsIds = item.teamIdList || [];- modelData.teamsNames = item.teamNames || {};- modelData.id = item.id;- modelData.name = item.name;- modelData.mode = item.mode;- }- });- }- else {- modelData.name = this.translate('Shared', 'labels', 'Calendar');+ this.createView('record', 'crm:views/calendar/record/edit-view', {+ selector: '.record-container',+ model: model+ });- var foundCount = 0;+ if (this.isNew) {+ this.headerText = this.translate('Create Shared View', 'labels', 'Calendar');+ } else {+ this.headerText = this.translate('Edit Shared View', 'labels', 'Calendar') + ' · ' ++ modelData.name;+ }+ }- calendarViewDataList.forEach(item => {- if (item.name.indexOf(modelData.name) === 0) {- foundCount++;- }- });+ async actionSave() {+ const modelData = this.getView('record').fetch();- if (foundCount) {- modelData.name += ' ' + foundCount;- }+ this.getView('record').model.set(modelData);++ if (this.getView('record').validate()) {+ return;+ }- modelData.id = id;+ this.disableButton('save');+ this.disableButton('remove');- modelData.teamsIds = this.getUser().get('teamsIds') || [];- modelData.teamsNames = this.getUser().get('teamsNames') || {};- }+ const calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];++ const data = {+ name: modelData.name,+ teamIdList: modelData.teamsIds,+ teamNames: modelData.teamsNames,+ mode: modelData.mode,+ id: undefined,+ };- model.set(modelData);+ if (this.isNew) {+ data.id = Math.random().toString(36).substr(2, 10);- this.createView('record', 'crm:views/calendar/record/edit-view', {- selector: '.record-container',- model: model+ calendarViewDataList.push(data);+ } else {+ data.id = this.getView('record').model.id;++ calendarViewDataList.forEach((item, i) => {+ if (item.id === data.id) {+ calendarViewDataList[i] = data;+ }});- },+ }- actionSave: function () {- var modelData = this.getView('record').fetch();- this.getView('record').model.set(modelData);+ Espo.Ui.notify(this.translate('saving', 'messages'));- if (this.getView('record').validate()) {- return;- }+ try {+ await this.getPreferences().save(+ {+ calendarViewDataList: calendarViewDataList,+ },+ {patch: true}+ )+ } catch (e) {+ this.enableButton('remove');+ this.enableButton('save');++ return;+ }++ Espo.Ui.notify();++ this.trigger('after:save', data);++ if (this.options.afterSave) {+ this.options.afterSave(data);+ }++ this.close();+ }++ async actionRemove() {+ await this.confirm(this.translate('confirmation', 'messages'));++ this.disableButton('save');+ this.disableButton('remove');- this.disableButton('save');- this.disableButton('remove');-- var calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];-- var data = {- name: modelData.name,- teamIdList: modelData.teamsIds,- teamNames: modelData.teamsNames,- mode: modelData.mode- };-- if (this.isNew) {- data.id = Math.random().toString(36).substr(2, 10);- calendarViewDataList.push(data);- } else {- data.id = this.getView('record').model.id;-- calendarViewDataList.forEach((item, i) => {- if (item.id === data.id) {- calendarViewDataList[i] = data;- }- });+ const id = this.options.id;++ if (!id) {+ return;+ }++ const newCalendarViewDataList = [];++ const calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];++ calendarViewDataList.forEach(item => {+ if (item.id !== id) {+ newCalendarViewDataList.push(item);}+ });- Espo.Ui.notify(this.translate('saving', 'messages'));-- this.getPreferences()- .save(- {- 'calendarViewDataList': calendarViewDataList,- },- {patch: true}- )- .then(() => {- Espo.Ui.notify(false);- this.trigger('after:save', data);- this.remove();- })- .catch(() => {- this.enableButton('remove');- this.enableButton('save');- });- },-- actionRemove: function () {- this.confirm(this.translate('confirmation', 'messages'), () => {- this.disableButton('save');- this.disableButton('remove');-- var id = this.options.id;-- if (!id) {- return;- }+ Espo.Ui.notifyWait();- var newCalendarViewDataList = [];-- var calendarViewDataList = this.getPreferences().get('calendarViewDataList') || [];-- calendarViewDataList.forEach((item) => {- if (item.id !== id) {- newCalendarViewDataList.push(item);- }- });-- Espo.Ui.notifyWait();-- this.getPreferences()- .save({- 'calendarViewDataList': newCalendarViewDataList- }, {patch: true})- .then(() => {- Espo.Ui.notify(false);- this.trigger('after:remove');- this.remove();- })- .catch(() => {- this.enableButton('remove');- this.enableButton('save');- });- });+ try {+ await this.getPreferences().save({+ calendarViewDataList: newCalendarViewDataList,+ }, {patch: true})+ } catch (e) {+ this.enableButton('remove');+ this.enableButton('save');++ return;+ }++ Espo.Ui.notify();++ this.trigger('after:remove');++ if (this.options.afterRemove) {+ this.options.afterRemove();}- });-});++ this.close();+ }+}