Skip to content

Commit 50859c7

Browse files
committed
Updating the code to support the new SDK.
1 parent 33d97bd commit 50859c7

File tree

12 files changed

+17
-16
lines changed

12 files changed

+17
-16
lines changed

eFormAPI/eFormAPI/Controllers/EntitySearchController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public OperationResult CreateEntityGroup(AdvEntitySearchableGroupEditModel editM
4747
var groupCreate = core.EntityGroupCreate(Constants.FieldTypes.EntitySearch, editModel.Name);
4848
if (editModel.AdvEntitySearchableItemModels.Any())
4949
{
50-
var entityGroup = core.EntityGroupRead(groupCreate.EntityGroupMUId);
50+
var entityGroup = core.EntityGroupRead(groupCreate.MicrotingUUID);
5151
var nextItemUid = entityGroup.EntityGroupItemLst.Count;
5252
foreach (var entityItem in editModel.AdvEntitySearchableItemModels)
5353
{
@@ -57,7 +57,7 @@ public OperationResult CreateEntityGroup(AdvEntitySearchableGroupEditModel editM
5757
}
5858
core.EntityGroupUpdate(entityGroup);
5959
}
60-
return new OperationResult(true, LocaleHelper.GetString("ParamCreatedSuccessfully", groupCreate.EntityGroupMUId));
60+
return new OperationResult(true, LocaleHelper.GetString("ParamCreatedSuccessfully", groupCreate.MicrotingUUID));
6161
}
6262
catch (Exception)
6363
{
@@ -119,7 +119,7 @@ public OperationDataResult<List<CommonDictionaryTextModel>> GetEntityGroupDictio
119119
{
120120
mappedEntityGroupDict.Add(new CommonDictionaryTextModel()
121121
{
122-
Id = entityGroupItem.MicrotingUId,
122+
Id = entityGroupItem.MicrotingUUID,
123123
Text = entityGroupItem.Name
124124
});
125125
}

eFormAPI/eFormAPI/Controllers/EntitySelectController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public OperationResult CreateEntityGroup(AdvEntitySelectableGroupEditModel editM
4747
var groupCreate = core.EntityGroupCreate(Constants.FieldTypes.EntitySelect, editModel.Name);
4848
if (editModel.AdvEntitySelectableItemModels.Any())
4949
{
50-
var entityGroup = core.EntityGroupRead(groupCreate.EntityGroupMUId);
50+
var entityGroup = core.EntityGroupRead(groupCreate.MicrotingUUID);
5151
var nextItemUid = entityGroup.EntityGroupItemLst.Count;
5252
foreach (var entityItem in editModel.AdvEntitySelectableItemModels)
5353
{
@@ -57,7 +57,7 @@ public OperationResult CreateEntityGroup(AdvEntitySelectableGroupEditModel editM
5757
}
5858
core.EntityGroupUpdate(entityGroup);
5959
}
60-
return new OperationResult(true, LocaleHelper.GetString("ParamCreatedSuccessfully", groupCreate.EntityGroupMUId));
60+
return new OperationResult(true, LocaleHelper.GetString("ParamCreatedSuccessfully", groupCreate.MicrotingUUID));
6161
}
6262
catch (Exception)
6363
{
@@ -118,7 +118,7 @@ public OperationDataResult<List<CommonDictionaryTextModel>> GetEntityGroupDictio
118118
{
119119
mappedEntityGroupDict.Add(new CommonDictionaryTextModel()
120120
{
121-
Id = entityGroupItem.MicrotingUId,
121+
Id = entityGroupItem.MicrotingUUID,
122122
Text = entityGroupItem.Name
123123
});
124124
}

eform-client/src/app/common/models/advanced/adv-entity-searchable-group.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {AdvEntitySearchableItemModel} from './adv-entity-searchable-item.model';
22
export class AdvEntitySearchableGroupModel {
33
name: string;
44
type: string;
5-
entityGroupMUId: string;
5+
microtingUUID: string;
66
workflowState: string;
77
status = true;
88
createdAt: Date;

eform-client/src/app/common/models/advanced/adv-entity-selectable-group.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {AdvEntitySelectableItemModel} from './adv-entity-selectable-item.model';
22
export class AdvEntitySelectableGroupModel {
33
name: string;
44
type: string;
5-
entityGroupMUId: string;
5+
MicrotingUUID: string;
66
workflowState: string;
77
status = true;
88
createdAt: Date;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3>{{'Delete' | translate}} searchable_group?</h3>
1111
<h6>ID</h6>
1212
</div>
1313
<div class="col-md-6">
14-
<h6><strong>{{selectedGroupModel.entityGroupMUId}}</strong></h6>
14+
<h6><strong>{{selectedGroupModel.microtingUUID}}</strong></h6>
1515
</div>
1616
</div>
1717
<div class="row">

eform-client/src/app/modules/advanced/components/entity-search/entity-search-remove/entity-search-remove.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class EntitySearchRemoveComponent implements OnInit {
2424

2525
deleteSelectedAdvEntitySearchableGroup() {
2626
this.spinnerStatus = true;
27-
this.entitySearchService.deleteEntitySearchableGroup(this.selectedGroupModel.entityGroupMUId).subscribe((data) => {
27+
this.entitySearchService.deleteEntitySearchableGroup(this.selectedGroupModel.microtingUUID).subscribe((data) => {
2828
if (data && data.success) {
2929
this.frame.hide();
3030
this.onEntityRemoved.emit();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</thead>
5353
<tbody>
5454
<tr *ngFor="let advEntitySearchableGroup of advEntitySearchableGroupListModel.entityGroups">
55-
<td scope="row">{{advEntitySearchableGroup.entityGroupMUId}}</td>
55+
<td scope="row">{{advEntitySearchableGroup.microtingUUID}}</td>
5656
<td> {{advEntitySearchableGroup.name}}</td>
5757
<td>
5858
<div class="d-flex flex-row justify-content-center">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class EntitySearchComponent implements OnInit {
4242

4343
openModalSearchEdit(selectedSearchModel: AdvEntitySelectableGroupModel) {
4444
this.selectedAdvGroup = selectedSearchModel;
45-
this.modalSearchEdit.show(this.selectedAdvGroup.entityGroupMUId);
45+
this.modalSearchEdit.show(this.selectedAdvGroup.microtingUUID);
4646
}
4747

4848

@@ -60,6 +60,7 @@ export class EntitySearchComponent implements OnInit {
6060
this.spinnerStatus = true;
6161
this.entitySearchService.getEntitySearchableGroupList(this.advEntitySearchableGroupListRequestModel).subscribe((data) => {
6262
if (data && data.model) {
63+
debugger;
6364
this.advEntitySearchableGroupListModel = data.model;
6465
} this.spinnerStatus = false;
6566
});

eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3>{{'Delete' | translate}} selectable_group?</h3>
1111
<h6>ID</h6>
1212
</div>
1313
<div class="col-md-6">
14-
<h6><strong>{{selectedGroupModel.entityGroupMUId}}</strong></h6>
14+
<h6><strong>{{selectedGroupModel.microtingUUID}}</strong></h6>
1515
</div>
1616
</div>
1717
<div class="row">

eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class EntitySelectRemoveComponent implements OnInit {
2424

2525
deleteSelectedAdvEntitySelectableGroup() {
2626
this.spinnerStatus = true;
27-
this.entitySelectService.deleteEntitySelectableGroup(this.selectedGroupModel.entityGroupMUId).subscribe((data) => {
27+
this.entitySelectService.deleteEntitySelectableGroup(this.selectedGroupModel.microtingUUID).subscribe((data) => {
2828
if (data && data.success) {
2929
this.frame.hide();
3030
this.onEntityRemoved.emit();

0 commit comments

Comments
 (0)