Merge branch 'master' of https://github.com/scottdurow/SparkleXrm.git

scottdurow · Sep 19, 2016 · 87b9cdf · 87b9cdf
2 parents a7162a6 + 14c12c4
commit 87b9cdf
Show file tree

Hide file tree

Showing 14 changed files with 433 additions and 86 deletions.
diff --git a/SparkleXrmSource/Client/ContactEditor/Model/Entities.cs b/SparkleXrmSource/Client/ContactEditor/Model/Entities.cs
@@ -47,6 +47,9 @@ public Contact()
         [ScriptName("ownerid")]
         public EntityReference OwnerId;
 
+        [ScriptName("parentcustomerid")]
+        public EntityReference ParentCustomerId;
+
     }
 
 }

diff --git a/SparkleXrmSource/Client/ContactEditor/ViewModels/ContactsEditorViewModel.cs b/SparkleXrmSource/Client/ContactEditor/ViewModels/ContactsEditorViewModel.cs
@@ -11,6 +11,8 @@
 using SparkleXrm;
 using Client.ContactEditor.ViewModels;
 using Client.ContactEditor.Model;
+using Xrm;
+using System.Runtime.CompilerServices;
 
 namespace Client.ContactEditor.ViewModels
 {
@@ -229,7 +231,6 @@ public Action SaveCommand()
         public void TransactionCurrencySearchCommand(string term, Action<EntityCollection> callback)
         {
             // Get the option set values
-
             string fetchXml = @"<fetch version='1.0' output-format='xml-platform' mapping='logical' distinct='false'>
                               <entity name='transactioncurrency'>
                                 <attribute name='transactioncurrencyid' />
@@ -255,6 +256,14 @@ public void TransactionCurrencySearchCommand(string term, Action<EntityCollectio
 
             });
         }
+        [PreserveCase]
+        public void AddNewAccountInLine(object item)
+        {
+            OpenEntityFormOptions newRecordOptions = new OpenEntityFormOptions();
+            newRecordOptions.OpenInNewWindow = true;
+            Utility.OpenEntityForm2("account", null, null, newRecordOptions);
+
+        }
         public void OwnerSearchCommand(string term, Action<EntityCollection> callback)
         {
 
@@ -287,6 +296,29 @@ public void OwnerSearchCommand(string term, Action<EntityCollection> callback)
             }
         }
 
+        [PreserveCase]
+        public void AccountSearchCommand(string term, Action<EntityCollection> callback)
+        {
+            string fetchXml = @"<fetch version='1.0' output-format='xml-platform' mapping='logical' distinct='false'>
+                              <entity name='account'>
+                                <attribute name='accountid' />
+                                <attribute name='name' />
+                                <attribute name='address1_city' />
+                                <order attribute='name' descending='false' />
+                                <filter type='and'>
+                                  <condition attribute='name' operator='like' value='%{0}%' />
+                                </filter>
+                              </entity>
+                            </fetch>";
+
+            fetchXml = string.Format(fetchXml, XmlHelper.Encode(term));
+            OrganizationServiceProxy.BeginRetrieveMultiple(fetchXml, delegate(object result)
+            {
+                EntityCollection fetchResult = OrganizationServiceProxy.EndRetrieveMultiple(result, typeof(Entity));
+                callback(fetchResult);
+            });
+        }
+
         private void SearchRecords(string term, Action<EntityCollection> callback, string entityType, string entityNameAttribute)
         {
             string fetchXml = @"<fetch version='1.0' output-format='xml-platform' mapping='logical' distinct='false' no-lock='true' count='25'>

diff --git a/SparkleXrmSource/Client/ContactEditor/ViewModels/ObservableEntities.cs b/SparkleXrmSource/Client/ContactEditor/ViewModels/ObservableEntities.cs
@@ -34,6 +34,9 @@ public partial class ObservableContact
         [ScriptName("transactioncurrencyid")]
         public Observable<EntityReference> TransactionCurrencyId = Knockout.Observable<EntityReference>();
 
+        [ScriptName("parentcustomerid")]
+        public Observable<EntityReference> ParentCustomerId = Knockout.Observable<EntityReference>();
+
         [ScriptName("creditlimit")]
         public Observable<Money> CreditLimit = Knockout.Observable<Money>();
 
@@ -53,6 +56,7 @@ public void SetValue(Contact value)
             AccountRoleCode.SetValue(_value.AccountRoleCode.Value);
             NumberOfChildren.SetValue(_value.NumberOfChildren.Value);
             TransactionCurrencyId.SetValue(_value.TransactionCurrencyId);
+            ParentCustomerId.SetValue(_value.ParentCustomerId);
             CreditLimit.SetValue(_value.CreditLimit);
         }
 
@@ -67,6 +71,7 @@ public Contact Commit()
             _value.TransactionCurrencyId = TransactionCurrencyId.GetValue();
             _value.CreditLimit = CreditLimit.GetValue();
             _value.EntityState = EntityStates.Changed;
+            _value.ParentCustomerId = ParentCustomerId.GetValue();
             return _value;
         }
 

diff --git a/SparkleXrmSource/Client/ContactEditor/Views/ContactEditorView.cs b/SparkleXrmSource/Client/ContactEditor/Views/ContactEditorView.cs
@@ -23,6 +23,7 @@
 using SparkleXrm.CustomBinding;
 using Client.ContactEditor.ViewModels;
 using Xrm;
+using Client.ContactEditor.Model;
 
 namespace Client.Views
 {
@@ -36,7 +37,7 @@ public static void init()
 
             OrganizationServiceProxy.GetUserSettings();
             // Data Bind Grid
-            List<Column> columns = GridDataViewBinder.ParseLayout(",entityState,20,First Name,firstname,200,Last Name,lastname,200,Birth Date,birthdate,200,Account Role Code,accountrolecode,200,Number of Children,numberofchildren,100,Currency,transactioncurrencyid,200,Credit Limit,creditlimit,100,Gender,gendercode,100,Owner,ownerid,100");
+            List<Column> columns = GridDataViewBinder.ParseLayout(",entityState,20,First Name,firstname,200,Last Name,lastname,200,Birth Date,birthdate,200,Account Role Code,accountrolecode,200,Number of Children,numberofchildren,100,Currency,transactioncurrencyid,200,Credit Limit,creditlimit,100,Gender,gendercode,100,Owner,ownerid,100,Parent Customer,parentcustomerid,100");
 
             // Set Column formatters and editors
             columns[0].Formatter = delegate(int row, int cell, object value, Column columnDef, object dataContext)
@@ -65,21 +66,30 @@ public static void init()
 
             // Currency Column
             XrmLookupEditor.BindColumn(columns[6], vm.TransactionCurrencySearchCommand, "transactioncurrencyid", "currencyname", "");
-
+           
             // Credit Limit Column
             XrmMoneyEditor.BindColumn(columns[7], -10000, 10000);
 
             // Another optionset
             XrmOptionSetEditor.BindColumn(columns[8], "contact", columns[8].Field, true);
 
+            // Owner Column
+            XrmLookupEditorOptions options = (XrmLookupEditorOptions)XrmLookupEditor.BindColumn(columns[9], vm.OwnerSearchCommand, "id", "name", "").Options;
+            options.showFooter = true;
+
 
-            // OWner Column
-            XrmLookupEditor.BindColumn(columns[9], vm.OwnerSearchCommand, "id", "name", "");
+            // Account Column
+            XrmLookupEditorOptions accountLookupOptions = (XrmLookupEditorOptions)XrmLookupEditor.BindColumn(columns[10], vm.AccountSearchCommand, "id", "name", "").Options;
+            accountLookupOptions.showFooter = true;
+            accountLookupOptions.footerButton = new XrmLookupEditorButton();
+            accountLookupOptions.footerButton.Label = "Add New";
+            accountLookupOptions.footerButton.Image = "/_imgs/add_10.png";
+            accountLookupOptions.footerButton.OnClick = vm.AddNewAccountInLine;
 
             // Create Grid
             GridDataViewBinder contactGridDataBinder = new GridDataViewBinder();
             Grid contactsGrid = contactGridDataBinder.DataBindXrmGrid(vm.Contacts, columns, "container", "pager",true,false);
-            //contactGridDataBinder.BindClickHandler(contactsGrid);
+
             // Data Bind
             ViewBase.RegisterViewModel(vm);
 
@@ -89,13 +99,5 @@ public static void init()
             }, 0);
 
         }
-
-
-
-
-
-
-
-
     }
 }
diff --git a/SparkleXrmSource/CrmPackage/WebResources/sparkle_/css/2013/sparkle.css b/SparkleXrmSource/CrmPackage/WebResources/sparkle_/css/2013/sparkle.css
@@ -906,7 +906,31 @@ TEXTAREA.sparkle-Input {
     width:150px;
     text-overflow:ellipsis;
 }
-
+.sparkle-menu-footer {
+    position: absolute;
+    border-width: 1px;
+    border-style: solid;
+    border-color: rgb(160, 160, 160) rgb(128, 128, 128) rgb(128, 128, 128);
+    margin: 0px;
+    padding: 2px;
+    display: block;
+    background: white;
+    height: 16px;
+    min-width: 100px;
+}
+.sparkle-xrm .ui-autocomplete {
+    min-width:100px !important;
+}
+.sparkle-menu-footer-right {
+    position: absolute;
+    right: 4px;
+    top: 1px;
+}
+.sparkle-menu-footer-left {
+    position: absolute;
+    left: 4px;
+    top: 1px;
+}
 .sparkle-menu-item-label {
 }
 
@@ -1030,7 +1054,6 @@ TEXTAREA.sparkle-Input {
     width: 16px;
     height: 16px;
     overflow: hidden;
-    display:block;
 }
 
 

diff --git a/SparkleXrmSource/CrmPackage/WebResources/sparkle_/html/form.templates.htm b/SparkleXrmSource/CrmPackage/WebResources/sparkle_/html/form.templates.htm
@@ -98,7 +98,7 @@ <h2 class="sparkle-Form">
         </table>
         <!--/ko-->
         <!--ko if:type=='lookup'-->
-        <table style="width: 100%" cellspacing="0" cellpadding="0" class="sparkle-control-layout-table" data-bind="lookup: field, queryCommand: queryCommand, typeCodeAttribute: typeCodeAttribute, idAttribute: idAttribute, nameAttribute: nameAttribute, visible: visible">
+        <table style="width: 100%" cellspacing="0" cellpadding="0" class="sparkle-control-layout-table" data-bind="lookup: field, queryCommand: queryCommand, typeCodeAttribute: typeCodeAttribute, idAttribute: idAttribute, nameAttribute: nameAttribute, visible: visible, footerButton: $data.footerButton, showFooter: $data.showFooter">
             <tr>
                 <td class="sparkle-input-Container">
                     <input data-bind="disable: disable" type="text" class="sparkle-Input sparkle-Text sparkle-input-lookup-part" />

diff --git a/SparkleXrmSource/DebugWeb/WebResources/dev1_/html/ContactEditor.htm b/SparkleXrmSource/DebugWeb/WebResources/dev1_/html/ContactEditor.htm
@@ -84,13 +84,48 @@
                                 <!--/ko-->
                             </tr>
                             <tr valign="top">
-                                <!--ko template: { name: 'sparkle-form-field', data: { label: 'Currency',field:transactioncurrencyid,required:0,type:'lookup',disable:false,visible:true,queryCommand: $root.transactionCurrencySearchCommand,type:'lookup',typeCodeAttribute: '', idAttribute:'transactioncurrencyid',nameAttribute:'currencyname' } }-->
+                                <!--ko template: { name: 'sparkle-form-field', 
+                                    data: { 
+                                    label: 'Currency',
+                                    field:transactioncurrencyid,
+                                    required:0,
+                                    type:'lookup',
+                                    disable:false,
+                                    visible:true,
+                                    queryCommand: $root.transactionCurrencySearchCommand,
+                                    type:'lookup',
+                                    typeCodeAttribute: '', 
+                                    idAttribute:'transactioncurrencyid',
+                                    nameAttribute:'currencyname,currencysymbol',
+                                    showFooter: true
+                                    }
+                                    }-->
                                 <!--/ko-->
                             </tr>
                              <tr valign="top">
                                 <!--ko template: { name: 'sparkle-form-field', data: { label: 'Credit Limit',field:creditlimit,required:0,type:'money',disable:false,visible:true,minvalue:0,maxvalue:100000000 } }-->
                                 <!--/ko-->
                             </tr>
+                             <tr valign="top">
+                                <!--ko template: { name: 'sparkle-form-field', 
+                                    data: { 
+                                    label: 'Account',
+                                    field:parentcustomerid,
+                                    required:0,
+                                    type:'lookup',
+                                    disable:false,
+                                    visible:true,
+                                    queryCommand: $root.AccountSearchCommand,
+                                    type:'lookup',
+                                    typeCodeAttribute: '', 
+                                    idAttribute:'accountid',
+                                    nameAttribute:'name,address1_city',
+                                    showFooter: true,
+                                    footerButton: {label:'Add New',onClick:$root.AddNewAccountInLine, image:'/_imgs/add_10.png' }
+                                    }
+                                    }-->
+                                <!--/ko-->
+                            </tr>
                         </table>
 
             </div>

diff --git a/SparkleXrmSource/DebugWeb/WebResources/sparkle_/css/2013/sparkle.css b/SparkleXrmSource/DebugWeb/WebResources/sparkle_/css/2013/sparkle.css
@@ -906,7 +906,31 @@ TEXTAREA.sparkle-Input {
     width:150px;
     text-overflow:ellipsis;
 }
-
+.sparkle-menu-footer {
+    position: absolute;
+    border-width: 1px;
+    border-style: solid;
+    border-color: rgb(160, 160, 160) rgb(128, 128, 128) rgb(128, 128, 128);
+    margin: 0px;
+    padding: 2px;
+    display: block;
+    background: white;
+    height: 16px;
+    min-width: 100px;
+}
+.sparkle-xrm .ui-autocomplete {
+    min-width:100px !important;
+}
+.sparkle-menu-footer-right {
+    position: absolute;
+    right: 4px;
+    top: 1px;
+}
+.sparkle-menu-footer-left {
+    position: absolute;
+    left: 4px;
+    top: 1px;
+}
 .sparkle-menu-item-label {
 }
 

diff --git a/SparkleXrmSource/DebugWeb/WebResources/sparkle_/html/form.templates.htm b/SparkleXrmSource/DebugWeb/WebResources/sparkle_/html/form.templates.htm
@@ -98,7 +98,7 @@ <h2 class="sparkle-Form">
         </table>
         <!--/ko-->
         <!--ko if:type=='lookup'-->
-        <table style="width: 100%" cellspacing="0" cellpadding="0" class="sparkle-control-layout-table" data-bind="lookup: field, queryCommand: queryCommand, typeCodeAttribute: typeCodeAttribute, idAttribute: idAttribute, nameAttribute: nameAttribute, visible: visible">
+        <table style="width: 100%" cellspacing="0" cellpadding="0" class="sparkle-control-layout-table" data-bind="lookup: field, queryCommand: queryCommand, typeCodeAttribute: typeCodeAttribute, idAttribute: idAttribute, nameAttribute: nameAttribute, visible: visible, footerButton: $data.footerButton, showFooter: $data.showFooter">
             <tr>
                 <td class="sparkle-input-Container">
                     <input data-bind="disable: disable" type="text" class="sparkle-Input sparkle-Text sparkle-input-lookup-part" />

diff --git a/SparkleXrmSource/SparkleXrm/Sdk/Entity.cs b/SparkleXrmSource/SparkleXrm/Sdk/Entity.cs
@@ -226,7 +226,7 @@ public static int SortDelegate(string attributeName, Entity a, Entity b)
                 typeName = l.GetType().Name;
             else if (r != null)
                 typeName = r.GetType().Name;
-
+            
             if (l != r)
             {
                 switch (typeName.ToLowerCase())
@@ -240,7 +240,11 @@ public static int SortDelegate(string attributeName, Entity a, Entity b)
                             result = 1;
                         break;
                     case "date":
-                        if ((bool)Script.Literal("{0}<{1}", l, r))
+                        if (l == null)
+                            result = -1;
+                        else if (r == null)
+                            result = 1;
+                        else if ((bool)Script.Literal("{0}<{1}", l, r))
                             result = -1;
                         else
                             result = 1;