Develop 1.9

.vs/config/applicationhost.config

@@ -163,7 +163,7 @@
             </site>
             <site name="WebApiContrib.Formatting.Xlsx.Sample" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="C:\Users\Jordan\Documents\GitHub\WebApiContrib.Formatting.Xlsx\samples\WebApiContrib.Formatting.Xlsx.Sample" />
+                    <virtualDirectory path="/" physicalPath="C:\Projects\WEBPro\API\WebApiContrib.Formatting.Xlsx\samples\WebApiContrib.Formatting.Xlsx.Sample" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:54005:localhost" />

src/WebApiContrib.Formatting.Xlsx/Serialisation/IColumnResolver.cs → Interfaces/IColumnResolver.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using SQAD.XlsxExportImport.Base.Models;
+using System;
 
-namespace WebApiContrib.Formatting.Xlsx.Serialisation
+namespace SQAD.MTNext.Interfaces.WebApiContrib.Formatting.Xlsx.Interfaces
 {
     /// <summary>
     /// Allows easy customisation of what columns are generated from a type and how they should be formatted.
@@ -17,6 +16,7 @@ public interface IColumnResolver
         /// </summary>
         /// <param name="itemType">Type of item being serialised.</param>
         /// <param name="data">The collection of values being serialised.</param>
-        ExcelColumnInfoCollection GetExcelColumnInfo(Type itemType, IEnumerable<object> data);
+        //ExcelColumnInfoCollection GetExcelColumnInfo(Type itemType, IEnumerable<object> data);
+        ExcelColumnInfoCollection GetExcelColumnInfo(Type itemType, object data, string namePrefix = "", bool isComplexColumn=false);
     }
 }

Interfaces/ISheetResolver.cs

@@ -0,0 +1,10 @@
+using SQAD.MTNext.Serialisation.WebApiContrib.Formatting.Xlsx.Serialisation;
+using System;
+
+namespace SQAD.MTNext.Interfaces.WebApiContrib.Formatting.Xlsx.Interfaces
+{
+    public interface ISheetResolver
+    {
+        ExcelSheetInfoCollection GetExcelSheetInfo(Type itemType, object data);
+    }
+}

src/WebApiContrib.Formatting.Xlsx/Attributes/ExcelColumnAttribute.cs → SQAD.XlsxExportImport.Base/Attributes/ExcelColumnAttribute.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace WebApiContrib.Formatting.Xlsx.Attributes
+namespace SQAD.XlsxExportImport.Base.Attributes
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class ExcelColumnAttribute : Attribute
     {
         // Nullable parameters not allowed on attributes. :(
-        internal int? _order;
+        public int? _order;
 
         /// <summary>
         /// Control the output of this property when serialized to Excel.
@@ -59,5 +59,32 @@ public int Order
         /// Apply the specified Excel number format string to this property in the generated Excel output.
         /// </summary>
         public string NumberFormat { get; set; }
+
+        public string ResolveFromTable { get; set; }
+
+        public string OverrideResolveTableName { get; set; }
+        /// <summary>
+        /// Default Value is ID
+        /// </summary>
+        public string ResolveValue { get; set; } = "ID";
+        /// <summary>
+        /// Default Value is Name
+        /// </summary>
+        public string ResolveName { get; set; } = "Name";
+
+        /// <summary>
+        /// When we have subproperty that we want to skip name
+        /// like ParentPropertyName:Value(this property). Value will not be included
+        /// in column name path
+        /// </summary>
+        public bool DoNotUsePropertyName { get; set; } = false;
+
+        public bool IsHidden { get; set; }
+
+        /// <summary>
+        /// Used to items containing override value. 
+        /// Original value will be preserved and if changed will be moved to override property
+        /// </summary>
+        public bool PreserverHidden { get; set; }
     }
 }

src/WebApiContrib.Formatting.Xlsx/Attributes/ExcelDocumentAttribute.cs → SQAD.XlsxExportImport.Base/Attributes/ExcelDocumentAttribute.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace WebApiContrib.Formatting.Xlsx.Attributes
+namespace SQAD.XlsxExportImport.Base.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class ExcelDocumentAttribute : Attribute
     {
-        
+
         /// <summary>
         /// Set properties of Excel documents generated from this type.
         /// </summary>

SQAD.XlsxExportImport.Base/Attributes/ExcelSheetAttribute.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace SQAD.XlsxExportImport.Base.Attributes
+{
+    public class ExcelSheetAttribute : Attribute
+    {
+        private int? _order;
+
+        public int Order
+        {
+            get { return _order ?? default(int); }
+            set { _order = value; }
+        }
+
+        public ExcelSheetAttribute() { }
+
+        public ExcelSheetAttribute(string SheetName) : this()
+        {
+            this.SheetName = SheetName;
+        }
+
+        public string SheetName { get; set; }
+    }
+}

SQAD.XlsxExportImport.Base/Builders/SqadXlsxDocumentBuilder.cs

@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using OfficeOpenXml;
+using SQAD.XlsxExportImport.Base.Interfaces;
+using SQAD.XlsxExportImport.Base.Models;
+using SQAD.XlsxExportImport.Base.Formatters;
+
+namespace SQAD.XlsxExportImport.Base.Builders
+{
+    public class SqadXlsxDocumentBuilder : IXlsxDocumentBuilder
+    {
+        //private  { get; set; }
+
+        private Stream _stream;
+
+
+        //New Stuff
+        private List<SqadXlsxSheetBuilderBase> _sheets { get; set; }
+
+        private XlsxTemplateInfo _templateInfo;
+
+        public SqadXlsxDocumentBuilder(Stream stream)
+        {
+            _stream = stream;
+            _sheets = new List<SqadXlsxSheetBuilderBase>();
+        }
+
+
+        public void AppendSheet(SqadXlsxSheetBuilderBase sheet)
+        {
+            _sheets.Add(sheet);
+        }
+
+        public SqadXlsxSheetBuilderBase GetReferenceSheet() => _sheets.FirstOrDefault(w => w.IsReferenceSheet);
+
+        public SqadXlsxSheetBuilderBase GetPreservationSheet() => _sheets.FirstOrDefault(w => w.IsPreservationSheet);
+
+        public SqadXlsxSheetBuilderBase GetSheetByName(string name)
+        {
+            return _sheets.FirstOrDefault(w => w.ContainsTable(name));
+        }
+
+        public bool IsVBA => _sheets.Any(a => a.IsReferenceSheet);
+
+        public void SetTemplateInfo(XlsxTemplateInfo templateInfo)
+        {
+            _templateInfo = templateInfo;
+        }
+
+        public async Task WriteToStream()
+        {
+            var package = await Task.Run(() =>
+                                         {
+                                             Stream templateStream = null;
+                                             ExcelPackage excelPackage;
+                                             try
+                                             {
+                                                 if (_templateInfo == null)
+                                                 {
+                                                     excelPackage = new ExcelPackage();
+                                                 } else
+                                                 {
+                                                     templateStream = File.OpenRead(_templateInfo.Path);
+                                                     excelPackage = new ExcelPackage(templateStream);
+                                                 }
+                                             } finally
+                                             {
+                                                 templateStream?.Dispose();
+                                             }
+                                             Stopwatch sw = new Stopwatch();
+                                             sw.Start();
+                                             foreach (var sheet in _sheets.OrderBy(o => o.IsReferenceSheet))
+                                             {
+                                                 sheet.CompileSheet(excelPackage);
+                                             }
+
+                                             excelPackage.SaveAs(_stream);
+                                             sw.Stop();
+                                             string eTime = sw.Elapsed.ToString();
+
+                                             return excelPackage;
+                                         });
+        }
+
+        public bool IsExcelSupportedType(object expression)
+        {
+            return FormatterUtils.IsExcelSupportedType(expression);
+        }
+    }
+}