Merge branch hotfix/v7.2.2 into develop

Plugin description updates

api.js

@@ -30,6 +30,8 @@
  *
  */
 
+var AscOForm = {};
+window["AscOForm"] = window.AscOForm = AscOForm;
 
 (function(window, document) {
     window['Asc']['Addons'] = window['Asc']['Addons'] || {};

apiPlugins.js

@@ -35,11 +35,29 @@
 (function(window)
 {
 	/**
-	 * Returns information about all the forms that have been added to the document
+     * @typedef {Object} ContentControl
+	 * Content control object.
+     * @property {string} Tag - A tag assigned to the content control. The same tag can be assigned to several content controls so that it is possible to make reference to them in your code.
+     * @property {string} Id - A unique identifier of the content control. It can be used to search for a certain content control and make reference to it in the code.
+     * @property {ContentControlLock} Lock - A value that defines if it is possible to delete and/or edit the content control or not: 0 - only deleting, 1 - no deleting or editing, 2 - only editing, 3 - full access.
+     * @property {string} InternalId - A unique internal identifier of the content control. It is used for all operations with content controls.
+     */
+
+	/**
+     * @typedef {(0 | 1 | 2 | 3)} ContentControlLock
+     * A value that defines if it is possible to delete and/or edit the content control or not:
+	 * * **0** - only deleting
+	 * * **1** - disable deleting or editing
+	 * * **2** - only editing
+	 * * **3** - full access
+     */
+
+	/**
+	 * Returns information about all the forms that have been added to the document.
 	 * @memberof Api
 	 * @typeofeditors ["CDE"]
 	 * @alias GetAllForms
-	 * @returns {[]} - An array of forms
+	 * @returns {ContentControl[]} - An array with all the forms from the document.
 	 * @example
 	 * window.Asc.plugin.executeMethod("GetAllForms");
 	 */
@@ -58,12 +76,12 @@
 		return arrResult;
 	};
 	/**
-	 * Returns information about all the forms that have been added to the document with specified Tag
+	 * Returns information about all the forms that have been added to the document with specified tag.
 	 * @memberof Api
 	 * @typeofeditors ["CDE"]
 	 * @alias GetFormsByTag
-	 * @param {string} tag - Tag of the form
-	 * @returns {[]} - An array of forms
+	 * @param {string} tag - The form tag.
+	 * @returns {ContentControl[]} - An array with all the forms from the document with the specified tag.
 	 * @example
 	 * window.Asc.plugin.executeMethod("GetFormsByTag");
 	 */
@@ -85,12 +103,12 @@
 		return arrResult;
 	};
 	/**
-	 * Set value for specified form
+	 * Sets a value to the specified form.
 	 * @memberof Api
 	 * @typeofeditors ["CDE"]
 	 * @alias SetFormValue
-	 * @param {string} internalId - A unique internal identifier of the content control.
-	 * @param {*} value - Depends on the type of a form
+	 * @param {string} internalId - A unique internal identifier of the form.
+	 * @param {string | boolean} value - Form value to be set. Its type depends on the form type.
 	 * @example
 	 * window.Asc.plugin.executeMethod("SetFormValue");
 	 */
@@ -195,12 +213,12 @@
 		oLogicDocument.FinalizeAction();
 	};
 	/**
-	 * Get form value
+	 * Returns a value of the specified form.
 	 * @memberof Api
 	 * @typeofeditors ["CDE"]
 	 * @alias GetFormValue
-	 * @param {string} internalId - A unique internal identifier of the content control.
-	 * @returns {null | string} Value of the form (null means the form is filled with a placeholder)
+	 * @param {string} internalId - A unique internal identifier of the form.
+	 * @returns {null | string | boolean} The form value in the string or boolean format depending on the form type. The null value means that the form is filled with a placeholder.
 	 * @example
 	 * window.Asc.plugin.executeMethod("GetFormValue");
 	 *

configs/word.json

@@ -2,13 +2,21 @@
   "sdk": {
     "min": [
       "api.js",
-	  "apiPlugins.js"
-	],
-    "common": [      
-	  "apiBuilder.js",
-	  "oform/Main.js",
-	  "oform/Field.js",
-	  "oform/User.js"
+      "apiPlugins.js"
+    ],
+    "common": [
+      "apiBuilder.js",
+      "oform/Document.js",
+      "oform/FieldGroup.js",
+      "oform/FieldMaster.js",
+      "oform/User.js",
+      "oform/UserMaster.js",
+      "oform/changes/DictionaryBase.js",
+      "oform/changes/DocumentChanges.js",
+      "oform/changes/FieldGroupChanges.js",
+      "oform/changes/FieldMasterChanges.js",
+      "oform/changes/UserChanges.js",
+      "oform/changes/UserMasterChanges.js"
     ]
   }
 }

oform/Document.js

@@ -0,0 +1,227 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	/**
+	 * Основной класс для работы с форматом oform
+	 * @constructor
+	 */
+	function CDocument()
+	{
+		AscFormat.CBaseFormatObject.call(this);
+
+		this.Author      = null;
+		this.Date        = null;
+		this.Description = null;
+		this.Type        = null;
+		this.Application = null;
+		this.DocumentId  = null;
+		this.FieldGroups = [];
+
+		this.Users  = [];
+		this.Fields = [];
+	}
+	AscFormat.InitClass(CDocument, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_OForm_Document);
+	CDocument.prototype.setAuthor = function(author)
+	{
+		if (this.Author === author)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentAuthor(this, this.Author, author));
+		this.Author = author;
+	};
+	CDocument.prototype.setDate = function(date)
+	{
+		if (this.Date === date)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentDate(this, this.Date, date));
+		this.Date = date;
+	};
+	CDocument.prototype.setDescription = function(description)
+	{
+		if (this.Description === description)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentDescription(this, this.Description, description));
+		this.Description = description;
+	};
+	CDocument.prototype.setType = function(type)
+	{
+		if (this.Type === type)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentType(this, this.Type, type));
+		this.Type = type;
+	};
+	CDocument.prototype.setApplication = function(app)
+	{
+		if (this.Application === app)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentApplication(this, this.Application, app));
+		this.Application = app;
+	};
+	CDocument.prototype.setDocumentId = function(documentId)
+	{
+		if (this.DocumentId === documentId)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentDocumentId(this, this.DocumentId, documentId));
+		this.DocumentId = documentId;
+	};
+	CDocument.prototype.addFieldGroup = function(fieldGroup)
+	{
+		if (-1 !== this.FieldGroups.indexOf(fieldGroup))
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentFieldGroup(this, fieldGroup.GetId(), true));
+		this.FieldGroups.push(fieldGroup);
+	};
+	CDocument.prototype.removeFieldGroup = function(fieldGroup)
+	{
+		if (!fieldGroup)
+			return;
+		
+		let index = this.FieldGroups.indexOf(fieldGroup);
+		if (-1 === index)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormDocumentFieldGroup(this, fieldGroup.GetId(), false));
+		this.FieldGroups.splice(index, 1);
+	};
+	CDocument.prototype.readChildXml = function(name, reader)
+	{
+		// TODO: fix me
+		switch (name)
+		{
+			case "Author":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				let sAuthor = oNode.attributes["id"];
+				if (sAuthor)
+				{
+					this.setAuthor(sAuthor);
+				}
+				break;
+			}
+			case "Date":
+			{
+				let oDate = new CFormDate();
+				oDate.fromXml(reader);
+				this.setDate(oDate);
+				break;
+			}
+			case "Description":
+			{
+				
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setDescription(oNode.text);
+				break;
+			}
+			case "Type":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setType(oNode.text);
+				break;
+			}
+			case "Application":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setApplication(oNode.text);
+				break;
+			}
+			case "Id":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setDocumentId(oNode.text);
+				break;
+			}
+			case "FieldsGroup":
+			{
+				let oFieldsGroup = new CFieldsGroup();
+				oFieldsGroup.fromXml(reader);
+				this.addFieldsGroups(oFieldsGroup);
+				break;
+			}
+		}
+	};
+	CDocument.prototype.toXml = function(writer)
+	{
+		// TODO: fix me
+		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
+		writer.WriteXmlNodeStart("Document");
+		writer.WriteXmlAttributeString("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+		writer.WriteXmlAttributesEnd();
+		if (this.Author)
+		{
+			let oNode              = new CT_XmlNode();
+			oNode.attributes["id"] = this.Author;
+			oNode.toXml(writer, "Author");
+		}
+		if (this.Date)
+		{
+			this.Date.toXml(writer);
+		}
+		let oDescriptionNode  = new CT_XmlNode();
+		oDescriptionNode.text = this.Description;
+		oDescriptionNode.toXml(writer, "Description");
+		
+		let oTypeNode  = new CT_XmlNode();
+		oTypeNode.text = this.Type;
+		oTypeNode.toXml(writer, "Type");
+		
+		let oAppNode  = new CT_XmlNode();
+		oAppNode.text = this.Application;
+		oAppNode.toXml(writer, "Application");
+		
+		let oIdNode  = new CT_XmlNode();
+		oIdNode.text = this.DocumentId;
+		oIdNode.toXml(writer, "Id");
+		for (let nFG = 0; nFG < this.FieldsGroups.length; ++nFG)
+		{
+			this.FieldsGroups[nFG].toXml(writer);
+		}
+		writer.WriteXmlNodeEnd("Document");
+	};
+	//--------------------------------------------------------export----------------------------------------------------
+	AscOForm.CDocument = CDocument;
+
+})(window);

oform/Field.js

@@ -1,416 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-"use strict";
-
-(function(window, undefined) {
-
-	const CBaseFormatObject = AscFormat.CBaseFormatObject;
-	const InitClass = AscFormat.InitClass;
-	const CChangesString = AscDFH.CChangesDrawingsString;
-	const CChangesObject = AscDFH.CChangesDrawingsObject;
-	const CChangesContent = AscDFH.CChangesDrawingsContent;
-
-	AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_FieldId] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_User] = CChangesContent;
-	AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_Field] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_FormFieldMaster_SignRequest] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_FormField_Content] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_FormField_EncryptedData] = CChangesContent;
-	AscDFH.changesFactory[AscDFH.historyitem_FormField_FieldMaster] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_SignRequest_User] = CChangesContent;
-	AscDFH.changesFactory[AscDFH.historyitem_EncryptedData_Method] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_EncryptedData_Value] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_EncryptedData_KeyInfo] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_KeyInfo_User] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_KeyInfo_Value] = CChangesObject;
-
-
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormFieldMaster_FieldId] = function(oClass, value) {oClass.FieldId = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormFieldMaster_Field] = function(oClass, value) {oClass.Field = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormFieldMaster_SignRequest] = function(oClass, value) {oClass.SignRequest = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormField_Content] = function(oClass, value) {oClass.FieldContent = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormField_FieldMaster] = function(oClass, value) {oClass.FieldMaster = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_EncryptedData_Method] = function(oClass, value) {oClass.EncryptedMethod = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_EncryptedData_Value] = function(oClass, value) {oClass.EncryptedValue = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_EncryptedData_KeyInfo] = function(oClass, value) {oClass.KeyInfo = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_KeyInfo_User] = function(oClass, value) {oClass.FieldId = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_KeyInfo_Value] = function(oClass, value) {oClass.FieldId = value;};
-
-
-	AscDFH.drawingContentChanges[AscDFH.historyitem_FormFieldMaster_User] = function (oClass) {return oClass.Users;};
-	AscDFH.drawingContentChanges[AscDFH.historyitem_SignRequest_User] = function (oClass) {return oClass.Users;};
-	AscDFH.drawingContentChanges[AscDFH.historyitem_FormField_EncryptedData] = function (oClass) {return oClass.EndcriptedData;};
-
-
-	function CFieldMaster() {
-		CBaseFormatObject.call(this);
-		this.FieldId = null;
-		this.Users = [];
-		this.Field = null;
-		this.SignRequest = null;
-	}
-	InitClass(CFieldMaster, CBaseFormatObject, AscDFH.historyitem_type_FormFieldMaster);
-	CFieldMaster.prototype.setFieldId = function(sFieldId) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_FormFieldMaster_FieldId, this.FieldId, sFieldId));
-		this.FieldId = sFieldId;
-	};
-	CFieldMaster.prototype.addUser = function(oUser) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_FormFieldMaster_User, this.Users.length, [oUser], true));
-		this.Users.push(oUser);
-	};
-	CFieldMaster.prototype.setField = function(oField) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_FormFieldMaster_Field, this.Field, oField));
-		this.Field = oField;
-		if(oField) {
-			oField.setFieldMaster(this);
-		}
-	};
-	CFieldMaster.prototype.setSignRequest = function(oSignRequest) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_FormFieldMaster_SignRequest, this.SignRequest, oSignRequest));
-		this.SignRequest = oSignRequest;
-	};
-	CFieldMaster.prototype.readAttrXml = function(name, reader) {
-		switch (name) {
-			case "id": {
-				this.setFieldId(reader.GetValue());
-				break;
-			}
-		}
-	};
-	CFieldMaster.prototype.readChildXml = function (name, reader) {
-		let oThis = this;
-		switch (name) {
-			case "Users": {
-				let oUsersNode = new CT_XmlNode(function (reader, name){
-					if(name === "User") {
-						let oUserNode = new CT_XmlNode();
-						oUserNode.fromXml(reader);
-						let sId = oUserNode.attributes["id"];
-						let oRel = reader.rels.getRelationshipById(sId);
-						reader.context.addFieldMasterRelation(oThis, oRel.targetFullName)
-					}
-					return true;
-				});
-				oUsersNode.fromXml(reader);
-				break;
-			}
-			case "SignRequest": {
-				let oSignRequest = new CSignRequest();
-				oSignRequest.fromXml(reader);
-				this.setSignRequest(oSignRequest);
-				break;
-			}
-		}
-	};
-	CFieldMaster.prototype.toXml = function (writer) {
-		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
-		writer.WriteXmlNodeStart("FieldMaster");
-		writer.WriteXmlAttributeString("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-		writer.WriteXmlNullableAttributeString("id", this.FieldId);
-		writer.WriteXmlAttributesEnd();
-
-		writer.WriteXmlNodeStart("Users");
-		writer.WriteXmlAttributesEnd();
-		let oContext = writer.context;
-		let oUserMasterPartMap = oContext.userMasterPartMap;
-		let oUsersIdMap = {};
-		for(let nUser = 0; nUser < this.Users.length; ++nUser) {
-			let oUser = this.Users[nUser];
-			let oPart = oUserMasterPartMap[oUser.Id];
-			if(!oPart) {
-				oPart = writer.context.part.addPart(AscCommon.openXml.Types.userMaster);
-				let oUserMemory = new AscCommon.CMemory();
-				oUserMemory.context = writer.context;
-				oPart.part.setDataXml(oUser, oUserMemory);
-				oUserMasterPartMap[oUser.Id] = oPart;
-			}
-			let oNode = new CT_XmlNode();
-			let sRId = oContext.part.addRelationship(AscCommon.openXml.Types.userMaster.relationType, oPart.uri);
-			oNode.attributes["r:id"] = sRId
-			oUsersIdMap[oUser.Id] = sRId;
-			oNode.toXml(writer, "User");
-
-		}
-		writer.WriteXmlNodeEnd("Users");
-		if(this.SignRequest) {
-			this.SignRequest.toXml(writer, oUsersIdMap);
-		}
-		writer.WriteXmlNodeEnd("FieldMaster");
-		if(writer.context.fileType === Asc.c_oAscFileType.OFORM) {
-			if(this.Field) {
-				let oPart = writer.context.docPart.part.addPartWithoutRels(AscCommon.openXml.Types.field);
-				let oMemory = new AscCommon.CMemory();
-				oMemory.context = writer.context;
-				oPart.setDataXml(this.Field, oMemory);
-				oMemory.Seek(0);
-				oPart.addRelationship(AscCommon.openXml.Types.fieldMaster.relationType, oContext.part.uri)
-			}
-		}
-	};
-
-	function CSignRequest() {
-		CBaseFormatObject.call(this);
-		this.Users = [];
-	}
-	InitClass(CSignRequest, CBaseFormatObject, AscDFH.historyitem_type_SignRequest);
-	CSignRequest.prototype.addUser = function(oUser) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_SignRequest_User, this.Users.length, [oUser], true));
-		this.Users.push(oUser);
-	};
-	CSignRequest.prototype.readChildXml = function (name, reader) {
-		CFieldMaster.prototype.readChildXml.call(this, name, reader);
-	};
-	CSignRequest.prototype.toXml = function (writer, oUsersIdMap) {
-		writer.WriteXmlNodeStart("SignRequest");
-		writer.WriteXmlAttributesEnd();
-
-		writer.WriteXmlNodeStart("Users");
-		writer.WriteXmlAttributesEnd();
-		for(let nUser = 0; nUser < this.Users.length; ++nUser) {
-			let oUser = this.Users[nUser];
-			let oNode = new CT_XmlNode();
-			let sRId = oUsersIdMap[oUser.Id];
-			if(sRId) {
-				oNode.attributes["r:id"] = sRId
-				oUsersIdMap[oUser.Id] = sRId;
-				oNode.toXml(writer, "User");
-			}
-
-		}
-		writer.WriteXmlNodeEnd("Users");
-		writer.WriteXmlNodeEnd("SignRequest");
-	};
-
-	function CFieldContent() {
-		CParagraphContentWithParagraphLikeContent.call(this);
-	}
-	InitClass(CFieldContent, CParagraphContentWithParagraphLikeContent, 0);
-	CFieldContent.prototype.Add_ToContent = function(Pos, Item, UpdatePosition)
-	{
-		AscCommon.History.Add(new CChangesFormFieldAddItem(this, Pos, [Item]));
-		CParagraphContentWithParagraphLikeContent.prototype.Add_ToContent.apply(this, arguments);
-	};
-
-	CFieldContent.prototype.Remove_FromContent = function(Pos, Count, UpdatePosition)
-	{
-		let DeletedItems = this.Content.slice( Pos, Pos + Count );
-		AscCommon.History.Add(new CChangesFormFieldRemoveItem(this, Pos, DeletedItems));
-		CParagraphContentWithParagraphLikeContent.prototype.Remove_FromContent.apply(this, arguments);
-	};
-	CFieldContent.prototype.fromXml = function (reader) {
-		CParagraphContentWithParagraphLikeContent.prototype.fromXml.call(this, reader);
-	};
-	CFieldContent.prototype.toXml = function (writer) {
-		writer.WriteXmlNodeStart("w:sdtContent");
-		writer.WriteXmlAttributesEnd();
-		CParagraphContentWithParagraphLikeContent.prototype.toXml.call(this, writer);
-		writer.WriteXmlNodeEnd("w:sdtContent");
-	};
-
-	function CField() {
-		CBaseFormatObject.call(this);
-		this.EndcriptedData = [];
-		this.FieldContent = null;
-	}
-	InitClass(CField, CBaseFormatObject, AscDFH.historyitem_type_FormField);
-	CField.prototype.setFieldContent = function(oFieldContent) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_FormField_Content, this.FieldContent, oFieldContent));
-		this.FieldContent = oFieldContent;
-	};
-	CField.prototype.addEncryptedData = function(oEncryptedData) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_FormField_EncryptedData, this.EndcriptedData.length, [oEncryptedData], true));
-		this.EndcriptedData.push(oEncryptedData);
-	};
-	CField.prototype.setFieldMaster = function(oFieldMaster) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_FormField_FieldMaster, this.FieldMaster, oFieldMaster));
-		this.FieldMaster = oFieldMaster;
-	};
-	CField.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "EncryptedData": {
-				let oEncryptedData = new CEncryptedData();
-				oEncryptedData.fromXml(reader);
-				this.addEncryptedData(oEncryptedData);
-				break;
-			}
-			case "Body": {
-				let oFieldContent = null;
-				let oNode = new CT_XmlNode(function (reader, name) {
-					if(name === "sdtContent") {
-						oFieldContent = new CFieldContent();
-						oFieldContent.fromXml(reader);
-						return oFieldContent;
-					}
-					return null;
-				});
-				oNode.fromXml(reader);
-				if(oFieldContent) {
-					this.setFieldContent(oFieldContent);
-				}
-				break;
-			}
-		}
-	};
-	CField.prototype.toXml = function(writer) {
-		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
-		writer.WriteXmlNodeStart("Field");
-		writer.WriteXmlAttributesEnd();
-		if(this.FieldContent) {
-			writer.WriteXmlNodeStart("Body");
-			writer.WriteXmlString(AscCommonWord.g_sXmlDocumentNamespaces);
-			writer.WriteXmlAttributesEnd();
-			this.FieldContent.toXml(writer);
-			writer.WriteXmlNodeEnd("Body");
-		}
-		for(let nData = 0; nData < this.EndcriptedData.length; ++nData) {
-			this.EndcriptedData[nData].toXml(writer);
-		}
-		writer.WriteXmlNodeEnd("Field");
-	};
-
-	function CEncryptedData() {
-		CBaseFormatObject.call(this);
-		this.EncryptedMethod = null;
-		this.EncryptedValue = null;
-		this.KeyInfo = null;
-	}
-	InitClass(CEncryptedData, CBaseFormatObject, AscDFH.historyitem_type_EncryptedData);
-	CEncryptedData.prototype.setEncryptedMethod = function (sEncryptedMethod) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_EncryptedData_Method, this.EncryptedMethod, sEncryptedMethod));
-		this.EncryptedMethod = sEncryptedMethod;
-	};
-	CEncryptedData.prototype.setEncryptedValue = function (sEncryptedValue) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_EncryptedData_Value, this.EncryptedValue, sEncryptedValue));
-		this.EncryptedValue = sEncryptedValue;
-	};
-	CEncryptedData.prototype.setKeyInfo = function (oKeyInfo) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_EncryptedData_KeyInfo, this.KeyInfo, oKeyInfo));
-		this.KeyInfo = oKeyInfo;
-	};
-	CEncryptedData.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "EncryptedMethod": {
-				let oMethod =  new CT_XmlNode();
-				oMethod.fromXml(reader);
-				let sAlgorithm = oMethod.attributes["Algorithm"];
-				if(sAlgorithm) {
-					this.setEncryptedMethod(sAlgorithm)
-				}
-				break;
-			}
-			case "EncryptedValue": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setEncryptedValue(oNode.text);
-				break;
-			}
-			case "KeyInfo": {
-				let oKeyInfo = new CKeyInfo();
-				oKeyInfo.fromXml(reader);
-				this.setKeyInfo(oKeyInfo)
-				break;
-			}
-		}
-	};
-	CEncryptedData.prototype.toXml = function(writer) {
-		writer.WriteXmlNodeStart("EncryptedData");
-		writer.WriteXmlAttributesEnd();
-		if(this.EncryptedMethod) {
-			let oMethod =  new CT_XmlNode();
-			oMethod.attributes["Algorithm"] = this.EncryptedMethod;
-			oMethod.toXml(writer, "EncryptedMethod");
-		}
-		if(this.EncryptedValue) {
-			let oValue =  new CT_XmlNode();
-			oValue.text = this.EncryptedValue;
-			oValue.toXml(writer, "EncryptedValue");
-		}
-		if(this.KeyInfo) {
-			this.KeyInfo.toXml(writer);
-		}
-		writer.WriteXmlNodeEnd("EncryptedData");
-	};
-
-	function CKeyInfo() {
-		CBaseFormatObject.call(this);
-		this.UserId = null;
-		this.Value = null;
-	}
-	InitClass(CKeyInfo, CBaseFormatObject, AscDFH.historyitem_type_KeyInfo);
-	CKeyInfo.prototype.setUserId = function (sUserId) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_KeyInfo_User, this.UserId, sUserId));
-		this.UserId = sUserId;
-	};
-	CKeyInfo.prototype.setValue = function (sValue) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_KeyInfo_Value, this.Value, sValue));
-		this.Value = sValue;
-	};
-	CKeyInfo.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "User": {
-				let oNode =  new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setUserId(oNode.attributes["id"]);
-				break;
-			}
-			case "Value": {
-				let oNode =  new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setValue(oNode.text);
-				break;
-			}
-		}
-	};
-	CKeyInfo.prototype.toXml = function(writer) {
-		writer.WriteXmlNodeStart("KeyInfo");
-		writer.WriteXmlAttributesEnd();
-		if(this.UserId) {
-			let oNode = new CT_XmlNode();
-			oNode.attributes["id"] = this.UserId;
-			oNode.toXml(writer, "User");
-		}
-		if(this.Value) {
-			let oValue =  new CT_XmlNode();
-			oValue.text = this.Value;
-			oValue.toXml(writer, "Value");
-		}
-		writer.WriteXmlNodeEnd("KeyInfo");
-	};
-
-	AscWord.CFieldContent = CFieldContent;
-	AscWord.CFieldMaster = CFieldMaster;
-	AscWord.CField = CField;
-	AscWord.CEncryptedData = CEncryptedData;
-	AscWord.CKeyInfo = CKeyInfo;
-	AscWord.CSignRequest = CSignRequest;
-})(window);

oform/FieldGroup.js

@@ -0,0 +1,88 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	/**
+	 * @constructor
+	 */
+	function CFieldGroup()
+	{
+		AscFormat.CBaseFormatObject.call(this);
+
+		this.Weight = null;
+		this.Fields = [];
+	}
+	AscFormat.InitClass(CFieldGroup, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldGroup);
+	CFieldGroup.prototype.setWeight = function(value)
+	{
+		if (this.Weight === value)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldGroupWeight(this, this.Weight, value));
+		this.Weight = value;
+	};
+	CFieldGroup.prototype.addField = function(field)
+	{
+		if (!field || -1 !== this.Fields.indexOf(field))
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldGroupAddRemoveField(this, field.GetId(), true));
+		this.Fields.push(field);
+	};
+	CFieldGroup.prototype.removeField = function(field)
+	{
+		if (!field)
+			return;
+
+		let index = this.Fields.indexOf(field);
+		if (-1 === index)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldGroupAddRemoveField(this, field.GetId(), false));
+		this.Fields.splice(index, 1);
+	};
+	CFieldGroup.prototype.readChildXml = function(name, reader)
+	{
+		// TODO: implement
+		return false;
+	};
+	CFieldGroup.prototype.toXml = function(writer)
+	{
+		// TODO: implement
+	};
+	//--------------------------------------------------------export----------------------------------------------------
+	AscOForm.CFieldGroup = CFieldGroup;
+
+})(window);

oform/FieldMaster.js

@@ -0,0 +1,197 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	/**
+	 *
+	 * @constructor
+	 */
+	function CFieldMaster()
+	{
+		AscFormat.CBaseFormatObject.call(this);
+
+		this.FieldId = null;
+		this.Field   = null;
+		this.Users   = [];
+		this.Signers = [];
+	}
+	AscFormat.InitClass(CFieldMaster, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldMaster);
+	CFieldMaster.prototype.setLogicField = function(logicField)
+	{
+		this.Field = logicField;
+	};
+	CFieldMaster.prototype.setFieldId = function(fieldId)
+	{
+		if (fieldId === this.FieldId)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldMasterFieldId(this, this.FieldId, fieldId));
+		this.FieldId = fieldId;
+	};
+	CFieldMaster.prototype.getFieldId = function()
+	{
+		return this.FieldId;
+	};
+	CFieldMaster.prototype.addUser = function(user)
+	{
+		if (-1 !== this.Users.indexOf(user))
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldMasterAddRemoveUser(this, user.GetId(), true));
+		this.Users.push(user);
+	};
+	CFieldMaster.prototype.removeUser = function(user)
+	{
+		let index = this.User.indexOf(user);
+		if (-1 === index)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldMasterAddRemoveUser(this, user.GetId(), false));
+		this.Users.splice(index, 1);
+	};
+	CFieldMaster.prototype.addSigner = function(user)
+	{
+		if (-1 !== this.Signers.indexOf(user))
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldMasterAddRemoveSigner(this, user.GetId(), true));
+		this.Signers.push(user);
+	};
+	CFieldMaster.prototype.removeSigner = function(user)
+	{
+		let index = this.Signers.indexOf(user);
+		if (-1 === index)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldMasterAddRemoveSigner(this, user.GetId(), false));
+		this.Signers.splice(index, 1);
+	};
+	CFieldMaster.prototype.readAttrXml = function(name, reader)
+	{
+		switch (name)
+		{
+			case "id":
+			{
+				this.setFieldId(reader.GetValue());
+				break;
+			}
+		}
+	};
+	CFieldMaster.prototype.readChildXml = function(name, reader)
+	{
+		let oThis = this;
+		switch (name)
+		{
+			case "Users":
+			{
+				let oUsersNode = new CT_XmlNode(function(reader, name)
+				{
+					if (name === "User")
+					{
+						let oUserNode = new CT_XmlNode();
+						oUserNode.fromXml(reader);
+						let sId  = oUserNode.attributes["id"];
+						let oRel = reader.rels.getRelationshipById(sId);
+						reader.context.addFieldMasterRelation(oThis, oRel.targetFullName)
+					}
+					return true;
+				});
+				oUsersNode.fromXml(reader);
+				break;
+			}
+			case "SignRequest":
+			{
+				let oSignRequest = new CSignRequest();
+				oSignRequest.fromXml(reader);
+				this.setSignRequest(oSignRequest);
+				break;
+			}
+		}
+	};
+	CFieldMaster.prototype.toXml = function(writer)
+	{
+		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
+		writer.WriteXmlNodeStart("FieldMaster");
+		writer.WriteXmlAttributeString("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+		writer.WriteXmlNullableAttributeString("id", this.FieldId);
+		writer.WriteXmlAttributesEnd();
+
+		writer.WriteXmlNodeStart("Users");
+		writer.WriteXmlAttributesEnd();
+		let oContext           = writer.context;
+		let oUserMasterPartMap = oContext.userMasterPartMap;
+		let oUsersIdMap        = {};
+		for (let nUser = 0; nUser < this.Users.length; ++nUser)
+		{
+			let oUser = this.Users[nUser];
+			let oPart = oUserMasterPartMap[oUser.Id];
+			if (!oPart)
+			{
+				oPart               = writer.context.part.addPart(AscCommon.openXml.Types.userMaster);
+				let oUserMemory     = new AscCommon.CMemory();
+				oUserMemory.context = writer.context;
+				oPart.part.setDataXml(oUser, oUserMemory);
+				oUserMasterPartMap[oUser.Id] = oPart;
+			}
+			let oNode                = new CT_XmlNode();
+			let sRId                 = oContext.part.addRelationship(AscCommon.openXml.Types.userMaster.relationType, oPart.uri);
+			oNode.attributes["r:id"] = sRId
+			oUsersIdMap[oUser.Id]    = sRId;
+			oNode.toXml(writer, "User");
+		}
+		writer.WriteXmlNodeEnd("Users");
+		if (this.SignRequest)
+		{
+			this.SignRequest.toXml(writer, oUsersIdMap);
+		}
+		writer.WriteXmlNodeEnd("FieldMaster");
+
+		if (writer.context.fileType === Asc.c_oAscFileType.OFORM)
+		{
+			if (this.Field)
+			{
+				let oPart       = writer.context.docPart.part.addPartWithoutRels(AscCommon.openXml.Types.field);
+				let oMemory     = new AscCommon.CMemory();
+				oMemory.context = writer.context;
+				oPart.setDataXml(this.Field, oMemory);
+				oMemory.Seek(0);
+				oPart.addRelationship(AscCommon.openXml.Types.fieldMaster.relationType, oContext.part.uri)
+			}
+		}
+	};
+	//--------------------------------------------------------export----------------------------------------------------
+	AscOForm.CFieldMaster = CFieldMaster;
+
+})(window);

oform/Main.js

@@ -1,316 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-"use strict";
-
-(function(window, undefined) {
-
-	const CBaseFormatObject = AscFormat.CBaseFormatObject;
-	const InitClass = AscFormat.InitClass;
-	const CChangesString = AscDFH.CChangesDrawingsString;
-	const CChangesObject = AscDFH.CChangesDrawingsObject;
-	const CChangesContent = AscDFH.CChangesDrawingsContent;
-	const CChangesLong = AscDFH.CChangesDrawingsLong;
-
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_Author] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_Date] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_Description] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_Type] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_Application] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_DocumentId] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_FieldsGroups] = CChangesContent;
-	AscDFH.changesFactory[AscDFH.historyitem_MainDocument_User] = CChangesContent;
-	AscDFH.changesFactory[AscDFH.historyitem_FormDate_Format] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_FormDate_Value] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_FieldsGroup_Id] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_FieldsGroup_Weight] = CChangesLong;
-	AscDFH.changesFactory[AscDFH.historyitem_FieldsGroup_Field] = CChangesContent;
-
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_Author] = function (oClass, value) {oClass.Author = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_Date] = function (oClass, value) {oClass.Date = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_Description] = function (oClass, value) {oClass.Description = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_Type] = function (oClass, value) {oClass.Type = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_Application] = function (oClass, value) {oClass.Application = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_MainDocument_DocumentId] = function (oClass, value) {oClass.DocumentId = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormDate_Format] = function (oClass, value) {oClass.Format = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FormDate_Value] = function (oClass, value) {oClass.Value = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FieldsGroup_Id] = function (oClass, value) {oClass.GroupId = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_FieldsGroup_Weight] = function (oClass, value) {oClass.Weight = value;};
-
-	AscDFH.drawingContentChanges[AscDFH.historyitem_MainDocument_FieldsGroups] = function (oClass) {return oClass.FieldsGroups;};
-	AscDFH.drawingContentChanges[AscDFH.historyitem_MainDocument_User] = function (oClass) {return oClass.Users;};
-	AscDFH.drawingContentChanges[AscDFH.historyitem_FieldsGroup_Field] = function (oClass) {return oClass.Fields;};
-
-
-	function CMainDocument() {
-		CBaseFormatObject.call(this);
-		this.Author = null;
-		this.Date = null;
-		this.Description = null;
-		this.Type = null;
-		this.Application = null;
-		this.DocumentId = null;
-		this.FieldsGroups = [];
-
-		this.Users = [];
-	}
-	InitClass(CMainDocument, CBaseFormatObject, AscDFH.historyitem_type_MainDocument);
-	CMainDocument.prototype.setAuthor = function (sAuthor) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_MainDocument_Author, this.Author, sAuthor));
-		this.Author = sAuthor;
-	};
-	CMainDocument.prototype.setDate = function (oDate) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_MainDocument_Date, this.Date, oDate));
-		this.Date = oDate;
-	};
-	CMainDocument.prototype.setDescription = function (sDescription) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_MainDocument_Description, this.Description, sDescription));
-		this.Description = sDescription;
-	};
-	CMainDocument.prototype.setType = function (sType) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_MainDocument_Type, this.Type, sType));
-		this.Type = sType;
-	};
-	CMainDocument.prototype.setApplication = function (sApplication) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_MainDocument_Application, this.Application, sApplication));
-		this.Application = sApplication;
-	};
-	CMainDocument.prototype.setDocumentId = function (sDocumentId) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_MainDocument_DocumentId, this.DocumentId, sDocumentId));
-		this.DocumentId = sDocumentId;
-	};
-	CMainDocument.prototype.addFieldsGroups = function(oFieldsGroup) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_MainDocument_FieldsGroups, this.FieldsGroups.length, [oFieldsGroup], true));
-		this.FieldsGroups.push(oFieldsGroup);
-	};
-	CMainDocument.prototype.addUser = function(oUser) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_MainDocument_User, this.FieldsGroups.length, [oUser], true));
-		this.Users.push(oUser);
-	};
-	CMainDocument.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "Author": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				let sAuthor = oNode.attributes["id"];
-				if(sAuthor) {
-					this.setAuthor(sAuthor);
-				}
-				break;
-			}
-			case "Date": {
-				let oDate = new CFormDate();
-				oDate.fromXml(reader);
-				this.setDate(oDate);
-				break;
-			}
-			case "Description": {
-
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setDescription(oNode.text);
-				break;
-			}
-			case "Type": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setType(oNode.text);
-				break;
-			}
-			case "Application": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setApplication(oNode.text);
-				break;
-			}
-			case "Id": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setDocumentId(oNode.text);
-				break;
-			}
-			case "FieldsGroup": {
-				let oFieldsGroup = new CFieldsGroup();
-				oFieldsGroup.fromXml(reader);
-				this.addFieldsGroups(oFieldsGroup);
-				break;
-			}
-		}
-	};
-	CMainDocument.prototype.toXml = function(writer) {
-
-		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
-		writer.WriteXmlNodeStart("Document");
-		writer.WriteXmlAttributeString("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-		writer.WriteXmlAttributesEnd();
-		if(this.Author) {
-			let oNode = new CT_XmlNode();
-			oNode.attributes["id"] = this.Author;
-			oNode.toXml(writer, "Author");
-		}
-		if(this.Date) {
-			this.Date.toXml(writer);
-		}
-		let oDescriptionNode = new CT_XmlNode();
-		oDescriptionNode.text = this.Description;
-		oDescriptionNode.toXml(writer, "Description");
-
-		let oTypeNode = new CT_XmlNode();
-		oTypeNode.text = this.Type;
-		oTypeNode.toXml(writer, "Type");
-
-		let oAppNode = new CT_XmlNode();
-		oAppNode.text = this.Application;
-		oAppNode.toXml(writer, "Application");
-
-		let oIdNode = new CT_XmlNode();
-		oIdNode.text = this.DocumentId;
-		oIdNode.toXml(writer, "Id");
-		for(let nFG = 0; nFG < this.FieldsGroups.length; ++nFG) {
-			this.FieldsGroups[nFG].toXml(writer);
-		}
-		writer.WriteXmlNodeEnd("Document");
-	};
-
-	function CFormDate() {
-		CBaseFormatObject.call(this);
-		this.Format = null;
-		this.Value = null;
-	}
-	InitClass(CFormDate, CBaseFormatObject, AscDFH.historyitem_type_FormDate);
-	CFormDate.prototype.setFormat = function(sFormat) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_FormDate_Format, this.Format, sFormat));
-		this.Format = sFormat;
-	};
-	CFormDate.prototype.setValue = function(sValue) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_FormDate_Value, this.Value, sValue));
-		this.Value = sValue;
-	};
-	CFormDate.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "Format": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setFormat(oNode.text);
-				break;
-			}
-			case "Value": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setValue(oNode.text);
-				break;
-			}
-		}
-	};
-	CFormDate.prototype.toXml = function (writer) {
-		writer.WriteXmlNodeStart("Date");
-		writer.WriteXmlAttributesEnd();
-
-		let oFormatNode = new CT_XmlNode();
-		oFormatNode.text = this.Format;
-		oFormatNode.toXml(writer, "Format");
-
-		let oValueNode = new CT_XmlNode();
-		oValueNode.text = this.Value;
-		oValueNode.toXml(writer, "Value");
-
-		writer.WriteXmlNodeEnd("Date");
-	};
-
-	function CFieldsGroup() {
-		CBaseFormatObject.call(this);
-		this.GroupId = null;
-		this.Weight = null;
-		this.Fields = [];
-	}
-	InitClass(CFieldsGroup, CBaseFormatObject, AscDFH.historyitem_type_FieldsGroup);
-	CFieldsGroup.prototype.setGroupId = function (sGroupId) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_FieldsGroup_Id, this.GroupId, sGroupId));
-		this.GroupId = sGroupId;
-	};
-	CFieldsGroup.prototype.setWeight = function (nWeight) {
-		AscCommon.History.Add(new CChangesLong(this, AscDFH.historyitem_FieldsGroup_Weight, this.Weight, nWeight));
-		this.Weight = nWeight;
-	};
-	CFieldsGroup.prototype.addField = function (oField) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_FieldsGroup_Field, this.Fields.length, [oField], true));
-		this.Fields.push(oField);
-	};
-	CFieldsGroup.prototype.readAttrXml = function(name, reader) {
-		switch (name) {
-			case "id": {
-				this.setGroupId(reader.GetValue());
-				break;
-			}
-			case "weight": {
-				this.setWeight(reader.GetValueInt());
-				break;
-			}
-		}
-	};
-	CFieldsGroup.prototype.readChildXml = function(name, reader) {
-		switch (name) {
-			case "Field": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				let sId = oNode.attributes["id"];
-				let oRel = reader.rels.getRelationshipById(sId);
-				reader.context.addFieldGroupRelation(this, oRel.targetFullName);
-				break;
-			}
-		}
-	};
-	CFieldsGroup.prototype.toXml = function (writer) {
-		writer.WriteXmlNodeStart("FieldsGroup");
-		writer.WriteXmlNullableAttributeString("id", this.GroupId);
-		writer.WriteXmlNullableAttributeInt("weight", this.Weight);
-		writer.WriteXmlAttributesEnd();
-
-		let oContext = writer.context;
-		let oFldMasterPartMap = oContext.fieldMastersPartMap;
-		for(let nFldMaster = 0; nFldMaster < this.Fields.length; ++nFldMaster) {
-			let oFieldMaster = this.Fields[nFldMaster];
-			let oPart = oFldMasterPartMap[oFieldMaster.Id];
-			if(oPart) {
-				let oNode = new CT_XmlNode();
-				oNode.attributes["r:id"] = oContext.part.addRelationship(AscCommon.openXml.Types.fieldMaster.relationType, oPart.part.uri);
-				oNode.toXml(writer, "Field");
-			}
-		}
-
-		writer.WriteXmlNodeEnd("FieldsGroup");
-	};
-
-	AscWord.CMainDocument = CMainDocument;
-	AscWord.CFieldsGroup = CFieldsGroup;
-	AscWord.CFormDate = CFormDate;
-})(window);

oform/User.js

@@ -32,275 +32,87 @@
 
 "use strict";
 
-(function(window, undefined) {
-	const CBaseFormatObject = AscFormat.CBaseFormatObject;
-	const InitClass = AscFormat.InitClass;
-	const CChangesString = AscDFH.CChangesDrawingsString;
-	const CChangesObject = AscDFH.CChangesDrawingsObject;
-	const CChangesContent = AscDFH.CChangesDrawingsContent;
+(function(window)
+{
+	/**
+	 * @param {AscOForm.CUserMaster} userMaster
+	 * @constructor
+	 */
+	function CUser(userMaster)
+	{
+		AscFormat.CBaseFormatObject.call(this);
 
-	AscDFH.changesFactory[AscDFH.historyitem_UserMasterUserId] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_UserMasterSignInfo] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_UserMasterCipherInfo] = CChangesObject;
-	AscDFH.changesFactory[AscDFH.historyitem_UserMasterRole] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_UserEmail] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_UserTelephone] = CChangesString;
-	AscDFH.changesFactory[AscDFH.historyitem_UserMasterUser] = CChangesContent;
+		this.Email      = undefined;
+		this.Telephone  = undefined;
+		this.UserMaster = undefined;
 
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserMasterUserId] = function(oClass, value) {oClass.UserId = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserMasterSignInfo] = function(oClass, value) {oClass.SignInfo = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserMasterCipherInfo] = function(oClass, value) {oClass.CipherInfo = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserMasterRole] = function(oClass, value) {oClass.Role = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserEmail] = function(oClass, value) {oClass.Email = value;};
-	AscDFH.drawingsChangesMap[AscDFH.historyitem_UserTelephone] = function(oClass, value) {oClass.Telephone = value;};
-
-	AscDFH.drawingContentChanges[AscDFH.historyitem_UserMasterUser] = function(oClass) {return oClass.Users;};
-
-
-
-	function CUserMaster() {
-		CBaseFormatObject.call(this);
-		this.UserId = null;
-		this.SignInfo = null;
-		this.CipherInfo = null;
-		this.Role = null;
-
-		this.Users = [];
+		if (userMaster)
+			this.setUserMaster(userMaster);
 	}
-	InitClass(CUserMaster, CBaseFormatObject, AscDFH.historyitem_type_UserMaster);
-	CUserMaster.prototype.setUserId = function (sUserId) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_UserMasterUserId, this.UserId, sUserId));
-		this.UserId = sUserId;
-	};
-	CUserMaster.prototype.setSignInfo = function (oSignInfo) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_UserMasterSignInfo, this.SignInfo, oSignInfo));
-		this.SignInfo = oSignInfo;
+	AscFormat.InitClass(CUser, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_OForm_User);
+	CUser.prototype.setUserMaster = function(userMaster)
+	{
+		if (this.UserMaster === userMaster)
+			return;
 
+		let oldValue = this.UserMaster ? this.UserMaster.GetId() : undefined;
+		let newValue = userMaster ? userMaster.GetId() : undefined;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormUserUserMaster(this, oldValue, newValue));
+		this.UserMaster = userMaster;
 	};
-	CUserMaster.prototype.setCipherInfo = function (oCipherInfo) {
-		AscCommon.History.Add(new CChangesObject(this, AscDFH.historyitem_UserMasterCipherInfo, this.CipherInfo, oCipherInfo));
-		this.CipherInfo = oCipherInfo;
+	CUser.prototype.setEmail = function(email)
+	{
+		if (email === this.Email)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormUserEmail(this, this.Email, email));
+		this.Email = email;
 	};
-	CUserMaster.prototype.setRole = function (sRole) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_UserMasterRole, this.Role, sRole));
-		this.Role = sRole;
+	CUser.prototype.setTelephone = function(telephone)
+	{
+		if (telephone === this.Telephone)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormUserTelephone(this, this.Telephone, telephone));
+		this.Telephone = telephone;
 	};
-	CUserMaster.prototype.addUser = function (oUser) {
-		AscCommon.History.Add(new CChangesContent(this, AscDFH.historyitem_UserMasterUser, this.Users.length, [oUser], true));
-		this.Users.push(oUser);
+	CUser.prototype.getUserMaster = function()
+	{
+		return this.UserMaster;
 	};
-	CUserMaster.prototype.readChildXml = function (name, reader) {
+	CUser.prototype.readChildXml = function(name, reader)
+	{
 		let bRead = false;
-		switch (name) {
-			case "Id": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setUserId(oNode.text);
+		switch (name)
+		{
+			case "Email":
+			{
+				let node = CT_XmlNode.fromReader(reader);
+				this.setEmail(node.text);
 				bRead = true;
 				break;
 			}
-			case "SignInfo": {
-				let oSignInfo = new CSignInfo();
-				oSignInfo.fromXml(reader);
-				this.setSignInfo(oSignInfo);
-				bRead = true;
-				break;
-			}
-			case "CipherInfo": {
-				let oCipherInfo = new CCipherInfo();
-				oCipherInfo.fromXml(reader);
-				this.setCipherInfo(oCipherInfo);
-				bRead = true;
-				break;
-			}
-			case "Role": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setRole(oNode.text);
+			case "Telephone":
+			{
+				let node = CT_XmlNode.fromReader(reader);
+				this.setTelephone(node.text);
 				bRead = true;
 				break;
 			}
 		}
 		return bRead;
 	};
-	CUserMaster.prototype.writeChildren = function(writer) {
-		let oIdNode = new CT_XmlNode();
-		oIdNode.text = this.UserId;
-		oIdNode.toXml(writer, "Id");
-		if(this.SignInfo) {
-			this.SignInfo.toXml(writer);
-		}
-		if(this.CipherInfo) {
-			this.CipherInfo.toXml(writer);
-		}
-		let oRoleNode = new CT_XmlNode();
-		oRoleNode.text = this.Role;
-		oRoleNode.toXml(writer, "Role");
-	}
-	CUserMaster.prototype.toXml = function (writer) {
-		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
-		writer.WriteXmlNodeStart("UserMaster");
-		writer.WriteXmlAttributesEnd();
-		this.writeChildren(writer);
-		writer.WriteXmlNodeEnd("UserMaster");
-	};
-
-	function CUser() {
-		CUserMaster.call(this);
-		this.Email = null;
-		this.Telephone = null;
-	}
-	InitClass(CUser, CUserMaster, AscDFH.historyitem_type_User);
-	CUser.prototype.setEmail = function (sEmail) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_UserEmail, this.Email, sEmail));
-		this.Email = sEmail;
-	};
-	CUser.prototype.setTelephone = function (sTelephone) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_UserTelephone, this.Telephone, sTelephone));
-		this.Telephone = sTelephone;
-	};
-	CUser.prototype.readChildXml = function (name, reader) {
-		if(CUserMaster.prototype.readChildXml.call(this, name, reader)) {
-			return true;
-		}
-		let bRead = false;
-		switch (name) {
-			case "Email": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setEmail(oNode.text);
-				bRead = true;
-				break;
-			}
-			case "Telephone": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setTelephone(oNode.text);
-				bRead = true;
-				break;
-			}
-		}
-		return bRead;
-	};
-	CUser.prototype.toXml = function (writer) {
+	CUser.prototype.toXml = function(writer)
+	{
 		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
 		writer.WriteXmlNodeStart("User");
 		writer.WriteXmlAttributesEnd();
-		let oEmailNode = new CT_XmlNode();
-		oEmailNode.text = this.Email;
-		oEmailNode.toXml(writer, "Email");
-
-		let oTelephoneNode = new CT_XmlNode();
-		oTelephoneNode.text = this.Telephone;
-		oTelephoneNode.toXml(writer, "Telephone");
-		this.writeChildren(writer);
+		writer.WriteXmlNodeWithText("Email", this.Email);
+		writer.WriteXmlNodeWithText("Telephone", this.Telephone);
 		writer.WriteXmlNodeEnd("User");
 	};
+	//--------------------------------------------------------export----------------------------------------------------
+	AscOForm.CUser = CUser;
 
-	function CSignInfo() {
-		CBaseFormatObject.call(this);
-		this.PublicKey = null;
-		this.X509 = null;
-		this.ImageValid = null;
-		this.ImageInvalid = null;
-	}
-	InitClass(CSignInfo, CBaseFormatObject, AscDFH.historyitem_type_SignInfo);
-	CSignInfo.prototype.setPublicKey = function (sPublicKey) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_SignInfo_PublicKey, this.PublicKey, sPublicKey));
-		this.PublicKey = sPublicKey;
-	};
-	CSignInfo.prototype.setX509 = function (sX509) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_SignInfo_X509, this.X509, sX509));
-		this.X509 = sX509;
-	};
-	CSignInfo.prototype.setImageValid = function (sImageValid) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_SignInfo_ImageValid, this.ImageValid, sImageValid));
-		this.ImageValid = sImageValid;
-	};
-	CSignInfo.prototype.setImageInvalid = function (sImageInvalid) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_SignInfo_ImageInvalid, this.ImageInvalid, sImageInvalid));
-		this.ImageInvalid = sImageInvalid;
-	};
-	CSignInfo.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "PublicKey": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setPublicKey(oNode.text);
-				break;
-			}
-			case "X509": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setX509(oNode.text);
-				break;
-			}
-			case "ImageValid": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setImageValid(oNode.text);
-				break;
-			}
-			case "ImageInvalid": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setImageInvalid(oNode.text);
-				break;
-			}
-		}
-	};
-	CSignInfo.prototype.toXml = function(writer) {
-		writer.WriteXmlNodeStart("SignInfo");
-		writer.WriteXmlAttributesEnd();
-		let oPublicKeyNode = new CT_XmlNode();
-		oPublicKeyNode.text = this.PublicKey;
-		oPublicKeyNode.toXml(writer, "PublicKey");
-
-		let oX509Node = new CT_XmlNode();
-		oX509Node.text = this.X509;
-		oX509Node.toXml(writer, "X509");
-
-		let oImageValidNode = new CT_XmlNode();
-		oImageValidNode.text = this.ImageValid;
-		oImageValidNode.toXml(writer, "ImageValid");
-
-		let oImageInvalidNode = new CT_XmlNode();
-		oImageInvalidNode.text = this.ImageInvalid;
-		oImageInvalidNode.toXml(writer, "ImageInvalid");
-
-		writer.WriteXmlNodeEnd("SignInfo");
-	};
-
-	function CCipherInfo() {
-		CBaseFormatObject.call(this);
-		this.PublicKey = null;
-	}
-	InitClass(CCipherInfo, CBaseFormatObject, AscDFH.historyitem_type_CipherInfo);
-	CCipherInfo.prototype.setPublicKey = function (sPublicKey) {
-		AscCommon.History.Add(new CChangesString(this, AscDFH.historyitem_CipherInfo_PublicKey, this.PublicKey, sPublicKey));
-		this.PublicKey = sPublicKey;
-	};
-	CCipherInfo.prototype.readChildXml = function (name, reader) {
-		switch (name) {
-			case "PublicKey": {
-				let oNode = new CT_XmlNode();
-				oNode.fromXml(reader);
-				this.setPublicKey(oNode.text);
-				break;
-			}
-		}
-	};
-	CCipherInfo.prototype.toXml = function(writer) {
-		writer.WriteXmlNodeStart("CipherInfo");
-		writer.WriteXmlAttributesEnd();
-		let oPublicKeyNode = new CT_XmlNode();
-		oPublicKeyNode.text = this.PublicKey;
-		oPublicKeyNode.toXml(writer, "PublicKey");
-		writer.WriteXmlNodeEnd("CipherInfo");
-	};
-
-	AscWord.CUserMaster = CUserMaster;
-	AscWord.CUser = CUser;
-	AscWord.CSignInfo = CSignInfo;
-	AscWord.CCipherInfo = CCipherInfo;
 })(window);

oform/UserMaster.js

@@ -0,0 +1,101 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	/**
+	 *
+	 * @constructor
+	 */
+	function CUserMaster()
+	{
+		AscFormat.CBaseFormatObject.call(this);
+
+		this.UserId = undefined;
+		this.Role   = undefined;
+	}
+	AscFormat.InitClass(CUserMaster, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_OForm_UserMaster);
+	CUserMaster.prototype.setUserId = function(userId)
+	{
+		if (userId === this.UserId)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormUserMasterUserId(this, this.UserId, userId));
+		this.UserId = userId;
+	};
+	CUserMaster.prototype.setRole = function(role)
+	{
+		if (role === this.Role)
+			return;
+
+		AscCommon.History.Add(new AscDFH.CChangesOFormUserMasterRole(this, this.Role, role));
+		this.Role = role;
+	};
+	CUserMaster.prototype.readChildXml = function(name, reader)
+	{
+		let bRead = false;
+		switch (name)
+		{
+			case "Id":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setUserId(oNode.text);
+				bRead = true;
+				break;
+			}
+			case "Role":
+			{
+				let oNode = new CT_XmlNode();
+				oNode.fromXml(reader);
+				this.setRole(oNode.text);
+				bRead = true;
+				break;
+			}
+		}
+		return bRead;
+	};
+	CUserMaster.prototype.toXml = function(writer)
+	{
+		writer.WriteXmlString(AscCommonWord.g_sXmlHeader);
+		writer.WriteXmlNodeStart("UserMaster");
+		writer.WriteXmlAttributesEnd();
+		writer.WriteXmlNodeWithText("Id", this.UserId);
+		writer.WriteXmlNodeWithText("Role", this.Role);
+		writer.WriteXmlNodeEnd("UserMaster");
+	};
+	//--------------------------------------------------------export----------------------------------------------------
+	AscOForm.CUserMaster = CUserMaster;
+
+})(window);

oform/changes/DictionaryBase.js

@@ -0,0 +1,103 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	/**
+	 * Базовое изменение для работы с каким-либо контейнером, в который по ключу-key (string)
+	 * добавляют/удаляют значение
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBase}
+	 */
+	function CChangesDictionaryBase(Class, key, isAdd)
+	{
+		AscDFH.CChangesBase.call(this, Class);
+		this.Key = key;
+		this.Add = isAdd;
+	}
+	CChangesDictionaryBase.prototype = Object.create(AscDFH.CChangesBase.prototype);
+	CChangesDictionaryBase.prototype.constructor = CChangesDictionaryBase;
+	CChangesDictionaryBase.prototype.Redo = function()
+	{
+		if (this.Add)
+			this.private_AddToDictionary();
+		else
+			this.private_RemoveFromDictionary();
+	};
+	CChangesDictionaryBase.prototype.Undo = function()
+	{
+		if (this.Add)
+			this.private_RemoveFromDictionary();
+		else
+			this.private_AddToDictionary();
+	};
+	CChangesDictionaryBase.prototype.WriteToBinary = function(writer)
+	{
+		writer.WriteString2(this.Key);
+		writer.WriteBool(this.Add);
+	};
+	CChangesDictionaryBase.prototype.ReadFromBinary = function(reader)
+	{
+		this.Key = reader.GetString2();
+		this.Add = reader.GetBool();
+	};
+	CChangesDictionaryBase.prototype.IsNeedRecalculate = function()
+	{
+		return false;
+	};
+	CChangesDictionaryBase.prototype.CreateReverseChange = function()
+	{
+		return new this.constructor(this.Class, this.Key, !this.Add);
+	};
+	CChangesDictionaryBase.prototype.private_AddToDictionary = function()
+	{
+	};
+	CChangesDictionaryBase.prototype.private_RemoveFromDictionary = function()
+	{
+	};
+	window['AscDFH'].CChangesDictionaryBase = CChangesDictionaryBase;
+
+	function InheritDictionaryChange(changeClass, type, addFunction, removeFunction)
+	{
+		window['AscDFH'].changesFactory[type] = changeClass;
+
+		changeClass.prototype                              = Object.create(CChangesDictionaryBase.prototype);
+		changeClass.prototype.constructor                  = changeClass;
+		changeClass.prototype.Type                         = type;
+		changeClass.prototype.private_AddToDictionary      = addFunction;
+		changeClass.prototype.private_RemoveFromDictionary = removeFunction;
+	}
+	window['AscDFH'].InheritDictionaryChange = InheritDictionaryChange;
+
+})(window);

oform/changes/DocumentChanges.js

@@ -0,0 +1,192 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	window['AscDFH'].historyitem_OForm_Document_Author      = window['AscDFH'].historyitem_type_OForm_Document | 1;
+	window['AscDFH'].historyitem_OForm_Document_Date        = window['AscDFH'].historyitem_type_OForm_Document | 2;
+	window['AscDFH'].historyitem_OForm_Document_Description = window['AscDFH'].historyitem_type_OForm_Document | 3;
+	window['AscDFH'].historyitem_OForm_Document_Type        = window['AscDFH'].historyitem_type_OForm_Document | 4;
+	window['AscDFH'].historyitem_OForm_Document_Application = window['AscDFH'].historyitem_type_OForm_Document | 5;
+	window['AscDFH'].historyitem_OForm_Document_DocumentId  = window['AscDFH'].historyitem_type_OForm_Document | 6;
+	window['AscDFH'].historyitem_OForm_Document_FieldGroup  = window['AscDFH'].historyitem_type_OForm_Document | 7;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentAuthor(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentAuthor,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_Author,
+		function(value)
+		{
+			this.Class.Author = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentAuthor = CChangesOFormDocumentAuthor;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentDate(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentDate,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_Date,
+		function(value)
+		{
+			this.Class.Date = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentDate = CChangesOFormDocumentDate;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentDescription(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentDescription,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_Description,
+		function(value)
+		{
+			this.Class.Description = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentDescription = CChangesOFormDocumentDescription;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentType(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentType,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_Type,
+		function(value)
+		{
+			this.Class.Type = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentType = CChangesOFormDocumentType;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentApplication(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentApplication,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_Application,
+		function(value)
+		{
+			this.Class.Application = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentApplication = CChangesOFormDocumentApplication;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormDocumentDocumentId(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormDocumentDocumentId,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_Document_DocumentId,
+		function(value)
+		{
+			this.Class.DocumentId = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormDocumentDocumentId = CChangesOFormDocumentDocumentId;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesDictionaryBase}
+	 */
+	function CChangesOFormDocumentFieldGroup(Class, fieldGroupId, isAdd)
+	{
+		window['AscDFH'].CChangesDictionaryBase.call(this, Class, fieldGroupId, isAdd);
+	}
+	window['AscDFH'].InheritDictionaryChange(
+		CChangesOFormDocumentFieldGroup,
+		window['AscDFH'].historyitem_OForm_Document_FieldGroup,
+		function()
+		{
+			let fieldGroup = AscCommon.g_oTableId.GetById(this.Key);
+			if (-1 === this.Class.FieldGroups.indexOf(fieldGroup))
+				this.Class.FieldGroups.push(fieldGroup);
+		},
+		function()
+		{
+			let fieldGroup = AscCommon.g_oTableId.GetById(this.Key);
+			let index      = this.Class.FieldGroups.indexOf(fieldGroup);
+			if (-1 !== index)
+				this.Class.FieldGroups.splice(index, 1);
+		}
+	);
+	window['AscDFH'].CChangesOFormDocumentFieldGroup = CChangesOFormDocumentFieldGroup;
+
+})(window);

oform/changes/FieldGroupChanges.js

@@ -0,0 +1,87 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	window['AscDFH'].historyitem_OForm_FieldGroup_Weight         = window['AscDFH'].historyitem_type_OForm_FieldGroup | 1;
+	window['AscDFH'].historyitem_OForm_FieldGroup_AddRemoveField = window['AscDFH'].historyitem_type_OForm_FieldGroup | 2;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseLongProperty}
+	 */
+	function CChangesOFormFieldGroupWeight(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseLongProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormFieldGroupWeight,
+		window['AscDFH'].CChangesBaseLongProperty,
+		window['AscDFH'].historyitem_OForm_FieldGroup_Weight,
+		function(value)
+		{
+			this.Class.Weight = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormFieldGroupWeight = CChangesOFormFieldGroupWeight;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesDictionaryBase}
+	 */
+	function CChangesOFormFieldGroupAddRemoveField(Class, fieldId, isAdd)
+	{
+		window['AscDFH'].CChangesDictionaryBase.call(this, Class, fieldId, isAdd);
+	}
+	window['AscDFH'].InheritDictionaryChange(
+		CChangesOFormFieldGroupAddRemoveField,
+		window['AscDFH'].historyitem_OForm_FieldGroup_AddRemoveField,
+		function()
+		{
+			let field = AscCommon.g_oTableId.GetById(this.Key);
+			if (-1 === this.Class.Fields.indexOf(field))
+				this.Class.Fields.push(field);
+		},
+		function()
+		{
+			let field  = AscCommon.g_oTableId.GetById(this.Key);
+			let index = this.Class.Fields.indexOf(field);
+			if (-1 !== index)
+				this.Class.Fields.splice(index, 1);
+		}
+	);
+	window['AscDFH'].CChangesOFormFieldGroupAddRemoveField = CChangesOFormFieldGroupAddRemoveField;
+
+})(window);

oform/changes/FieldMasterChanges.js

@@ -0,0 +1,115 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	window['AscDFH'].historyitem_OFormFieldMaster_FieldId         = window['AscDFH'].historyitem_type_OForm_FieldMaster | 1;
+	window['AscDFH'].historyitem_OFormFieldMaster_AddRemoveUser   = window['AscDFH'].historyitem_type_OForm_FieldMaster | 2;
+	window['AscDFH'].historyitem_OFormFieldMaster_AddRemoveSigner = window['AscDFH'].historyitem_type_OForm_FieldMaster | 3;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormFieldMasterFieldId(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormFieldMasterFieldId,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OFormFieldMaster_FieldId,
+		function(value)
+		{
+			this.Class.FieldId = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormFieldMasterFieldId = CChangesOFormFieldMasterFieldId;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesDictionaryBase}
+	 */
+	function CChangesOFormFieldMasterAddRemoveUser(Class, userId, isAdd)
+	{
+		window['AscDFH'].CChangesDictionaryBase.call(this, Class, userId, isAdd);
+	}
+	window['AscDFH'].InheritDictionaryChange(
+		CChangesOFormFieldMasterAddRemoveUser,
+		window['AscDFH'].historyitem_OFormFieldMaster_AddRemoveUser,
+		function()
+		{
+			let user = AscCommon.g_oTableId.GetById(this.Key);
+			if (-1 === this.Class.Users.indexOf(user))
+				this.Class.Users.push(user);
+		},
+		function()
+		{
+			let user  = AscCommon.g_oTableId.GetById(this.Key);
+			let index = this.Class.Users.indexOf(user);
+			if (-1 !== index)
+				this.Class.Users.splice(index, 1);
+		}
+	);
+	window['AscDFH'].CChangesOFormFieldMasterAddRemoveUser = CChangesOFormFieldMasterAddRemoveUser;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesDictionaryBase}
+	 */
+	function CChangesOFormFieldMasterAddRemoveSigner(Class, userId, isAdd)
+	{
+		window['AscDFH'].CChangesDictionaryBase.call(this, Class, userId, isAdd);
+	}
+	window['AscDFH'].InheritDictionaryChange(
+		CChangesOFormFieldMasterAddRemoveSigner,
+		window['AscDFH'].historyitem_OFormFieldMaster_AddSigner,
+		function()
+		{
+			let user = AscCommon.g_oTableId.GetById(this.Key);
+			if (-1 === this.Class.Signers.indexOf(user))
+				this.Class.Signers.push(user);
+		},
+		function()
+		{
+			let user  = AscCommon.g_oTableId.GetById(this.Key);
+			let index = this.Class.Signers.indexOf(user);
+			if (-1 !== index)
+				this.Class.Signers.splice(index, 1);
+		}
+	);
+	window['AscDFH'].CChangesOFormFieldMasterAddRemoveSigner = CChangesOFormFieldMasterAddRemoveSigner;
+
+})(window);

oform/changes/UserChanges.js

@@ -0,0 +1,110 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	window['AscDFH'].historyitem_OForm_User_UserMaster = window['AscDFH'].historyitem_type_OForm_User | 1;
+	window['AscDFH'].historyitem_OForm_User_Email      = window['AscDFH'].historyitem_type_OForm_User | 2;
+	window['AscDFH'].historyitem_OForm_User_Telephone  = window['AscDFH'].historyitem_type_OForm_User | 3;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormUserUserMaster(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormUserUserMaster,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_User_UserMaster,
+		function(value)
+		{
+			if (!value)
+			{
+				this.Class.UserMaster = undefined;
+			}
+			else
+			{
+				let userMaster = AscCommon.g_oTableId.Get_ById(value);
+				if (userMaster)
+					this.Class.UserMaster = userMaster;
+			}
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormUserUserMaster = CChangesOFormUserUserMaster;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormUserEmail(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormUserEmail,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_User_Email,
+		function(value)
+		{
+			this.Class.Email = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormUserEmail = CChangesOFormUserEmail;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormUserTelephone(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormUserTelephone,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_User_Telephone,
+		function(value)
+		{
+			this.Class.Telephone = value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormUserTelephone = CChangesOFormUserTelephone;
+
+})(window);

oform/changes/UserMasterChanges.js

@@ -0,0 +1,80 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+"use strict";
+
+(function(window)
+{
+	window['AscDFH'].historyitem_OForm_UserMaster_UserId = window['AscDFH'].historyitem_type_OForm_UserMaster | 1;
+	window['AscDFH'].historyitem_OForm_UserMaster_Role   = window['AscDFH'].historyitem_type_OForm_UserMaster | 2;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormUserMasterUserId(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormUserMasterUserId,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_UserMaster_UserId,
+		function(Value)
+		{
+			this.Class.UserId = Value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormUserMasterUserId = CChangesOFormUserMasterUserId;
+
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseStringProperty}
+	 */
+	function CChangesOFormUserMasterRole(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseStringProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormUserMasterRole,
+		window['AscDFH'].CChangesBaseStringProperty,
+		window['AscDFH'].historyitem_OForm_UserMaster_Role,
+		function(Value)
+		{
+			this.Class.Role = Value;
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormUserMasterRole = CChangesOFormUserMasterRole;
+
+})(window);