Merge branch 'master' of https://github.com/microting/eform-angular-frontend

Author: renemadsen

eFormAPI/eFormAPI.Common/Models/CommonDictionaryTextModel.cs

@@ -0,0 +1,8 @@
+namespace eFormAPI.Common.Models
+{
+    public class CommonDictionaryTextModel
+    {
+        public string Id { get; set; }
+        public string Text { get; set; }
+    }
+}

eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj

@@ -74,7 +74,7 @@
       <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.90.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Microting.eForm, Version=2.1.90.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\Microting.eForm.2.1.90\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
@@ -114,6 +114,7 @@
     <Compile Include="Models\Auth\ForgotPasswordModel.cs" />
     <Compile Include="Models\Auth\ResetPasswordModel.cs" />
     <Compile Include="Models\CommonDictionaryModel.cs" />
+    <Compile Include="Models\CommonDictionaryTextModel.cs" />
     <Compile Include="Models\DisplayTemplateColumnsModel.cs" />
     <Compile Include="Models\Settings\Admin\AdminSettingsModel.cs" />
     <Compile Include="Models\Settings\Admin\HeaderSettingsModel.cs" />

eFormAPI/eFormAPI/Controllers/CasesController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Web.Http;
 using eFormAPI.Common.API;
+using eFormAPI.Common.Models;
 using eFormAPI.Common.Models.Cases.Request;
 using eFormAPI.Web.Infrastructure.Helpers;
 using eFormShared;

eFormAPI/eFormAPI/Controllers/EntitySearchController.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
 using eFormAPI.Common.API;
+using eFormAPI.Common.Models;
 using eFormAPI.Common.Models.SearchableList;
 using eFormAPI.Web.Infrastructure.Helpers;
 using eFormData;
@@ -96,6 +98,35 @@ public OperationDataResult<EntityGroup> GetEntityGroup(string entityGroupUid)
             }
         }
 
+        [HttpGet]
+        [Route("api/searchable-groups/dict/{entityGroupUid}")]
+        public OperationDataResult<List<CommonDictionaryTextModel>> GetEntityGroupDictionary(string entityGroupUid, string searchString)
+        {
+            try
+            {
+                var core = _coreHelper.GetCore();
+
+                var entityGroup = core.EntityGroupRead(entityGroupUid, null, searchString);
+
+                var mappedEntityGroupDict = new List<CommonDictionaryTextModel>();
+
+                foreach (var entityGroupItem in entityGroup.EntityGroupItemLst)
+                {
+                    mappedEntityGroupDict.Add(new CommonDictionaryTextModel()
+                    {
+                        Id = entityGroupItem.EntityItemUId,
+                        Text = entityGroupItem.Name
+                    });
+                }
+
+                return new OperationDataResult<List<CommonDictionaryTextModel>>(true, mappedEntityGroupDict);
+            }
+            catch (Exception ex)
+            {
+                return new OperationDataResult<List<CommonDictionaryTextModel>>(false, "Error when obtaining searchable list");
+            }
+        }
+
         [HttpGet]
         [Route("api/searchable-groups/delete/{entityGroupUid}")]
         public OperationResult DeleteEntityGroup(string entityGroupUid)

eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs

@@ -99,6 +99,14 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                         list.Add(val);
                     }
                     break;
+                case "EntitySearch":
+                    var entitySearch = editRequestField?.FieldValues?.First();
+                    if (entitySearch?.Value != null && entitySearch?.FieldId != null)
+                    {
+                        string val = $"{entitySearch.FieldId}|{entitySearch.Value.ToString()}";
+                        list.Add(val);
+                    }
+                    break;
                 case "MultiSelect":
                     var multiFirst = editRequestField?.FieldValues?.First();
                     if (multiFirst?.Value != null && multiFirst?.FieldId != null)

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -127,7 +127,7 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.90.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Microting.eForm, Version=2.1.90.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\Microting.eForm.2.1.90\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">

eFormAPI/eFormAPI/packages.config

@@ -38,7 +38,7 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="2.1.90" targetFramework="net461" />
+  <package id="Microting.eForm" version="2.1.90" targetFramework="net46" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.11" targetFramework="net46" />
   <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />