Skip to content

Commit cd715ac

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents 5299094 + 5e7292e commit cd715ac

File tree

8 files changed

+49
-14
lines changed

8 files changed

+49
-14
lines changed

‎eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.128" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.144" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
1313
</ItemGroup>

‎eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj‎

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

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.128" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.144" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
13-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.86" />
13+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.87" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎eFormAPI/eFormAPI.Web/Hosting/Extensions/ApplicationBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void UseAngularMiddleware(this IApplicationBuilder app, IHostingEn
4949
public static void UseEFormPlugins(this IApplicationBuilder app, List<IEformPlugin> plugins)
5050
{
5151
Console.ForegroundColor = ConsoleColor.Green;
52-
Console.WriteLine($"Trying to load plugins, found : {plugins.Count}");
52+
Console.WriteLine($"Trying to load {plugins.Count} plugins...");
5353
foreach (var plugin in plugins)
5454
{
5555
Console.WriteLine($"Loading plugin : {plugin.Name}");

‎eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static List<IEformPlugin> GetAllPlugins()
137137
}
138138
}
139139
Console.ForegroundColor = ConsoleColor.Green;
140-
Console.WriteLine($"{plugins.Count} number of plugins found");
140+
Console.WriteLine($"{plugins.Count} plugins found");
141141

142142
Console.ForegroundColor = ConsoleColor.Gray;
143143
return plugins;

‎eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.86" />
27-
<PackageReference Include="Microting.eForm" Version="3.0.128" />
26+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.87" />
27+
<PackageReference Include="Microting.eForm" Version="3.0.144" />
2828
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
2929
<PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
3030
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ng-container *ngIf="dataItemList">
22
<ng-container *ngFor="let dataItem of dataItemList; let i = index">
33
<div class="card z-depth-2 mb-3" style="width: 100%"
4-
*ngIf="dataItem.fieldType != 'SaveButton' && dataItem.fieldValues">
4+
*ngIf="dataItem.fieldType != 'SaveButton' ">
55
<div class="card-header"
6-
[ngStyle]="{'background-color': dataItem.fieldValues[0].color ? '#' + dataItem.fieldValues[0].color : ''}"
6+
[ngStyle]="{'background-color': dataItem.fieldValues.length > 0 ? (dataItem.fieldValues[0].color ? '#' + dataItem.fieldValues[0].color : '') : ''}"
77
*ngIf="dataItem.fieldType != 'FieldContainer' && dataItem.fieldType != 'SaveButton'">
88
{{dataItem.label}}
99
</div>

‎eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
<label for="numberElement{{fieldValueObj.fieldId}}">{{'Value' | translate}}</label>
99
</div>
1010
</form>
11-

‎eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,46 @@
1919
<table class="table table-sm table-striped text-center z-depth-1">
2020
<thead>
2121
<tr>
22-
<th scope="col">ID</th>
23-
<th>{{ 'eForm finished at' | translate }}</th>
24-
<th>{{ 'Data accessible at' | translate }}</th>
25-
<th>{{ 'eForm done by' | translate }}</th>
22+
<th class="table-header-sortable"
23+
(click)="sortTable('id')"
24+
rowspan="1" colspan="1">
25+
<div class="d-flex align-items-center justify-content-center">
26+
ID
27+
<i class="material-icons text-black-50" *ngIf="localPageSettings.sort != 'id'">unfold_more</i>
28+
<i class="material-icons" *ngIf="localPageSettings.sort == 'id' && !localPageSettings.isSortDsc">expand_less</i>
29+
<i class="material-icons" *ngIf="localPageSettings.sort == 'id' && localPageSettings.isSortDsc">expand_more</i>
30+
</div>
31+
</th>
32+
<th class="table-header-sortable"
33+
(click)="sortTable('done_at')"
34+
rowspan="1" colspan="1">
35+
<div class="d-flex align-items-center justify-content-center">
36+
{{ 'eForm finished at' | translate }}
37+
<i class="material-icons text-black-50" *ngIf="localPageSettings.sort != 'done_at'">unfold_more</i>
38+
<i class="material-icons" *ngIf="localPageSettings.sort == 'done_at' && !localPageSettings.isSortDsc">expand_less</i>
39+
<i class="material-icons" *ngIf="localPageSettings.sort == 'done_at' && localPageSettings.isSortDsc">expand_more</i>
40+
</div>
41+
</th>
42+
<th class="table-header-sortable"
43+
(click)="sortTable('created_at')"
44+
rowspan="1" colspan="1">
45+
<div class="d-flex align-items-center justify-content-center">
46+
{{ 'Data accessible at' | translate }}
47+
<i class="material-icons text-black-50" *ngIf="localPageSettings.sort != 'created_at'">unfold_more</i>
48+
<i class="material-icons" *ngIf="localPageSettings.sort == 'created_at' && !localPageSettings.isSortDsc">expand_less</i>
49+
<i class="material-icons" *ngIf="localPageSettings.sort == 'created_at' && localPageSettings.isSortDsc">expand_more</i>
50+
</div>
51+
</th>
52+
<th class="table-header-sortable"
53+
(click)="sortTable('worker_name')"
54+
rowspan="1" colspan="1">
55+
<div class="d-flex align-items-center justify-content-center">
56+
{{ 'eForm done by' | translate }}
57+
<i class="material-icons text-black-50" *ngIf="localPageSettings.sort != 'worker_name'">unfold_more</i>
58+
<i class="material-icons" *ngIf="localPageSettings.sort == 'worker_name' && !localPageSettings.isSortDsc">expand_less</i>
59+
<i class="material-icons" *ngIf="localPageSettings.sort == 'worker_name' && localPageSettings.isSortDsc">expand_more</i>
60+
</div>
61+
</th>
2662
<th *ngIf="currentTemplate.field1" class="table-header-sortable"
2763
(click)="sortTable('field1')"
2864
rowspan="1" colspan="1">

0 commit comments

Comments
 (0)