case 3823

This commit is contained in:
2020-10-15 20:36:08 +00:00
parent 6ce273b16b
commit fb9066d5d1
6 changed files with 29 additions and 11 deletions

View File

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator(Watch=true)]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("7.6.4.0")]
[assembly: AssemblyFileVersionAttribute("7.6.5.0")]

View File

@@ -1330,6 +1330,13 @@ namespace AyaNova
Application.Idle+= new EventHandler(Application_Idle);
this.Visible=true;
//case 3823
if (mClientNoteIdToDisplay != Guid.Empty)
{
ClientNotesForm CN = new ClientNotesForm();
CN.ClientID = mClient.ID;
CN.ShowDialog();
}
}
@@ -2087,9 +2094,9 @@ namespace AyaNova
#region Business object editing / adding / deletion related code
//case 3823
private TypeAndID mClientNoteToDisplay;
public TypeAndID ClientNoteToDisplay { get { return mClientNoteToDisplay; } set { mClientNoteToDisplay = value; } }
//case 3823
private Guid mClientNoteIdToDisplay = Guid.Empty;
public Guid ClientNoteToDisplay { get { return mClientNoteIdToDisplay; } set { mClientNoteIdToDisplay = value; } }
private Client mClient;

View File

@@ -265,7 +265,10 @@ namespace AyaNova
this.Text = Util.LocaleText.GetLocalizedText("ClientNote.Label.List") + " - " + AyaBizUtils.GetBizObjectName("Client", mClientID);
if (mClientNoteIdToDisplay != Guid.Empty)
{
MessageBox.Show("STUB: scroll into view id " + mClientNoteIdToDisplay.ToString());
}
}
@@ -457,6 +460,11 @@ namespace AyaNova
#endregion
#region properties
//case 3823
private Guid mClientNoteIdToDisplay = Guid.Empty;
public Guid ClientNoteToDisplay { get { return mClientNoteIdToDisplay; } set { mClientNoteIdToDisplay = value; } }
private Guid mClientID=Guid.Empty;

View File

@@ -1848,7 +1848,7 @@ namespace AyaNova
object oId = e.Cell.Row.Cells["RootObjectID"].Value;
if (oId != null && oId is Guid)
{
bRefreshGrid = Util.EditRecord(RootObjectTypes.ClientNote, (Guid)oId);
bRefreshGrid = Util.EditRecord(i.RootObjectType, i.Value, new TypeAndID(RootObjectTypes.ClientNote, (Guid)oId));
}
else
{

View File

@@ -3353,7 +3353,7 @@ At first I was happy to find your code that solved my problem, but I did not lik
static public bool EditRecord(RootObjectTypes ObjectType, Guid ID)
{
//call version with optional id as optional id empty
return EditRecord(ObjectType, ID, Guid.Empty);
return EditRecord(ObjectType, ID);
}
//case 227
@@ -3376,18 +3376,17 @@ At first I was happy to find your code that solved my problem, but I did not lik
/// <returns></returns>
static public bool EditRecord(TypeAndID TID)
{
return EditRecord(TID.RootObjectType, TID.ID, Guid.Empty);
return EditRecord(TID.RootObjectType, TID.ID);
}
/// <summary>
/// Same as edit record but with optional id parameter
/// to be used when creating a work order or other object that requires the optional id value
/// </summary>
/// <param name="ObjectType"></param>
/// <param name="ID"></param>
/// <param name="OptionalIDForCreate"></param>
/// <param name="ID"></param>
/// <param name="subTypeIdToOpen"></param>
/// <returns></returns>
static public bool EditRecord(RootObjectTypes ObjectType, Guid ID, Guid OptionalIDForCreate, TypeAndID subTypeIdToOpen=null)
static public bool EditRecord(RootObjectTypes ObjectType, Guid ID, TypeAndID subTypeIdToOpen=null)
{
//case 1039 //if(log.IsDebugEnabled)
//case 1039 //log.Debug("EditRecord(" + ObjectType.ToString()+", " + ID.ToString());