@bnsights/bbsf-admin-portal 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bnsights-bbsf-admin-portal-1.0.6.tgz +0 -0
- package/bundles/bnsights-bbsf-admin-portal.umd.js +239 -220
- package/bundles/bnsights-bbsf-admin-portal.umd.js.map +1 -1
- package/esm2015/lib/Pages/configurations/configuration/configuration.component.js +1 -1
- package/esm2015/lib/Pages/core/authentication/auth.guard.js +10 -4
- package/esm2015/lib/Pages/departments/department/department.component.js +5 -2
- package/esm2015/lib/Pages/departments/department-info/department-info.component.js +1 -1
- package/esm2015/lib/Pages/departments/departments.module.js +6 -4
- package/esm2015/lib/Pages/helpCenter/help-center/help-center.component.js +9 -9
- package/esm2015/lib/Pages/helpCenter/help-center-secondlevel/help-center-secondlevel.component.js +9 -9
- package/esm2015/lib/Pages/helpCenter/help-center-thirdlevel/help-center-thirdlevel.component.js +9 -9
- package/esm2015/lib/Pages/impersonation-rules/impersonation-rules/impersonation-rules.component.js +1 -1
- package/esm2015/lib/Pages/jobs/jobs/jobs.component.js +1 -1
- package/esm2015/lib/Pages/localizations/localizations.component.js +9 -9
- package/esm2015/lib/Pages/lookups/lookup/lookup.component.js +9 -9
- package/esm2015/lib/Pages/lookups/lookup-group/lookup-group.component.js +5 -5
- package/esm2015/lib/Pages/lookups/lookup-item/lookup-item.component.js +5 -5
- package/esm2015/lib/Pages/notifications/add/add.component.js +11 -11
- package/esm2015/lib/Pages/notifications/edit/edit.component.js +11 -11
- package/esm2015/lib/Pages/notifications/master-layouts/master-layouts.component.js +1 -1
- package/esm2015/lib/Pages/notifications/template-info/template-info.component.js +5 -5
- package/esm2015/lib/Pages/notifications/templates/templates.component.js +9 -9
- package/esm2015/lib/Pages/providers/provider/provider.component.js +1 -1
- package/esm2015/lib/Pages/publicHolidays/public-holiday/public-holiday.component.js +5 -5
- package/esm2015/lib/Pages/roles/permission-set-info/permission-set-info.component.js +1 -1
- package/esm2015/lib/Pages/roles/permissions/permissions.component.js +5 -5
- package/esm2015/lib/Pages/roles/permissionsets/permissionsets.component.js +5 -5
- package/esm2015/lib/Pages/sectors/department-info/department-info.component.js +1 -1
- package/esm2015/lib/Pages/sectors/sector/sector.component.js +5 -5
- package/esm2015/lib/Pages/sectors/sector-info/sector-info.component.js +1 -1
- package/esm2015/lib/Pages/shared/models/DepartmentModels/DepartmentModel.js +1 -1
- package/esm2015/lib/Pages/users/users.component.js +5 -5
- package/esm2015/lib/Pages/workflows/tabs/tabs.component.js +2 -2
- package/esm2015/lib/masterlayout.module.js +2 -4
- package/esm2015/public-api.js +2 -1
- package/fesm2015/bnsights-bbsf-admin-portal.js +238 -218
- package/fesm2015/bnsights-bbsf-admin-portal.js.map +1 -1
- package/lib/Pages/configurations/configuration/configuration.component.d.ts +1 -1
- package/lib/Pages/core/authentication/auth.guard.d.ts +1 -0
- package/lib/Pages/departments/department/department.component.d.ts +3 -2
- package/lib/Pages/departments/department-info/department-info.component.d.ts +1 -1
- package/lib/Pages/helpCenter/help-center/help-center.component.d.ts +1 -1
- package/lib/Pages/helpCenter/help-center-secondlevel/help-center-secondlevel.component.d.ts +1 -1
- package/lib/Pages/helpCenter/help-center-thirdlevel/help-center-thirdlevel.component.d.ts +1 -1
- package/lib/Pages/impersonation-rules/impersonation-rules/impersonation-rules.component.d.ts +1 -1
- package/lib/Pages/jobs/jobs/jobs.component.d.ts +6 -6
- package/lib/Pages/localizations/localizations.component.d.ts +1 -1
- package/lib/Pages/lookups/lookup/lookup.component.d.ts +1 -1
- package/lib/Pages/lookups/lookup-group/lookup-group.component.d.ts +1 -1
- package/lib/Pages/lookups/lookup-item/lookup-item.component.d.ts +1 -1
- package/lib/Pages/notifications/master-layouts/master-layouts.component.d.ts +1 -1
- package/lib/Pages/notifications/templates/templates.component.d.ts +1 -1
- package/lib/Pages/providers/provider/provider.component.d.ts +1 -1
- package/lib/Pages/publicHolidays/public-holiday/public-holiday.component.d.ts +1 -1
- package/lib/Pages/roles/permission-set-info/permission-set-info.component.d.ts +1 -1
- package/lib/Pages/roles/permissions/permissions.component.d.ts +1 -1
- package/lib/Pages/roles/permissionsets/permissionsets.component.d.ts +1 -1
- package/lib/Pages/sectors/department-info/department-info.component.d.ts +1 -1
- package/lib/Pages/sectors/sector/sector.component.d.ts +1 -1
- package/lib/Pages/sectors/sector-info/sector-info.component.d.ts +1 -1
- package/lib/Pages/shared/Services/AccountService.service.d.ts +1 -1
- package/lib/Pages/shared/Services/ActiveDirectoryService.service.d.ts +8 -8
- package/lib/Pages/shared/Services/ConfigurationsService.service.d.ts +7 -7
- package/lib/Pages/shared/Services/DepartmentService.service.d.ts +7 -7
- package/lib/Pages/shared/Services/EmailHeaderAndFooterTemplateService.Service.d.ts +5 -5
- package/lib/Pages/shared/Services/HelpCenterService.service.d.ts +8 -8
- package/lib/Pages/shared/Services/ImpersonationRuleService.service.d.ts +5 -5
- package/lib/Pages/shared/Services/JobsService.service.d.ts +1 -1
- package/lib/Pages/shared/Services/LicenseService.service.d.ts +2 -2
- package/lib/Pages/shared/Services/LogsService.d.ts +1 -1
- package/lib/Pages/shared/Services/LookupGroupsService.service.d.ts +4 -4
- package/lib/Pages/shared/Services/LookupService.service.d.ts +14 -14
- package/lib/Pages/shared/Services/PermissionSetService.service.d.ts +8 -8
- package/lib/Pages/shared/Services/PermissionsService.service.d.ts +5 -5
- package/lib/Pages/shared/Services/PublicHolidayService.service.d.ts +6 -6
- package/lib/Pages/shared/Services/SectorService.service.d.ts +7 -7
- package/lib/Pages/shared/Services/TemplateService.service.d.ts +20 -20
- package/lib/Pages/shared/Services/WorkflowActivityService.service.d.ts +3 -3
- package/lib/Pages/shared/Services/WorkflowService.service.d.ts +3 -3
- package/lib/Pages/shared/Services/WorkflowVariablesService.service.d.ts +4 -4
- package/lib/Pages/shared/Services/localizationsService.service .d.ts +12 -12
- package/lib/Pages/shared/Services/provider.service.d.ts +10 -10
- package/lib/Pages/shared/Services/userService.service.d.ts +14 -14
- package/lib/Pages/shared/models/DepartmentModels/DepartmentModel.d.ts +1 -0
- package/lib/Pages/users/users.component.d.ts +1 -1
- package/package.json +3 -3
- package/public-api.d.ts +1 -0
- package/bnsights-bbsf-admin-portal-1.0.5.tgz +0 -0
|
@@ -3796,17 +3796,22 @@
|
|
|
3796
3796
|
this.router = router;
|
|
3797
3797
|
this.authService = authService;
|
|
3798
3798
|
this.allowedPermission = [];
|
|
3799
|
+
this.homeURL = "";
|
|
3799
3800
|
}
|
|
3800
3801
|
AuthGuard.prototype.canActivate = function (route, state) {
|
|
3801
3802
|
return __awaiter(this, void 0, void 0, function () {
|
|
3802
3803
|
return __generator(this, function (_a) {
|
|
3803
3804
|
switch (_a.label) {
|
|
3804
|
-
case 0:
|
|
3805
|
-
debugger;
|
|
3806
|
-
return [4 /*yield*/, this.authService.isAuthenticated(this.allowedPermission)];
|
|
3805
|
+
case 0: return [4 /*yield*/, this.authService.isAuthenticated()];
|
|
3807
3806
|
case 1:
|
|
3808
|
-
if (_a.sent())
|
|
3809
|
-
|
|
3807
|
+
if (_a.sent()) {
|
|
3808
|
+
if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
|
|
3809
|
+
return [2 /*return*/, true];
|
|
3810
|
+
else if (this.homeURL) {
|
|
3811
|
+
this.router.navigate([this.homeURL]);
|
|
3812
|
+
return [2 /*return*/, true];
|
|
3813
|
+
}
|
|
3814
|
+
}
|
|
3810
3815
|
this.authService.setUrl(state.url);
|
|
3811
3816
|
this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
|
|
3812
3817
|
return [2 /*return*/, false];
|
|
@@ -4199,10 +4204,10 @@
|
|
|
4199
4204
|
var AddModel = new EditResourceModel$1();
|
|
4200
4205
|
AddModel.ResourceId = ResultModel.ResourceId;
|
|
4201
4206
|
AddModel.ResourceSet = ResultModel.ResourceSet.value;
|
|
4202
|
-
AddModel.ValueEN = ResultModel.Value.
|
|
4203
|
-
AddModel.ValueAR = ResultModel.Value.
|
|
4204
|
-
AddModel.CommentAr = ResultModel.Comment.
|
|
4205
|
-
AddModel.CommentEn = ResultModel.Comment.
|
|
4207
|
+
AddModel.ValueEN = ResultModel.Value.English;
|
|
4208
|
+
AddModel.ValueAR = ResultModel.Value.English;
|
|
4209
|
+
AddModel.CommentAr = ResultModel.Comment.English;
|
|
4210
|
+
AddModel.CommentEn = ResultModel.Comment.English;
|
|
4206
4211
|
paramArray.push(AddModel);
|
|
4207
4212
|
return paramArray;
|
|
4208
4213
|
};
|
|
@@ -4215,10 +4220,10 @@
|
|
|
4215
4220
|
var EditModel = new EditResourceModel$1();
|
|
4216
4221
|
EditModel.ResourceId = _this.editResourceId;
|
|
4217
4222
|
EditModel.ResourceSet = _this.editResourceSet;
|
|
4218
|
-
EditModel.ValueEN = ResultModel.Value.
|
|
4219
|
-
EditModel.ValueAR = ResultModel.Value.
|
|
4220
|
-
EditModel.CommentEn = ResultModel.Comment.
|
|
4221
|
-
EditModel.CommentAr = ResultModel.Comment.
|
|
4223
|
+
EditModel.ValueEN = ResultModel.Value.English;
|
|
4224
|
+
EditModel.ValueAR = ResultModel.Value.English;
|
|
4225
|
+
EditModel.CommentEn = ResultModel.Comment.English;
|
|
4226
|
+
EditModel.CommentAr = ResultModel.Comment.English;
|
|
4222
4227
|
paramArray.push(EditModel);
|
|
4223
4228
|
return paramArray;
|
|
4224
4229
|
};
|
|
@@ -4816,8 +4821,8 @@
|
|
|
4816
4821
|
var AddPermissionModel = new PermissionModel$1();
|
|
4817
4822
|
if (_this.ProductionMode == false)
|
|
4818
4823
|
AddPermissionModel.SysName = ResultModel.SysName;
|
|
4819
|
-
AddPermissionModel.Name.Arabic = ResultModel.Name.
|
|
4820
|
-
AddPermissionModel.Name.English = ResultModel.Name.
|
|
4824
|
+
AddPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
4825
|
+
AddPermissionModel.Name.English = ResultModel.Name.English;
|
|
4821
4826
|
AddPermissionModel.OrganizationID = Number(ResultModel.Organization);
|
|
4822
4827
|
paramArray.push(AddPermissionModel);
|
|
4823
4828
|
return paramArray;
|
|
@@ -4830,8 +4835,8 @@
|
|
|
4830
4835
|
var ResultModel = _this.editPermissionForm.value;
|
|
4831
4836
|
var EditPermissionModel = new PermissionModel$1();
|
|
4832
4837
|
EditPermissionModel.Id = _this.editPermissionId;
|
|
4833
|
-
EditPermissionModel.Name.Arabic = ResultModel.Name.
|
|
4834
|
-
EditPermissionModel.Name.English = ResultModel.Name.
|
|
4838
|
+
EditPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
4839
|
+
EditPermissionModel.Name.English = ResultModel.Name.English;
|
|
4835
4840
|
if (_this.ProductionMode == false)
|
|
4836
4841
|
EditPermissionModel.SysName = ResultModel.SysName;
|
|
4837
4842
|
EditPermissionModel.OrganizationID = Number(ResultModel.Organization);
|
|
@@ -5094,8 +5099,8 @@
|
|
|
5094
5099
|
var AddPermissionSetModel = new PermissionSetModel$1();
|
|
5095
5100
|
if (_this.ProductionMode == false)
|
|
5096
5101
|
AddPermissionSetModel.SysName = ResultModel.SysName;
|
|
5097
|
-
AddPermissionSetModel.Name.Arabic = ResultModel.Name.
|
|
5098
|
-
AddPermissionSetModel.Name.English = ResultModel.Name.
|
|
5102
|
+
AddPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
5103
|
+
AddPermissionSetModel.Name.English = ResultModel.Name.English;
|
|
5099
5104
|
AddPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
|
|
5100
5105
|
var Ids = [];
|
|
5101
5106
|
if (ResultModel.Permissions != null) {
|
|
@@ -5116,8 +5121,8 @@
|
|
|
5116
5121
|
var ResultModel = _this.editPermissionSetForm.value;
|
|
5117
5122
|
var EditPermissionSetModel = new PermissionSetModel$1();
|
|
5118
5123
|
EditPermissionSetModel.Id = _this.editPermissionSetId;
|
|
5119
|
-
EditPermissionSetModel.Name.Arabic = ResultModel.Name.
|
|
5120
|
-
EditPermissionSetModel.Name.English = ResultModel.Name.
|
|
5124
|
+
EditPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
5125
|
+
EditPermissionSetModel.Name.English = ResultModel.Name.English;
|
|
5121
5126
|
if (_this.ProductionMode == false)
|
|
5122
5127
|
EditPermissionSetModel.SysName = ResultModel.SydName;
|
|
5123
5128
|
EditPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
|
|
@@ -5965,16 +5970,16 @@
|
|
|
5965
5970
|
var paramArray = [];
|
|
5966
5971
|
var ResultModel = _this.AddForm.value;
|
|
5967
5972
|
var AddModel = new EmailHeaderAndFooterTemplate$1();
|
|
5968
|
-
AddModel.Name.English = ResultModel.Name.
|
|
5969
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
5970
|
-
AddModel.Header.English = ResultModel.Header.
|
|
5971
|
-
AddModel.Header.Arabic = ResultModel.Header.
|
|
5972
|
-
AddModel.Footer.English = ResultModel.Footer.
|
|
5973
|
-
AddModel.Footer.Arabic = ResultModel.Footer.
|
|
5974
|
-
AddModel.HeadSection.English = ResultModel.HtmlHeadSection.
|
|
5975
|
-
AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.
|
|
5976
|
-
AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.
|
|
5977
|
-
AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.
|
|
5973
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
5974
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
5975
|
+
AddModel.Header.English = ResultModel.Header.English;
|
|
5976
|
+
AddModel.Header.Arabic = ResultModel.Header.Arabic;
|
|
5977
|
+
AddModel.Footer.English = ResultModel.Footer.English;
|
|
5978
|
+
AddModel.Footer.Arabic = ResultModel.Footer.Arabic;
|
|
5979
|
+
AddModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
|
|
5980
|
+
AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
|
|
5981
|
+
AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
|
|
5982
|
+
AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
|
|
5978
5983
|
paramArray.push(AddModel);
|
|
5979
5984
|
return paramArray;
|
|
5980
5985
|
};
|
|
@@ -6077,16 +6082,16 @@
|
|
|
6077
6082
|
var ResultModel = _this.EditForm.value;
|
|
6078
6083
|
var EditModel = new EmailHeaderAndFooterTemplate$1();
|
|
6079
6084
|
EditModel.ID = Number(_this.TemplateId);
|
|
6080
|
-
EditModel.Name.English = ResultModel.Name.
|
|
6081
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
6082
|
-
EditModel.Header.English = ResultModel.Header.
|
|
6083
|
-
EditModel.Header.Arabic = ResultModel.Header.
|
|
6084
|
-
EditModel.Footer.English = ResultModel.Footer.
|
|
6085
|
-
EditModel.Footer.Arabic = ResultModel.Footer.
|
|
6086
|
-
EditModel.HeadSection.English = ResultModel.HtmlHeadSection.
|
|
6087
|
-
EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.
|
|
6088
|
-
EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.
|
|
6089
|
-
EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.
|
|
6085
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
6086
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
6087
|
+
EditModel.Header.English = ResultModel.Header.English;
|
|
6088
|
+
EditModel.Header.Arabic = ResultModel.Header.Arabic;
|
|
6089
|
+
EditModel.Footer.English = ResultModel.Footer.English;
|
|
6090
|
+
EditModel.Footer.Arabic = ResultModel.Footer.Arabic;
|
|
6091
|
+
EditModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
|
|
6092
|
+
EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
|
|
6093
|
+
EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
|
|
6094
|
+
EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
|
|
6090
6095
|
paramArray.push(EditModel);
|
|
6091
6096
|
return paramArray;
|
|
6092
6097
|
};
|
|
@@ -6329,11 +6334,11 @@
|
|
|
6329
6334
|
var paramArray = [];
|
|
6330
6335
|
var ResultModel = _this.AddTemplateForm.value;
|
|
6331
6336
|
var AddModel = new TemplateDTO$1();
|
|
6332
|
-
AddModel.Name.Arabic = ResultModel.AddName.
|
|
6333
|
-
AddModel.Name.English = ResultModel.AddName.
|
|
6337
|
+
AddModel.Name.Arabic = ResultModel.AddName.Arabic;
|
|
6338
|
+
AddModel.Name.English = ResultModel.AddName.English;
|
|
6334
6339
|
AddModel.SysName = ResultModel.AddSysName;
|
|
6335
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
6336
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
6340
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
6341
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
6337
6342
|
AddModel.OrganizationID = Number(ResultModel.AddOrganization);
|
|
6338
6343
|
AddModel.CategoryItemID = Number(ResultModel.AddCategory);
|
|
6339
6344
|
AddModel.LanguageModeItemID = Number(ResultModel.AddLanguageMode);
|
|
@@ -6352,11 +6357,11 @@
|
|
|
6352
6357
|
var ResultModel = _this.EditTemplateForm.value;
|
|
6353
6358
|
var EditModel = new TemplateDTO$1();
|
|
6354
6359
|
EditModel.ID = Number(_this.TemplateId);
|
|
6355
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
6356
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
6360
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
6361
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
6357
6362
|
EditModel.SysName = ResultModel.EditSysName;
|
|
6358
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
6359
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
6363
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
6364
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
6360
6365
|
EditModel.OrganizationID = Number(ResultModel.EditOrganization);
|
|
6361
6366
|
EditModel.CategoryItemID = Number(ResultModel.EditCategory);
|
|
6362
6367
|
EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
|
|
@@ -6851,11 +6856,11 @@
|
|
|
6851
6856
|
var ResultModel = _this.EditTemplateForm.value;
|
|
6852
6857
|
var EditModel = new TemplateDTO$1();
|
|
6853
6858
|
EditModel.ID = Number(_this.TemplateId);
|
|
6854
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
6855
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
6859
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
6860
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
6856
6861
|
EditModel.SysName = ResultModel.EditSysName ? ResultModel.EditSysName : _this.EditSysNameValue;
|
|
6857
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
6858
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
6862
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
6863
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
6859
6864
|
EditModel.OrganizationID = Number(ResultModel.EditOrganization);
|
|
6860
6865
|
EditModel.CategoryItemID = Number(ResultModel.EditCategory);
|
|
6861
6866
|
EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
|
|
@@ -7731,14 +7736,14 @@
|
|
|
7731
7736
|
var paramArray = [];
|
|
7732
7737
|
var ResultModel = _this.addLookupForm.value;
|
|
7733
7738
|
var AddModel = new LookupModel$1();
|
|
7734
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
7735
|
-
AddModel.Name.English = ResultModel.Name.
|
|
7739
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
7740
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
7736
7741
|
if (!_this.ProductionMode) {
|
|
7737
7742
|
AddModel.SysName = ResultModel.SysName;
|
|
7738
7743
|
}
|
|
7739
7744
|
AddModel.Manageable = _this.ProductionMode == true ? true : ResultModel.IsManageable;
|
|
7740
|
-
AddModel.Description.English = ResultModel.Description.
|
|
7741
|
-
AddModel.Description.Arabic = ResultModel.Description.
|
|
7745
|
+
AddModel.Description.English = ResultModel.Description.English;
|
|
7746
|
+
AddModel.Description.Arabic = ResultModel.Description.English;
|
|
7742
7747
|
AddModel.LookupGroupID = ResultModel.LookupGroups != null ? Number(ResultModel.LookupGroups) : null;
|
|
7743
7748
|
paramArray.push(AddModel);
|
|
7744
7749
|
return paramArray;
|
|
@@ -7752,8 +7757,8 @@
|
|
|
7752
7757
|
console.log(ResultModel);
|
|
7753
7758
|
var EditModel = new LookupModel$1();
|
|
7754
7759
|
EditModel.ID = Number(_this.lookupId);
|
|
7755
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
7756
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
7760
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
7761
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
7757
7762
|
if (!_this.ProductionMode) {
|
|
7758
7763
|
EditModel.SysName = ResultModel.EditSysName;
|
|
7759
7764
|
EditModel.Manageable = ResultModel.EditIsManageable;
|
|
@@ -7764,8 +7769,8 @@
|
|
|
7764
7769
|
EditModel.Manageable = _this.Lookup.manageable;
|
|
7765
7770
|
EditModel.LookupGroupID = _this.Lookup.lookupGroupID;
|
|
7766
7771
|
}
|
|
7767
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
7768
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
7772
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
7773
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
7769
7774
|
paramArray.push(EditModel);
|
|
7770
7775
|
return paramArray;
|
|
7771
7776
|
};
|
|
@@ -8125,8 +8130,8 @@
|
|
|
8125
8130
|
var paramArray = [];
|
|
8126
8131
|
var ResultModel = _this.addLookupGroupForm.value;
|
|
8127
8132
|
var AddModel = new LookupGroupModel$1();
|
|
8128
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
8129
|
-
AddModel.Name.English = ResultModel.Name.
|
|
8133
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
8134
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
8130
8135
|
paramArray.push(AddModel);
|
|
8131
8136
|
return paramArray;
|
|
8132
8137
|
};
|
|
@@ -8138,8 +8143,8 @@
|
|
|
8138
8143
|
var ResultModel = _this.editLookupGroupForm.value;
|
|
8139
8144
|
var EditModel = new LookupGroupModel$1();
|
|
8140
8145
|
EditModel.Id = _this.lookupGroupId;
|
|
8141
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
8142
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
8146
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
8147
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
8143
8148
|
paramArray.push(EditModel);
|
|
8144
8149
|
return paramArray;
|
|
8145
8150
|
};
|
|
@@ -8326,8 +8331,8 @@
|
|
|
8326
8331
|
var paramArray = [];
|
|
8327
8332
|
var ResultModel = _this.addLookupItemForm.value;
|
|
8328
8333
|
var AddModel = new LookUpItem$1();
|
|
8329
|
-
AddModel.Name.English = ResultModel.Name.
|
|
8330
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
8334
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
8335
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
8331
8336
|
if (!_this.ProductionMode) {
|
|
8332
8337
|
AddModel.SysName = ResultModel.SysName;
|
|
8333
8338
|
}
|
|
@@ -8347,8 +8352,8 @@
|
|
|
8347
8352
|
var EditModel = new LookUpItem$1();
|
|
8348
8353
|
EditModel.ID = Number(_this.lookupItemId);
|
|
8349
8354
|
EditModel.LookupID = Number(_this.editLookupId);
|
|
8350
|
-
EditModel.Name.English = ResultModel.Name.
|
|
8351
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
8355
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
8356
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
8352
8357
|
if (!_this.ProductionMode) {
|
|
8353
8358
|
EditModel.SysName = ResultModel.EditSysName;
|
|
8354
8359
|
}
|
|
@@ -8856,6 +8861,7 @@
|
|
|
8856
8861
|
};
|
|
8857
8862
|
//Paging functions
|
|
8858
8863
|
DepartmentComponent.prototype.setDepartmentListResult = function (result) {
|
|
8864
|
+
console.log(result);
|
|
8859
8865
|
this.DepartmentPagingResult = result;
|
|
8860
8866
|
this.DepartmentFilteredList = this.DepartmentPagingResult;
|
|
8861
8867
|
this.utilityService.stopBlockUI();
|
|
@@ -8884,6 +8890,7 @@
|
|
|
8884
8890
|
this.AddSamAccount.Value = null;
|
|
8885
8891
|
this.modalService.open(addDepartmentModal);
|
|
8886
8892
|
this.utilityService.stopBlockUI();
|
|
8893
|
+
console.log(this.AddSamAccount);
|
|
8887
8894
|
};
|
|
8888
8895
|
//Edit department
|
|
8889
8896
|
DepartmentComponent.prototype.showEditDepartmentModal = function (departmentId, departmentIDEnc, editDepartmentModal) {
|
|
@@ -8897,6 +8904,7 @@
|
|
|
8897
8904
|
this.EditDepartmentFormOptions.OnErrorHandler = this.onEditDepartmentError;
|
|
8898
8905
|
this.EditDepartmentFormOptions.PagingReference = this.pagingElement;
|
|
8899
8906
|
this.DepartmentId = departmentId;
|
|
8907
|
+
this.requestHandlerService.getLuckyNumber().subscribe(function () { });
|
|
8900
8908
|
this.departmentService.getEditDepartment(departmentIDEnc).subscribe(function (result) {
|
|
8901
8909
|
var department = result.model;
|
|
8902
8910
|
var name = new i6.EnglishArabicDTO();
|
|
@@ -8943,7 +8951,7 @@
|
|
|
8943
8951
|
this.DepartmentFilteredList = this.DepartmentPagingResult;
|
|
8944
8952
|
};
|
|
8945
8953
|
DepartmentComponent.prototype.ngOnDestroy = function () {
|
|
8946
|
-
this.requestHandlerService.
|
|
8954
|
+
this.requestHandlerService.onDestroy$.next();
|
|
8947
8955
|
};
|
|
8948
8956
|
return DepartmentComponent;
|
|
8949
8957
|
}());
|
|
@@ -9198,7 +9206,8 @@
|
|
|
9198
9206
|
i1.UtilityService,
|
|
9199
9207
|
i1.AuthService,
|
|
9200
9208
|
i1.BBSFTranslateService,
|
|
9201
|
-
DepartmentService$1
|
|
9209
|
+
DepartmentService$1,
|
|
9210
|
+
i1.RequestHandlerService
|
|
9202
9211
|
], imports: [[
|
|
9203
9212
|
DepartmentsRoutingModule$1,
|
|
9204
9213
|
i9.CommonModule,
|
|
@@ -9243,7 +9252,8 @@
|
|
|
9243
9252
|
i1.UtilityService,
|
|
9244
9253
|
i1.AuthService,
|
|
9245
9254
|
i1.BBSFTranslateService,
|
|
9246
|
-
DepartmentService$1
|
|
9255
|
+
DepartmentService$1,
|
|
9256
|
+
i1.RequestHandlerService
|
|
9247
9257
|
]
|
|
9248
9258
|
}]
|
|
9249
9259
|
}] });
|
|
@@ -9324,8 +9334,8 @@
|
|
|
9324
9334
|
var paramArray = [];
|
|
9325
9335
|
var ResultModel = _this.AddSectorForm.value;
|
|
9326
9336
|
var AddModel = new SectorModel$1();
|
|
9327
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
9328
|
-
AddModel.Name.English = ResultModel.Name.
|
|
9337
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
9338
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
9329
9339
|
paramArray.push(AddModel);
|
|
9330
9340
|
return paramArray;
|
|
9331
9341
|
};
|
|
@@ -9337,8 +9347,8 @@
|
|
|
9337
9347
|
var ResultModel = _this.EditSectorForm.value;
|
|
9338
9348
|
var EditModel = new SectorModel$1();
|
|
9339
9349
|
EditModel.Id = _this.SectorId;
|
|
9340
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
9341
|
-
EditModel.Name.English = ResultModel.Name.
|
|
9350
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
9351
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
9342
9352
|
paramArray.push(EditModel);
|
|
9343
9353
|
return paramArray;
|
|
9344
9354
|
};
|
|
@@ -12679,7 +12689,7 @@
|
|
|
12679
12689
|
//console.log(ResultModel)
|
|
12680
12690
|
var addModel = new WFVariableModel$1();
|
|
12681
12691
|
addModel.Name.English = ResultModel.NameInEnglish;
|
|
12682
|
-
addModel.Name.Arabic = ResultModel.
|
|
12692
|
+
addModel.Name.Arabic = ResultModel.English;
|
|
12683
12693
|
addModel.SysName = ResultModel.SysName;
|
|
12684
12694
|
addModel.WorkflowVersionID = Number(this.VersionId);
|
|
12685
12695
|
addModel.DataTypeItemID = ResultModel.DataType != null ? Number(ResultModel.DataType) : null;
|
|
@@ -13171,8 +13181,8 @@
|
|
|
13171
13181
|
var AddModel = new PublicHolidayModel$1();
|
|
13172
13182
|
if (!_this.ProductionMode)
|
|
13173
13183
|
AddModel.SysName = ResultModel.SysName;
|
|
13174
|
-
AddModel.Name.Arabic = ResultModel.AddName.
|
|
13175
|
-
AddModel.Name.English = ResultModel.AddName.
|
|
13184
|
+
AddModel.Name.Arabic = ResultModel.AddName.Arabic;
|
|
13185
|
+
AddModel.Name.English = ResultModel.AddName.English;
|
|
13176
13186
|
AddModel.Description.Arabic = ResultModel.DescriptionInArabic;
|
|
13177
13187
|
AddModel.Description.English = ResultModel.DescriptionInEnglish;
|
|
13178
13188
|
AddModel.CountryID = ResultModel.CountryOptions != null ? Number(ResultModel.CountryOptions) : null;
|
|
@@ -13190,8 +13200,8 @@
|
|
|
13190
13200
|
var ResultModel = _this.EditPublicHolidayForm.value;
|
|
13191
13201
|
var EditModel = new PublicHolidayModel$1();
|
|
13192
13202
|
EditModel.ID = Number(_this.PublicHolidayId);
|
|
13193
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
13194
|
-
EditModel.Name.English = ResultModel.Name.
|
|
13203
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
13204
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
13195
13205
|
if (!_this.ProductionMode)
|
|
13196
13206
|
EditModel.SysName = ResultModel.EditSysName;
|
|
13197
13207
|
EditModel.Description.English = ResultModel.EditDescriptionInEnglish;
|
|
@@ -13679,10 +13689,10 @@
|
|
|
13679
13689
|
var paramArray = [];
|
|
13680
13690
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
13681
13691
|
var AddModel = new HelpCenterItemModel$1();
|
|
13682
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
13683
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
13684
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
13685
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
13692
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
13693
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
13694
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
13695
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
13686
13696
|
var arr = ResultModel.AddPermissionSetsOptions;
|
|
13687
13697
|
var permissionSets = [];
|
|
13688
13698
|
var toNumbers = function (arr) { return arr.map(Number); };
|
|
@@ -13707,10 +13717,10 @@
|
|
|
13707
13717
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
13708
13718
|
var EditModel = new HelpCenterItemModel$1();
|
|
13709
13719
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
13710
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
13711
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
13712
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
13713
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
13720
|
+
EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
|
|
13721
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
13722
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
13723
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
13714
13724
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
13715
13725
|
EditModel.LogoFileDTO = ResultModel.EditLogo == "" ? null : ResultModel.EditLogo;
|
|
13716
13726
|
EditModel.LogoFileID = _this.EditLogoFileID;
|
|
@@ -14004,10 +14014,10 @@
|
|
|
14004
14014
|
var paramArray = [];
|
|
14005
14015
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
14006
14016
|
var AddModel = new HelpCenterItemModel$1();
|
|
14007
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
14008
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
14009
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
14010
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
14017
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
14018
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
14019
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
14020
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
14011
14021
|
AddModel.IsHidden = ResultModel.AddIsHidden;
|
|
14012
14022
|
AddModel.ParentIDEncrypted = _this.ParentId;
|
|
14013
14023
|
paramArray.push(AddModel);
|
|
@@ -14021,10 +14031,10 @@
|
|
|
14021
14031
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
14022
14032
|
var EditModel = new HelpCenterItemModel$1();
|
|
14023
14033
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
14024
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
14025
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
14026
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
14027
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
14034
|
+
EditModel.Title.English = ResultModel.EditTitle.English;
|
|
14035
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
14036
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
14037
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
14028
14038
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
14029
14039
|
paramArray.push(EditModel);
|
|
14030
14040
|
return paramArray;
|
|
@@ -14243,10 +14253,10 @@
|
|
|
14243
14253
|
var paramArray = [];
|
|
14244
14254
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
14245
14255
|
var AddModel = new HelpCenterItemModel$1();
|
|
14246
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
14247
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
14248
|
-
AddModel.Html.Arabic = ResultModel.AddContent.
|
|
14249
|
-
AddModel.Html.English = ResultModel.AddContent.
|
|
14256
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
14257
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
14258
|
+
AddModel.Html.Arabic = ResultModel.AddContent.Arabic;
|
|
14259
|
+
AddModel.Html.English = ResultModel.AddContent.English;
|
|
14250
14260
|
AddModel.IsHidden = ResultModel.AddIsHidden;
|
|
14251
14261
|
AddModel.ParentIDEncrypted = _this.ParentId;
|
|
14252
14262
|
AddModel.IsParent = true;
|
|
@@ -14262,10 +14272,10 @@
|
|
|
14262
14272
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
14263
14273
|
var EditModel = new HelpCenterItemModel$1();
|
|
14264
14274
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
14265
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
14266
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
14267
|
-
EditModel.Html.English = ResultModel.EditContent.
|
|
14268
|
-
EditModel.Html.Arabic = ResultModel.EditContent.
|
|
14275
|
+
EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
|
|
14276
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
14277
|
+
EditModel.Html.English = ResultModel.EditContent.English;
|
|
14278
|
+
EditModel.Html.Arabic = ResultModel.EditContent.Arabic;
|
|
14269
14279
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
14270
14280
|
paramArray.push(EditModel);
|
|
14271
14281
|
return paramArray;
|
|
@@ -15748,8 +15758,8 @@
|
|
|
15748
15758
|
var ResultModel = _this.AddUserForm.value;
|
|
15749
15759
|
var AddModel = new AddUserModel$1();
|
|
15750
15760
|
AddModel.Username = ResultModel.AddUsername;
|
|
15751
|
-
AddModel.NameAR = ResultModel.AddName.
|
|
15752
|
-
AddModel.NameEN = ResultModel.AddName.
|
|
15761
|
+
AddModel.NameAR = ResultModel.AddName.Arabic;
|
|
15762
|
+
AddModel.NameEN = ResultModel.AddName.English;
|
|
15753
15763
|
AddModel.SamAccount = ResultModel.AddSamAccount;
|
|
15754
15764
|
AddModel.OrganizationID = 1;
|
|
15755
15765
|
if (ResultModel.AddDepartmentID != undefined)
|
|
@@ -15776,8 +15786,8 @@
|
|
|
15776
15786
|
EditModel.ID = _this.UserId;
|
|
15777
15787
|
EditModel.Username = ResultModel.EditUsername;
|
|
15778
15788
|
EditModel.Email = ResultModel.EditEmail;
|
|
15779
|
-
EditModel.NameAR = ResultModel.EditName.
|
|
15780
|
-
EditModel.NameEN = ResultModel.EditName.
|
|
15789
|
+
EditModel.NameAR = ResultModel.EditName.Arabic;
|
|
15790
|
+
EditModel.NameEN = ResultModel.EditName.English;
|
|
15781
15791
|
EditModel.SamAccount = ResultModel.EditSamAccount;
|
|
15782
15792
|
if (ResultModel.EditDepartmentID != undefined)
|
|
15783
15793
|
EditModel.DepartmentID = Number(ResultModel.EditDepartmentID);
|
|
@@ -18306,7 +18316,6 @@
|
|
|
18306
18316
|
i1.StylesBundleService,
|
|
18307
18317
|
i1.EnvironmentService,
|
|
18308
18318
|
i1.AuthService,
|
|
18309
|
-
i1.RequestHandlerService,
|
|
18310
18319
|
i1.UtilityService,
|
|
18311
18320
|
AuthGuard$1,
|
|
18312
18321
|
i1.BBSFTranslateService,
|
|
@@ -18382,7 +18391,6 @@
|
|
|
18382
18391
|
i1.StylesBundleService,
|
|
18383
18392
|
i1.EnvironmentService,
|
|
18384
18393
|
i1.AuthService,
|
|
18385
|
-
i1.RequestHandlerService,
|
|
18386
18394
|
i1.UtilityService,
|
|
18387
18395
|
AuthGuard$1,
|
|
18388
18396
|
i1.BBSFTranslateService,
|
|
@@ -18892,8 +18900,8 @@
|
|
|
18892
18900
|
var ResultModel = _this.AddUserForm.value;
|
|
18893
18901
|
var AddModel = new AddUserModel();
|
|
18894
18902
|
AddModel.Username = ResultModel.AddUsername;
|
|
18895
|
-
AddModel.NameAR = ResultModel.AddName.
|
|
18896
|
-
AddModel.NameEN = ResultModel.AddName.
|
|
18903
|
+
AddModel.NameAR = ResultModel.AddName.Arabic;
|
|
18904
|
+
AddModel.NameEN = ResultModel.AddName.English;
|
|
18897
18905
|
AddModel.SamAccount = ResultModel.AddSamAccount;
|
|
18898
18906
|
AddModel.OrganizationID = 1;
|
|
18899
18907
|
if (ResultModel.AddDepartmentID != undefined)
|
|
@@ -18920,8 +18928,8 @@
|
|
|
18920
18928
|
EditModel.ID = _this.UserId;
|
|
18921
18929
|
EditModel.Username = ResultModel.EditUsername;
|
|
18922
18930
|
EditModel.Email = ResultModel.EditEmail;
|
|
18923
|
-
EditModel.NameAR = ResultModel.EditName.
|
|
18924
|
-
EditModel.NameEN = ResultModel.EditName.
|
|
18931
|
+
EditModel.NameAR = ResultModel.EditName.Arabic;
|
|
18932
|
+
EditModel.NameEN = ResultModel.EditName.English;
|
|
18925
18933
|
EditModel.SamAccount = ResultModel.EditSamAccount;
|
|
18926
18934
|
if (ResultModel.EditDepartmentID != undefined)
|
|
18927
18935
|
EditModel.DepartmentID = Number(ResultModel.EditDepartmentID);
|
|
@@ -20325,10 +20333,10 @@
|
|
|
20325
20333
|
var AddModel = new EditResourceModel();
|
|
20326
20334
|
AddModel.ResourceId = ResultModel.ResourceId;
|
|
20327
20335
|
AddModel.ResourceSet = ResultModel.ResourceSet.value;
|
|
20328
|
-
AddModel.ValueEN = ResultModel.Value.
|
|
20329
|
-
AddModel.ValueAR = ResultModel.Value.
|
|
20330
|
-
AddModel.CommentAr = ResultModel.Comment.
|
|
20331
|
-
AddModel.CommentEn = ResultModel.Comment.
|
|
20336
|
+
AddModel.ValueEN = ResultModel.Value.English;
|
|
20337
|
+
AddModel.ValueAR = ResultModel.Value.English;
|
|
20338
|
+
AddModel.CommentAr = ResultModel.Comment.English;
|
|
20339
|
+
AddModel.CommentEn = ResultModel.Comment.English;
|
|
20332
20340
|
paramArray.push(AddModel);
|
|
20333
20341
|
return paramArray;
|
|
20334
20342
|
};
|
|
@@ -20341,10 +20349,10 @@
|
|
|
20341
20349
|
var EditModel = new EditResourceModel();
|
|
20342
20350
|
EditModel.ResourceId = _this.editResourceId;
|
|
20343
20351
|
EditModel.ResourceSet = _this.editResourceSet;
|
|
20344
|
-
EditModel.ValueEN = ResultModel.Value.
|
|
20345
|
-
EditModel.ValueAR = ResultModel.Value.
|
|
20346
|
-
EditModel.CommentEn = ResultModel.Comment.
|
|
20347
|
-
EditModel.CommentAr = ResultModel.Comment.
|
|
20352
|
+
EditModel.ValueEN = ResultModel.Value.English;
|
|
20353
|
+
EditModel.ValueAR = ResultModel.Value.English;
|
|
20354
|
+
EditModel.CommentEn = ResultModel.Comment.English;
|
|
20355
|
+
EditModel.CommentAr = ResultModel.Comment.English;
|
|
20348
20356
|
paramArray.push(EditModel);
|
|
20349
20357
|
return paramArray;
|
|
20350
20358
|
};
|
|
@@ -20975,17 +20983,22 @@
|
|
|
20975
20983
|
this.router = router;
|
|
20976
20984
|
this.authService = authService;
|
|
20977
20985
|
this.allowedPermission = [];
|
|
20986
|
+
this.homeURL = "";
|
|
20978
20987
|
}
|
|
20979
20988
|
AuthGuard.prototype.canActivate = function (route, state) {
|
|
20980
20989
|
return __awaiter(this, void 0, void 0, function () {
|
|
20981
20990
|
return __generator(this, function (_a) {
|
|
20982
20991
|
switch (_a.label) {
|
|
20983
|
-
case 0:
|
|
20984
|
-
debugger;
|
|
20985
|
-
return [4 /*yield*/, this.authService.isAuthenticated(this.allowedPermission)];
|
|
20992
|
+
case 0: return [4 /*yield*/, this.authService.isAuthenticated()];
|
|
20986
20993
|
case 1:
|
|
20987
|
-
if (_a.sent())
|
|
20988
|
-
|
|
20994
|
+
if (_a.sent()) {
|
|
20995
|
+
if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
|
|
20996
|
+
return [2 /*return*/, true];
|
|
20997
|
+
else if (this.homeURL) {
|
|
20998
|
+
this.router.navigate([this.homeURL]);
|
|
20999
|
+
return [2 /*return*/, true];
|
|
21000
|
+
}
|
|
21001
|
+
}
|
|
20989
21002
|
this.authService.setUrl(state.url);
|
|
20990
21003
|
this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
|
|
20991
21004
|
return [2 /*return*/, false];
|
|
@@ -21133,8 +21146,8 @@
|
|
|
21133
21146
|
var AddPermissionModel = new PermissionModel();
|
|
21134
21147
|
if (_this.ProductionMode == false)
|
|
21135
21148
|
AddPermissionModel.SysName = ResultModel.SysName;
|
|
21136
|
-
AddPermissionModel.Name.Arabic = ResultModel.Name.
|
|
21137
|
-
AddPermissionModel.Name.English = ResultModel.Name.
|
|
21149
|
+
AddPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
21150
|
+
AddPermissionModel.Name.English = ResultModel.Name.English;
|
|
21138
21151
|
AddPermissionModel.OrganizationID = Number(ResultModel.Organization);
|
|
21139
21152
|
paramArray.push(AddPermissionModel);
|
|
21140
21153
|
return paramArray;
|
|
@@ -21147,8 +21160,8 @@
|
|
|
21147
21160
|
var ResultModel = _this.editPermissionForm.value;
|
|
21148
21161
|
var EditPermissionModel = new PermissionModel();
|
|
21149
21162
|
EditPermissionModel.Id = _this.editPermissionId;
|
|
21150
|
-
EditPermissionModel.Name.Arabic = ResultModel.Name.
|
|
21151
|
-
EditPermissionModel.Name.English = ResultModel.Name.
|
|
21163
|
+
EditPermissionModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
21164
|
+
EditPermissionModel.Name.English = ResultModel.Name.English;
|
|
21152
21165
|
if (_this.ProductionMode == false)
|
|
21153
21166
|
EditPermissionModel.SysName = ResultModel.SysName;
|
|
21154
21167
|
EditPermissionModel.OrganizationID = Number(ResultModel.Organization);
|
|
@@ -21411,8 +21424,8 @@
|
|
|
21411
21424
|
var AddPermissionSetModel = new PermissionSetModel();
|
|
21412
21425
|
if (_this.ProductionMode == false)
|
|
21413
21426
|
AddPermissionSetModel.SysName = ResultModel.SysName;
|
|
21414
|
-
AddPermissionSetModel.Name.Arabic = ResultModel.Name.
|
|
21415
|
-
AddPermissionSetModel.Name.English = ResultModel.Name.
|
|
21427
|
+
AddPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
21428
|
+
AddPermissionSetModel.Name.English = ResultModel.Name.English;
|
|
21416
21429
|
AddPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
|
|
21417
21430
|
var Ids = [];
|
|
21418
21431
|
if (ResultModel.Permissions != null) {
|
|
@@ -21433,8 +21446,8 @@
|
|
|
21433
21446
|
var ResultModel = _this.editPermissionSetForm.value;
|
|
21434
21447
|
var EditPermissionSetModel = new PermissionSetModel();
|
|
21435
21448
|
EditPermissionSetModel.Id = _this.editPermissionSetId;
|
|
21436
|
-
EditPermissionSetModel.Name.Arabic = ResultModel.Name.
|
|
21437
|
-
EditPermissionSetModel.Name.English = ResultModel.Name.
|
|
21449
|
+
EditPermissionSetModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
21450
|
+
EditPermissionSetModel.Name.English = ResultModel.Name.English;
|
|
21438
21451
|
if (_this.ProductionMode == false)
|
|
21439
21452
|
EditPermissionSetModel.SysName = ResultModel.SydName;
|
|
21440
21453
|
EditPermissionSetModel.OrganizationID = Number(ResultModel.Organization);
|
|
@@ -22196,16 +22209,16 @@
|
|
|
22196
22209
|
var paramArray = [];
|
|
22197
22210
|
var ResultModel = _this.AddForm.value;
|
|
22198
22211
|
var AddModel = new EmailHeaderAndFooterTemplate();
|
|
22199
|
-
AddModel.Name.English = ResultModel.Name.
|
|
22200
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
22201
|
-
AddModel.Header.English = ResultModel.Header.
|
|
22202
|
-
AddModel.Header.Arabic = ResultModel.Header.
|
|
22203
|
-
AddModel.Footer.English = ResultModel.Footer.
|
|
22204
|
-
AddModel.Footer.Arabic = ResultModel.Footer.
|
|
22205
|
-
AddModel.HeadSection.English = ResultModel.HtmlHeadSection.
|
|
22206
|
-
AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.
|
|
22207
|
-
AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.
|
|
22208
|
-
AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.
|
|
22212
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
22213
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
22214
|
+
AddModel.Header.English = ResultModel.Header.English;
|
|
22215
|
+
AddModel.Header.Arabic = ResultModel.Header.Arabic;
|
|
22216
|
+
AddModel.Footer.English = ResultModel.Footer.English;
|
|
22217
|
+
AddModel.Footer.Arabic = ResultModel.Footer.Arabic;
|
|
22218
|
+
AddModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
|
|
22219
|
+
AddModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
|
|
22220
|
+
AddModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
|
|
22221
|
+
AddModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
|
|
22209
22222
|
paramArray.push(AddModel);
|
|
22210
22223
|
return paramArray;
|
|
22211
22224
|
};
|
|
@@ -22308,16 +22321,16 @@
|
|
|
22308
22321
|
var ResultModel = _this.EditForm.value;
|
|
22309
22322
|
var EditModel = new EmailHeaderAndFooterTemplate();
|
|
22310
22323
|
EditModel.ID = Number(_this.TemplateId);
|
|
22311
|
-
EditModel.Name.English = ResultModel.Name.
|
|
22312
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
22313
|
-
EditModel.Header.English = ResultModel.Header.
|
|
22314
|
-
EditModel.Header.Arabic = ResultModel.Header.
|
|
22315
|
-
EditModel.Footer.English = ResultModel.Footer.
|
|
22316
|
-
EditModel.Footer.Arabic = ResultModel.Footer.
|
|
22317
|
-
EditModel.HeadSection.English = ResultModel.HtmlHeadSection.
|
|
22318
|
-
EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.
|
|
22319
|
-
EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.
|
|
22320
|
-
EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.
|
|
22324
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
22325
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
22326
|
+
EditModel.Header.English = ResultModel.Header.English;
|
|
22327
|
+
EditModel.Header.Arabic = ResultModel.Header.Arabic;
|
|
22328
|
+
EditModel.Footer.English = ResultModel.Footer.English;
|
|
22329
|
+
EditModel.Footer.Arabic = ResultModel.Footer.Arabic;
|
|
22330
|
+
EditModel.HeadSection.English = ResultModel.HtmlHeadSection.English;
|
|
22331
|
+
EditModel.HeadSection.Arabic = ResultModel.HtmlHeadSection.Arabic;
|
|
22332
|
+
EditModel.HeadTagAttributes.English = ResultModel.HtmlHeadTagAttributes.English;
|
|
22333
|
+
EditModel.HeadTagAttributes.Arabic = ResultModel.HtmlHeadTagAttributes.Arabic;
|
|
22321
22334
|
paramArray.push(EditModel);
|
|
22322
22335
|
return paramArray;
|
|
22323
22336
|
};
|
|
@@ -22560,11 +22573,11 @@
|
|
|
22560
22573
|
var paramArray = [];
|
|
22561
22574
|
var ResultModel = _this.AddTemplateForm.value;
|
|
22562
22575
|
var AddModel = new TemplateDTO();
|
|
22563
|
-
AddModel.Name.Arabic = ResultModel.AddName.
|
|
22564
|
-
AddModel.Name.English = ResultModel.AddName.
|
|
22576
|
+
AddModel.Name.Arabic = ResultModel.AddName.Arabic;
|
|
22577
|
+
AddModel.Name.English = ResultModel.AddName.English;
|
|
22565
22578
|
AddModel.SysName = ResultModel.AddSysName;
|
|
22566
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
22567
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
22579
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
22580
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
22568
22581
|
AddModel.OrganizationID = Number(ResultModel.AddOrganization);
|
|
22569
22582
|
AddModel.CategoryItemID = Number(ResultModel.AddCategory);
|
|
22570
22583
|
AddModel.LanguageModeItemID = Number(ResultModel.AddLanguageMode);
|
|
@@ -22583,11 +22596,11 @@
|
|
|
22583
22596
|
var ResultModel = _this.EditTemplateForm.value;
|
|
22584
22597
|
var EditModel = new TemplateDTO();
|
|
22585
22598
|
EditModel.ID = Number(_this.TemplateId);
|
|
22586
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
22587
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
22599
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
22600
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
22588
22601
|
EditModel.SysName = ResultModel.EditSysName;
|
|
22589
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
22590
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
22602
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
22603
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
22591
22604
|
EditModel.OrganizationID = Number(ResultModel.EditOrganization);
|
|
22592
22605
|
EditModel.CategoryItemID = Number(ResultModel.EditCategory);
|
|
22593
22606
|
EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
|
|
@@ -23082,11 +23095,11 @@
|
|
|
23082
23095
|
var ResultModel = _this.EditTemplateForm.value;
|
|
23083
23096
|
var EditModel = new TemplateDTO();
|
|
23084
23097
|
EditModel.ID = Number(_this.TemplateId);
|
|
23085
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
23086
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
23098
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
23099
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
23087
23100
|
EditModel.SysName = ResultModel.EditSysName ? ResultModel.EditSysName : _this.EditSysNameValue;
|
|
23088
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
23089
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
23101
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
23102
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
23090
23103
|
EditModel.OrganizationID = Number(ResultModel.EditOrganization);
|
|
23091
23104
|
EditModel.CategoryItemID = Number(ResultModel.EditCategory);
|
|
23092
23105
|
EditModel.LanguageModeItemID = Number(ResultModel.EditLanguageMode);
|
|
@@ -23962,14 +23975,14 @@
|
|
|
23962
23975
|
var paramArray = [];
|
|
23963
23976
|
var ResultModel = _this.addLookupForm.value;
|
|
23964
23977
|
var AddModel = new LookupModel();
|
|
23965
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
23966
|
-
AddModel.Name.English = ResultModel.Name.
|
|
23978
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
23979
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
23967
23980
|
if (!_this.ProductionMode) {
|
|
23968
23981
|
AddModel.SysName = ResultModel.SysName;
|
|
23969
23982
|
}
|
|
23970
23983
|
AddModel.Manageable = _this.ProductionMode == true ? true : ResultModel.IsManageable;
|
|
23971
|
-
AddModel.Description.English = ResultModel.Description.
|
|
23972
|
-
AddModel.Description.Arabic = ResultModel.Description.
|
|
23984
|
+
AddModel.Description.English = ResultModel.Description.English;
|
|
23985
|
+
AddModel.Description.Arabic = ResultModel.Description.English;
|
|
23973
23986
|
AddModel.LookupGroupID = ResultModel.LookupGroups != null ? Number(ResultModel.LookupGroups) : null;
|
|
23974
23987
|
paramArray.push(AddModel);
|
|
23975
23988
|
return paramArray;
|
|
@@ -23983,8 +23996,8 @@
|
|
|
23983
23996
|
console.log(ResultModel);
|
|
23984
23997
|
var EditModel = new LookupModel();
|
|
23985
23998
|
EditModel.ID = Number(_this.lookupId);
|
|
23986
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
23987
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
23999
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
24000
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
23988
24001
|
if (!_this.ProductionMode) {
|
|
23989
24002
|
EditModel.SysName = ResultModel.EditSysName;
|
|
23990
24003
|
EditModel.Manageable = ResultModel.EditIsManageable;
|
|
@@ -23995,8 +24008,8 @@
|
|
|
23995
24008
|
EditModel.Manageable = _this.Lookup.manageable;
|
|
23996
24009
|
EditModel.LookupGroupID = _this.Lookup.lookupGroupID;
|
|
23997
24010
|
}
|
|
23998
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
23999
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
24011
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
24012
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
24000
24013
|
paramArray.push(EditModel);
|
|
24001
24014
|
return paramArray;
|
|
24002
24015
|
};
|
|
@@ -24356,8 +24369,8 @@
|
|
|
24356
24369
|
var paramArray = [];
|
|
24357
24370
|
var ResultModel = _this.addLookupGroupForm.value;
|
|
24358
24371
|
var AddModel = new LookupGroupModel();
|
|
24359
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
24360
|
-
AddModel.Name.English = ResultModel.Name.
|
|
24372
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
24373
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
24361
24374
|
paramArray.push(AddModel);
|
|
24362
24375
|
return paramArray;
|
|
24363
24376
|
};
|
|
@@ -24369,8 +24382,8 @@
|
|
|
24369
24382
|
var ResultModel = _this.editLookupGroupForm.value;
|
|
24370
24383
|
var EditModel = new LookupGroupModel();
|
|
24371
24384
|
EditModel.Id = _this.lookupGroupId;
|
|
24372
|
-
EditModel.Name.English = ResultModel.EditName.
|
|
24373
|
-
EditModel.Name.Arabic = ResultModel.EditName.
|
|
24385
|
+
EditModel.Name.English = ResultModel.EditName.English;
|
|
24386
|
+
EditModel.Name.Arabic = ResultModel.EditName.Arabic;
|
|
24374
24387
|
paramArray.push(EditModel);
|
|
24375
24388
|
return paramArray;
|
|
24376
24389
|
};
|
|
@@ -24557,8 +24570,8 @@
|
|
|
24557
24570
|
var paramArray = [];
|
|
24558
24571
|
var ResultModel = _this.addLookupItemForm.value;
|
|
24559
24572
|
var AddModel = new LookUpItem();
|
|
24560
|
-
AddModel.Name.English = ResultModel.Name.
|
|
24561
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
24573
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
24574
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
24562
24575
|
if (!_this.ProductionMode) {
|
|
24563
24576
|
AddModel.SysName = ResultModel.SysName;
|
|
24564
24577
|
}
|
|
@@ -24578,8 +24591,8 @@
|
|
|
24578
24591
|
var EditModel = new LookUpItem();
|
|
24579
24592
|
EditModel.ID = Number(_this.lookupItemId);
|
|
24580
24593
|
EditModel.LookupID = Number(_this.editLookupId);
|
|
24581
|
-
EditModel.Name.English = ResultModel.Name.
|
|
24582
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
24594
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
24595
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
24583
24596
|
if (!_this.ProductionMode) {
|
|
24584
24597
|
EditModel.SysName = ResultModel.EditSysName;
|
|
24585
24598
|
}
|
|
@@ -25087,6 +25100,7 @@
|
|
|
25087
25100
|
};
|
|
25088
25101
|
//Paging functions
|
|
25089
25102
|
DepartmentComponent.prototype.setDepartmentListResult = function (result) {
|
|
25103
|
+
console.log(result);
|
|
25090
25104
|
this.DepartmentPagingResult = result;
|
|
25091
25105
|
this.DepartmentFilteredList = this.DepartmentPagingResult;
|
|
25092
25106
|
this.utilityService.stopBlockUI();
|
|
@@ -25115,6 +25129,7 @@
|
|
|
25115
25129
|
this.AddSamAccount.Value = null;
|
|
25116
25130
|
this.modalService.open(addDepartmentModal);
|
|
25117
25131
|
this.utilityService.stopBlockUI();
|
|
25132
|
+
console.log(this.AddSamAccount);
|
|
25118
25133
|
};
|
|
25119
25134
|
//Edit department
|
|
25120
25135
|
DepartmentComponent.prototype.showEditDepartmentModal = function (departmentId, departmentIDEnc, editDepartmentModal) {
|
|
@@ -25128,6 +25143,7 @@
|
|
|
25128
25143
|
this.EditDepartmentFormOptions.OnErrorHandler = this.onEditDepartmentError;
|
|
25129
25144
|
this.EditDepartmentFormOptions.PagingReference = this.pagingElement;
|
|
25130
25145
|
this.DepartmentId = departmentId;
|
|
25146
|
+
this.requestHandlerService.getLuckyNumber().subscribe(function () { });
|
|
25131
25147
|
this.departmentService.getEditDepartment(departmentIDEnc).subscribe(function (result) {
|
|
25132
25148
|
var department = result.model;
|
|
25133
25149
|
var name = new i6.EnglishArabicDTO();
|
|
@@ -25174,7 +25190,7 @@
|
|
|
25174
25190
|
this.DepartmentFilteredList = this.DepartmentPagingResult;
|
|
25175
25191
|
};
|
|
25176
25192
|
DepartmentComponent.prototype.ngOnDestroy = function () {
|
|
25177
|
-
this.requestHandlerService.
|
|
25193
|
+
this.requestHandlerService.onDestroy$.next();
|
|
25178
25194
|
};
|
|
25179
25195
|
return DepartmentComponent;
|
|
25180
25196
|
}());
|
|
@@ -25429,7 +25445,8 @@
|
|
|
25429
25445
|
i1.UtilityService,
|
|
25430
25446
|
i1.AuthService,
|
|
25431
25447
|
i1.BBSFTranslateService,
|
|
25432
|
-
DepartmentService
|
|
25448
|
+
DepartmentService,
|
|
25449
|
+
i1.RequestHandlerService
|
|
25433
25450
|
], imports: [[
|
|
25434
25451
|
DepartmentsRoutingModule,
|
|
25435
25452
|
i9.CommonModule,
|
|
@@ -25474,7 +25491,8 @@
|
|
|
25474
25491
|
i1.UtilityService,
|
|
25475
25492
|
i1.AuthService,
|
|
25476
25493
|
i1.BBSFTranslateService,
|
|
25477
|
-
DepartmentService
|
|
25494
|
+
DepartmentService,
|
|
25495
|
+
i1.RequestHandlerService
|
|
25478
25496
|
]
|
|
25479
25497
|
}]
|
|
25480
25498
|
}] });
|
|
@@ -25555,8 +25573,8 @@
|
|
|
25555
25573
|
var paramArray = [];
|
|
25556
25574
|
var ResultModel = _this.AddSectorForm.value;
|
|
25557
25575
|
var AddModel = new SectorModel();
|
|
25558
|
-
AddModel.Name.Arabic = ResultModel.Name.
|
|
25559
|
-
AddModel.Name.English = ResultModel.Name.
|
|
25576
|
+
AddModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
25577
|
+
AddModel.Name.English = ResultModel.Name.English;
|
|
25560
25578
|
paramArray.push(AddModel);
|
|
25561
25579
|
return paramArray;
|
|
25562
25580
|
};
|
|
@@ -25568,8 +25586,8 @@
|
|
|
25568
25586
|
var ResultModel = _this.EditSectorForm.value;
|
|
25569
25587
|
var EditModel = new SectorModel();
|
|
25570
25588
|
EditModel.Id = _this.SectorId;
|
|
25571
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
25572
|
-
EditModel.Name.English = ResultModel.Name.
|
|
25589
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
25590
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
25573
25591
|
paramArray.push(EditModel);
|
|
25574
25592
|
return paramArray;
|
|
25575
25593
|
};
|
|
@@ -28910,7 +28928,7 @@
|
|
|
28910
28928
|
//console.log(ResultModel)
|
|
28911
28929
|
var addModel = new WFVariableModel();
|
|
28912
28930
|
addModel.Name.English = ResultModel.NameInEnglish;
|
|
28913
|
-
addModel.Name.Arabic = ResultModel.
|
|
28931
|
+
addModel.Name.Arabic = ResultModel.English;
|
|
28914
28932
|
addModel.SysName = ResultModel.SysName;
|
|
28915
28933
|
addModel.WorkflowVersionID = Number(this.VersionId);
|
|
28916
28934
|
addModel.DataTypeItemID = ResultModel.DataType != null ? Number(ResultModel.DataType) : null;
|
|
@@ -29402,8 +29420,8 @@
|
|
|
29402
29420
|
var AddModel = new PublicHolidayModel();
|
|
29403
29421
|
if (!_this.ProductionMode)
|
|
29404
29422
|
AddModel.SysName = ResultModel.SysName;
|
|
29405
|
-
AddModel.Name.Arabic = ResultModel.AddName.
|
|
29406
|
-
AddModel.Name.English = ResultModel.AddName.
|
|
29423
|
+
AddModel.Name.Arabic = ResultModel.AddName.Arabic;
|
|
29424
|
+
AddModel.Name.English = ResultModel.AddName.English;
|
|
29407
29425
|
AddModel.Description.Arabic = ResultModel.DescriptionInArabic;
|
|
29408
29426
|
AddModel.Description.English = ResultModel.DescriptionInEnglish;
|
|
29409
29427
|
AddModel.CountryID = ResultModel.CountryOptions != null ? Number(ResultModel.CountryOptions) : null;
|
|
@@ -29421,8 +29439,8 @@
|
|
|
29421
29439
|
var ResultModel = _this.EditPublicHolidayForm.value;
|
|
29422
29440
|
var EditModel = new PublicHolidayModel();
|
|
29423
29441
|
EditModel.ID = Number(_this.PublicHolidayId);
|
|
29424
|
-
EditModel.Name.Arabic = ResultModel.Name.
|
|
29425
|
-
EditModel.Name.English = ResultModel.Name.
|
|
29442
|
+
EditModel.Name.Arabic = ResultModel.Name.Arabic;
|
|
29443
|
+
EditModel.Name.English = ResultModel.Name.English;
|
|
29426
29444
|
if (!_this.ProductionMode)
|
|
29427
29445
|
EditModel.SysName = ResultModel.EditSysName;
|
|
29428
29446
|
EditModel.Description.English = ResultModel.EditDescriptionInEnglish;
|
|
@@ -29910,10 +29928,10 @@
|
|
|
29910
29928
|
var paramArray = [];
|
|
29911
29929
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
29912
29930
|
var AddModel = new HelpCenterItemModel();
|
|
29913
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
29914
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
29915
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
29916
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
29931
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
29932
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
29933
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
29934
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
29917
29935
|
var arr = ResultModel.AddPermissionSetsOptions;
|
|
29918
29936
|
var permissionSets = [];
|
|
29919
29937
|
var toNumbers = function (arr) { return arr.map(Number); };
|
|
@@ -29938,10 +29956,10 @@
|
|
|
29938
29956
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
29939
29957
|
var EditModel = new HelpCenterItemModel();
|
|
29940
29958
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
29941
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
29942
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
29943
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
29944
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
29959
|
+
EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
|
|
29960
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
29961
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
29962
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
29945
29963
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
29946
29964
|
EditModel.LogoFileDTO = ResultModel.EditLogo == "" ? null : ResultModel.EditLogo;
|
|
29947
29965
|
EditModel.LogoFileID = _this.EditLogoFileID;
|
|
@@ -30235,10 +30253,10 @@
|
|
|
30235
30253
|
var paramArray = [];
|
|
30236
30254
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
30237
30255
|
var AddModel = new HelpCenterItemModel();
|
|
30238
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
30239
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
30240
|
-
AddModel.Description.Arabic = ResultModel.AddDescription.
|
|
30241
|
-
AddModel.Description.English = ResultModel.AddDescription.
|
|
30256
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
30257
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
30258
|
+
AddModel.Description.Arabic = ResultModel.AddDescription.English;
|
|
30259
|
+
AddModel.Description.English = ResultModel.AddDescription.English;
|
|
30242
30260
|
AddModel.IsHidden = ResultModel.AddIsHidden;
|
|
30243
30261
|
AddModel.ParentIDEncrypted = _this.ParentId;
|
|
30244
30262
|
paramArray.push(AddModel);
|
|
@@ -30252,10 +30270,10 @@
|
|
|
30252
30270
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
30253
30271
|
var EditModel = new HelpCenterItemModel();
|
|
30254
30272
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
30255
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
30256
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
30257
|
-
EditModel.Description.English = ResultModel.EditDescription.
|
|
30258
|
-
EditModel.Description.Arabic = ResultModel.EditDescription.
|
|
30273
|
+
EditModel.Title.English = ResultModel.EditTitle.English;
|
|
30274
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
30275
|
+
EditModel.Description.English = ResultModel.EditDescription.English;
|
|
30276
|
+
EditModel.Description.Arabic = ResultModel.EditDescription.English;
|
|
30259
30277
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
30260
30278
|
paramArray.push(EditModel);
|
|
30261
30279
|
return paramArray;
|
|
@@ -30474,10 +30492,10 @@
|
|
|
30474
30492
|
var paramArray = [];
|
|
30475
30493
|
var ResultModel = _this.AddHelpCenterForm.value;
|
|
30476
30494
|
var AddModel = new HelpCenterItemModel();
|
|
30477
|
-
AddModel.Title.Arabic = ResultModel.AddTitle.
|
|
30478
|
-
AddModel.Title.English = ResultModel.AddTitle.
|
|
30479
|
-
AddModel.Html.Arabic = ResultModel.AddContent.
|
|
30480
|
-
AddModel.Html.English = ResultModel.AddContent.
|
|
30495
|
+
AddModel.Title.Arabic = ResultModel.AddTitle.Arabic;
|
|
30496
|
+
AddModel.Title.English = ResultModel.AddTitle.English;
|
|
30497
|
+
AddModel.Html.Arabic = ResultModel.AddContent.Arabic;
|
|
30498
|
+
AddModel.Html.English = ResultModel.AddContent.English;
|
|
30481
30499
|
AddModel.IsHidden = ResultModel.AddIsHidden;
|
|
30482
30500
|
AddModel.ParentIDEncrypted = _this.ParentId;
|
|
30483
30501
|
AddModel.IsParent = true;
|
|
@@ -30493,10 +30511,10 @@
|
|
|
30493
30511
|
var ResultModel = _this.EditHelpCenterForm.value;
|
|
30494
30512
|
var EditModel = new HelpCenterItemModel();
|
|
30495
30513
|
EditModel.ID = Number(_this.HelpCenterItemId);
|
|
30496
|
-
EditModel.Title.English = ResultModel.EditTitle.
|
|
30497
|
-
EditModel.Title.Arabic = ResultModel.EditTitle.
|
|
30498
|
-
EditModel.Html.English = ResultModel.EditContent.
|
|
30499
|
-
EditModel.Html.Arabic = ResultModel.EditContent.
|
|
30514
|
+
EditModel.Title.English = ResultModel.EditTitle.English; //(##1)
|
|
30515
|
+
EditModel.Title.Arabic = ResultModel.EditTitle.Arabic;
|
|
30516
|
+
EditModel.Html.English = ResultModel.EditContent.English;
|
|
30517
|
+
EditModel.Html.Arabic = ResultModel.EditContent.Arabic;
|
|
30500
30518
|
EditModel.IsHidden = ResultModel.EditIsHidden;
|
|
30501
30519
|
paramArray.push(EditModel);
|
|
30502
30520
|
return paramArray;
|
|
@@ -32828,6 +32846,7 @@
|
|
|
32828
32846
|
exports.BaseService = BaseService;
|
|
32829
32847
|
exports.DataSecretService = DataSecretService$1;
|
|
32830
32848
|
exports.DefaultLayoutConfig = DefaultLayoutConfig;
|
|
32849
|
+
exports.DepartmentModel = DepartmentModel$1;
|
|
32831
32850
|
exports.GlobalErrorHandler = GlobalErrorHandler;
|
|
32832
32851
|
exports.HomeComponent = HomeComponent$1;
|
|
32833
32852
|
exports.HomeModule = HomeModule;
|