diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln
index 23dc101..6ca04d3 100644
--- a/AyaNovaSolution.sln
+++ b/AyaNovaSolution.sln
@@ -1080,6 +1080,7 @@ Global
{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU
diff --git a/TODO.txt b/TODO.txt
index b4219f5..b15fc6f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,9 +1,22 @@
//////////////////////////////////////////////////////////
//TODO
-qbi case 3717 not released but coded see the case for documenting
-QBI case 3718 "
+
//////////////////////////////////////////////////////////
//DONE STUFF
+Release 2020-March
+
+QBI 7.6 patch 3
+qbi case 3717 not released but coded see the case for documenting
+QBI case 3718 Mapping / linking large lists can overwhelm sql server giving client an error
+
+BIZ 7.6 patch 1
+3731 - Unit list Receipt column can't be filtered
+
+Winform 7.6 patch 1
+3716 - Client entry form Active checkbox too wide, can cause unintentional change
+
+DataDump plugin 7.6 Patch 1
+various changes to synchronize with ongoing work in AyaNova version 8
\ No newline at end of file
diff --git a/source/Plugins/AyaNova.Plugin.Dump/Dump.cs b/source/Plugins/AyaNova.Plugin.Dump/Dump.cs
index 29ca5cf..ff780af 100644
--- a/source/Plugins/AyaNova.Plugin.Dump/Dump.cs
+++ b/source/Plugins/AyaNova.Plugin.Dump/Dump.cs
@@ -12,6 +12,7 @@ using System.IO.Compression;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using ICSharpCode.SharpZipLib.Zip;
+using Newtonsoft.Json.Linq;
namespace AyaNova.Plugin.Dump
{
@@ -192,6 +193,8 @@ namespace AyaNova.Plugin.Dump
dumpPartCategories(tempArchiveFolder, progress);
dumpScheduleableUserGroups(tempArchiveFolder, progress);
dumpDispatchZones(tempArchiveFolder, progress);
+
+ //NOTE: when get to PRIORITY, or WORKORDER STATUS be sure to add color code as per already done in USER export
@@ -242,7 +245,7 @@ namespace AyaNova.Plugin.Dump
if (!SkipLocales.Contains(i.Locale))
{
LocalizedTextTable lt = LocalizedTextTable.Load(i.Locale);
- DumpObjectToFolder(tempArchiveFolder, lt.LT, "locale." + EnsureValidFileName(i.Locale), objectExcludeProperties, "GZTW.AyaNova.BLL.Locale");
+ DumpObjectToFolder(tempArchiveFolder, lt.LT, "translation." + EnsureValidFileName(i.Locale), objectExcludeProperties, "GZTW.AyaNova.BLL.Translation");
}
}
}
@@ -362,7 +365,10 @@ namespace AyaNova.Plugin.Dump
foreach (UserPickList.UserPickListInfo i in pl)
{
User c = User.GetItem(i.ID);
- DumpObjectToFolder(tempArchiveFolder, c, "user." + c.ID.ToString(), objectExcludeProperties);
+ JObject xtra = new JObject();
+ xtra.Add("hexaScheduleBackColor",System.Drawing.ColorTranslator.ToHtml(System.Drawing.Color.FromArgb(c.ScheduleBackColor)));
+
+ DumpObjectToFolder(tempArchiveFolder, c, "user." + c.ID.ToString(), objectExcludeProperties,null, xtra);
}
}
@@ -522,7 +528,7 @@ namespace AyaNova.Plugin.Dump
///
///
///
- private void DumpObjectToFolder(string tempArchiveFolder, object o, string objectFileName, List excludeProperties, string forceTypeString = "")
+ private void DumpObjectToFolder(string tempArchiveFolder, object o, string objectFileName, List excludeProperties, string forceTypeString = "", JObject jExtra=null)
{
var typestring = o.GetType().ToString();
@@ -550,12 +556,19 @@ namespace AyaNova.Plugin.Dump
//generate file name, should be ID of object plus .json
+ JObject jo = JObject.FromObject(o, serializer);
+ if (jExtra != null)
+ {
+ jo.Add("jextra", jExtra);
+ }
+
using (StreamWriter sw = new StreamWriter(outputFileName))
using (JsonWriter writer = new JsonTextWriter(sw))
{
- serializer.Serialize(writer, o);
- // {"ExpiryDate":new Date(1230375600000),"Price":0}
+
+ // serializer.Serialize(writer, o);
+ serializer.Serialize(writer, jo);
}
}
diff --git a/source/Plugins/AyaNova.Plugin.Dump/Properties/AssemblyInfo.cs b/source/Plugins/AyaNova.Plugin.Dump/Properties/AssemblyInfo.cs
index 54de1cb..895f55b 100644
--- a/source/Plugins/AyaNova.Plugin.Dump/Properties/AssemblyInfo.cs
+++ b/source/Plugins/AyaNova.Plugin.Dump/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.0.0")]
-[assembly: AssemblyFileVersion("7.6.0.0")]
+[assembly: AssemblyFileVersion("7.6.1.0")]