Skip to content

Commit 2ae14c7

Browse files
Gid733Gid733
authored
Merge pull request #5 from microting/master
Updates
2 parents ecfa816 + c163bfe commit 2ae14c7

File tree

67 files changed

+1408
-418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1408
-418
lines changed

‎eFormAPI/Installation/Bundle/InstallBundle.wixproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ProjectView>ShowAllFiles</ProjectView>
4+
<ProjectView>ProjectFiles</ProjectView>
55
</PropertyGroup>
66
</Project>

eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntityGroupEditModel.cs renamed to eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntitySearchableGroupEditModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
namespace eFormAPI.Common.Models.SearchableList
55
{
6-
public class AdvEntityGroupEditModel
6+
public class AdvEntitySearchableGroupEditModel
77
{
88
public string Name { get; set; }
99
public string GroupUid { get; set; }
10-
public List<EntityItem> AdvEntityItemModels { get; set; }
10+
public List<EntityItem> AdvEntitySearchableItemModels { get; set; }
1111
}
1212
}

eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntityGroupImportModel.cs renamed to eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntitySearchableGroupImportModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace eFormAPI.Common.Models.SearchableList
22
{
3-
public class AdvEntityGroupImportModel
3+
public class AdvEntitySearchableGroupImportModel
44
{
55
public string ImportString { get; set; }
66
}

eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntityGroupListRequestModel.cs renamed to eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntitySearchableGroupListRequestModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace eFormAPI.Common.Models.SearchableList
22
{
3-
public class AdvEntityGroupListRequestModel
3+
public class AdvEntitySearchableGroupListRequestModel
44
{
55
public string Sort { get; set; }
66
public string NameFilter { get; set; }

eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntityItemModel.cs renamed to eFormAPI/eFormAPI.Common/Models/SearchableList/AdvEntitySearchableItemModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace eFormAPI.Common.Models.SearchableList
22
{
3-
public class AdvEntityItemModel
3+
public class AdvEntitySearchableItemModel
44
{
55
public string Name { get; set; }
66
public string Description { get; set; }

‎eFormAPI/eFormAPI.Common/Models/SelectableList/AdvEntitySelectableGroupEditModel.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.Collections.Generic;
2+
using eFormData;
3+
4+
namespace eFormAPI.Common.Models.SelectableList
5+
{
6+
public class AdvEntitySelectableGroupEditModel
7+
{
8+
public string Name { get; set; }
9+
public string GroupUid { get; set; }
10+
public List<EntityItem> AdvEntitySelectableItemModels { get; set; }
11+
}
12+
}

‎eFormAPI/eFormAPI.Common/Models/SelectableList/AdvEntitySelectableGroupImportModel.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace eFormAPI.Common.Models.SelectableList
2+
{
3+
public class AdvEntitySelectableGroupImportModel
4+
{
5+
public string ImportString { get; set; }
6+
}
7+
}

‎eFormAPI/eFormAPI.Common/Models/SelectableList/AdvEntitySelectableGroupListRequestModel.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace eFormAPI.Common.Models.SelectableList
2+
{
3+
public class AdvEntitySelectableGroupListRequestModel
4+
{
5+
public string Sort { get; set; }
6+
public string NameFilter { get; set; }
7+
public int PageIndex { get; set; }
8+
public int PageSize { get; set; }
9+
public bool IsSortDsc { get; set; }
10+
}
11+
}

‎eFormAPI/eFormAPI.Common/Models/SelectableList/AdvEntitySelectableItemModel.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace eFormAPI.Common.Models.SelectableList
2+
{
3+
public class AdvEntitySelectableItemModel
4+
{
5+
public string Name { get; set; }
6+
public string Description { get; set; }
7+
public string EntityItemUId { get; set; }
8+
public string WorkflowState { get; set; }
9+
10+
}
11+
}

‎eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="Microting.eForm, Version=2.1.90.0, Culture=neutral, PublicKeyToken=null">
78-
<HintPath>..\packages\Microting.eForm.2.1.90\lib\net45\Microting.eForm.dll</HintPath>
77+
<Reference Include="Microting.eForm, Version=2.1.96.0, Culture=neutral, processorArchitecture=AMD64">
78+
<HintPath>..\packages\Microting.eForm.2.1.96\lib\net45\Microting.eForm.dll</HintPath>
7979
</Reference>
8080
<Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
8181
<HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
@@ -116,6 +116,10 @@
116116
<Compile Include="Models\CommonDictionaryModel.cs" />
117117
<Compile Include="Models\CommonDictionaryTextModel.cs" />
118118
<Compile Include="Models\DisplayTemplateColumnsModel.cs" />
119+
<Compile Include="Models\SelectableList\AdvEntitySelectableGroupEditModel.cs" />
120+
<Compile Include="Models\SelectableList\AdvEntitySelectableGroupImportModel.cs" />
121+
<Compile Include="Models\SelectableList\AdvEntitySelectableGroupListRequestModel.cs" />
122+
<Compile Include="Models\SelectableList\AdvEntitySelectableItemModel.cs" />
119123
<Compile Include="Models\Settings\Admin\AdminSettingsModel.cs" />
120124
<Compile Include="Models\Settings\Admin\HeaderSettingsModel.cs" />
121125
<Compile Include="Models\Settings\Admin\LoginPageSettingsModel.cs" />
@@ -139,10 +143,10 @@
139143
<Compile Include="Models\DeployModel.cs" />
140144
<Compile Include="Models\DeployToModel.cs" />
141145
<Compile Include="Models\EFormXmlModel.cs" />
142-
<Compile Include="Models\SearchableList\AdvEntityGroupEditModel.cs" />
143-
<Compile Include="Models\SearchableList\AdvEntityGroupImportModel.cs" />
144-
<Compile Include="Models\SearchableList\AdvEntityItemModel.cs" />
145-
<Compile Include="Models\SearchableList\AdvEntityGroupListRequestModel.cs" />
146+
<Compile Include="Models\SearchableList\AdvEntitySearchableGroupEditModel.cs" />
147+
<Compile Include="Models\SearchableList\AdvEntitySearchableGroupImportModel.cs" />
148+
<Compile Include="Models\SearchableList\AdvEntitySearchableItemModel.cs" />
149+
<Compile Include="Models\SearchableList\AdvEntitySearchableGroupListRequestModel.cs" />
146150
<Compile Include="Models\SimpleSiteModel.cs" />
147151
<Compile Include="Models\SiteNameModel.cs" />
148152
<Compile Include="Models\User\UserInfoModelList.cs" />

0 commit comments

Comments
 (0)