Merge branch hotfix/v8.3.1 into master

oform/OForm.js

@@ -96,10 +96,22 @@
 			
 		this.CurrentUser = role.getUserMaster();
 	};
+	/**
+	 * Difference between noRole and when role is not set, is that when role is not set we can fill any field,
+	 * but when noRole is set then we can't fill anything
+	 */
+	OForm.prototype.setCurrentNoRole = function()
+	{
+		this.CurrentUser = AscOForm.getNoRole();
+	};
 	OForm.prototype.clearCurrentRole = function()
 	{
 		this.CurrentUser = null;
 	};
+	OForm.prototype.getCurrentRole = function()
+	{
+		return this.CurrentUser ? this.CurrentUser.getRole() : null;
+	};
 	OForm.prototype.getCurrentUserMaster = function()
 	{
 		return this.CurrentUser;
@@ -444,6 +456,21 @@
 	{
 		this.NeedUpdateRoles = true;
 	};
+	OForm.prototype.onChangeFieldGroupFilled = function(fieldGroup)
+	{
+		if (!this.Document)
+			return;
+		
+		for (let i = 0; i < this.Roles.length; ++i)
+		{
+			let role = this.Roles[i];
+			if (fieldGroup === role.getFieldGroup())
+			{
+				this.Document.sendEvent("asc_onOFormRoleFilled", role.getRole(), fieldGroup.isFilled());
+				return;
+			}
+		}
+	};
 	OForm.prototype.onChangeRoleColor = function()
 	{
 		this.NeedRedraw = true;
@@ -561,6 +588,39 @@
 	{
 		this.onUndoRedo();
 	};
+	OForm.prototype.canFillRole = function(roleName)
+	{
+		let role = this.getRole(roleName);
+		if (!role || role.isFilled())
+			return false;
+		
+		let weight = role.getWeight();
+		for (let i = 0; i < this.Roles.length; ++i)
+		{
+			if (this.Roles[i] === role || this.Roles[i].isFilled())
+				continue;
+			
+			if (this.Roles[i].getWeight() < weight)
+				return false;
+		}
+		
+		return true;
+	};
+	OForm.prototype.setRoleFilled = function(roleName, isFilled)
+	{
+		let role = this.getRole(roleName);
+		if (!role)
+			return;
+		
+		role.setFilled(isFilled);
+	};
+	OForm.prototype.setAllRolesNotFilled = function()
+	{
+		for (let roleIndex = 0, roleCount = this.Roles.length; roleIndex < roleCount; ++roleIndex)
+		{
+			this.Roles[roleIndex].setFilled(false);
+		}
+	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Private area
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -598,5 +658,6 @@
 	OForm.prototype['asc_moveDownRole'] = OForm.prototype.moveDownRole;
 	OForm.prototype['asc_haveRole']     = OForm.prototype.haveRole;
 	OForm.prototype['asc_getRole']      = OForm.prototype.getRoleSettings;
+	OForm.prototype['asc_canFillRole']  = OForm.prototype.canFillRole;
 	
 })(window);

oform/Role.js

@@ -78,6 +78,15 @@
 		if (this.FieldGroup)
 			this.FieldGroup.setWeight(weight);
 	};
+	CRole.prototype.isFilled = function()
+	{
+		return this.FieldGroup ? this.FieldGroup.isFilled() : true;
+	};
+	CRole.prototype.setFilled = function(isFilled)
+	{
+		if (this.FieldGroup)
+			this.FieldGroup.setFilled(isFilled);
+	};
 	CRole.prototype.getFieldGroup = function()
 	{
 		return this.FieldGroup;

oform/format/Document.js

@@ -568,6 +568,13 @@
 		
 		this.OForm.onChangeRoles();
 	};
+	CDocument.prototype.onChangeFieldGroup = function(fieldGroup)
+	{
+		if (!this.OForm)
+			return;
+		
+		this.OForm.onChangeFieldGroupFilled(fieldGroup);
+	};
 	CDocument.prototype.onChangeUserMaster = function(userMaster)
 	{
 		if (!this.OForm)

oform/format/FieldGroup.js

@@ -42,6 +42,7 @@
 	{
 		AscOForm.CBaseFormatObject.call(this);
 
+		this.Filled = false;
 		this.Weight = null;
 		this.Fields = [];
 		this.Users  = [];
@@ -57,6 +58,19 @@
 		this.Parent = parent;
 		this.onChange();
 	};
+	CFieldGroup.prototype.isFilled = function()
+	{
+		return !!this.Filled;
+	};
+	CFieldGroup.prototype.setFilled = function(isFilled)
+	{
+		if (this.Filled === isFilled)
+			return;
+		
+		AscCommon.History.Add(new AscDFH.CChangesOFormFieldGroupFilled(this, this.Filled, isFilled));
+		this.Filled = isFilled;
+		this.onChange();
+	};
 	CFieldGroup.prototype.setWeight = function(value)
 	{
 		if (this.Weight === value)
@@ -149,6 +163,13 @@
 		
 		this.Parent.onChangeFieldGroup(this);
 	};
+	CFieldGroup.prototype.onChangeFilled = function()
+	{
+		if (!this.Parent)
+			return;
+		
+		this.Parent.onChangeFieldGroupFilled(this);
+	};
 	CFieldGroup.prototype.getAllFields = function()
 	{
 		let fields = [];
@@ -207,6 +228,8 @@
 		
 		writer.WriteXmlNodeStart("fieldGroup");
 		writer.WriteXmlNullableAttributeInt("weight", this.getWeight());
+		if (this.isFilled())
+			writer.WriteXmlNullableAttributeBool("filled", true);
 		writer.WriteXmlAttributesEnd();
 		
 		for (let userIndex = 0, userCount = this.Users.length; userIndex < userCount; ++userIndex)
@@ -239,8 +262,11 @@
 		
 		while (reader.MoveToNextAttribute())
 		{
-			if ("weight" === reader.GetNameNoNS())
+			let attrName = reader.GetNameNoNS();
+			if ("weight" === attrName)
 				fG.setWeight(reader.GetValueInt());
+			if ("filled" === attrName)
+				fG.setFilled(reader.GetValueBool());
 		}
 		
 		let xmlReaderContext = reader.GetOformContext();

oform/format/UserMaster.js

@@ -34,6 +34,23 @@
 
 (function(window)
 {
+	let noRole = null;
+	function getNoRole()
+	{
+		if (!noRole)
+		{
+			noRole = AscCommon.ExecuteNoHistory(function()
+			{
+				let user = new CUserMaster();
+				user.setUserId("{BA186350-BB64-8503-5C55-083595AB15A9}");
+				user.setRole("NoRole");
+				return user;
+			});
+		}
+		
+		return noRole;
+	}
+	
 	/**
 	 * @param {boolean} [generateId=false]
 	 * @constructor
@@ -228,5 +245,7 @@
 	};
 	//--------------------------------------------------------export----------------------------------------------------
 	AscOForm.CUserMaster = CUserMaster;
+	AscOForm.getNoRole   = getNoRole;
+	
 
 })(window);

oform/format/changes/FieldGroupChanges.js

@@ -37,6 +37,7 @@
 	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;
 	window['AscDFH'].historyitem_OForm_FieldGroup_AddRemoveUser  = window['AscDFH'].historyitem_type_OForm_FieldGroup | 3;
+	window['AscDFH'].historyitem_OForm_FieldGroup_Filled         = window['AscDFH'].historyitem_type_OForm_FieldGroup | 4;
 
 	/**
 	 * @constructor
@@ -120,5 +121,26 @@
 		}
 	);
 	window['AscDFH'].CChangesOFormFieldGroupAddRemoveUser = CChangesOFormFieldGroupAddRemoveUser;
-
+	
+	/**
+	 * @constructor
+	 * @extends {window['AscDFH'].CChangesBaseBoolProperty}
+	 */
+	function CChangesOFormFieldGroupFilled(Class, Old, New)
+	{
+		window['AscDFH'].CChangesBaseBoolProperty.call(this, Class, Old, New);
+	}
+	window['AscDFH'].InheritPropertyChange(
+		CChangesOFormFieldGroupFilled,
+		window['AscDFH'].CChangesBaseBoolProperty,
+		window['AscDFH'].historyitem_OForm_FieldGroup_Filled,
+		function(value)
+		{
+			this.Class.Filled = value;
+			this.Class.onChange();
+		},
+		false
+	);
+	window['AscDFH'].CChangesOFormFieldGroupFilled = CChangesOFormFieldGroupFilled;
+	
 })(window);