admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-12-15 20:46:06 +00:00
parent 02bf076a19
commit a118282fbb
7 changed files with 372 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user
View File

@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>03/14/2019 14:44:18</publishTime> <publishTime>03/14/2019 14:44:18</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>06/14/2017 11:29:54</publishTime> <publishTime>06/14/2017 11:29:54</publishTime>
@@ -34,40 +34,40 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>03/14/2019 14:41:56</publishTime> <publishTime>03/14/2019 14:41:56</publishTime>
</File> </File>
<File Include="bin/clients.aspx.cdcab7d2.compiled"> <File Include="bin/clients.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/cmd.aspx.cdcab7d2.compiled"> <File Include="bin/cmd.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/config.txt"> <File Include="bin/config.txt">
<publishTime>03/22/2019 15:27:40</publishTime> <publishTime>03/22/2019 15:27:40</publishTime>
</File> </File>
<File Include="bin/CSLA.Core.Bindablebase.dll"> <File Include="bin/CSLA.Core.Bindablebase.dll">
<publishTime>10/19/2020 14:30:05</publishTime> <publishTime>12/11/2020 11:13:03</publishTime>
</File> </File>
<File Include="bin/CSLA.dll"> <File Include="bin/CSLA.dll">
<publishTime>10/19/2020 14:30:06</publishTime> <publishTime>12/11/2020 11:13:05</publishTime>
</File> </File>
<File Include="bin/CSLA.Server.DataPortal.dll"> <File Include="bin/CSLA.Server.DataPortal.dll">
<publishTime>10/19/2020 14:30:05</publishTime> <publishTime>12/11/2020 11:13:03</publishTime>
</File> </File>
<File Include="bin/default.aspx.cdcab7d2.compiled"> <File Include="bin/default.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/FirebirdSql.Data.FirebirdClient.dll"> <File Include="bin/FirebirdSql.Data.FirebirdClient.dll">
<publishTime>03/14/2019 14:42:21</publishTime> <publishTime>03/14/2019 14:42:21</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNova.BLL.dll"> <File Include="bin/GZTW.AyaNova.BLL.dll">
<publishTime>10/19/2020 14:30:08</publishTime> <publishTime>12/11/2020 11:13:47</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNovaMBI.dll"> <File Include="bin/GZTW.AyaNovaMBI.dll">
<publishTime>10/19/2020 14:30:40</publishTime> <publishTime>12/11/2020 11:13:48</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNovaMBI.Pages.dll"> <File Include="bin/GZTW.AyaNovaMBI.Pages.dll">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/GZTW.Data.dll"> <File Include="bin/GZTW.Data.dll">
<publishTime>10/19/2020 14:30:06</publishTime> <publishTime>12/11/2020 11:13:04</publishTime>
</File> </File>
<File Include="bin/GZTW.MBI.dll"> <File Include="bin/GZTW.MBI.dll">
<publishTime>06/14/2017 12:04:42</publishTime> <publishTime>06/14/2017 12:04:42</publishTime>
@@ -76,61 +76,61 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>06/14/2017 11:32:19</publishTime> <publishTime>06/14/2017 11:32:19</publishTime>
</File> </File>
<File Include="bin/GZTW.Profile.dll"> <File Include="bin/GZTW.Profile.dll">
<publishTime>10/19/2020 14:30:05</publishTime> <publishTime>12/11/2020 11:13:03</publishTime>
</File> </File>
<File Include="bin/labor.aspx.cdcab7d2.compiled"> <File Include="bin/labor.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/memoedit.aspx.cdcab7d2.compiled"> <File Include="bin/memoedit.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/memoto.aspx.cdcab7d2.compiled"> <File Include="bin/memoto.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/18/2019 11:54:01</publishTime> <publishTime>03/18/2019 11:54:01</publishTime>
</File> </File>
<File Include="bin/ro.aspx.cdcab7d2.compiled"> <File Include="bin/ro.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/sched2labor.aspx.cdcab7d2.compiled"> <File Include="bin/sched2labor.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/schedule.aspx.cdcab7d2.compiled"> <File Include="bin/schedule.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/sign.aspx.cdcab7d2.compiled"> <File Include="bin/sign.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="bin/status.aspx.cdcab7d2.compiled"> <File Include="bin/status.aspx.cdcab7d2.compiled">
<publishTime>10/19/2020 14:30:56</publishTime> <publishTime>12/11/2020 11:14:08</publishTime>
</File> </File>
<File Include="clients.aspx"> <File Include="clients.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="cmd.aspx"> <File Include="cmd.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="config.txt"> <File Include="config.txt">
<publishTime>03/22/2019 15:27:40</publishTime> <publishTime>03/22/2019 15:27:40</publishTime>
</File> </File>
<File Include="default.aspx"> <File Include="default.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="jquery-1.4.4.min.js"> <File Include="jquery-1.4.4.min.js">
<publishTime>03/14/2019 14:44:19</publishTime> <publishTime>03/14/2019 14:44:19</publishTime>
</File> </File>
<File Include="labor.aspx"> <File Include="labor.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="mbi.css"> <File Include="mbi.css">
<publishTime>03/14/2019 14:44:19</publishTime> <publishTime>03/14/2019 14:44:19</publishTime>
</File> </File>
<File Include="memoedit.aspx"> <File Include="memoedit.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="memoto.aspx"> <File Include="memoto.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="ok.gif"> <File Include="ok.gif">
<publishTime>03/14/2019 14:44:19</publishTime> <publishTime>03/14/2019 14:44:19</publishTime>
@@ -142,25 +142,25 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>03/14/2019 14:44:19</publishTime> <publishTime>03/14/2019 14:44:19</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>10/19/2020 14:30:42</publishTime> <publishTime>12/11/2020 11:13:50</publishTime>
</File> </File>
<File Include="ro.aspx"> <File Include="ro.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="sched2labor.aspx"> <File Include="sched2labor.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="schedule.aspx"> <File Include="schedule.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="sig.js"> <File Include="sig.js">
<publishTime>03/14/2019 14:44:19</publishTime> <publishTime>03/14/2019 14:44:19</publishTime>
</File> </File>
<File Include="sign.aspx"> <File Include="sign.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="status.aspx"> <File Include="status.aspx">
<publishTime>10/19/2020 14:30:47</publishTime> <publishTime>12/11/2020 11:13:58</publishTime>
</File> </File>
<File Include="user.gif"> <File Include="user.gif">
<publishTime>03/14/2019 14:44:18</publishTime> <publishTime>03/14/2019 14:44:18</publishTime>

13
source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs generated
View File

@@ -41,6 +41,7 @@
this.btnTest = new System.Windows.Forms.Button(); this.btnTest = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.lblPreRelease = new System.Windows.Forms.Label(); this.lblPreRelease = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -167,6 +168,16 @@
this.lblPreRelease.Text = "Pre-release 7.6-Alpha"; this.lblPreRelease.Text = "Pre-release 7.6-Alpha";
this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(28, 278);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(181, 16);
this.label3.TabIndex = 38;
this.label3.Text = "AyaNova 8 SuperUser login:";
//
// Auth // Auth
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -174,6 +185,7 @@
this.AutoSize = true; this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(614, 545); this.ClientSize = new System.Drawing.Size(614, 545);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.label3);
this.Controls.Add(this.lblPreRelease); this.Controls.Add(this.lblPreRelease);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.btnTest); this.Controls.Add(this.btnTest);
@@ -213,5 +225,6 @@
private System.Windows.Forms.Button btnTest; private System.Windows.Forms.Button btnTest;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblPreRelease; private System.Windows.Forms.Label lblPreRelease;
private System.Windows.Forms.Label label3;
} }
} }

2
source/Plugins/AyaNova.Plugin.V8/Auth.cs
View File

@@ -42,7 +42,7 @@ namespace AyaNova.PlugIn.V8
var res = await util.AuthenticateAsync(edUserName.Text,edPassword.Text); var res = await util.AuthenticateAsync(edUserName.Text,edPassword.Text);
if (!res) if (!res)
{ {
MessageBox.Show("Login failed"); MessageBox.Show("AyaNova 8 SuperUser account login failed");
return; return;
} }

56
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8
public string PluginVersion public string PluginVersion
{ {
get { return "7.6.1-alpha.95"; } get { return "7.6.1-alpha.96"; }
} }
public string About public string About
@@ -317,6 +317,8 @@ namespace AyaNova.PlugIn.V8
await ExportUnitModels(progress); await ExportUnitModels(progress);
await ExportVendors(progress); await ExportVendors(progress);
await ExportExternalUsers(progress);//needs vendors, clients and headoffices already exported so needs to be here late await ExportExternalUsers(progress);//needs vendors, clients and headoffices already exported so needs to be here late
await ExportMemos(progress);
await ExportServiceWorkorders(progress); await ExportServiceWorkorders(progress);
//todo: these are now invalid and awaiting RAVEN end implementation //todo: these are now invalid and awaiting RAVEN end implementation
//after which can copy mostly from service workorder block //after which can copy mostly from service workorder block
@@ -1849,6 +1851,58 @@ namespace AyaNova.PlugIn.V8
} }
#endregion Vendors #endregion Vendors
#region Memos
private async System.Threading.Tasks.Task ExportMemos(ProgressForm progress)
{
if (!progress.KeepGoing) return;
progress.Op("Start Memos export");
progress.SubOp("");
var ObjectTypeName = "Memo";
//Step 2: export the objects
MemoList pl = MemoList.GetListForSingleItem(PluginID);
progress.Append("Exporting " + pl.Count.ToString() + " " + ObjectTypeName + "s");
foreach (MemoList.MemoListInfo i in pl)
{
if (!progress.KeepGoing) return;
List<string> tags = new List<string>();
tags.Add(ImportTag);
dynamic d = new JObject();
d.name = i.LT_Memo_Label_Subject.Display;
d.notes = i.LT_Memo_Label_Message;
//d.customFields = "{}";
//d.tags = "[]";
d.viewed = i.LT_Memo_Label_Viewed;
d.replied = i.LT_Memo_Label_Replied;
d.fromId = SafeGetUserMap(i.LT_Memo_Label_FromID.Value);
d.sent = i.LT_Memo_Label_Sent;
progress.Op(ObjectTypeName + " " + i.ID.ToString());
var rMainObject = await util.PostAsync("memo", d.ToString());
long RavenId = util.IdFromResponse(rMainObject);
//-----
d = rMainObject.ObjectResponse["data"];
//-----
//Event log fixup
await util.EventLog(util.AyaType.Project, RavenId, SafeGetUserMap(i.LT_Memo_Label_FromID.Value), SafeGetUserMap(i.LT_Memo_Label_FromID.Value), i.LT_Memo_Label_Sent.ToString(), i.LT_Memo_Label_Sent.ToString());
}
}
#endregion Memos
#region Service Workorders #region Service Workorders
private async System.Threading.Tasks.Task ExportServiceWorkorders(ProgressForm progress) private async System.Threading.Tasks.Task ExportServiceWorkorders(ProgressForm progress)
{ {

11
source/Plugins/AyaNova.Plugin.V8/util.cs
View File

@@ -110,7 +110,16 @@ namespace AyaNova.PlugIn.V8
if (a.HttpResponse.IsSuccessStatusCode) if (a.HttpResponse.IsSuccessStatusCode)
{ {
JWT = a.ObjectResponse["data"]["token"].Value<string>(); JWT=a.ObjectResponse["data"]["token"].Value<string>();
//Must be *the* SuperUser to continue:
a = await GetAsync("user/amsu");
var IsSuperUser = a.ObjectResponse["data"].Value<bool>();
if (!IsSuperUser) {
JWT = string.Empty;
return false;
}
return true; return true;
} }

2
source/bizobjects/AyaLib/AssemblyInfo.cs
View File

@@ -64,4 +64,4 @@ using System.Security.Permissions;
// Configure log4net using the .config file // Configure log4net using the .config file
//[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
[assembly: AssemblyFileVersionAttribute("7.6.10.0")] [assembly: AssemblyFileVersionAttribute("7.6.11.0")]

51
source/bizobjects/AyaLib/GZTW.AyaNova.BLL/MemoList.cs
View File

@@ -55,7 +55,7 @@ namespace GZTW.AyaNova.BLL
} }
} }
[SqlColumnNameAttribute("aMemo.aCreated"),Display(DisplayType.DateTime)] [SqlColumnNameAttribute("aMemo.aCreated"), Display(DisplayType.DateTime)]
public object LT_Memo_Label_Sent public object LT_Memo_Label_Sent
{ {
get get
@@ -136,12 +136,12 @@ namespace GZTW.AyaNova.BLL
#endregion #endregion
#region Constructor #region Constructor
private RelativeTimeFormatter rtfm=null; private RelativeTimeFormatter rtfm = null;
protected MemoList() protected MemoList()
{ {
rtfm=RelativeTimeFormatter.GetItem(User.CurrentUserLanguage); rtfm = RelativeTimeFormatter.GetItem(User.CurrentUserLanguage);
// AllowSort=false; // AllowSort=false;
// AllowFind=true; // AllowFind=true;
// AllowEdit=false; // AllowEdit=false;
@@ -162,7 +162,7 @@ namespace GZTW.AyaNova.BLL
get get
{ {
return (MemoListInfo) List[Item]; return (MemoListInfo)List[Item];
} }
} }
@@ -178,9 +178,9 @@ namespace GZTW.AyaNova.BLL
{ {
foreach (MemoListInfo child in List) foreach (MemoListInfo child in List)
{ {
if(child.ID==ItemID) return child.ToString(); if (child.ID == ItemID) return child.ToString();
} }
return "Missing: "+ItemID.ToString(); return "Missing: " + ItemID.ToString();
} }
} }
#endregion #endregion
@@ -194,7 +194,7 @@ namespace GZTW.AyaNova.BLL
{ {
foreach (MemoListInfo child in List) foreach (MemoListInfo child in List)
{ {
if(child.Equals(obj)) return true; if (child.Equals(obj)) return true;
} }
return false; return false;
@@ -376,6 +376,19 @@ namespace GZTW.AyaNova.BLL
{ {
if (crit.IDList != null) if (crit.IDList != null)
{
//v8 Migrate related change
//this is a workaround to get all the memos even though the current user is not the recipient of all of them
if (crit.IDList.Count == 1 && crit.IDList[0] == new Guid("{BD608E8A-820C-46D1-9D81-4CCB6E71B213}"))//v8 migrate plugin id
{
dr = DBUtil.GetReaderFromSQLString(
"SELECT aMemo.aID, aMemo.aCreated, " +
"aMemo.aViewed, aMemo.aReplied, aMemo.aSubject, aMemo.aMessage, " +
"aMemo.aFromID, aMemo.aToId " +
" 'first' as afirstname, 'last' as alastname, 'ii' as ainitials, 'en' as aemployeenumber, 'r' as aregionname " +
"FROM aMemo order by amemo.acreated");
}
else
{ {
//Case 556 //Case 556
System.Text.StringBuilder sbIN = new System.Text.StringBuilder(); System.Text.StringBuilder sbIN = new System.Text.StringBuilder();
@@ -402,7 +415,7 @@ namespace GZTW.AyaNova.BLL
" LEFT OUTER JOIN AREGION ON (AUSER.AREGIONID=AREGION.AID) " + " LEFT OUTER JOIN AREGION ON (AUSER.AREGIONID=AREGION.AID) " +
sbIN.ToString() + " " + sbIN.ToString() + " " +
AyaBizUtils.GetGridSortOrderColumns(crit.CriteriaXML)); AyaBizUtils.GetGridSortOrderColumns(crit.CriteriaXML));
}
} }
@@ -428,20 +441,20 @@ namespace GZTW.AyaNova.BLL
dr = DBUtil.GetReaderFromSQLString(q, CurrentUserID); dr = DBUtil.GetReaderFromSQLString(q, CurrentUserID);
} }
while(dr.Read()) while (dr.Read())
{ {
//******************************************* //*******************************************
MemoListInfo info=new MemoListInfo(); MemoListInfo info = new MemoListInfo();
info.mID=dr.GetGuid("aID"); info.mID = dr.GetGuid("aID");
info.mCreated=DBUtil.ToLocal(dr.GetSmartDate("aCreated")); info.mCreated = DBUtil.ToLocal(dr.GetSmartDate("aCreated"));
info.mCreatedRelative = new GridRelativeTimeCellItem(rtfm.Format(dtNow,info.mCreated)); info.mCreatedRelative = new GridRelativeTimeCellItem(rtfm.Format(dtNow, info.mCreated));
info.mFrom=new GridNameValueCellItem( info.mFrom = new GridNameValueCellItem(
dr.GetGuid("aFromID"), dr.GetGuid("aFromID"),
User.NameFormatter(dr.GetString("aFirstName"),dr.GetString("aLastName"),dr.GetString("aInitials"), User.NameFormatter(dr.GetString("aFirstName"), dr.GetString("aLastName"), dr.GetString("aInitials"),
dr.GetString("aEmployeeNumber"), dr.GetString("AREGIONNAME"), AyaBizUtils.GlobalSettings.DefaultScheduleableUserNameDisplayFormat) dr.GetString("aEmployeeNumber"), dr.GetString("AREGIONNAME"), AyaBizUtils.GlobalSettings.DefaultScheduleableUserNameDisplayFormat)
,RootObjectTypes.User); , RootObjectTypes.User);
info.mSubject = new GridNameValueCellItem( info.mSubject = new GridNameValueCellItem(
dr.GetGuid("aID"), dr.GetGuid("aID"),
@@ -449,8 +462,8 @@ namespace GZTW.AyaNova.BLL
RootObjectTypes.Memo); RootObjectTypes.Memo);
info.mViewed=dr.GetBoolean("aViewed"); info.mViewed = dr.GetBoolean("aViewed");
info.mReplied=dr.GetBoolean("aReplied"); info.mReplied = dr.GetBoolean("aReplied");
info.mMessage = dr.GetString("aMessage"); info.mMessage = dr.GetString("aMessage");
InnerList.Add(info); InnerList.Add(info);
@@ -459,7 +472,7 @@ namespace GZTW.AyaNova.BLL
} }
finally finally
{ {
if(dr!=null) dr.Close(); if (dr != null) dr.Close();
} }