Skip to content

Commit 35997d3

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents b989358 + d48bee3 commit 35997d3

File tree

32 files changed

+154
-39
lines changed

32 files changed

+154
-39
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ eFormAPI/eFormAPI/logs/
2424
eFormAPI/eFormAPI\.sln\.DotSettings\.user
2525

2626
eFormAPI/eFormAPI/output/dataFolder/
27+
eform-client/package-lock.json

‎eFormAPI/eFormAPI/Controllers/TemplatesController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public OperationDataResult<List<Template_Dto>> Index()
6262
return new OperationDataResult<List<Template_Dto>>(false, "Check settings before proceed");
6363
}
6464
}
65-
catch (Exception)
65+
catch (Exception exception)
6666
{
6767
throw new HttpResponseException(HttpStatusCode.Unauthorized);
6868
}
@@ -195,8 +195,8 @@ public HttpResponseMessage Csv(int id)
195195
System.IO.Directory.CreateDirectory(System.Web.Hosting.HostingEnvironment.MapPath("~/bin/output/"));
196196
string filePath = System.Web.Hosting.HostingEnvironment.MapPath($"~/bin/output/{fileName}");
197197
var fullPath = core.CasesToCsv(id, null, null, filePath,
198-
$"{Request.RequestUri.Scheme}://{Request.RequestUri.Authority}{Url.Content("~")}" +
199-
"output/dataFolder/");
198+
$"{Request.RequestUri.Scheme}://{Request.RequestUri.DnsSafeHost}" +
199+
"/api/templates/getimage?&filename=");
200200

201201
HttpResponseMessage result = new HttpResponseMessage(HttpStatusCode.OK);
202202
var fileStream = new FileStream(fullPath, FileMode.Open, FileAccess.Read);

‎eFormAPI/eFormAPI/Infrastructure/Helpers/EFormCoreHelper.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ public Core GetCore()
6767
_core.HandleCaseDeleted += EventCaseDeleted;
6868
_core.HandleFileDownloaded += EventFileDownloaded;
6969
_core.HandleSiteActivated += EventSiteActivated;
70-
//_core.HandleEventLog += EventLog;
71-
//_core.HandleEventMessage += EventMessage;
72-
//_core.HandleEventWarning += EventWarning;
7370
_core.HandleEventException += EventException;
7471

7572
running = _core.StartSqlOnly(connectionStr);

‎eFormAPI/eFormAPI/Web.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22

33
<!--
44
For more information on how to configure your ASP.NET application, please visit
@@ -11,8 +11,7 @@
1111
</configSections>
1212

1313
<connectionStrings>
14-
<add name="eFormMainConnection" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=eFormAuthDb;Integrated Security=True"
15-
providerName="System.Data.SqlClient" />
14+
<add name="eFormMainConnection" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=v162Angular;User Id=sa;Password=aiT1sueh" providerName="System.Data.SqlClient" />
1615
</connectionStrings>
1716

1817
<appSettings>

‎eform-client/src/app/modules/admin/components/change-password/change-password.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ <h1 class="page-title header-page-title">
5454
</form>
5555
<div class="col-md-2">
5656
<div class="bs-docs-container hidden-print affix" id="mt-side-bar" role="complementary">
57-
<button class="btn btn-ar btn-danger" [disabled]="!changePassword.form.valid" (click)="updateUserPassword()">Gem</button>
57+
<button class="btn btn-ar btn-danger" [disabled]="!changePassword.form.valid" (click)="updateUserPassword()">Save</button>
5858
</div>
5959
<eform-spinner [middleActive]="spinnerStatus"></eform-spinner>
6060
</div>

‎eform-client/src/app/modules/advanced/components/edit-entity-group/edit-entity-group.component.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<modal #createAdvEntityGroupModal [size]="'lg'">
22
<modal-header [show-close]="true">
3-
<h4>Opret Søgbar liste</h4>
3+
<h4>Create searchable list</h4>
44
</modal-header>
55
<modal-body>
66
<div class="create_eform">
77
<div class="row">
88
<div class="form-group col-xs-12 col-md-12">
9-
<label class="mt-validation-container">Navn</label>
9+
<label class="mt-validation-container">Name</label>
1010
<span class="mt-icon-md needs_tooltip vcenter">
1111
<span *ngIf="!advEntityGroupEditModel.name"
1212
class="glyphicon glyphicon-info-sign glyphicon-info-sign-yellow glyphicon-info-sign-wrapper vertical-align needs_tooltip"
13-
tooltip="Påkrævet" data-toggle="tooltip">
13+
tooltip="Mandatory" data-toggle="tooltip">
1414
</span>
1515
</span>
1616
<input class="form-control mt-required" [(ngModel)]="advEntityGroupEditModel.name" required type="text"
@@ -19,7 +19,7 @@ <h4>Opret Søgbar liste</h4>
1919
</div>
2020
</div>
2121
<div class="row">
22-
<label class="table-title-wrapper">Svarmuligheder</label>
22+
<label class="table-title-wrapper">Options:</label>
2323
</div>
2424
<div class="row">
2525
<div class="mt-table-head col-sm-1 col-md-1">
@@ -32,7 +32,7 @@ <h4>Opret Søgbar liste</h4>
3232
<div class="mt-searchable-entities-actions pull-right">
3333
<button class="needs_tooltip btn btn-ar btn-xs btn-success"
3434
container="body" placement="top" type="button" (click)="showImportAdvEntityGroupModal()"
35-
tooltip="Importér svarmuligheder">
35+
tooltip="Import options">
3636
<span class="glyphicon glyphicon-import"></span>
3737
</button>
3838
<a class="needs_tooltip btn btn-xs btn-ar btn-success" data-bootbox-title="Add searchable_entity to case"
@@ -67,15 +67,15 @@ <h4>Opret Søgbar liste</h4>
6767
<span class="glyphicon-info-sign-inherit">
6868
<span
6969
class="glyphicon glyphicon-info-sign glyphicon-info-sign-yellow glyphicon-info-sign-wrapper mt-error-notification-icon needs_tooltip vcenter"
70-
container="body" placement="top" tooltip="Ikke færdigudfyldt!"></span>
70+
container="body" placement="top" tooltip="Missing name!"></span>
7171
</span>
7272
</div>
73-
<button tooltip="Redigér Søgbar element" (click)="openEditAdvEntityModal(entityItem)"
73+
<button tooltip="Edit searchable option" (click)="openEditAdvEntityModal(entityItem)"
7474
class="needs_tooltip btn btn-ar btn-sm btn-default"
7575
placement="top" type="button" container="body">
7676
<span class="fa fa-pencil"></span>
7777
</button>
78-
<button tooltip="Slet Søgbar element" placement="top" (click)="deleteAdvEntityItem(entityItem)"
78+
<button tooltip="Delete searchable option" placement="top" (click)="deleteAdvEntityItem(entityItem)"
7979
class="needs_tooltip btn btn-ar btn-sm btn-danger"
8080
type="button" container="body">
8181
<span class="fa fa-trash-o"></span>
@@ -93,29 +93,29 @@ <h4>Opret Søgbar liste</h4>
9393
</modal-body>
9494
<modal-footer>
9595
<button type="button" class="btn btn-default" data-dismiss="createTemplateModal"
96-
(click)="createAdvEntityGroupModal.dismiss()">Annullér
96+
(click)="createAdvEntityGroupModal.dismiss()">Cancel
9797
</button>
98-
<button type="button" class="btn btn-success" (click)="createEntityGroup()">Gem</button>
98+
<button type="button" class="btn btn-success" (click)="createEntityGroup()">Save</button>
9999
</modal-footer>
100100
</modal>
101101

102102
<modal #editAdvEntityItemModal (onDismiss)="onChildModalDismissed()">
103103
<modal-header [show-close]="true">
104-
<h4>Redigér Søgbar element</h4>
104+
<h4>Edit searchable option</h4>
105105
</modal-header>
106106
<modal-body>
107107
<div class="create_eform">
108108
<div class="row">
109109
<div class="form-group col-xs-12 col-md-12">
110-
<label class="mt-validation-container">Navn</label>
110+
<label class="mt-validation-container">Name</label>
111111
<input class="form-control mt-required" [(ngModel)]="selectedAdvEntityItemModel.name" type="text" value="">
112112
</div>
113113
</div>
114114
</div>
115115
</modal-body>
116116
<modal-footer>
117117
<button type="button" class="btn btn-default" data-dismiss="createTemplateModal"
118-
(click)="editAdvEntityItemModal.dismiss()">Annullér
118+
(click)="editAdvEntityItemModal.dismiss()">Cancel
119119
</button>
120120
<button type="button" class="btn btn-success" (click)="onAdvEntityItemChanged(selectedAdvEntityItemModel)">Ok
121121
</button>
@@ -137,7 +137,7 @@ <h4>Importér svarmuligheder (max 100)</h4>
137137
</modal-body>
138138
<modal-footer>
139139
<button type="button" class="btn btn-default" data-dismiss="createTemplateModal"
140-
(click)="importAdvEntityGroupModal.dismiss()">Annullér
140+
(click)="importAdvEntityGroupModal.dismiss()">Cancel
141141
</button>
142142
<button type="button" class="btn btn-success" (click)="importAdvEntityGroup(importString.value)">Importér</button>
143143
</modal-footer>

‎eform-client/src/app/modules/advanced/components/entity-search-grid/entity-search-grid.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
[class.sorting]="!isSortedByNameDsc && !isSortedByNameAsc"
1818
(click)="sortByName()"
1919
rowspan="1" colspan="1">
20-
Navn
20+
Name
2121
</th>
2222
<th class="col-md-2 text-center" rowspan="1" colspan="1">
2323
</th>
@@ -33,12 +33,12 @@
3333
</td>
3434
<td class="text-center">
3535
<!--<eform-switch [status]="false" [isDisabledON]="true" [onText]="'ON'" [offText]="'OFF'" [onColor]="'green'" [offColor]="'red'" [size]="'small'"></eform-switch>-->
36-
<a (click)="showEditAdvEntityGroupModal(advEntityGroup.entityGroupMUId)" tooltip="Redigér Søgbar liste"
36+
<a (click)="showEditAdvEntityGroupModal(advEntityGroup.entityGroupMUId)" tooltip="Edit searchable list"
3737
class="needs_tooltip btn btn-ar btn-sm btn-default" placement="top" container="body"
3838
type="button" data-original-title="Edit site">
3939
<span class="fa fa-pencil"></span>
4040
</a>
41-
<button tooltip="Slet Søgbar element" placement="top" container="body"
41+
<button tooltip="Delete searchable option" placement="top" container="body"
4242
(click)="showDeleteAdvEntityGroupModal(advEntityGroup)"
4343
class="needs_tooltip btn btn-ar btn-danger btn-sm dangerous-action" type="button">
4444
<span class="fa fa-trash-o"></span>
@@ -72,7 +72,7 @@ <h4 class="modal-title">Delete searchable_group?</h4>
7272
<div class='col-md-8'> {{selectedAdvEntityGroupModel.updatedAt | date:'dd.MM.y HH:mm:ss'}}</div>
7373
</div>
7474
<div class='row'>
75-
<div class='col-md-4'><label>Navn</label></div>
75+
<div class='col-md-4'><label>Name</label></div>
7676
<div class='col-md-8'> {{selectedAdvEntityGroupModel.name}}</div>
7777
</div>
7878
</div>

‎eform-client/src/app/modules/advanced/components/entity-search/entity-search.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<header class="main-header main-header-title">
22
<div class="container-fluid">
33
<h1 class="page-title header-page-title">
4-
<div class="container" style="width: 200px !important;">
5-
Søgbar lister
4+
<div class="container" style="width: 250px !important;">
5+
Searchable lists
66
</div>
77
</h1>
88
<div class="pull-right">
9-
<button class="needs_tooltip btn btn-ar btn-success" tooltip='Opret Søgbar liste'
9+
<button class="needs_tooltip btn btn-ar btn-success" tooltip='Create searchable list'
1010
(click)="showCreateAdvEntityGroupModal()" type="button">
11-
Opret ny Søgbar liste
11+
Create new searchable list
1212
</button>
1313
</div>
1414
</div>
@@ -17,7 +17,7 @@ <h1 class="page-title header-page-title">
1717
<div class="row">
1818
<div class="col-xs-8">
1919
<div id="check_lists_filter" class="dataTables_filter form-inline">
20-
<label>Søg:
20+
<label>Search:
2121
<input type="search" class="form-control input-sm" (ngModelChange)="onSearchChanged($event)"
2222
[ngModel]="advEntityGroupListRequestModel.nameFilter"
2323
placeholder="">

‎eform-client/src/app/modules/advanced/components/site-edit/site-edit.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h1 class="page-title header-page-title">
3535
</div>
3636
<div class="col-md-3">
3737
<div class="bs-docs-container hidden-print affix" id="mt-side-bar" role="complementary">
38-
<button class="btn btn-ar btn-danger" (click)="updateSingle()">Gem</button>
38+
<button class="btn btn-ar btn-danger" (click)="updateSingle()">Save</button>
3939
</div>
4040
</div>
4141
</div>

‎eform-client/src/app/modules/advanced/components/worker-edit/worker-edit.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1 class="page-title header-page-title">
4747
</div>
4848
<div class="col-md-3">
4949
<div class="bs-docs-container hidden-print affix" id="mt-side-bar" role="complementary">
50-
<button class="btn btn-ar btn-danger" (click)="updateSingle()">Gem</button>
50+
<button class="btn btn-ar btn-danger" (click)="updateSingle()">Save</button>
5151
</div>
5252
</div>
5353
</div>

0 commit comments

Comments
 (0)