Skip to content

Commit 2edde67

Browse files
Gid733Gid733
authored
Merge pull request #2 from microting/master
Get latest changes
2 parents c391226 + fb442cd commit 2edde67

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ eFormAPI/eFormApi.Integration.Tests/obj/*
100100
eFormAPI/eFormApi.Tests/obj/*
101101
eFormAPI/eFormAPI/content/JasperExporter.jar
102102
eFormAPI/eFormAPI.Common/content/JasperExporter.jar
103+
JasperExporter.jar

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

Lines changed: 2 additions & 2 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.76.0, Culture=neutral, PublicKeyToken=null">
78-
<HintPath>..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll</HintPath>
77+
<Reference Include="Microting.eForm, Version=2.1.83.0, Culture=neutral, processorArchitecture=AMD64">
78+
<HintPath>..\packages\Microting.eForm.2.1.83\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>

‎eFormAPI/eFormAPI.Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
88
<package id="EPPlus" version="4.1.1" targetFramework="net46" />
99
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
10-
<package id="Microting.eForm" version="2.1.76" targetFramework="net46" />
10+
<package id="Microting.eForm" version="2.1.83" targetFramework="net46" />
1111
<package id="MySql.Data" version="6.9.11" targetFramework="net46" />
1212
<package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />
1313
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />

‎eFormAPI/eFormAPI/Controllers/CasesController.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ public OperationResult Update(ReplyRequest model)
8989
try
9090
{
9191
core.CaseUpdate(model.Id, fieldValueList, checkListValueList);
92-
var allCases = core.CaseReadAll(model.Id, null, null);
93-
foreach (var caseObject in allCases) {
94-
core.CaseUpdateFieldValues(caseObject.Id);
95-
}
92+
core.CaseUpdateFieldValues(model.Id);
9693
return new OperationResult(true, "Case has been updated");
9794
}
9895
catch (Exception)

‎eFormAPI/eFormAPI/Controllers/TemplateColumnsController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public OperationResult UpdateColumns(UpdateTemplateColumnsModel model)
107107
columnsList[0], columnsList[1], columnsList[2], columnsList[3],
108108
columnsList[4], columnsList[5], columnsList[6], columnsList[7],
109109
columnsList[8], columnsList[9]);
110+
var allCases = core.CaseReadAll(model.TemplateId, null, null);
111+
foreach (var caseObject in allCases)
112+
{
113+
core.CaseUpdateFieldValues(caseObject.Id);
114+
}
110115
return columnsUpdateResult
111116
? new OperationResult(true, "Columns was updated")
112117
: new OperationResult(false, "Error while updating columns");

‎eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
8181
DateTime currentDate = (DateTime)dateFirst.Value;
8282
if (currentDate != null)
8383
{
84-
string val = $"{dateFirst.FieldId}|{currentDate:MM-dd-yyyy}";
84+
string val = $"{dateFirst.FieldId}|{currentDate:yyyy-MM-dd}";
8585
list.Add(val);
8686
}
8787
}

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@
127127
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128128
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
129129
</Reference>
130-
<Reference Include="Microting.eForm, Version=2.1.76.0, Culture=neutral, PublicKeyToken=null">
131-
<HintPath>..\packages\Microting.eForm.2.1.76\lib\net45\Microting.eForm.dll</HintPath>
130+
<Reference Include="Microting.eForm, Version=2.1.83.0, Culture=neutral, processorArchitecture=AMD64">
131+
<HintPath>..\packages\Microting.eForm.2.1.83\lib\net45\Microting.eForm.dll</HintPath>
132132
</Reference>
133133
<Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
134134
<HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
@@ -295,9 +295,7 @@
295295
</ItemGroup>
296296
<ItemGroup>
297297
<Content Include="Global.asax" />
298-
<Content Include="JasperExporter.jar">
299-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300-
</Content>
298+
<Content Include="JasperExporter.jar" />
301299
<Content Include="Web.config">
302300
<SubType>Designer</SubType>
303301
</Content>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3939
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
4040
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
41-
<package id="Microting.eForm" version="2.1.76" targetFramework="net46" />
41+
<package id="Microting.eForm" version="2.1.83" targetFramework="net461" />
4242
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4343
<package id="MySql.Data" version="6.9.11" targetFramework="net46" />
4444
<package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />

‎eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ng-container *ngIf="dataItemList">
22
<ng-container *ngFor="let dataItem of dataItemList; let i = index">
3-
<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)" *ngIf="dataItem.fieldType != 'FieldContainer'">
3+
<tr [style.backgroundColor]="getStyleColorFromDataItem(dataItem)" *ngIf="dataItem.fieldType != 'FieldContainer' && dataItem.fieldType != 'SaveButton'">
44
<td>
55
<strong>{{dataItem.label}}</strong>
66
</td>

0 commit comments

Comments
 (0)