From 61cea4f8b0a94ca9911d7f718e658e0f80421036 Mon Sep 17 00:00:00 2001 From: "salauddin.shamim" Date: Wed, 11 Nov 2026 12:09:05 +0600 Subject: [PATCH 1/4] correction --- EmployeeNoUnique_DB_Changes.sql | 28 + HRM.BO/User/Users.cs | 2 +- HRM.DA/DA/Users/UserDA.cs | 10 +- HRM.DA/Service/Users/UserRoleService.cs | 2 +- HRM.DA/Service/Users/UserService.cs | 2 +- HRM.UI/ClientApp/package-lock.json | 646 +++++++++++++----- HRM.UI/ClientApp/package.json | 15 +- .../_services/employee/employee.service.ts | 3 + .../users-entry/users-entry.component.html | 29 +- .../users-entry/users-entry.component.ts | 48 +- .../users-list/users-list.component.html | 6 +- HRM.UI/Controllers/Auth/AuthController.cs | 2 +- .../Employee/EmployeeController.cs | 20 + TablesWithoutPK_MasterProjectDBUAT.txt | 4 + UnusedTables_MasterProjectDBUAT.txt | 517 ++++++++++++++ UsersEmailColumn_DB_Changes.sql | 26 + 16 files changed, 1134 insertions(+), 226 deletions(-) create mode 100644 EmployeeNoUnique_DB_Changes.sql create mode 100644 TablesWithoutPK_MasterProjectDBUAT.txt create mode 100644 UnusedTables_MasterProjectDBUAT.txt create mode 100644 UsersEmailColumn_DB_Changes.sql diff --git a/EmployeeNoUnique_DB_Changes.sql b/EmployeeNoUnique_DB_Changes.sql new file mode 100644 index 0000000..1d23901 --- /dev/null +++ b/EmployeeNoUnique_DB_Changes.sql @@ -0,0 +1,28 @@ +/* + EmployeeNoUnique_DB_Changes.sql + + Why: + dbo.EMPLOYEE.EMPLOYEENO had no uniqueness guard, so two employees could be saved with the + same Employee No (bulk upload, manual entry, ESS lookups by number all assume it is unique). + + What: + Adds unique constraint UQ_EMPLOYEE_EMPLOYEENO on dbo.EMPLOYEE (EMPLOYEENO). + Stops with an error (and changes nothing) if duplicate Employee Nos already exist - + fix those first with the query printed below. + + Run order: + Any time; no code depends on it. Re-runnable: does nothing when the constraint exists. +*/ + +IF EXISTS (SELECT 1 FROM sys.objects WHERE name = 'UQ_EMPLOYEE_EMPLOYEENO' AND parent_object_id = OBJECT_ID('dbo.EMPLOYEE')) + PRINT 'UQ_EMPLOYEE_EMPLOYEENO already exists - nothing to do.'; +ELSE IF EXISTS (SELECT EMPLOYEENO FROM dbo.EMPLOYEE GROUP BY EMPLOYEENO HAVING COUNT(*) > 1) +BEGIN + RAISERROR('Duplicate EMPLOYEENO values exist. Find them with: SELECT EMPLOYEENO, COUNT(*) FROM dbo.EMPLOYEE GROUP BY EMPLOYEENO HAVING COUNT(*) > 1', 16, 1); +END +ELSE +BEGIN + ALTER TABLE dbo.EMPLOYEE ADD CONSTRAINT UQ_EMPLOYEE_EMPLOYEENO UNIQUE NONCLUSTERED (EMPLOYEENO); + PRINT 'UQ_EMPLOYEE_EMPLOYEENO added.'; +END +GO diff --git a/HRM.BO/User/Users.cs b/HRM.BO/User/Users.cs index ba4a2cd..4954b16 100644 --- a/HRM.BO/User/Users.cs +++ b/HRM.BO/User/Users.cs @@ -136,7 +136,7 @@ namespace HRM.BO public int? EmployeeID { get; set; } public string MobileNo { get; set; } public string Email { get; set; } //erec - public string EmailAddress { get; set; } + //public string EmailAddress { get; set; } public string ADloginID { get; set; } #region Payroll Specific diff --git a/HRM.DA/DA/Users/UserDA.cs b/HRM.DA/DA/Users/UserDA.cs index 14af5b6..d6e8d0a 100644 --- a/HRM.DA/DA/Users/UserDA.cs +++ b/HRM.DA/DA/Users/UserDA.cs @@ -25,16 +25,16 @@ namespace HRM.DA string sql = SQLParser.MakeSQL(@"INSERT INTO Users(USERID, COMPUTERNAME, APPROVEDCOMPUTERNAME, USERTYPE, STATUS," + " LOCKEDWORKSTATION,PASSWORDHINT,LOGINID,USERNAME,PASSWORD, ApprovedBy," + " ApprovedDate, EMPLOYEEID,ChangePasswordAtNextLogon,NeverExpire,MacAddress,IPAddress," + - " ExpireDate,CreatedDate,OwnerID, reason, authorizedBy, authorizedDate, EmailAddress, Email)" + + " ExpireDate,CreatedDate,OwnerID, reason, authorizedBy, authorizedDate , Email)" + " VALUES(%n, %s, %s, %n, %n, " + "%s, %s, %s, %s, %s, %n, " + " %d, %n, %n, %n, %s, %s, " + - " %D, %D, %n, %s, %n, %D, %u, %s)" , + " %D, %D, %n, %s, %n, %D , %s)" , item.ID, item.ComputerName, item.ApprovedComputerName, item.UserType, item.UserStatus, item.LockedWorkStation, item.PasswordHints, item.LoginID, item.UserName, item.Password, item.ApprovedBy, item.ApprovedDate, item.EmployeeID, item.ChangePasswordAtNextLogon, item.NeverExpire, item.MacAddress, item.IPAddress, item.ExpireDate, item.CreatedDate,item.ParentID, item.Reason, item.AuthorizedBy, item.AuthorizedDate, - string.IsNullOrWhiteSpace(item.EmailAddress) ? null : item.EmailAddress.Trim(), + string.IsNullOrWhiteSpace(item.Email) ? null : item.Email.Trim()); tc.ExecuteNonQuery(sql); @@ -49,12 +49,12 @@ namespace HRM.DA string sql = SQLParser.MakeSQL(@"UPDATE Users SET COMPUTERNAME=%s, APPROVEDCOMPUTERNAME=%s, USERTYPE=%n, LOCKEDWORKSTATION=%s, " + " LOGINID=%s, USERNAME=%s,PASSWORD=%s, PASSWORDHINT=%s, ApprovedBy=%n, ApprovedDate=%D, EMPLOYEEID=%n, " + " ChangePasswordAtNextLogon=%n, NeverExpire=%n, MacAddress = %s, IPAddress = %s , " + - " ExpireDate = %D, Status = %n, reason = %s, authorizedBy = %n, authorizedDate = %D, EmailAddress = %u " + + " ExpireDate = %D, Status = %n, reason = %s, authorizedBy = %n, authorizedDate = %D, Email = %s " + " WHERE UserID=%n", item.ComputerName, item.ApprovedComputerName, item.UserType, item.LockedWorkStation, item.LoginID, item.UserName, item.Password, item.PasswordHints, item.ApprovedBy, DataReader.GetNullValue(item.ApprovedDate), item.EmployeeID, item.ChangePasswordAtNextLogon, item.NeverExpire, item.MacAddress, item.IPAddress, DataReader.GetNullValue(item.ExpireDate), item.UserStatus, item.Reason, item.AuthorizedBy, DataReader.GetNullValue(item.AuthorizedDate), - string.IsNullOrWhiteSpace(item.EmailAddress) ? null : item.EmailAddress.Trim(), item.ID); + item.ID); tc.ExecuteNonQuery(sql); } diff --git a/HRM.DA/Service/Users/UserRoleService.cs b/HRM.DA/Service/Users/UserRoleService.cs index 96b7e95..4030992 100644 --- a/HRM.DA/Service/Users/UserRoleService.cs +++ b/HRM.DA/Service/Users/UserRoleService.cs @@ -338,7 +338,7 @@ namespace HRM.DA userObject.EmployeeID = emp.ID; // the employee's e-mail becomes the user's (both e-mail columns); no e-mail on the employee leaves them empty userObject.Email = string.IsNullOrWhiteSpace(emp.EmailAddress) ? null : emp.EmailAddress.Trim(); - userObject.EmailAddress = userObject.Email; + // userObject.EmailAddress = userObject.Email; userObject.UserStatus = EnumAuthStatus.Approved; userObject.ChangePasswordAtNextLogon = true; userObject.SISU = false; diff --git a/HRM.DA/Service/Users/UserService.cs b/HRM.DA/Service/Users/UserService.cs index 3c9942b..d37d59a 100644 --- a/HRM.DA/Service/Users/UserService.cs +++ b/HRM.DA/Service/Users/UserService.cs @@ -53,7 +53,7 @@ namespace HRM.DA oUser.ChangePasswordAtNextLogon = oReader.GetBoolean("ChangePasswordAtNextLogon", false); oUser.EmployeeID = oReader.GetInt32("EmployeeID"); oUser.Email = oReader.GetString("Email", true, string.Empty); - oUser.EmailAddress = oReader.GetString("EmailAddress", true, null); + // oUser.EmailAddress = oReader.GetString("EmailAddress", true, null); // oUser.LogInPayrollTypeID = oReader.GetInt32("PAYROLLTYPEID", 0); // oUser.ChangePasswordAtNextLogon = oReader.GetBoolean("ChangePasswordAtNextLogon").Value; //oUser.NeverExpire = oReader.GetBoolean("NeverExpire").Value; diff --git a/HRM.UI/ClientApp/package-lock.json b/HRM.UI/ClientApp/package-lock.json index f903773..d7e14a9 100644 --- a/HRM.UI/ClientApp/package-lock.json +++ b/HRM.UI/ClientApp/package-lock.json @@ -64,13 +64,14 @@ "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", + "fix": "^0.0.3", "hammerjs": "^2.0.8", "ng2-pdf-viewer": "^10.4.0", "ngx-extended-pdf-viewer": "^31.0.1", "primeflex": "^4.0.0", "primeicons": "^7.0.0", "prismjs": "^1.30.0", - "quill": "^2.0.3", + "quill": "^2.0.2", "rxjs": "^7.8.2", "sweetalert2": "^11.26.25", "tslib": "^2.9.1", @@ -79,8 +80,8 @@ }, "devDependencies": { "@angular-eslint/builder": "^22.6.0", - "@angular-eslint/eslint-plugin": "^22.6.0", - "@angular-eslint/eslint-plugin-template": "^22.6.0", + "@angular-eslint/eslint-plugin": "^17.1.1", + "@angular-eslint/eslint-plugin-template": "^17.1.1", "@angular-eslint/template-parser": "^22.6.0", "@angular/build": "^22.2.5", "@angular/cli": "^22.2.5", @@ -201,42 +202,163 @@ "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-22.6.0.tgz", - "integrity": "sha512-zLQSfwNiOaWYp1IRQh4TlgBbUmaGm0OWNEO98E2U9DstHJTPTghRwG4wZX4Ly/YOYsb3WU06pD1/cCRUYHRgmw==", + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.1.1.tgz", + "integrity": "sha512-fFOBlCOVObVu3gjLj+0BypqO1ZR/0bfJnDElqMdYwJG7zRaFT8NNQbrOo/q/GQoqOFoNna6mw3teTGsd5JnL2A==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "22.6.0", - "@angular-eslint/utils": "22.6.0", - "ts-api-utils": "^2.1.0" + "@angular-eslint/utils": "17.1.1", + "@typescript-eslint/utils": "6.13.1" }, "peerDependencies": { - "@typescript-eslint/utils": "^8.0.0", - "eslint": "^9.0.0 || ^10.0.0", + "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-22.6.0.tgz", - "integrity": "sha512-e3ueYzr1ARovQtoBaiAeYtLR3MLIeJNKA46LBwKbRhVl1S8L1FiwYsWJvx0lRvcgdFWFt+WrSXeTxuc0ITW9eA==", + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.1.1.tgz", + "integrity": "sha512-unZ6QNwtxuB8Eni7UPdw7uK6iZipZUXIsH+ZuLMOxwFgGMqeRnpv8SW0212rto3d/Ec0jESzVHKcwZ9pT+jxgw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "22.6.0", - "@angular-eslint/utils": "22.6.0", - "aria-query": "5.3.2", - "axobject-query": "4.1.0" + "@angular-eslint/bundled-angular-compiler": "17.1.1", + "@angular-eslint/utils": "17.1.1", + "@typescript-eslint/type-utils": "6.13.1", + "@typescript-eslint/utils": "6.13.1", + "aria-query": "5.3.0", + "axobject-query": "4.0.0" }, "peerDependencies": { - "@angular-eslint/template-parser": "22.6.0", - "@typescript-eslint/types": "^8.0.0", - "@typescript-eslint/utils": "^8.0.0", - "eslint": "^9.0.0 || ^10.0.0", + "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.1.1.tgz", + "integrity": "sha512-xRlSh9qjdUdUKAy/0UQsxX7wf1tHApAsHsfismebPriqfmVAPyEg4HBrM8ImWaZxiqaTGC1AyHsUBQD5FK8o6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/utils": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.1.1.tgz", + "integrity": "sha512-CTNPOb05S/DII/Fm8JYUvKo+B4u/ctHjGJ0X1YXUR0q31oaGqTE3KePGq76+Y6swRDf9NjUIcfcnZp3u3j4CBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "17.1.1", + "@typescript-eslint/utils": "6.13.1" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/type-utils": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.1.tgz", + "integrity": "sha512-A2qPlgpxx2v//3meMqQyB1qqTg1h1dJvzca7TugM3Yc2USDY+fsRBiojAEo92HO7f5hW5mjAUF6qobOPzlBCBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "6.13.1", + "@typescript-eslint/utils": "6.13.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz", + "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.13.1", + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/typescript-estree": "6.13.1", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.1.1.tgz", + "integrity": "sha512-xRlSh9qjdUdUKAy/0UQsxX7wf1tHApAsHsfismebPriqfmVAPyEg4HBrM8ImWaZxiqaTGC1AyHsUBQD5FK8o6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.1.1.tgz", + "integrity": "sha512-CTNPOb05S/DII/Fm8JYUvKo+B4u/ctHjGJ0X1YXUR0q31oaGqTE3KePGq76+Y6swRDf9NjUIcfcnZp3u3j4CBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "17.1.1", + "@typescript-eslint/utils": "6.13.1" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz", + "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.13.1", + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/typescript-estree": "6.13.1", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, "node_modules/@angular-eslint/template-parser": { "version": "22.6.0", "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-22.6.0.tgz", @@ -252,21 +374,6 @@ "typescript": "*" } }, - "node_modules/@angular-eslint/utils": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-22.6.0.tgz", - "integrity": "sha512-Nd5pZGgkBTvcCNMBt88iG6r/Tzk1XTWHpQQccwYUWYhz4PMim0yyXAEvqAabxag8S9iLPUEufpaOw20OOxNJ3w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "22.6.0" - }, - "peerDependencies": { - "@typescript-eslint/utils": "^8.0.0", - "eslint": "^9.0.0 || ^10.0.0", - "typescript": "*" - } - }, "node_modules/@angular/animations": { "version": "22.2.4", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-22.2.4.tgz", @@ -3740,6 +3847,44 @@ "@emnapi/runtime": "^1.7.1 || 2.0.0-beta.2" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@oxc-parser/binding-android-arm-eabi": { "version": "0.150.0", "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.150.0.tgz", @@ -6037,75 +6182,32 @@ "@types/node": "*" } }, - "node_modules/@typescript-eslint/project-service": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.72.1.tgz", - "integrity": "sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.72.1", - "@typescript-eslint/types": "^8.72.1", - "debug": "^4.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.72.1.tgz", - "integrity": "sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz", + "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/visitor-keys": "8.72.1" + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.72.1.tgz", - "integrity": "sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, "node_modules/@typescript-eslint/types": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.72.1.tgz", - "integrity": "sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz", + "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==", "dev": true, "license": "MIT", - "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -6113,92 +6215,51 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.72.1.tgz", - "integrity": "sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz", + "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==", "dev": true, - "license": "MIT", - "peer": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/project-service": "8.72.1", - "@typescript-eslint/tsconfig-utils": "8.72.1", - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/visitor-keys": "8.72.1", - "debug": "^4.4.3", - "minimatch": "^10.2.2", - "semver": "^7.7.3", - "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.5.0" + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.72.1.tgz", - "integrity": "sha512-5v5liypurJBFHCBNqh/RjsymAD+VWcE0djuGY/BUqp5fC3Qn+luWDEksjuTtWjPn6i5zQlUtkZCRG/CYG0yCkA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.72.1", - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/typescript-estree": "8.72.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.72.1.tgz", - "integrity": "sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz", + "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@typescript-eslint/types": "8.72.1", - "eslint-visitor-keys": "^5.0.0" + "@typescript-eslint/types": "6.13.1", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", - "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@vitejs/plugin-basic-ssl": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.3.0.tgz", @@ -6480,13 +6541,13 @@ "license": "Python-2.0" }, "node_modules/aria-query": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", - "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" + "dependencies": { + "dequal": "^2.0.3" } }, "node_modules/array-buffer-byte-length": { @@ -6528,6 +6589,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/array.prototype.findlastindex": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", @@ -6640,13 +6711,13 @@ } }, "node_modules/axobject-query": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", - "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz", + "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==", "dev": true, "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" + "dependencies": { + "dequal": "^2.0.3" } }, "node_modules/balanced-match": { @@ -7632,6 +7703,16 @@ "node": ">= 0.8" } }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -7660,6 +7741,19 @@ "dev": true, "license": "MIT" }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -8677,6 +8771,36 @@ "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", "license": "Apache-2.0" }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -8734,6 +8858,16 @@ "fast-string-width": "^3.0.2" } }, + "node_modules/fastq": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.3.tgz", + "integrity": "sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -8801,6 +8935,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/fix": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/fix/-/fix-0.0.3.tgz", + "integrity": "sha512-nDbGTpfpPiWYuJ2qwrF2Qxqga8ANe3BV31vFA943FmEvX9iUROH3YmCOM4aq3DPZWF2WsKHoH9+Gw3qLdXfcSA==", + "dependencies": { + "pipe": "0.0.1" + }, + "engines": { + "node": "0.2.5" + } + }, "node_modules/flat-cache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", @@ -9205,6 +9350,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -11522,6 +11688,43 @@ "node": ">= 0.4" } }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -11560,23 +11763,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", - "dev": true, - "license": "BlueOak-1.0.0", - "peer": true, - "dependencies": { - "brace-expansion": "^5.0.8" - }, - "engines": { - "node": "18 || 20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", @@ -12304,6 +12490,16 @@ "node": "20 || >=22" } }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/path2d": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.2.tgz", @@ -12346,6 +12542,14 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pipe": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/pipe/-/pipe-0.0.1.tgz", + "integrity": "sha512-8tESQnbeUKIuET8aTNt3HL0EG7RuPT7C8gDrZ2lK2AjEUi7TOu6NPaJvk2Voe+tc7NkBqe4HRdftDA6w+caAvg==", + "engines": { + "node": "0.2.5" + } + }, "node_modules/piscina": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/piscina/-/piscina-5.3.2.tgz", @@ -12552,10 +12756,31 @@ "node": ">=0.9" } }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/quill": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/quill/-/quill-2.0.3.tgz", - "integrity": "sha512-xEYQBqfYx/sfb33VJiKnSJp8ehloavImQ2A6564GAbqG55PGw1dAWUn1MUbQB62t0azawUS2CZZhWCjO8gRvTw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/quill/-/quill-2.0.2.tgz", + "integrity": "sha512-QfazNrhMakEdRG57IoYFwffUIr04LWJxbS/ZkidRFXYCQt63c1gK6Z7IHUXMx/Vh25WgPBU42oBaNzQ0K1R/xw==", "license": "BSD-3-Clause", "dependencies": { "eventemitter3": "^5.0.1", @@ -12822,6 +13047,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -12943,6 +13179,30 @@ "url": "https://github.com/sponsors/oxc-project" } }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/rxjs": { "version": "7.8.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", @@ -13661,6 +13921,16 @@ "simple-concat": "^1.0.0" } }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/slice-ansi": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-10.0.0.tgz", @@ -14155,16 +14425,16 @@ } }, "node_modules/ts-api-utils": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", - "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", + "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", "dev": true, "license": "MIT", "engines": { - "node": ">=18.12" + "node": ">=16" }, "peerDependencies": { - "typescript": ">=4.8.4" + "typescript": ">=4.2.0" } }, "node_modules/tsconfig-paths": { diff --git a/HRM.UI/ClientApp/package.json b/HRM.UI/ClientApp/package.json index 4718e4c..cd5a5de 100644 --- a/HRM.UI/ClientApp/package.json +++ b/HRM.UI/ClientApp/package.json @@ -66,13 +66,14 @@ "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", + "fix": "^0.0.3", "hammerjs": "^2.0.8", "ng2-pdf-viewer": "^10.4.0", "ngx-extended-pdf-viewer": "^31.0.1", "primeflex": "^4.0.0", "primeicons": "^7.0.0", "prismjs": "^1.30.0", - "quill": "^2.0.3", + "quill": "^2.0.2", "rxjs": "^7.8.2", "sweetalert2": "^11.26.25", "tslib": "^2.9.1", @@ -81,8 +82,8 @@ }, "devDependencies": { "@angular-eslint/builder": "^22.6.0", - "@angular-eslint/eslint-plugin": "^22.6.0", - "@angular-eslint/eslint-plugin-template": "^22.6.0", + "@angular-eslint/eslint-plugin": "^17.1.1", + "@angular-eslint/eslint-plugin-template": "^17.1.1", "@angular-eslint/template-parser": "^22.6.0", "@angular/build": "^22.2.5", "@angular/cli": "^22.2.5", @@ -112,6 +113,10 @@ }, "allowScripts": { "@progress/kendo-licensing@1.12.0": true, - "esbuild@0.28.2": true + "esbuild@0.28.2": true, + "canvas@3.2.3": true, + "@parcel/watcher@2.6.0": true, + "lmdb@3.5.6": true, + "msgpackr-extract@3.0.6": true } -} \ No newline at end of file +} diff --git a/HRM.UI/ClientApp/src/app/_services/employee/employee.service.ts b/HRM.UI/ClientApp/src/app/_services/employee/employee.service.ts index 87e80c1..0ac5621 100644 --- a/HRM.UI/ClientApp/src/app/_services/employee/employee.service.ts +++ b/HRM.UI/ClientApp/src/app/_services/employee/employee.service.ts @@ -129,6 +129,9 @@ export class EmployeeServices { getEmployeeByID(empID: number) { return this.apiService.httpGet('/Employee/getEmployeeByID' + '/' + empID); } + getEmployeeByEmpNo(empNo: string) { + return this.apiService.httpGet('/Employee/getEmployeeByEmpNo' + '/' + empNo); + } getEmployeeDetailByEmpID(empID: number) { return this.apiService.httpGet('/Employee/getEmployeeDetailByEmpID' + '/' + empID); } diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html index da3d8e6..8d33723 100644 --- a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html @@ -16,37 +16,37 @@
- +
- +
- +
- +
-
+
- +
-
+ + @@ -81,10 +81,11 @@
-->
- +
-
- +
+ +
diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.ts b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.ts index 4f782fe..c2d05c3 100644 --- a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.ts +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.ts @@ -36,6 +36,7 @@ export class UsersEntryComponent implements OnInit { isNew: boolean = true; status: any = EnumExtension.getNamesAndValues(EnumAuthStatus); currentUser: User = undefined; + employeeNo:string ="" @Output() saveCompleted: EventEmitter = new EventEmitter(); constructor(public userServiceFactory: AuthService, public apiService: ApiService, @@ -78,24 +79,26 @@ export class UsersEntryComponent implements OnInit { private CreateFormValidator(): void { this.fromValidator = new FormBuilder().group({ - loginId: ['', Validators.required], + loginId: ['', [ + Validators.required, + Validators.minLength(3), + Validators.maxLength(30), + Validators.pattern(/^[a-zA-Z0-9._-]+$/) // letters, digits, . _ - only (no spaces) + ]], name: ['', Validators.required], password: ['', Validators.required], confirmPassword: ['', Validators.required], passwordHints: '', email: '', emailAddress: ['', [Validators.email, Validators.maxLength(254)]], + employeeNo: '', /* status: ['', Validators.required]*/ }); } - public onSave(e): void { - if (this.selectedEmployee == undefined) { - this._user.employeeID = undefined; - } else { - this._user.employeeID = this.selectedEmployee.employeeID; - } + public saveUser() { + var oUser; if (this._user.isNew == true) { this._user.userType = EnumUserType.User; @@ -126,6 +129,37 @@ export class UsersEntryComponent implements OnInit { this.loadingPanel.ShowLoadingPanel = false; }); } + public onSave(e): void { + this.loadingPanel.ShowLoadingPanel = true; + if (this.employeeNo == undefined || this.employeeNo == null || this.employeeNo == '') { + this.saveUser(); + } + else { + var employee; + this.employeeService.getEmployeeByEmpNo(this.employeeNo).subscribe( + (x) => { + employee = x; + }, + (x) => { + this.notificationService.showError(x.error); + this.loadingPanel.ShowLoadingPanel = false; + }, + () => { + this.loadingPanel.ShowLoadingPanel = false; + if (employee == undefined || employee == null) { + this.notificationService.showError('Employee not found.'); + } + else { + + this._user.employeeID = this.selectedEmployee.employeeID; + this.saveUser(); + } + + }); + } + + + } public onCancel(e): void { this.saveCompleted.emit(undefined); diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.html b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.html index a54c409..3a423e4 100644 --- a/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.html +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.html @@ -41,7 +41,7 @@ - - + --> @@ -62,7 +62,7 @@ - + @if (dataItem.userStatus ==1 || dataItem.userStatus ==5) { -
-
-
-
-
- -
- + + (dataStateChange)="dataStateChange($event)"> + - - - - - +
+
+ + + Type: {{ dataItem?.name }} + + + + + + +
+ + + + +
+
+ +
+ + + Export + + +
+
- - - - - - - {{getUserStatusString(dataItem.id)}} + + + - - - @if (dataItem.userStatus ==1 || dataItem.userStatus ==5) { - + + + + + + {{ dataItem.statusLabel }} + + + + + + + @if (dataItem.createdDate) { + {{ dataItem.createdDate | date: 'dd MMM yyyy' }} + } + @if (dataItem.createdByName) { + · {{ dataItem.createdByName }} } - - - - - @if (dataItem.userStatus ==1 || dataItem.userStatus ==5) { - - } - @if (dataItem.userStatus !=1 && dataItem.userStatus !=5) { - - } + + + + + + + + + +
+ @if (rows.length === 0) { + No users of this type yet. + } @else { + No users match the current search or filters. + } +
-
- - -
+ + + + + + + + + + + + + + + +
-
- @if (showModal) { - - - Add/Edit User - - - - } -
- -@if (showReason) { - +@if (showModal) { + - Reason + Add/Edit User -
- -
-
- -
+
} + +@if (showReason) { +
+ +

+ {{ deactivateTargetName }} will be deactivated once another administrator approves it. +

+ + + + + + + +
+
+} diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.scss b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.scss new file mode 100644 index 0000000..7d5b130 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.scss @@ -0,0 +1,197 @@ +@use '../../../../styles/abstracts/tokens' as *; + +// Scoped to this component (default emulated encapsulation). Kendo internals that render inside +// this component's own template (grid rows, toolbar) are reached with :host ::ng-deep, and only +// under the component's own .ul-grid class, so nothing leaks to other grids. + +.ul-page { + padding: 0; +} + +// ---------- toolbar ---------- + +.ul-toolbar { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 12px; + width: 100%; + padding: 4px 0; +} + +.ul-toolbar__filters, +.ul-toolbar__actions { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; +} + +.ul-type { + width: 190px; +} + +.ul-type__prefix { + color: $gray-500; + margin-right: 2px; +} + +.ul-search { + width: 240px; +} + +// Status filter chips +.ul-chips { + display: inline-flex; + flex-wrap: wrap; + gap: 6px; +} + +.ul-chip { + display: inline-flex; + align-items: center; + gap: 6px; + height: 30px; + padding: 0 12px; + border: 1px solid $userlist-border; + border-radius: 999px; + background: $color-white; + color: $gray-700; + font: inherit; + font-size: 13px; + cursor: pointer; + transition: background-color 0.15s, border-color 0.15s, color 0.15s; + + &:hover { + border-color: $brand-primary; + } + + &:focus-visible { + outline: 2px solid $brand-primary; + outline-offset: 1px; + } + + &.is-selected { + background: $brand-primary; + border-color: $brand-primary; + color: $color-white; + + .ul-chip__count { + background: rgba(255, 255, 255, 0.22); + color: $color-white; + } + } +} + +.ul-chip__count { + min-width: 20px; + padding: 0 6px; + border-radius: 999px; + background: $gray-100; + color: $gray-600; + font-size: 12px; + line-height: 18px; + text-align: center; +} + +.ul-chip--pending:not(.is-selected) .ul-chip__count { + background: $userlist-warning-bg; + color: $userlist-warning; +} + +// ---------- grid ---------- + +:host ::ng-deep .ul-grid { + // Uniform, compact rows + .k-grid-table td { + height: 44px; + padding-top: 4px; + padding-bottom: 4px; + vertical-align: middle; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + td.ul-actions-cell, + th.ul-actions-cell { + text-align: center; + padding-left: 4px; + padding-right: 4px; + } + + .k-grid-toolbar { + padding: 8px 12px; + } +} + +.ul-login { + font-weight: 600; + color: $gray-700; +} + +.ul-muted { + color: $gray-500; + font-size: 12px; +} + +// Status badge +.ul-badge { + display: inline-flex; + align-items: center; + gap: 6px; + padding: 2px 10px; + border-radius: 999px; + font-size: 12px; + font-weight: 600; + line-height: 20px; + white-space: nowrap; +} + +.ul-badge__dot { + width: 6px; + height: 6px; + border-radius: 50%; + background: currentColor; +} + +.ul-badge--success { background: $userlist-success-bg; color: $userlist-success; } +.ul-badge--warning { background: $userlist-warning-bg; color: $userlist-warning; } +.ul-badge--neutral { background: $userlist-neutral-bg; color: $userlist-neutral; } +.ul-badge--danger { background: $userlist-danger-bg; color: $danger; } + +.ul-empty { + padding: 32px 16px; + color: $gray-500; + text-align: center; +} + +// ---------- deactivate dialog ---------- + +.ul-dialog__lead { + margin: 0 0 16px; + color: $gray-700; +} + +.ul-dialog__label { + display: block; + margin-bottom: 6px; + font-weight: 600; +} + +.ul-required { + color: $danger; +} + +@media (max-width: 768px) { + .ul-toolbar__actions { + width: 100%; + justify-content: flex-end; + } + + .ul-type, + .ul-search { + width: 100%; + } +} diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.ts b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.ts index d6866a6..4827d03 100644 --- a/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.ts +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-list/users-list.component.ts @@ -1,78 +1,114 @@ -import {Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core'; +import {Component, OnInit, ViewChild, ChangeDetectionStrategy} from '@angular/core'; import {Subscription} from 'rxjs'; -import {DataStateChangeEvent, GridDataResult} from '@progress/kendo-angular-grid'; +import {DataStateChangeEvent, GridComponent, GridDataResult} from '@progress/kendo-angular-grid'; +import {ExcelExportData} from '@progress/kendo-angular-excel-export'; import {process, State} from '@progress/kendo-data-query'; +import { + SVGIcon, arrowRotateCwIcon, cancelIcon, checkIcon, downloadIcon, fileExcelIcon, filePdfIcon, + moreVerticalIcon, pencilIcon, plusIcon, +} from '@progress/kendo-svg-icons'; import {AuthService} from '../../../_services/auth/auth.service'; -import {EnumAuthStatus, EnumExtension, EnumUserType, TempEnumAuthStatus} from '../../../_models/enums'; +import {EnumAuthStatus, EnumUserType} from '../../../_models/enums'; import {ApiService} from '../../../app.api.service'; import {HRMNotificationService} from '../../../app.notification.service'; -import {DataTransferService} from '../../../data.transfer.service'; -import {AppWindowPopUp} from '../../../app.windowPopup.service'; -import {UsersEntryComponent} from '../users-entry/users-entry.component'; -import {UntilityHandlerService} from '../../../utility.hanldler.service'; import {User} from '../../../_models/Authentication/user'; -import {SearchEmployee} from '../../../_models/Employee/searchEmployee'; -import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service'; +import {loadingPanelService} from '../../../hrm-loding panel/loding.panel.service'; + +/** Which status filter chip a user falls under. */ +type StatusGroup = 'active' | 'pending' | 'inactive'; +type StatusFilter = 'all' | StatusGroup; +/** Badge colour; see the `.ul-badge--*` rules in users-list.component.scss. */ +type StatusTone = 'success' | 'warning' | 'neutral' | 'danger'; +type RowAction = 'edit' | 'deactivate' | 'approve' | 'reject' | 'deactivate-approve'; + +interface RowActionItem { + text: string; + svgIcon: SVGIcon; + action: RowAction; +} + +/** What one grid row shows. The `User` itself is kept on `user` and is what gets edited/posted. */ +interface UserRow { + id: number; + loginID: string; + userName: string; + statusLabel: string; + statusTone: StatusTone; + statusGroup: StatusGroup; + reason: string; + createdDate: Date; + createdByName: string; + actions: RowActionItem[]; + user: User; +} + +interface StatusInfo { + label: string; + tone: StatusTone; + group: StatusGroup; +} -import { LoadingPanelComponent } from 'src/app/hrm-loding panel/loading-panel.component'; -import { ButtonModule } from '@progress/kendo-angular-buttons'; -import { DropDownListModule } from '@progress/kendo-angular-dropdowns'; -import { ReactiveFormsModule } from '@angular/forms'; -import { FormsModule } from '@angular/forms'; -import { ExcelExportModule } from '@progress/kendo-angular-excel-export'; -import { KENDO_GRID } from '@progress/kendo-angular-grid'; -import { DatePickerModule } from '@progress/kendo-angular-dateinputs'; @Component({ selector: 'app-users-list', templateUrl: './users-list.component.html', -// styleUrls: ['./users-list.component.css', '../../../../assets/kendo-grid/grid.css'], - encapsulation: ViewEncapsulation.None, + styleUrls: ['./users-list.component.scss'], changeDetection: ChangeDetectionStrategy.Eager, - standalone: false, - + standalone: false, }) /** users-list component*/ export class UsersListComponent implements OnInit { - public users: User[]; + @ViewChild(GridComponent) grid: GridComponent; + + readonly icons = { + add: plusIcon, refresh: arrowRotateCwIcon, export: downloadIcon, excel: fileExcelIcon, + pdf: filePdfIcon, more: moreVerticalIcon, + }; + + readonly userTypes = [ + {name: 'User', value: EnumUserType.User}, + {name: 'Employee', value: EnumUserType.Employee}, + {name: 'Super user', value: EnumUserType.SuperUser}, + ]; + + readonly exportItems = [ + {text: 'Excel (.xlsx)', svgIcon: fileExcelIcon, format: 'excel'}, + {text: 'PDF', svgIcon: filePdfIcon, format: 'pdf'}, + ]; + + public users: User[] = []; + public rows: UserRow[] = []; + public gridView: GridDataResult = {data: [], total: 0}; public _getUserSubscriber$: Subscription; - loadingPanelVisible: boolean; - public selectedEmployee: SearchEmployee[]; - _selectedRoleType: EnumUserType; - roleTypes: any = EnumExtension.getNamesAndValues(EnumUserType); - gridView: GridDataResult; + + _selectedRoleType: EnumUserType = EnumUserType.User; + searchText = ''; + statusFilter: StatusFilter = 'all'; + counts: Record = {all: 0, active: 0, pending: 0, inactive: 0}; + public _user: User; - public isNew: boolean; showModal = false; - status = EnumAuthStatus; - statuses: any = EnumExtension.getNamesAndValues(TempEnumAuthStatus); - selectedStatus = 1; - // filteredUsers: User[] = []; showReason = false; reasonForStatusChange = ''; + private deactivateTarget: User; currentUser: User; + actionselected: string = ''; + public state: State = { skip: 0, take: 20, - - // Initial filter descriptor - filter: { - logic: 'and', - filters: [], - }, + sort: [{field: 'loginID', dir: 'asc'}], + filter: {logic: 'and', filters: []}, }; - constructor(public userService: AuthService, public apiservice: ApiService,public apiService: ApiService, - public notificationService: HRMNotificationService, public loadingPanel: loadingPanelService, - public datatransferservice: DataTransferService, - public utilityHandlerService: UntilityHandlerService) { - this.utilityHandlerService.ShowLoadingPanel = false; - this.apiservice.selectedMenuName = 'User Entry'; + constructor(public userService: AuthService, public apiService: ApiService, + public notificationService: HRMNotificationService, public loadingPanel: loadingPanelService) { + this.apiService.selectedMenuName = 'User Entry'; + this.allData = this.allData.bind(this); } ngOnInit(): void { - debugger; - this._selectedRoleType = EnumUserType.User; this.loadCurrentUser(); + this.RefreshControl(); } loadCurrentUser() { @@ -80,240 +116,341 @@ export class UsersListComponent implements OnInit { (resp) => { this.currentUser = resp; }, - (x) => { + ); + } + + /** Loads the users of the selected type. Runs on open, on a type change, and from the refresh button. */ + public RefreshControl() { + if (this._selectedRoleType === null || this._selectedRoleType === undefined) { + return; + } + this._getUserSubscriber$?.unsubscribe(); + this.loadingPanel.ShowLoadingPanel = true; + this._getUserSubscriber$ = this.userService.GetUsers(this._selectedRoleType).subscribe( + (x: User[]) => { + this.users = x ?? []; + this.rebuildRows(); + this.loadingPanel.ShowLoadingPanel = false; }, - () => { + (x) => { + this.notificationService.showError(x?.error ?? x); + this.loadingPanel.ShowLoadingPanel = false; }, ); } - public RefreshControl() {debugger; - this.utilityHandlerService.ShowLoadingPanel = true; - this._getUserSubscriber$ = this.userService.GetUsers(this._selectedRoleType).subscribe( - (x) => { - this.users = x; - this.utilityHandlerService.ShowLoadingPanel = false; - }, - (x) => { - this.notificationService.showError(x); - this.utilityHandlerService.ShowLoadingPanel = false; - }, - () => { - //this.filteredUsers = this.users.filter(x => x.userStatus === EnumAuthStatus.Active - // || x.userStatus === EnumAuthStatus.Approved); - this.utilityHandlerService.ShowLoadingPanel = false; - //console.log(this.users); - this.gridView = process(this.users, this.state); - }); + onUserTypeChange(): void { + this.state = {...this.state, skip: 0}; + this.RefreshControl(); + } + + onSearch(value: string): void { + this.searchText = value ?? ''; + this.state = {...this.state, skip: 0}; + this.applyView(); + } + + setStatusFilter(filter: StatusFilter): void { + this.statusFilter = filter; + this.state = {...this.state, skip: 0}; + this.applyView(); } public dataStateChange(state: DataStateChangeEvent): void { this.state = state; - this.gridView = process(this.users, this.state); + this.applyView(); } + // ---------- rows ---------- - saveCompleted(faction: any) { - //console.log('after'); - //console.log(this._user); - if (faction !== undefined) { + private rebuildRows(): void { + const loginById = new Map(this.users.map(u => [u.id, u.loginID] as [number, string])); + this.rows = this.users.map(u => { + const info = UsersListComponent.statusInfo(u.userStatus); + const createdBy = u.createdBy > 0 ? loginById.get(u.createdBy) : undefined; + return { + id: u.id, + loginID: u.loginID, + userName: u.userName, + statusLabel: info.label, + statusTone: info.tone, + statusGroup: info.group, + reason: u.reason || '', + createdDate: u.createdDate ? new Date(u.createdDate) : null, + createdByName: createdBy ?? '', + actions: this.actionsFor(u.userStatus), + user: u, + }; + }); - if (this.isNew == true) { - this.users.push(faction); - } + this.counts = {all: this.rows.length, active: 0, pending: 0, inactive: 0}; + this.rows.forEach(r => this.counts[r.statusGroup]++); + this.applyView(); + } + /** Rows after the toolbar's status chip and search box, before the grid's own filter/sort/paging. */ + private toolbarFilteredRows(): UserRow[] { + const term = this.searchText.trim().toLowerCase(); + return this.rows.filter(r => + (this.statusFilter === 'all' || r.statusGroup === this.statusFilter) && + (!term || + (r.loginID ?? '').toLowerCase().includes(term) || + (r.userName ?? '').toLowerCase().includes(term))); + } + + private applyView(): void { + this.gridView = process(this.toolbarFilteredRows(), this.state); + } + + /** Excel export: every row that matches the current filters, not just the visible page. */ + public allData(): ExcelExportData { + return { + data: process(this.toolbarFilteredRows(), {sort: this.state.sort, filter: this.state.filter}).data, + }; + } + + onExport(item: { format: string }): void { + if (item.format === 'excel') { + this.grid.saveAsExcel(); + } else { + this.grid.saveAsPDF(); + } + } + + static statusInfo(status: EnumAuthStatus): StatusInfo { + switch (status) { + case EnumAuthStatus.Active: + case EnumAuthStatus.Approved: + return {label: 'Active', tone: 'success', group: 'active'}; + case EnumAuthStatus.New_Not_Yet_Approve: + return {label: 'Pending: new user', tone: 'warning', group: 'pending'}; + case EnumAuthStatus.Edited_Not_Yet_Approve: + return {label: 'Pending: changes', tone: 'warning', group: 'pending'}; + case EnumAuthStatus.Inactive_Not_Yet_Approve: + return {label: 'Pending: deactivation', tone: 'warning', group: 'pending'}; + case EnumAuthStatus.Deleted_Not_Yet_Approve: + return {label: 'Pending: deletion', tone: 'warning', group: 'pending'}; + case EnumAuthStatus.Inactive: + return {label: 'Inactive', tone: 'neutral', group: 'inactive'}; + case EnumAuthStatus.Locked: + return {label: 'Locked', tone: 'danger', group: 'inactive'}; + case EnumAuthStatus.Rejected: + return {label: 'Rejected', tone: 'danger', group: 'inactive'}; + case EnumAuthStatus.Archived: + return {label: 'Archived', tone: 'neutral', group: 'inactive'}; + case EnumAuthStatus.Reverted: + return {label: 'Reverted', tone: 'neutral', group: 'inactive'}; + default: + return {label: 'Unknown', tone: 'neutral', group: 'inactive'}; + } + } + + /** + * The actions a row offers, by status. Same rules as before: active users can be edited or + * deactivated, every other status can only be approved. The server's approve always sets the + * status to Approved, so for an inactive user or a pending deactivation it re-activates the + * user; the label says so. + */ + private actionsFor(status: EnumAuthStatus): RowActionItem[] { + if (status === EnumAuthStatus.Active || status === EnumAuthStatus.Approved) { + return [ + {text: 'Edit', svgIcon: pencilIcon, action: 'edit'}, + {text: 'Deactivate…', svgIcon: cancelIcon, action: 'deactivate'}, + ]; + } + if (status === EnumAuthStatus.Edited_Not_Yet_Approve) { + return [ + { text: 'approve', svgIcon: pencilIcon, action: 'approve' }, + + ]; + } + if (status === EnumAuthStatus.New_Not_Yet_Approve ) { + return [ + { text: 'Approve', svgIcon: pencilIcon, action: 'approve' }, + { text: 'Reject', svgIcon: cancelIcon, action: 'reject' }, + ]; + } + if (status === EnumAuthStatus.Inactive) { + return [ + { text: 'Re-activate', svgIcon: pencilIcon, action: 'edit' }, + + ]; } - this.showModal = false; + if (status === EnumAuthStatus.Rejected) { + return [ + { text: 'Re-activate', svgIcon: pencilIcon, action: 'edit' }, + + ]; + } + if (status === EnumAuthStatus.Inactive_Not_Yet_Approve) { + return [ + { text: 'approve', svgIcon: pencilIcon, action: 'approve' }, + + ]; + } + const reactivates =EnumAuthStatus.Inactive_Not_Yet_Approve; + return [{text: reactivates ? 'Re-activate' : 'Approve', svgIcon: checkIcon, action: 'approve'}]; } - - //public onFilter(inputValue: string): void { - // this.gridView = process(this.users, { - // filter: { - // logic: 'or', - // filters: [ - // { - // field: 'userName', - // operator: 'contains', - // value: inputValue, - // }, - // { - // field: 'loginID', - // operator: 'contains', - // value: inputValue, - // }, - // { - // field: 'assignedRoles', - // operator: 'contains', - // value: inputValue, - // }, - // ], - // }, - // }).data; - - // //this.dataBinding.skip = 0; - //} - - public ShowData(childData) { - this.selectedEmployee = childData; + onRowAction(item: RowActionItem, row: UserRow): void { + switch (item.action) { + case 'edit': + this.editHandler(row.id); + break; + case 'deactivate': + this.onStatusToggle(row.id); + this.actionselected = "deactivate"; + break; + case 'deactivate-approve': + this.actionselected = "deactivate-approve"; + this.Approve(row.id); + break; + case 'reject': + this.onStatusToggle(row.id); + this.actionselected = "reject"; + break; + case 'approve': + this.actionselected = "approve"; + this.Approve(row.id); + break; + } } + // ---------- add / edit ---------- + public addHandler() { - this._user = new User(); this.showModal = true; - } //pop up - - - + } public editHandler(id: number) { - - - this._user = this.users.find(x => x.id === id); - //console.log('before'); - //console.log(this._user); + const found = this.users.find(x => x.id === id); + if (!found) { + return; + } + // A copy, so fields changed in the dialog and then cancelled do not stick to the row. + this._user = Object.assign(new User(), found); this.showModal = true; } - public Approve(id: number) { - - - var oselecteduser = this.users.find(x => x.id === id); - //console.log(oselecteduser); - //console.log(this.currentUser); - if (oselecteduser.modifiedBy == undefined) { - if (oselecteduser.createdBy == this.currentUser.userID) { - this.notificationService.showError("Created user and Approve user can't be Same."); - return; - } + saveCompleted(saved: any) { + this.showModal = false; + if (saved !== undefined) { + // Reload, so a new user appears and an edited one shows its new (pending) status. + this.RefreshControl(); } - else { - if (oselecteduser.modifiedBy == this.currentUser.userID) { - this.notificationService.showError("Created user and Approve user can't be Same."); - return; - } - - } - - - var ouser = Object.assign({}, oselecteduser) - ouser.userStatus = EnumAuthStatus.Approved; - this.loadingPanelVisible - - this.userService.ApproveUser(ouser).subscribe( - (x) => { - ouser = x; - }, - (x) => { - this.notificationService.showError(x.error); - }, - () => { - var index = this.users.findIndex(x => x.id === id); - this.users[index] = ouser; - this.notificationService.showSuccess('Approved successfully.'); - this.gridView = process(this.users, this.state); - }); - - } - public cancelHandler() { - - } - - public buttonText = 'Show Loading Panel'; - onPopUpClose() { this.showModal = false; } - public onButtonClick(): void { - this.loadingPanelVisible = !this.loadingPanelVisible; + // ---------- approve ---------- - if (this.loadingPanelVisible) { - this.buttonText = 'Hide Loading Panel'; - } else { - this.buttonText = 'Show Loading Panel'; + public Approve(id: number) { + const oselecteduser = this.users.find(x => x.id === id); + if (!oselecteduser) { + return; } + const lastChangedBy = oselecteduser.modifiedBy == undefined ? oselecteduser.createdBy : oselecteduser.modifiedBy; + if (this.currentUser && lastChangedBy == this.currentUser.userID) { + this.notificationService.showError('Created user and Approve user can\'t be Same.'); + return; + } + + const ouser = Object.assign({}, oselecteduser); + if (this.actionselected == "deactivate-approve") { + ouser.userStatus = EnumAuthStatus.Inactive; + } + else + ouser.userStatus = EnumAuthStatus.Approved; + + this.loadingPanel.ShowLoadingPanel = true; + this.userService.ApproveUser(ouser).subscribe( + (x: User) => { + const index = this.users.findIndex(u => u.id === id); + if (index >= 0) { + this.users[index] = x ?? ouser; + } + this.rebuildRows(); + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showSuccess('Approved successfully.'); + }, + (x) => { + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showError(x.error); + }, + ); } - onStatusChange(value: any) { - //if (this.users.length > 0) { - // if (value === TempEnumAuthStatus.Active) { - // this.filteredUsers = this.users.filter(x => x.userStatus === EnumAuthStatus.Active - // || x.userStatus === EnumAuthStatus.Approved); - // } else { - // this.filteredUsers = this.users.filter(x => x.userStatus === EnumAuthStatus.Inactive); - // } - // this.gridView = process(this.filteredUsers, this.state); - //} else { - // this.notificationService.showError('There is no data in this grid'); - //} - } + // ---------- deactivate ---------- - onStatusToggle(id) { + onStatusToggle(id: number) { + this.deactivateTarget = this.users.find(x => x.id === id); + if (!this.deactivateTarget) { + return; + } + if (this.actionselected == "deactivate-approve" || this.actionselected == "reject") { + const oselecteduser = this.users.find(x => x.id == this.deactivateTarget.id); + if (!oselecteduser) { + return; + } + const lastChangedBy = oselecteduser.modifiedBy == undefined ? oselecteduser.createdBy : oselecteduser.modifiedBy; + if (this.currentUser && lastChangedBy == this.currentUser.userID) { + this.notificationService.showError('Created user and Approve user can\'t be Same.'); + return; + } + } + this.reasonForStatusChange = ''; this.showReason = true; - this._user = this.users.find(x => x.id === id); } - getUserStatusString(id):string { - - var sts= "Approved" - var ouser = this.users.find(x => x.id === id); - switch (ouser.userStatus) { - case EnumAuthStatus.New_Not_Yet_Approve: - { - sts = "New_Waiting_For_Approve"; - break; - } - - case EnumAuthStatus.Edited_Not_Yet_Approve: - { - sts = "Edited_Waiting_For_Approve"; - break; - } - - case EnumAuthStatus.Inactive_Not_Yet_Approve: - { - sts = "Inactive_Waiting_For_Approve"; - break; - } - - default: sts = "Approved" - } - return sts; + get deactivateTargetName(): string { + const u = this.deactivateTarget; + return u ? `${u.userName ?? ''} (${u.loginID ?? ''})` : ''; } onReasonSave() { + debugger; + // Change a copy; the row only changes once the server has accepted it. + const target = this.deactivateTarget; + const changed = Object.assign({}, target); + if (this.actionselected == 'reject' && changed.userStatus == EnumAuthStatus.New_Not_Yet_Approve) { - if (this.reasonForStatusChange == undefined || this.reasonForStatusChange == '') { - this.notificationService.showError(`Please enter reason`); - return; + + changed.userStatus = EnumAuthStatus.Rejected; } + else changed.userStatus = EnumAuthStatus.Inactive_Not_Yet_Approve; - this._user.userStatus = EnumAuthStatus.Inactive_Not_Yet_Approve; - this._user.reason = this.reasonForStatusChange; - //console.log(this._user); - this.userService.DoActiveAndIntacive(this._user).subscribe( - (x) => { + const reason = (this.reasonForStatusChange ?? '').trim(); + if (!reason) { + this.notificationService.showError('Please enter reason'); + return; + } + changed.reason = reason; - }, - (x) => { - this.notificationService.showError(x.error); - }, + this.loadingPanel.ShowLoadingPanel = true; + this.userService.DoActiveAndIntacive(changed).subscribe( () => { - this.notificationService.showSuccess('Status changed successfully.'); + target.userStatus = changed.userStatus; + target.reason = changed.reason; + this.rebuildRows(); + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showSuccess('Deactivation sent for approval.'); this.reasonForStatusChange = ''; this.showReason = false; - }); + }, + (x) => { + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showError(x.error); + }, + ); } - onReasonPopUpClose() { this.showReason = false; } diff --git a/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js b/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js new file mode 100644 index 0000000..5e7452e --- /dev/null +++ b/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js @@ -0,0 +1,27 @@ +import { EnumCalendarItemType } from '../../_models/enums'; +/** "event", "task", "schedule job" or "schedule email", for titles and messages. */ +export function calendarTypeText(type) { + switch (type) { + case EnumCalendarItemType.Task: return 'task'; + case EnumCalendarItemType.ScheduleJob: return 'schedule job'; + case EnumCalendarItemType.ScheduleEmail: return 'schedule email'; + default: return 'event'; + } +} +/** "Event", "Task", "Schedule job" or "Schedule email". */ +export function calendarTypeTitle(type) { + const text = calendarTypeText(type); + return text.charAt(0).toUpperCase() + text.slice(1); +} +/** The same day at midnight. */ +export function dateOnly(value) { + return new Date(value.getFullYear(), value.getMonth(), value.getDate()); +} +/** The server's message for a 400 / 403 (plain text), or the fallback. */ +export function calendarErrorText(err, fallback) { + if (err && typeof err.error === 'string' && err.error.trim()) { + return err.error; + } + return fallback; +} +//# sourceMappingURL=calendar-ui.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js.map b/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js.map new file mode 100644 index 0000000..471fdcc --- /dev/null +++ b/HRM.UI/ClientApp/src/app/calendar/shared/calendar-ui.js.map @@ -0,0 +1 @@ +{"version":3,"file":"calendar-ui.js","sourceRoot":"","sources":["calendar-ui.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAwB3D,oFAAoF;AACpF,MAAM,UAAU,gBAAgB,CAAC,IAA0B;IACvD,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,MAAM,CAAC;QAC9C,KAAK,oBAAoB,CAAC,WAAW,CAAC,CAAC,OAAO,cAAc,CAAC;QAC7D,KAAK,oBAAoB,CAAC,aAAa,CAAC,CAAC,OAAO,gBAAgB,CAAC;QACjE,OAAO,CAAC,CAAC,OAAO,OAAO,CAAC;IAC5B,CAAC;AACL,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,iBAAiB,CAAC,IAA0B;IACxD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,QAAQ,CAAC,KAAW;IAChC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,iBAAiB,CAAC,GAAQ,EAAE,QAAgB;IACxD,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3D,OAAO,GAAG,CAAC,KAAK,CAAC;IACrB,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js b/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js index 576c261..add1bee 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js +++ b/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js @@ -1,86 +1,54 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ClaimDisbursementReport = exports.ClaimDisbursement = exports.ClaimRequisitionItem = exports.ClaimRequisitionAttachment = exports.ClaimRequisition = void 0; -var baseObject_1 = require("../_models/Basic/baseObject"); -var ClaimRequisition = /** @class */ (function (_super) { - __extends(ClaimRequisition, _super); - function ClaimRequisition() { - var _this = _super.call(this) || this; - _this.claimAmount = 0; - _this.glCode = ''; - _this.glSide = ''; - _this.glSideCode = ''; - _this.description = ''; - _this.initiatorRemarks = ''; - _this.isOnBehalf = false; - _this.isAdvance = false; - _this.isExpense = false; - _this.advanceItemId = 0; - _this.claimRequisitionItems = []; - _this.claimRequisitionAttachments = []; - _this.irFileAttacments = []; - _this.prevClaimAmount = 0; - _this.totalClaimAmount = 0; - _this.expenseClaimAmount = 0; - _this.isPayment = false; - _this.paymentRemarks = ''; - _this.paymentType = null; - return _this; +import { BaseObject } from '../_models/Basic/baseObject'; +export class ClaimRequisition extends BaseObject { + constructor() { + super(); + this.claimAmount = 0; + this.glCode = ''; + this.glSide = ''; + this.glSideCode = ''; + this.description = ''; + this.initiatorRemarks = ''; + this.isOnBehalf = false; + this.isAdvance = false; + this.isExpense = false; + this.advanceItemId = 0; + this.claimRequisitionItems = []; + this.claimRequisitionAttachments = []; + this.irFileAttacments = []; + this.prevClaimAmount = 0; + this.totalClaimAmount = 0; + this.expenseClaimAmount = 0; + this.isPayment = false; + this.paymentRemarks = ''; + this.paymentType = null; } - return ClaimRequisition; -}(baseObject_1.BaseObject)); -exports.ClaimRequisition = ClaimRequisition; -var ClaimRequisitionAttachment = /** @class */ (function () { - function ClaimRequisitionAttachment() { +} +export class ClaimRequisitionAttachment { + constructor() { } - return ClaimRequisitionAttachment; -}()); -exports.ClaimRequisitionAttachment = ClaimRequisitionAttachment; -var ClaimRequisitionItem = /** @class */ (function (_super) { - __extends(ClaimRequisitionItem, _super); - function ClaimRequisitionItem() { - var _this = _super.call(this) || this; - _this.amount = 0; - _this.glCode = ''; - _this.glSide = ''; - _this.glSideCode = ''; - _this.remarks = ''; - _this.fileName = ''; - _this.fileLink = ''; - _this.isAdvance = false; - _this.isExpense = false; - _this.isFileExist = false; - return _this; +} +export class ClaimRequisitionItem extends BaseObject { + constructor() { + super(); + this.amount = 0; + this.glCode = ''; + this.glSide = ''; + this.glSideCode = ''; + this.remarks = ''; + this.fileName = ''; + this.fileLink = ''; + this.isAdvance = false; + this.isExpense = false; + this.isFileExist = false; //this.claimRequisitionFileAttacment = new FileAttachment(); } - return ClaimRequisitionItem; -}(baseObject_1.BaseObject)); -exports.ClaimRequisitionItem = ClaimRequisitionItem; -var ClaimDisbursement = /** @class */ (function () { - function ClaimDisbursement() { +} +export class ClaimDisbursement { + constructor() { } - return ClaimDisbursement; -}()); -exports.ClaimDisbursement = ClaimDisbursement; -var ClaimDisbursementReport = /** @class */ (function () { - function ClaimDisbursementReport() { +} +export class ClaimDisbursementReport { + constructor() { } - return ClaimDisbursementReport; -}()); -exports.ClaimDisbursementReport = ClaimDisbursementReport; +} //# sourceMappingURL=claimRequisistion.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js.map b/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js.map index 6e69574..0f9e3d7 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js.map +++ b/HRM.UI/ClientApp/src/app/claim/claimRequisistion.js.map @@ -1 +1 @@ -{"version":3,"file":"claimRequisistion.js","sourceRoot":"","sources":["claimRequisistion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAEA,0DAAuD;AAIvD;IAAsC,oCAAU;IAC5C;QACI,YAAA,MAAK,WAAE,SAAC;QACR,KAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,KAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,KAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,KAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,KAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,KAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,KAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAChC,KAAI,CAAC,2BAA2B,GAAG,EAAE,CAAC;QACtC,KAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,KAAI,CAAC,eAAe,GAAG,CAAC,CAAC;QACzB,KAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,KAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAC5B,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,KAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,KAAI,CAAC,WAAW,GAAG,IAAI,CAAC;;IAC5B,CAAC;IAoDL,uBAAC;AAAD,CAAC,AA1ED,CAAsC,uBAAU,GA0E/C;AA1EY,4CAAgB;AA4E7B;IACI;IAEA,CAAC;IAOL,iCAAC;AAAD,CAAC,AAVD,IAUC;AAVY,gEAA0B;AAavC;IAA0C,wCAAU;IAChD;QACI,YAAA,MAAK,WAAE,SAAC;QACR,KAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,KAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,KAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,KAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,KAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,KAAI,CAAC,WAAW,GAAG,KAAK,CAAC;;QACzB,4DAA4D;IAChE,CAAC;IA4BL,2BAAC;AAAD,CAAC,AA1CD,CAA0C,uBAAU,GA0CnD;AA1CY,oDAAoB;AA4CjC;IACI;IACA,CAAC;IAOL,wBAAC;AAAD,CAAC,AATD,IASC;AATY,8CAAiB;AAW9B;IACI;IACA,CAAC;IAqCL,8BAAC;AAAD,CAAC,AAvCD,IAuCC;AAvCY,0DAAuB"} \ No newline at end of file +{"version":3,"file":"claimRequisistion.js","sourceRoot":"","sources":["claimRequisistion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAIvD,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC5C;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,2BAA2B,GAAG,EAAE,CAAC;QACtC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC5B,CAAC;CAoDJ;AAED,MAAM,OAAO,0BAA0B;IACnC;IAEA,CAAC;CAOJ;AAGD,MAAM,OAAO,oBAAqB,SAAQ,UAAU;IAChD;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,4DAA4D;IAChE,CAAC;CA4BJ;AAED,MAAM,OAAO,iBAAiB;IAC1B;IACA,CAAC;CAOJ;AAED,MAAM,OAAO,uBAAuB;IAChC;IACA,CAAC;CAqCJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimRule.js b/HRM.UI/ClientApp/src/app/claim/claimRule.js index 3e7a3c0..a62f7ea 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimRule.js +++ b/HRM.UI/ClientApp/src/app/claim/claimRule.js @@ -1,8 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ClaimRuleDesignations = exports.ClaimRule = void 0; -var ClaimRule = /** @class */ (function () { - function ClaimRule() { +export class ClaimRule { + constructor() { this.isAnnualBalance = false; this.onceMonthly = false; this.onceDaily = false; @@ -16,15 +13,11 @@ var ClaimRule = /** @class */ (function () { this.claimRuleDesignations = []; this.claimBasicItems = []; } - return ClaimRule; -}()); -exports.ClaimRule = ClaimRule; -var ClaimRuleDesignations = /** @class */ (function () { - function ClaimRuleDesignations() { +} +export class ClaimRuleDesignations { + constructor() { this.amount = 0; this.claimBasicItemName = ""; } - return ClaimRuleDesignations; -}()); -exports.ClaimRuleDesignations = ClaimRuleDesignations; +} //# sourceMappingURL=claimRule.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimRule.js.map b/HRM.UI/ClientApp/src/app/claim/claimRule.js.map index 17918c6..58431ea 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimRule.js.map +++ b/HRM.UI/ClientApp/src/app/claim/claimRule.js.map @@ -1 +1 @@ -{"version":3,"file":"claimRule.js","sourceRoot":"","sources":["claimRule.ts"],"names":[],"mappings":";;;AACA;IACI;QACI,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,0BAA0B,GAAG,KAAK,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC9B,CAAC;IAoBL,gBAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,8BAAS;AAoCtB;IACI;QACI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IACjC,CAAC;IAWL,4BAAC;AAAD,CAAC,AAfD,IAeC;AAfY,sDAAqB"} \ No newline at end of file +{"version":3,"file":"claimRule.js","sourceRoot":"","sources":["claimRule.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,SAAS;IAClB;QACI,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,0BAA0B,GAAG,KAAK,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC9B,CAAC;CAoBJ;AAED,MAAM,OAAO,qBAAqB;IAC9B;QACI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IACjC,CAAC;CAWJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimbasic.js b/HRM.UI/ClientApp/src/app/claim/claimbasic.js index dde7a38..a208498 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimbasic.js +++ b/HRM.UI/ClientApp/src/app/claim/claimbasic.js @@ -1,47 +1,25 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ClaimCurrentBalance = exports.ClaimBasicItem = exports.ClaimBasic = void 0; -var baseObject_1 = require("../_models/Basic/baseObject"); -var ClaimBasic = /** @class */ (function (_super) { - __extends(ClaimBasic, _super); - function ClaimBasic() { - var _this = _super.call(this) || this; - _this.itemName = undefined; - _this.itemCode = undefined; - _this.glCode = undefined; - _this.glForCredit = undefined; - _this.glForDebit = undefined; - _this.glSide = undefined; - _this.glSideCode = undefined; - _this.isPreApprovalNeeded = false; - _this.paidThroughSalary = false; - _this.allowDeductID = 0; - _this.payrollTypeID = 0; - _this.claimBasicItems = []; - _this.isField1Mandatory = false; - _this.isAttachment = false; - return _this; +import { BaseObject } from '../_models/Basic/baseObject'; +export class ClaimBasic extends BaseObject { + constructor() { + super(); + this.itemName = undefined; + this.itemCode = undefined; + this.glCode = undefined; + this.glForCredit = undefined; + this.glForDebit = undefined; + this.glSide = undefined; + this.glSideCode = undefined; + this.isPreApprovalNeeded = false; + this.paidThroughSalary = false; + this.allowDeductID = 0; + this.payrollTypeID = 0; + this.claimBasicItems = []; + this.isField1Mandatory = false; + this.isAttachment = false; } - return ClaimBasic; -}(baseObject_1.BaseObject)); -exports.ClaimBasic = ClaimBasic; -var ClaimBasicItem = /** @class */ (function () { - function ClaimBasicItem() { +} +export class ClaimBasicItem { + constructor() { this.fixedAmount = 0; this.serial = 0; this.glCode = undefined; @@ -51,16 +29,12 @@ var ClaimBasicItem = /** @class */ (function () { this.isFixedAmount = false; this.isAttachment = false; } - return ClaimBasicItem; -}()); -exports.ClaimBasicItem = ClaimBasicItem; -var ClaimCurrentBalance = /** @class */ (function () { - function ClaimCurrentBalance() { +} +export class ClaimCurrentBalance { + constructor() { this.expenseAmount = 0; this.adavnceAmount = 0; this.currentBalance = 0; } - return ClaimCurrentBalance; -}()); -exports.ClaimCurrentBalance = ClaimCurrentBalance; +} //# sourceMappingURL=claimbasic.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/claim/claimbasic.js.map b/HRM.UI/ClientApp/src/app/claim/claimbasic.js.map index 115c840..f31ea38 100644 --- a/HRM.UI/ClientApp/src/app/claim/claimbasic.js.map +++ b/HRM.UI/ClientApp/src/app/claim/claimbasic.js.map @@ -1 +1 @@ -{"version":3,"file":"claimbasic.js","sourceRoot":"","sources":["claimbasic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,0DAAyD;AAGzD;IAAgC,8BAAU;IACtC;QACI,YAAA,MAAK,WAAE,SAAC;QACR,KAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,KAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,KAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,KAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,KAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,KAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,KAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,KAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACjC,KAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,KAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,KAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,KAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,KAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,KAAI,CAAC,YAAY,GAAG,KAAK,CAAC;;IAC9B,CAAC;IA2CL,iBAAC;AAAD,CAAC,AA5DD,CAAgC,uBAAU,GA4DzC;AA5DY,gCAAU;AA8DvB;IACI;QACI,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAeL,qBAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBY,wCAAc;AA2B3B;IAEI;QACI,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC5B,CAAC;IAIL,0BAAC;AAAD,CAAC,AAVD,IAUC;AAVY,kDAAmB"} \ No newline at end of file +{"version":3,"file":"claimbasic.js","sourceRoot":"","sources":["claimbasic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAGzD,MAAM,OAAO,UAAW,SAAQ,UAAU;IACtC;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;CA2CJ;AAED,MAAM,OAAO,cAAc;IACvB;QACI,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;CAeJ;AAED,MAAM,OAAO,mBAAmB;IAE5B;QACI,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC5B,CAAC;CAIJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js b/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js new file mode 100644 index 0000000..b96ee05 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js @@ -0,0 +1,8 @@ +import { BaseObject } from "src/app/_models/Basic/baseObject"; +export class Achievement extends BaseObject { + constructor() { + super(); + this.achievementTitle = ""; + } +} +//# sourceMappingURL=achievement.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js.map b/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js.map new file mode 100644 index 0000000..ed5a566 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/core-hr/achievement/achievement.js.map @@ -0,0 +1 @@ +{"version":3,"file":"achievement.js","sourceRoot":"","sources":["achievement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,MAAM,OAAO,WAAY,SAAQ,UAAU;IAKvC;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC/B,CAAC;CACJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js b/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js index b9c6fae..07eb33c 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js +++ b/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Allergy = void 0; -var Allergy = /** @class */ (function () { - function Allergy() { - } - return Allergy; -}()); -exports.Allergy = Allergy; +export class Allergy { +} //# sourceMappingURL=allergy.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js.map b/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js.map index dfe43a6..8777a06 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/allergy/allergy.js.map @@ -1 +1 @@ -{"version":3,"file":"allergy.js","sourceRoot":"","sources":["allergy.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAIA,CAAC;IAAD,cAAC;AAAD,CAAC,AAJD,IAIC;AAJY,0BAAO"} \ No newline at end of file +{"version":3,"file":"allergy.js","sourceRoot":"","sources":["allergy.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,OAAO;CAInB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/district/district.js b/HRM.UI/ClientApp/src/app/core-hr/district/district.js index ca0335b..bcfaffd 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/district/district.js +++ b/HRM.UI/ClientApp/src/app/core-hr/district/district.js @@ -1,28 +1,7 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.District = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var District = /** @class */ (function (_super) { - __extends(District, _super); - function District() { - return _super.call(this) || this; +import { BaseObject } from '../../_models/Basic/baseObject'; +export class District extends BaseObject { + constructor() { + super(); } - return District; -}(baseObject_1.BaseObject)); -exports.District = District; +} //# sourceMappingURL=district.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/district/district.js.map b/HRM.UI/ClientApp/src/app/core-hr/district/district.js.map index 916eaf9..6535ed0 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/district/district.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/district/district.js.map @@ -1 +1 @@ -{"version":3,"file":"district.js","sourceRoot":"","sources":["district.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAE5D;IAA8B,4BAAU;IACpC;QACI,OAAA,MAAK,WAAE,SAAC;IACZ,CAAC;IAIL,eAAC;AAAD,CAAC,AAPD,CAA8B,uBAAU,GAOvC;AAPY,4BAAQ"} \ No newline at end of file +{"version":3,"file":"district.js","sourceRoot":"","sources":["district.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,QAAS,SAAQ,UAAU;IACpC;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CAIJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js b/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js index af66388..bff7a93 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js +++ b/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js @@ -1,28 +1,7 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.EducationLevel = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var EducationLevel = /** @class */ (function (_super) { - __extends(EducationLevel, _super); - function EducationLevel() { - return _super.call(this) || this; +import { BaseObject } from '../../_models/Basic/baseObject'; +export class EducationLevel extends BaseObject { + constructor() { + super(); } - return EducationLevel; -}(baseObject_1.BaseObject)); -exports.EducationLevel = EducationLevel; +} //# sourceMappingURL=education-level.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js.map b/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js.map index 3114612..c59933b 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/education-level/education-level.js.map @@ -1 +1 @@ -{"version":3,"file":"education-level.js","sourceRoot":"","sources":["education-level.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAE5D;IAAoC,kCAAU;IAC1C;QACI,OAAA,MAAK,WAAE,SAAC;IACZ,CAAC;IAIL,qBAAC;AAAD,CAAC,AAPD,CAAoC,uBAAU,GAO7C;AAPY,wCAAc"} \ No newline at end of file +{"version":3,"file":"education-level.js","sourceRoot":"","sources":["education-level.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC1C;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CAIJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js b/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js index 253b026..2f9d04f 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js +++ b/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js @@ -1,28 +1,4 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.EducationType = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var EducationType = /** @class */ (function (_super) { - __extends(EducationType, _super); - function EducationType() { - return _super !== null && _super.apply(this, arguments) || this; - } - return EducationType; -}(baseObject_1.BaseObject)); -exports.EducationType = EducationType; +import { BaseObject } from '../../_models/Basic/baseObject'; +export class EducationType extends BaseObject { +} //# sourceMappingURL=education-type.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js.map b/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js.map index 4765c45..e4afdc3 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/education-type/education-type.js.map @@ -1 +1 @@ -{"version":3,"file":"education-type.js","sourceRoot":"","sources":["education-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA0D;AAE1D;IAAmC,iCAAU;IAA7C;;IAIA,CAAC;IAAD,oBAAC;AAAD,CAAC,AAJD,CAAmC,uBAAU,GAI5C;AAJY,sCAAa"} \ No newline at end of file +{"version":3,"file":"education-type.js","sourceRoot":"","sources":["education-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAE1D,MAAM,OAAO,aAAc,SAAQ,UAAU;CAI5C"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js index 759d535..fe2596d 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.HRJoiningQuestionary = void 0; -var HRJoiningQuestionary = /** @class */ (function () { - function HRJoiningQuestionary() { - } - return HRJoiningQuestionary; -}()); -exports.HRJoiningQuestionary = HRJoiningQuestionary; +export class HRJoiningQuestionary { +} //# sourceMappingURL=HRJoiningQuestionary.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js.map index 22cbd8d..9cbf75c 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/HRJoiningQuestionary.js.map @@ -1 +1 @@ -{"version":3,"file":"HRJoiningQuestionary.js","sourceRoot":"","sources":["HRJoiningQuestionary.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAMA,CAAC;IAAD,2BAAC;AAAD,CAAC,AAND,IAMC;AANY,oDAAoB"} \ No newline at end of file +{"version":3,"file":"HRJoiningQuestionary.js","sourceRoot":"","sources":["HRJoiningQuestionary.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,oBAAoB;CAMhC"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js index d4a7d7e..c245f0b 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Hospitalization = void 0; -var Hospitalization = /** @class */ (function () { - function Hospitalization() { - } - return Hospitalization; -}()); -exports.Hospitalization = Hospitalization; +export class Hospitalization { +} //# sourceMappingURL=Hospitalization.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js.map index 4bb7d46..3ae9694 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Hospitalization.js.map @@ -1 +1 @@ -{"version":3,"file":"Hospitalization.js","sourceRoot":"","sources":["Hospitalization.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAeA,CAAC;IAAD,sBAAC;AAAD,CAAC,AAfD,IAeC;AAfY,0CAAe"} \ No newline at end of file +{"version":3,"file":"Hospitalization.js","sourceRoot":"","sources":["Hospitalization.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,eAAe;CAe3B"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js index 2f89476..71cb7cc 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Relative = void 0; -var Relative = /** @class */ (function () { - function Relative() { - } - return Relative; -}()); -exports.Relative = Relative; +export class Relative { +} //# sourceMappingURL=Relative.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js.map index 872417e..7314237 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/Relative.js.map @@ -1 +1 @@ -{"version":3,"file":"Relative.js","sourceRoot":"","sources":["Relative.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAUA,CAAC;IAAD,eAAC;AAAD,CAAC,AAVD,IAUC;AAVY,4BAAQ"} \ No newline at end of file +{"version":3,"file":"Relative.js","sourceRoot":"","sources":["Relative.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;CAUpB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js index 799b22b..5a94129 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js @@ -1,28 +1,7 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Contact = void 0; -var baseObject_1 = require("../../../_models/Basic/baseObject"); -var Contact = /** @class */ (function (_super) { - __extends(Contact, _super); - function Contact() { - return _super.call(this) || this; +import { BaseObject } from '../../../_models/Basic/baseObject'; +export class Contact extends BaseObject { + constructor() { + super(); } - return Contact; -}(baseObject_1.BaseObject)); -exports.Contact = Contact; +} //# sourceMappingURL=contact.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js.map index 6a83503..b22c559 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.js.map @@ -1 +1 @@ -{"version":3,"file":"contact.js","sourceRoot":"","sources":["contact.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAIA,gEAA+D;AAE/D;IAA6B,2BAAU;IACnC;QACI,OAAA,MAAK,WAAE,SAAC;IACZ,CAAC;IA4BL,cAAC;AAAD,CAAC,AA/BD,CAA6B,uBAAU,GA+BtC;AA/BY,0BAAO"} \ No newline at end of file +{"version":3,"file":"contact.js","sourceRoot":"","sources":["contact.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,MAAM,OAAO,OAAQ,SAAQ,UAAU;IACnC;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CA4BJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js index a09c39f..111311c 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Experience = void 0; -var Experience = /** @class */ (function () { - function Experience() { - } - return Experience; -}()); -exports.Experience = Experience; +export class Experience { +} //# sourceMappingURL=experience.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js.map index a7b6969..346f086 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/experience/experience.js.map @@ -1 +1 @@ -{"version":3,"file":"experience.js","sourceRoot":"","sources":["experience.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAgBA,CAAC;IAAD,iBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,gCAAU"} \ No newline at end of file +{"version":3,"file":"experience.js","sourceRoot":"","sources":["experience.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,UAAU;CAgBtB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js index 009a6dc..96fd291 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Guarantor = void 0; -var Guarantor = /** @class */ (function () { - function Guarantor() { - } - return Guarantor; -}()); -exports.Guarantor = Guarantor; +export class Guarantor { +} //# sourceMappingURL=guarantor.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js.map index 933a9cf..bc570f3 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/guarantor.js.map @@ -1 +1 @@ -{"version":3,"file":"guarantor.js","sourceRoot":"","sources":["guarantor.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAaA,CAAC;IAAD,gBAAC;AAAD,CAAC,AAbD,IAaC;AAbY,8BAAS"} \ No newline at end of file +{"version":3,"file":"guarantor.js","sourceRoot":"","sources":["guarantor.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,SAAS;CAarB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js index e8b7b40..73db9d6 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Language = void 0; -var Language = /** @class */ (function () { - function Language() { - } - return Language; -}()); -exports.Language = Language; +export class Language { +} //# sourceMappingURL=language.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js.map index e35b29e..b38e0a7 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/language.js.map @@ -1 +1 @@ -{"version":3,"file":"language.js","sourceRoot":"","sources":["language.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAMA,CAAC;IAAD,eAAC;AAAD,CAAC,AAND,IAMC;AANY,4BAAQ"} \ No newline at end of file +{"version":3,"file":"language.js","sourceRoot":"","sources":["language.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;CAMpB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js index a162986..993f79a 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js @@ -1,28 +1,4 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.NominationPurpose = void 0; -var baseObject_1 = require("../../../_models/Basic/baseObject"); -var NominationPurpose = /** @class */ (function (_super) { - __extends(NominationPurpose, _super); - function NominationPurpose() { - return _super !== null && _super.apply(this, arguments) || this; - } - return NominationPurpose; -}(baseObject_1.BaseObject)); -exports.NominationPurpose = NominationPurpose; +import { BaseObject } from '../../../_models/Basic/baseObject'; +export class NominationPurpose extends BaseObject { +} //# sourceMappingURL=nomination-purpose.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js.map index 9575592..dd8bb50 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nomination-purpose.js.map @@ -1 +1 @@ -{"version":3,"file":"nomination-purpose.js","sourceRoot":"","sources":["nomination-purpose.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gEAA6D;AAE7D;IAAuC,qCAAU;IAAjD;;IAGA,CAAC;IAAD,wBAAC;AAAD,CAAC,AAHD,CAAuC,uBAAU,GAGhD;AAHY,8CAAiB"} \ No newline at end of file +{"version":3,"file":"nomination-purpose.js","sourceRoot":"","sources":["nomination-purpose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAE7D,MAAM,OAAO,iBAAkB,SAAQ,UAAU;CAGhD"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js index 930a36c..6a2e973 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js @@ -1,13 +1,6 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.NomineeList = exports.Nominee = void 0; -var Nominee = /** @class */ (function () { - function Nominee() { - } - return Nominee; -}()); -exports.Nominee = Nominee; -exports.NomineeList = [ +export class Nominee { +} +export const NomineeList = [ { "id": 1, "nominationPurpose": "purpose 1", "nominationDate": "1st Jan, 2020", "nomineeName": "Name 1", "relation": "relation 1", "email": "email 1", "telephone": "telephone 1" }, { "id": 2, "nominationPurpose": "purpose 2", "nominationDate": "1st Jan, 2020", "nomineeName": "Name 2", "relation": "relation 2", "email": "email 2", "telephone": "telephone 2" }, { "id": 3, "nominationPurpose": "purpose 3", "nominationDate": "1st Jan, 2020", "nomineeName": "Name 3", "relation": "relation 3", "email": "email 3", "telephone": "telephone 3" } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js.map index 4e37211..8ea8a44 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee.js.map @@ -1 +1 @@ -{"version":3,"file":"nominee.js","sourceRoot":"","sources":["nominee.ts"],"names":[],"mappings":";;;AAKA;IAAA;IAkBA,CAAC;IAAD,cAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,0BAAO;AAqBP,QAAA,WAAW,GAAG;IACvB,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IACnL,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IACnL,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;CACtL,CAAA"} \ No newline at end of file +{"version":3,"file":"nominee.js","sourceRoot":"","sources":["nominee.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,OAAO;CAkBnB;AAGD,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IACnL,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IACnL,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;CACtL,CAAA"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js index 24f248e..8244fc8 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js @@ -1,13 +1,6 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.MembershipList = exports.Membership = void 0; -var Membership = /** @class */ (function () { - function Membership() { - } - return Membership; -}()); -exports.Membership = Membership; -exports.MembershipList = [ +export class Membership { +} +export const MembershipList = [ { "id": 1, "organization": "organization 1", "role": "role 1", "organizationType": "organizationType 1", "fromDate": "27th Dec, 2013", "toDate": "27th Dec, 2013" }, { "id": 2, "organization": "organization 2", "role": "role 2", "organizationType": "organizationType 2", "fromDate": "28th Dec, 2013", "toDate": "28th Dec, 2013" }, { "id": 3, "organization": "organization 3", "role": "role 3", "organizationType": "organizationType 3", "fromDate": "29th Dec, 2013", "toDate": "29th Dec, 2013" } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js.map index fb206a9..15422af 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/membership/membership.js.map @@ -1 +1 @@ -{"version":3,"file":"membership.js","sourceRoot":"","sources":["membership.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAUA,CAAC;IAAD,iBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,gCAAU;AAaV,QAAA,cAAc,GAAG;IAC1B,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;IACnK,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;IACnK,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;CACtK,CAAA"} \ No newline at end of file +{"version":3,"file":"membership.js","sourceRoot":"","sources":["membership.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,UAAU;CAUtB;AAGD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC1B,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;IACnK,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;IACnK,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;CACtK,CAAA"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js index d3acbae..e8079ea 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js @@ -1,13 +1,6 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.PublicationList = exports.Publication = void 0; -var Publication = /** @class */ (function () { - function Publication() { - } - return Publication; -}()); -exports.Publication = Publication; -exports.PublicationList = [ +export class Publication { +} +export const PublicationList = [ { 'id': 1, 'title': 'title 1', diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js.map index 5af3850..965d135 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/publication/publication/publication.js.map @@ -1 +1 @@ -{"version":3,"file":"publication.js","sourceRoot":"","sources":["publication.ts"],"names":[],"mappings":";;;AAEA;IAAA;IASA,CAAC;IAAD,kBAAC;AAAD,CAAC,AATD,IASC;AATY,kCAAW;AAYX,QAAA,eAAe,GAAG;IAC3B;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;IACD;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;IACD;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;CACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"publication.js","sourceRoot":"","sources":["publication.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;CASvB;AAGD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;IACD;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;IACD;QACI,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,gBAAgB;QACnC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;KACjC;CACJ,CAAC"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js index 4c950ab..f4dbd81 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js @@ -1,13 +1,6 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ReferenceList = exports.Reference = void 0; -var Reference = /** @class */ (function () { - function Reference() { - } - return Reference; -}()); -exports.Reference = Reference; -exports.ReferenceList = [ +export class Reference { +} +export const ReferenceList = [ { "id": 1, "name": "name 1", "occupation": "occupation 1", "relation": "relation 1", "address": "address", "email": "email 1", "telephone": "telephone 1" }, { "id": 2, "name": "name 2", "occupation": "occupation 2", "relation": "relation 2", "address": "address", "email": "email 2", "telephone": "telephone 2" }, { "id": 3, "name": "name 3", "occupation": "occupation 3", "relation": "relation 3", "address": "address", "email": "email 3", "telephone": "telephone 3" } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js.map index ee6dd77..475979f 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/reference/reference.js.map @@ -1 +1 @@ -{"version":3,"file":"reference.js","sourceRoot":"","sources":["reference.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAYA,CAAC;IAAD,gBAAC;AAAD,CAAC,AAZD,IAYC;AAZY,8BAAS;AAeT,QAAA,aAAa,GAAG;IACzB,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IAC3J,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IAC3J,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;CAC9J,CAAA"} \ No newline at end of file +{"version":3,"file":"reference.js","sourceRoot":"","sources":["reference.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,SAAS;CAYrB;AAGD,MAAM,CAAC,MAAM,aAAa,GAAG;IACzB,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IAC3J,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;IAC3J,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE;CAC9J,CAAA"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js index fc78fb5..29a4e61 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js @@ -1,35 +1,13 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ImmediateFamilyList = exports.ImmediateFamily = void 0; -var baseObject_1 = require("../../../../_models/Basic/baseObject"); -var ImmediateFamily = /** @class */ (function (_super) { - __extends(ImmediateFamily, _super); - function ImmediateFamily() { - var _this = _super.call(this) || this; - _this.name = ''; - _this.relation = ''; - _this.occupation = ''; - return _this; +import { BaseObject } from '../../../../_models/Basic/baseObject'; +export class ImmediateFamily extends BaseObject { + constructor() { + super(); + this.name = ''; + this.relation = ''; + this.occupation = ''; } - return ImmediateFamily; -}(baseObject_1.BaseObject)); -exports.ImmediateFamily = ImmediateFamily; -exports.ImmediateFamilyList = [ +} +export const ImmediateFamilyList = [ { "id": 1, "name": "name 1", "relation": "rel 1", "occupation": "occup 1" }, { "id": 2, "name": "name 2", "relation": "rel 2", "occupation": "occup 2" }, { "id": 3, "name": "name 3", "relation": "rel 3", "occupation": "occup 3" } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js.map index d526bb7..fb96a2d 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/immediate-family/immediate-family.js.map @@ -1 +1 @@ -{"version":3,"file":"immediate-family.js","sourceRoot":"","sources":["immediate-family.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,mEAAgE;AAEhE;IAAqC,mCAAU;IAI3C;QACI,YAAA,MAAK,WAAE,SAAC;QACR,KAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,KAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,KAAI,CAAC,UAAU,GAAG,EAAE,CAAC;;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AAVD,CAAqC,uBAAU,GAU9C;AAVY,0CAAe;AAaf,QAAA,mBAAmB,GAAG;IAC/B,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;IAC1E,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;IAC1E,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;CAC7E,CAAA"} \ No newline at end of file +{"version":3,"file":"immediate-family.js","sourceRoot":"","sources":["immediate-family.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AAEhE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAI3C;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ;AAGD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;IAC1E,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;IAC1E,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC;CAC7E,CAAA"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js index 93178f8..0b97174 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.RelativeCompany = void 0; -var RelativeCompany = /** @class */ (function () { - function RelativeCompany() { - } - return RelativeCompany; -}()); -exports.RelativeCompany = RelativeCompany; +export class RelativeCompany { +} //# sourceMappingURL=relative-company.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js.map index 3ff7882..d7296fc 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/relative/relative-in-company/relative-company.js.map @@ -1 +1 @@ -{"version":3,"file":"relative-company.js","sourceRoot":"","sources":["relative-company.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAUA,CAAC;IAAD,sBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,0CAAe"} \ No newline at end of file +{"version":3,"file":"relative-company.js","sourceRoot":"","sources":["relative-company.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,eAAe;CAU3B"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js index 848707c..203ee5e 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.WorkPlanSetup = void 0; -var WorkPlanSetup = /** @class */ (function () { - function WorkPlanSetup() { - } - return WorkPlanSetup; -}()); -exports.WorkPlanSetup = WorkPlanSetup; +export class WorkPlanSetup { +} //# sourceMappingURL=workPlanSetup.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js.map b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js.map index bc019a6..00cfff2 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/workPlanSetup.js.map @@ -1 +1 @@ -{"version":3,"file":"workPlanSetup.js","sourceRoot":"","sources":["workPlanSetup.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAOA,CAAC;IAAD,oBAAC;AAAD,CAAC,AAPD,IAOC;AAPY,sCAAa"} \ No newline at end of file +{"version":3,"file":"workPlanSetup.js","sourceRoot":"","sources":["workPlanSetup.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;CAOzB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js b/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js index 993ec6c..9137ede 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js +++ b/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js @@ -1,10 +1,8 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ExtracurricularActivity = void 0; -var ExtracurricularActivity = /** @class */ (function () { - function ExtracurricularActivity() { +import { BaseObject } from 'src/app/_models/Basic/baseObject'; +export class ExtracurricularActivity extends BaseObject { + constructor() { + super(); + this.extraCurricularTitle = ""; } - return ExtracurricularActivity; -}()); -exports.ExtracurricularActivity = ExtracurricularActivity; +} //# sourceMappingURL=extracurricular-activity.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js.map b/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js.map index 7452796..86df592 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/extracurricular-activity/extracurricular-activity.js.map @@ -1 +1 @@ -{"version":3,"file":"extracurricular-activity.js","sourceRoot":"","sources":["extracurricular-activity.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAIA,CAAC;IAAD,8BAAC;AAAD,CAAC,AAJD,IAIC;AAJY,0DAAuB"} \ No newline at end of file +{"version":3,"file":"extracurricular-activity.js","sourceRoot":"","sources":["extracurricular-activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAG9D,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAKnD;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACnC,CAAC;CACJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js b/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js index a0888ca..266962f 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js +++ b/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js @@ -1,10 +1,8 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Hobby = void 0; -var Hobby = /** @class */ (function () { - function Hobby() { +import { BaseObject } from 'src/app/_models/Basic/baseObject'; +export class Hobby extends BaseObject { + constructor() { + super(); + this.hobbyTitle = ""; } - return Hobby; -}()); -exports.Hobby = Hobby; +} //# sourceMappingURL=hobby.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js.map b/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js.map index 538aa62..7285530 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/hobby/hobby.js.map @@ -1 +1 @@ -{"version":3,"file":"hobby.js","sourceRoot":"","sources":["hobby.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAIA,CAAC;IAAD,YAAC;AAAD,CAAC,AAJD,IAIC;AAJY,sBAAK"} \ No newline at end of file +{"version":3,"file":"hobby.js","sourceRoot":"","sources":["hobby.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAG9D,MAAM,OAAO,KAAM,SAAQ,UAAU;IAMjC;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js b/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js new file mode 100644 index 0000000..f8715a5 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js @@ -0,0 +1,3 @@ +export class Institution { +} +//# sourceMappingURL=institution.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js.map b/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js.map new file mode 100644 index 0000000..ebca874 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/core-hr/institution/institution.js.map @@ -0,0 +1 @@ +{"version":3,"file":"institution.js","sourceRoot":"","sources":["institution.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;CAMvB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js b/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js index f1649bb..2fda2fe 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js +++ b/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js @@ -1,28 +1,4 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Nationality = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var Nationality = /** @class */ (function (_super) { - __extends(Nationality, _super); - function Nationality() { - return _super !== null && _super.apply(this, arguments) || this; - } - return Nationality; -}(baseObject_1.BaseObject)); -exports.Nationality = Nationality; +import { BaseObject } from "../../_models/Basic/baseObject"; +export class Nationality extends BaseObject { +} //# sourceMappingURL=nationality.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js.map b/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js.map index 52e8c98..a4c9ea3 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/nationality/nationality.js.map @@ -1 +1 @@ -{"version":3,"file":"nationality.js","sourceRoot":"","sources":["nationality.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAE5D;IAAiC,+BAAU;IAA3C;;IAGA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAHD,CAAiC,uBAAU,GAG1C;AAHY,kCAAW"} \ No newline at end of file +{"version":3,"file":"nationality.js","sourceRoot":"","sources":["nationality.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,WAAY,SAAQ,UAAU;CAG1C"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js b/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js index 5fb34c4..2e8589b 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js +++ b/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js @@ -1,28 +1,7 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Occupation = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var Occupation = /** @class */ (function (_super) { - __extends(Occupation, _super); - function Occupation() { - return _super.call(this) || this; +import { BaseObject } from '../../_models/Basic/baseObject'; +export class Occupation extends BaseObject { + constructor() { + super(); } - return Occupation; -}(baseObject_1.BaseObject)); -exports.Occupation = Occupation; +} //# sourceMappingURL=occupation.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js.map b/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js.map index 853f7bf..2c6eeab 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/occupation/occupation.js.map @@ -1 +1 @@ -{"version":3,"file":"occupation.js","sourceRoot":"","sources":["occupation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAE5D;IAAgC,8BAAU;IACtC;QACI,OAAA,MAAK,WAAE,SAAC;IACZ,CAAC;IAGL,iBAAC;AAAD,CAAC,AAND,CAAgC,uBAAU,GAMzC;AANY,gCAAU"} \ No newline at end of file +{"version":3,"file":"occupation.js","sourceRoot":"","sources":["occupation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,UAAW,SAAQ,UAAU;IACtC;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CAGJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js b/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js index 796bad4..ff428bf 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js +++ b/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js @@ -1,10 +1,8 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.OtherTalent = void 0; -var OtherTalent = /** @class */ (function () { - function OtherTalent() { +import { BaseObject } from 'src/app/_models/Basic/baseObject'; +export class OtherTalent extends BaseObject { + constructor() { + super(); + this.otherTalentsTitle = ""; } - return OtherTalent; -}()); -exports.OtherTalent = OtherTalent; +} //# sourceMappingURL=other-talent.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js.map b/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js.map index b0b9de7..0ed17e8 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/other-talent/other-talent.js.map @@ -1 +1 @@ -{"version":3,"file":"other-talent.js","sourceRoot":"","sources":["other-talent.ts"],"names":[],"mappings":";;;AAEA;IAAA;IAIA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAJD,IAIC;AAJY,kCAAW"} \ No newline at end of file +{"version":3,"file":"other-talent.js","sourceRoot":"","sources":["other-talent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAG9D,MAAM,OAAO,WAAY,SAAQ,UAAU;IAMvC;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAChC,CAAC;CACJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js b/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js index e1e192f..ed99eec 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js +++ b/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js @@ -1,28 +1,7 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; - return extendStatics(d, b); - }; - return function (d, b) { - if (typeof b !== "function" && b !== null) - throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Relation = void 0; -var baseObject_1 = require("../../_models/Basic/baseObject"); -var Relation = /** @class */ (function (_super) { - __extends(Relation, _super); - function Relation() { - return _super.call(this) || this; +import { BaseObject } from '../../_models/Basic/baseObject'; +export class Relation extends BaseObject { + constructor() { + super(); } - return Relation; -}(baseObject_1.BaseObject)); -exports.Relation = Relation; +} //# sourceMappingURL=relation.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js.map b/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js.map index e9325b3..c452704 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js.map +++ b/HRM.UI/ClientApp/src/app/core-hr/relation/relation.js.map @@ -1 +1 @@ -{"version":3,"file":"relation.js","sourceRoot":"","sources":["relation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAE5D;IAA8B,4BAAU;IACpC;QACI,OAAA,MAAK,WAAE,SAAC;IACZ,CAAC;IAGL,eAAC;AAAD,CAAC,AAND,CAA8B,uBAAU,GAMvC;AANY,4BAAQ"} \ No newline at end of file +{"version":3,"file":"relation.js","sourceRoot":"","sources":["relation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,OAAO,QAAS,SAAQ,UAAU;IACpC;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CAGJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/credit-card.js b/HRM.UI/ClientApp/src/app/credit-card.js index 5170789..9f02090 100644 --- a/HRM.UI/ClientApp/src/app/credit-card.js +++ b/HRM.UI/ClientApp/src/app/credit-card.js @@ -1,10 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.CreditCard = void 0; -var CreditCard = /** @class */ (function () { - function CreditCard() { - } - return CreditCard; -}()); -exports.CreditCard = CreditCard; +export class CreditCard { +} //# sourceMappingURL=credit-card.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/credit-card.js.map b/HRM.UI/ClientApp/src/app/credit-card.js.map index d259037..7231649 100644 --- a/HRM.UI/ClientApp/src/app/credit-card.js.map +++ b/HRM.UI/ClientApp/src/app/credit-card.js.map @@ -1 +1 @@ -{"version":3,"file":"credit-card.js","sourceRoot":"","sources":["credit-card.ts"],"names":[],"mappings":";;;AAGA;IAAA;IAWA,CAAC;IAAD,iBAAC;AAAD,CAAC,AAXD,IAWC;AAXY,gCAAU"} \ No newline at end of file +{"version":3,"file":"credit-card.js","sourceRoot":"","sources":["credit-card.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,UAAU;CAWtB"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js b/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js index bf840f3..6461f99 100644 --- a/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js +++ b/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js @@ -1,36 +1,25 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SettlementClearanceItem = exports.SettlementClearance = exports.FinalSettlementClerance = exports.FSHead = void 0; -var FSHead = /** @class */ (function () { - function FSHead() { +export class FSHead { + constructor() { this.clearanceRequired = false; this.finalStage = false; this.needDepartmentApprove = false; this.departmentToApproveBefore = null; } - return FSHead; -}()); -exports.FSHead = FSHead; -var FinalSettlementClerance = /** @class */ (function () { - function FinalSettlementClerance() { +} +export class FinalSettlementClerance { + constructor() { } - return FinalSettlementClerance; -}()); -exports.FinalSettlementClerance = FinalSettlementClerance; -var SettlementClearance = /** @class */ (function () { - function SettlementClearance() { +} +export class SettlementClearance { + constructor() { this.id = 0; } - return SettlementClearance; -}()); -exports.SettlementClearance = SettlementClearance; -var SettlementClearanceItem = /** @class */ (function () { - function SettlementClearanceItem() { +} +export class SettlementClearanceItem { + constructor() { this.checkBoxView = false; this.id = 0; this.fsTranType = null; } - return SettlementClearanceItem; -}()); -exports.SettlementClearanceItem = SettlementClearanceItem; +} //# sourceMappingURL=final-settlement.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js.map b/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js.map index def25f9..801048f 100644 --- a/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js.map +++ b/HRM.UI/ClientApp/src/app/final-settlement/final-settlement-heads/final-settlement-head/final-settlement.js.map @@ -1 +1 @@ -{"version":3,"file":"final-settlement.js","sourceRoot":"","sources":["final-settlement.ts"],"names":[],"mappings":";;;AACA;IACI;QACI,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACnC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAC1C,CAAC;IAkBL,aAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,wBAAM;AA0BnB;IACI;IAEA,CAAC;IAkBL,8BAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,0DAAuB;AAuBpC;IACI;QACI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAChB,CAAC;IASL,0BAAC;AAAD,CAAC,AAZD,IAYC;AAZY,kDAAmB;AAchC;IACI;QAkBA,iBAAY,GAAY,KAAK,CAAC;QAjB1B,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;IAgBL,8BAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,0DAAuB"} \ No newline at end of file +{"version":3,"file":"final-settlement.js","sourceRoot":"","sources":["final-settlement.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,MAAM;IACf;QACI,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACnC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAC1C,CAAC;CAkBJ;AAED,MAAM,OAAO,uBAAuB;IAChC;IAEA,CAAC;CAkBJ;AAED,MAAM,OAAO,mBAAmB;IAC5B;QACI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAChB,CAAC;CASJ;AAED,MAAM,OAAO,uBAAuB;IAChC;QAkBA,iBAAY,GAAY,KAAK,CAAC;QAjB1B,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;CAgBJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js b/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js index 743c7a3..319b978 100644 --- a/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js +++ b/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js @@ -1,7 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ControlDropDownValue = exports.BasicEntryFormControl = exports.BasicEntryForm = exports.EnumDefaultValidatorType = exports.EnumDynamicControlType = void 0; -var EnumDynamicControlType; +export var EnumDynamicControlType; (function (EnumDynamicControlType) { EnumDynamicControlType[EnumDynamicControlType["Lebel"] = 0] = "Lebel"; EnumDynamicControlType[EnumDynamicControlType["TextBox"] = 1] = "TextBox"; @@ -11,8 +8,8 @@ var EnumDynamicControlType; EnumDynamicControlType[EnumDynamicControlType["DateTime"] = 5] = "DateTime"; EnumDynamicControlType[EnumDynamicControlType["NumText"] = 6] = "NumText"; EnumDynamicControlType[EnumDynamicControlType["IntNumText"] = 7] = "IntNumText"; -})(EnumDynamicControlType || (exports.EnumDynamicControlType = EnumDynamicControlType = {})); -var EnumDefaultValidatorType; +})(EnumDynamicControlType || (EnumDynamicControlType = {})); +export var EnumDefaultValidatorType; (function (EnumDefaultValidatorType) { EnumDefaultValidatorType[EnumDefaultValidatorType["Email"] = 0] = "Email"; EnumDefaultValidatorType[EnumDefaultValidatorType["Password"] = 1] = "Password"; @@ -21,9 +18,9 @@ var EnumDefaultValidatorType; EnumDefaultValidatorType[EnumDefaultValidatorType["FromDateToDate"] = 4] = "FromDateToDate"; EnumDefaultValidatorType[EnumDefaultValidatorType["ServerSideValidator"] = 5] = "ServerSideValidator"; EnumDefaultValidatorType[EnumDefaultValidatorType["Custom"] = 6] = "Custom"; -})(EnumDefaultValidatorType || (exports.EnumDefaultValidatorType = EnumDefaultValidatorType = {})); -var BasicEntryForm = /** @class */ (function () { - function BasicEntryForm() { +})(EnumDefaultValidatorType || (EnumDefaultValidatorType = {})); +export class BasicEntryForm { + constructor() { this.formHeight = undefined; this.controls = []; this.iDValue = 0; @@ -31,9 +28,8 @@ var BasicEntryForm = /** @class */ (function () { this.parentID = -1; this.treeTier = 1; } - BasicEntryForm.prototype.AddControl = function (Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, Max, Min, readonly, CustomValidation, ServerValidation) { + AddControl(Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, Max, Min, readonly, CustomValidation, ServerValidation) { var item = new BasicEntryFormControl(Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, Max, Min, readonly, CustomValidation, ServerValidation); - debugger; //this.controls.push(new BasicEntryFormControl(Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, // Max, Min, readonly, CustomValidation, ServerValidation)); var controlID = this.controls.length.toString(); @@ -41,12 +37,10 @@ var BasicEntryForm = /** @class */ (function () { item.controlID = controlID; this.controls.push(item); return item; - }; - return BasicEntryForm; -}()); -exports.BasicEntryForm = BasicEntryForm; -var BasicEntryFormControl = /** @class */ (function () { - function BasicEntryFormControl(Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, Max, Min, readonly, CustomValidation, ServerValidation) { + } +} +export class BasicEntryFormControl { + constructor(Label, PropertyName, ControlType, DropDownValue, Required, DefaultValidationType, Max, Min, readonly, CustomValidation, ServerValidation) { this.isNew = true; this.readOnly = false; this.codeAutoGenerate = false; @@ -83,15 +77,11 @@ var BasicEntryFormControl = /** @class */ (function () { this.customValidation = CustomValidation; this.serverValidation = ServerValidation; } - return BasicEntryFormControl; -}()); -exports.BasicEntryFormControl = BasicEntryFormControl; -var ControlDropDownValue = /** @class */ (function () { - function ControlDropDownValue(keyvalue, datavalue) { +} +export class ControlDropDownValue { + constructor(keyvalue, datavalue) { this.keyValue = Number(keyvalue); this.dataValue = datavalue; } - return ControlDropDownValue; -}()); -exports.ControlDropDownValue = ControlDropDownValue; +} //# sourceMappingURL=Basic-Entry-form.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js.map b/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js.map index ddaa09b..793b42f 100644 --- a/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js.map +++ b/HRM.UI/ClientApp/src/app/form-builder/Basic-Entry-form.js.map @@ -1 +1 @@ -{"version":3,"file":"Basic-Entry-form.js","sourceRoot":"","sources":["Basic-Entry-form.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Basic-Entry-form.js","sourceRoot":"","sources":["Basic-Entry-form.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js index 6266f3f..9ab3ee8 100644 --- a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js +++ b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js @@ -1,16 +1,13 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.HnmEmployee = void 0; -var enums_1 = require("../../../_models/enums"); +import { EnumBaseStation, EnumEmployeeStatus, EnumGender, EnumMaritalStatus, EnumPaymentMode, EnumPersonType, EnumPFMembershipType, EnumProfileStatus, EnumRole, EnumTaxCircle } from '../../../_models/enums'; // do not change this class without discuss with shamim -var HnmEmployee = /** @class */ (function () { +export class HnmEmployee { // do not change this class without discuss with shamim - function HnmEmployee() { + constructor() { this.lineManager = ''; this.globalID = ''; this.employeeNo = ''; this.name = ''; - this.gender = enums_1.EnumGender.Regardless; + this.gender = EnumGender.Regardless; this.birthDate = new Date(); this.joiningDate = new Date(); this.retirementDate = new Date(); @@ -21,15 +18,15 @@ var HnmEmployee = /** @class */ (function () { this.categoryID = 0; this.categoryName = ''; this.foreignExPat = false; - this.personType = enums_1.EnumPersonType.None; - this.profileStatus = enums_1.EnumProfileStatus.Approve; - this.taxCircle = enums_1.EnumTaxCircle.CityCorporation; + this.personType = EnumPersonType.None; + this.profileStatus = EnumProfileStatus.Approve; + this.taxCircle = EnumTaxCircle.CityCorporation; this.isConfirmed = false; this.endOfContractDate = null; - this.status = enums_1.EnumEmployeeStatus.Live; + this.status = EnumEmployeeStatus.Live; this.statusName = ''; this.isShownInTaxSheet = false; - this.pfMemberType = enums_1.EnumPFMembershipType.NotYetLive; + this.pfMemberType = EnumPFMembershipType.NotYetLive; this.branchID = null; this.accountNo = ''; this.outPayBranchID = null; @@ -40,7 +37,7 @@ var HnmEmployee = /** @class */ (function () { this.locationID = null; this.religionName = ''; this.religionID = undefined; - this.maritalStatus = enums_1.EnumMaritalStatus.None; + this.maritalStatus = EnumMaritalStatus.None; this.designationName = ''; this.designationID = null; this.gradeName = ''; @@ -48,8 +45,8 @@ var HnmEmployee = /** @class */ (function () { this.basicSalary = 0; this.currentHistoryID = null; this.prevBasic = 0; - this.paymentMode = enums_1.EnumPaymentMode.Cash_Payment; - this.outPayPaymentMode = enums_1.EnumPaymentMode.Cash_Payment; + this.paymentMode = EnumPaymentMode.Cash_Payment; + this.outPayPaymentMode = EnumPaymentMode.Cash_Payment; this.fatherName = ''; this.isEligibleOT = false; this.descriptionText = ''; @@ -62,10 +59,10 @@ var HnmEmployee = /** @class */ (function () { this.positionID = null; this.positionName = ''; this.costcenterName = ''; - this.role = enums_1.EnumRole.None; + this.role = EnumRole.None; this.geId = ''; this.extraField1 = ''; - this.extraField2 = enums_1.EnumBaseStation.None; + this.extraField2 = EnumBaseStation.None; this.extraField3 = ''; this.extraField4 = ''; this.extraField5 = ''; @@ -91,23 +88,21 @@ var HnmEmployee = /** @class */ (function () { // emp.email = this.emailAddress; // return emp; //} - HnmEmployee.prototype.getStatusString = function (empStatus) { + getStatusString(empStatus) { var str = "Live"; switch (empStatus) { - case enums_1.EnumEmployeeStatus.Live: + case EnumEmployeeStatus.Live: str = "Live"; break; - case enums_1.EnumEmployeeStatus.Suspend: + case EnumEmployeeStatus.Suspend: //case EnumEmployeeStatus.Withheld: - case enums_1.EnumEmployeeStatus.IA: - case enums_1.EnumEmployeeStatus.Discontinued: + case EnumEmployeeStatus.IA: + case EnumEmployeeStatus.Discontinued: str = "Discontinued"; break; default: } return str; - }; - return HnmEmployee; -}()); -exports.HnmEmployee = HnmEmployee; + } +} //# sourceMappingURL=hnm-employee.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js.map b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js.map index 0ed4482..49235b0 100644 --- a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js.map +++ b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/hnm-employee-payroll-profile/hnm-employee.js.map @@ -1 +1 @@ -{"version":3,"file":"hnm-employee.js","sourceRoot":"","sources":["hnm-employee.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"hnm-employee.js","sourceRoot":"","sources":["hnm-employee.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js b/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js index 18538d5..515d430 100644 --- a/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js +++ b/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js @@ -1,8 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SalaryEditview = void 0; -var SalaryEditview = /** @class */ (function () { - function SalaryEditview() { +export class SalaryEditview { + constructor() { this.grossamount = 0; this.newgrossamount = 0; this.unauthMonthlyID = 0; @@ -12,7 +9,5 @@ var SalaryEditview = /** @class */ (function () { this.arrearamount = 0; this.newarrearamount = 0; } - return SalaryEditview; -}()); -exports.SalaryEditview = SalaryEditview; +} //# sourceMappingURL=salaryeditview.js.map \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js.map b/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js.map index 1a63e2d..133afec 100644 --- a/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js.map +++ b/HRM.UI/ClientApp/src/app/payroll/salary/salary-edit/salaryeditview.js.map @@ -1 +1 @@ -{"version":3,"file":"salaryeditview.js","sourceRoot":"","sources":["salaryeditview.ts"],"names":[],"mappings":";;;AAEA;IACI;QACI,IAAI,CAAC,WAAW,GAAC,CAAC,CAAC;QACnB,IAAI,CAAC,cAAc,GAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,YAAY,GAAC,CAAC,CAAC;QACpB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,YAAY,GAAC,CAAC,CAAC;QACpB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;IAE3B,CAAC;IAeL,qBAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,wCAAc"} \ No newline at end of file +{"version":3,"file":"salaryeditview.js","sourceRoot":"","sources":["salaryeditview.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,cAAc;IACvB;QACI,IAAI,CAAC,WAAW,GAAC,CAAC,CAAC;QACnB,IAAI,CAAC,cAAc,GAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,YAAY,GAAC,CAAC,CAAC;QACpB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;QACvB,IAAI,CAAC,YAAY,GAAC,CAAC,CAAC;QACpB,IAAI,CAAC,eAAe,GAAC,CAAC,CAAC;IAE3B,CAAC;CAeJ"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/styles/abstracts/_tokens.scss b/HRM.UI/ClientApp/src/styles/abstracts/_tokens.scss index d12e4ee..f476738 100644 --- a/HRM.UI/ClientApp/src/styles/abstracts/_tokens.scss +++ b/HRM.UI/ClientApp/src/styles/abstracts/_tokens.scss @@ -111,6 +111,16 @@ $empcard-success-bg: rgba(13, 158, 117, 0.10); $empcard-success-bdr: rgba(13, 158, 117, 0.25); $empcard-danger: #E05252; +// User list (authentication/users/users-list) — status badges and filter chips. +$userlist-success: #137A4B; +$userlist-success-bg: #E6F4EC; +$userlist-warning: #8A5300; +$userlist-warning-bg: #FFF2DB; +$userlist-neutral: #5B5B6B; +$userlist-neutral-bg: #EEEEF2; +$userlist-danger-bg: #FDE8EA; +$userlist-border: #E3E3EC; + // Emits the full 17-property `--brand-*` custom-property block onto whichever selector // includes it (each of the seven files below uses it on their own `:host`). Kept as runtime // CSS custom properties, not inlined $empcard-* references, because the seven files' From 2e028a211c8645d0d32d026c2dd81879f6f004d8 Mon Sep 17 00:00:00 2001 From: "salauddin.shamim" Date: Thu, 12 Nov 2026 14:58:04 +0600 Subject: [PATCH 4/4] correction --- BadLoginAttemptInfo_ClientInfo_DB_Changes.sql | 59 +++++ CLAUDE.md | 19 +- HRM.BO/Basic/BadLoginAttemptInfo.cs | 15 +- HRM.BO/Basic/UserLogInInfo.cs | 13 + HRM.BO/User/Role.cs | 7 + HRM.DA/DA/Basic/BadLoginAttemptInfoDA.cs | 19 +- HRM.DA/DA/Basic/UserLogInInfoDA.cs | 21 +- .../Basic/BadLoginAttemptInfoService.cs | 75 +++++- HRM.DA/Service/Basic/ClientRequestInfo.cs | 111 ++++++++ HRM.DA/Service/Basic/UserLogInInfoService.cs | 65 +++++ HRM.DA/Service/Users/UserService.cs | 26 +- .../app/_models/Authentication/auditTrail.ts | 49 ++++ .../src/app/_services/auth/auth.service.ts | 10 + .../authentication-routing.module.ts | 2 + .../authentication/authentication.module.ts | 8 +- .../system.audittrail.component.html | 169 +++++++++++++ .../system.audittrail.component.scss | 18 ++ .../system.audittrail.component.ts | 236 ++++++++++++++++++ .../users-entry/users-entry.component.html | 8 +- .../users-entry/users-entry.component.ts | 11 +- .../users-list/users-list.component.html | 2 +- .../users/users-list/users-list.component.ts | 24 +- .../DI/ServiceCollectionExtensions.cs | 2 + HRM.UI/Controllers/Auth/AuthController.cs | 82 +++++- HRM.UI/Startup.cs | 6 + UserLoginInfo_ClientInfo_DB_Changes.sql | 62 +++++ 26 files changed, 1086 insertions(+), 33 deletions(-) create mode 100644 BadLoginAttemptInfo_ClientInfo_DB_Changes.sql create mode 100644 HRM.DA/Service/Basic/ClientRequestInfo.cs create mode 100644 HRM.UI/ClientApp/src/app/_models/Authentication/auditTrail.ts create mode 100644 HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.html create mode 100644 HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.scss create mode 100644 HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.ts create mode 100644 UserLoginInfo_ClientInfo_DB_Changes.sql diff --git a/BadLoginAttemptInfo_ClientInfo_DB_Changes.sql b/BadLoginAttemptInfo_ClientInfo_DB_Changes.sql new file mode 100644 index 0000000..203603d --- /dev/null +++ b/BadLoginAttemptInfo_ClientInfo_DB_Changes.sql @@ -0,0 +1,59 @@ +/* ============================================================================ + Bad login attempt - client IP address and device id + ---------------------------------------------------------------------------- + BadLoginAttemptInfoService.Save now records who tried to log in: + + PCNumber computer name - reverse DNS of the client IP (falls back to the + IP when there is no name). Can be a fully-qualified host name, + so it is widened to NVARCHAR(255) below if it is narrower. + IPAddress client IP - first X-Forwarded-For entry, else the connection's + remote address. 45 chars fits the longest IPv6 text form. + DeviceId mobile / tab device id (request header X-Device-Id / DeviceId, + or set by the caller); NULL for a browser login. + + Run order: run this BEFORE deploying the matching code. BadLoginAttemptInfoDA + .Insert and BadLoginAttemptInfoService.MapObject name both new columns, so + without them every bad-login save and the System Audit Trail's "Bad Login + Attempt" tab fail. Guarded; safe to re-run. + ============================================================================ */ + +IF OBJECT_ID('dbo.BadLoginAttemptInfo') IS NULL +BEGIN + RAISERROR('dbo.BadLoginAttemptInfo does not exist on this database.', 16, 1); + RETURN; +END; +GO + +IF COL_LENGTH('dbo.BadLoginAttemptInfo', 'IPAddress') IS NULL +BEGIN + ALTER TABLE dbo.BadLoginAttemptInfo ADD IPAddress NVARCHAR(45) NULL; +END; +GO + +IF COL_LENGTH('dbo.BadLoginAttemptInfo', 'DeviceId') IS NULL +BEGIN + ALTER TABLE dbo.BadLoginAttemptInfo ADD DeviceId NVARCHAR(200) NULL; +END; +GO + +/* Widen PCNumber to NVARCHAR(255) when it is narrower (keeping its nullability), + so a long host name can not make the insert fail. MAX (-1) is left alone. */ +DECLARE @maxLength SMALLINT, @typeName SYSNAME, @isNullable BIT; + +SELECT @maxLength = c.max_length, @typeName = t.name, @isNullable = c.is_nullable +FROM sys.columns c +JOIN sys.types t ON t.user_type_id = c.user_type_id +WHERE c.object_id = OBJECT_ID('dbo.BadLoginAttemptInfo') + AND c.name = 'PCNumber'; + +IF @maxLength IS NOT NULL + AND @maxLength <> -1 + AND ( (@typeName IN ('nvarchar', 'nchar') AND @maxLength < 510) + OR (@typeName IN ('varchar', 'char') AND @maxLength < 255) ) +BEGIN + DECLARE @sql NVARCHAR(400) = + N'ALTER TABLE dbo.BadLoginAttemptInfo ALTER COLUMN PCNumber NVARCHAR(255) ' + + CASE WHEN @isNullable = 1 THEN N'NULL' ELSE N'NOT NULL' END + N';'; + EXEC sp_executesql @sql; +END; +GO diff --git a/CLAUDE.md b/CLAUDE.md index 601991f..f71d747 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -436,6 +436,16 @@ calendar's Users dropdown once came back silently empty for exactly this reason. column: use the pattern in `CalendarItemDA.UserEmailExpression`, which checks `COL_LENGTH` once per process and builds `COALESCE(EmailAddress, Email)` from whichever columns exist. Server-side SQL errors that the UI swallows land in `HRM.UI/Log/Error.log` (`ExceptionLog`), the first place to look. +Two places don't follow that pattern yet. `UserDA.Insert` writes only `Email`, so creating a user fails on a +database that lacks it (the pending `UsersEmailColumn_DB_Changes.sql` adds it; its header wrongly says Insert +writes both columns). `UserService.MapObject` +reads only `Email` (the `EmailAddress` line is commented out), so the user list's `email` is blank wherever +addresses live in `EmailAddress`. + +Gotcha in user approval: `UserDA.Approve` always sets `Status = Approved` (5), whatever the request was. So +"approving" an `Inactive_Not_Yet_Approve` (9) or `Inactive` (8) user **re-activates** them, and a deactivation +can never actually be approved. The user list labels that action "Re-activate" for this reason; the fix +belongs in the server. `PayrollTypeID` is the scoping key threaded through most payroll/attendance queries — when adding a query that returns employee data, check whether existing siblings filter by it. Reading `EmployeeID` @@ -545,8 +555,10 @@ Schema/proc changes are hand-authored `.sql` scripts named `_DB_Changes each database **manually**. They live in two places and the distinction is the whole point: - **Repo root** — the *pending* ones. `ls *_DB_Changes.sql` shows what has not been applied yet - (at the initial import there were none). Write new scripts here, in the same commit as the code - that needs them. + Write new scripts here, in the same commit as the code that needs them. The root also holds + generated DB analysis reports (`UnusedTables_.txt`, `TablesWithoutPK_.txt`). They are + input for clean-up decisions, not proof a table is safe to drop: they only scan `HRM.DA/DA` SQL and + DB objects, and `HangFire.*` is used by the library itself. - **[`db/Script/`](db/Script)** — the archive of shipped ones (`Calendar`, `MenuIcon`, `AttendanceLeaveSummaryLM`, `TaxParameterEssDeadline`, `PMS_SquareAlign_IDP`, `EmpHistoricalData`). Read them for precedent — they are the best worked examples of house style — but don't re-run one @@ -659,6 +671,9 @@ What the earlier 19 → 21 upgrade fixed in place, so don't undo it: under `src/`). Always edit the `.ts`; never the generated `.js`. - Long-running actions show the shared loading panel: `` in the template plus `loadingPanel.ShowLoadingPanel = true/false` around the call (~395 templates use it). + The flag must be on the injected **`loadingPanelService`** (`hrm-loding panel/loding.panel.service.ts`), + which is what `` reads. `UntilityHandlerService` has a same-named + `ShowLoadingPanel` that nothing renders, so ~10 older components that set it never show a spinner. Wrap every button/API action that can take a moment, and clear the flag in the error path too. ### App bootstrap and the initial route diff --git a/HRM.BO/Basic/BadLoginAttemptInfo.cs b/HRM.BO/Basic/BadLoginAttemptInfo.cs index 2d563c2..86b5a58 100644 --- a/HRM.BO/Basic/BadLoginAttemptInfo.cs +++ b/HRM.BO/Basic/BadLoginAttemptInfo.cs @@ -24,6 +24,17 @@ namespace HRM.BO public DateTime AttemptTime { get; set; } public string PCNumber { get; set; } + // Client of the failed login (BadLoginAttemptInfo_ClientInfo_DB_Changes.sql). + // Filled by BadLoginAttemptInfoService.Save from the HTTP request when not set. + public string IPAddress { get; set; } + /// Mobile / tab device id; null for a browser login. + public string DeviceId { get; set; } + + // Display only, not persisted: filled by GetAuditTrail (joined from Users) + // for the System Audit Trail screen. + public string LoginID { get; set; } + public string UserName { get; set; } + //#region Service Factory IBadLoginAttemptInfoService : IBadLoginAttemptInfoService @@ -46,9 +57,11 @@ namespace HRM.BO { BadLoginAttemptInfo Get(int id); List Get(); - int Save(BadLoginAttemptInfo item); + void Save(BadLoginAttemptInfo item); + void SaveInThread(BadLoginAttemptInfo item); List Get(DateTime dtFrom, DateTime dtTo); void Delete(int id); + List GetAuditTrail(DateTime dtFrom, DateTime dtTo); } #endregion diff --git a/HRM.BO/Basic/UserLogInInfo.cs b/HRM.BO/Basic/UserLogInInfo.cs index 8024e0c..70fd6c6 100644 --- a/HRM.BO/Basic/UserLogInInfo.cs +++ b/HRM.BO/Basic/UserLogInInfo.cs @@ -28,6 +28,18 @@ namespace HRM.BO public DateTime? LogoutTime { get; set; } public EnumLogoutType? LogoutType { get; set; } public string PCNumber { get; set; } + // Client of the login (UserLoginInfo_ClientInfo_DB_Changes.sql). + // Filled by UserLogInInfoService.Save from the HTTP request when not set. + public string IPAddress { get; set; } + /// Mobile / tab device id; null for a browser login. + public string DeviceId { get; set; } + #endregion + + #region Audit Trail (display only, not persisted) + + // Filled only by GetAuditTrail (joined from Users) for the System Audit Trail screen. + public string LoginID { get; set; } + public string UserName { get; set; } #endregion @@ -58,6 +70,7 @@ namespace HRM.BO void Delete(int id); void UpdateLogoutTime(int nLoginID); long NoofLogin(int nUserID); + List GetAuditTrail(DateTime dtFrom, DateTime dtTo); } #endregion diff --git a/HRM.BO/User/Role.cs b/HRM.BO/User/Role.cs index b426fef..5c48a2a 100644 --- a/HRM.BO/User/Role.cs +++ b/HRM.BO/User/Role.cs @@ -394,6 +394,13 @@ namespace HRM.BO routerLink = "/authentication/data-permssion", icon = "pi pi-fw pi-database", }, + new WebMenuItem() + { + uniqueName = "WEB.01.08", + label = "Audit log", + routerLink = "/authentication/system-auditlog", + icon = "pi pi-fw pi-database", + }, } }, diff --git a/HRM.DA/DA/Basic/BadLoginAttemptInfoDA.cs b/HRM.DA/DA/Basic/BadLoginAttemptInfoDA.cs index d1e4b98..521fd12 100644 --- a/HRM.DA/DA/Basic/BadLoginAttemptInfoDA.cs +++ b/HRM.DA/DA/Basic/BadLoginAttemptInfoDA.cs @@ -19,8 +19,9 @@ namespace HRM.DA internal static void Insert(TransactionContext tc, BadLoginAttemptInfo item) { - tc.ExecuteNonQuery("INSERT INTO BadLoginAttemptInfo(SlID, UserID, AttemptTime, PCNumber)" + - " VALUES(%n, %n, %D,%s)", item.ID, item.UserID, item.AttemptTime, item.PCNumber); + tc.ExecuteNonQuery("INSERT INTO BadLoginAttemptInfo(LoginID, AttemptTime, PCNumber, IPAddress, DeviceId)" + + " VALUES(%s, %D, %s, %s, %s)", + item.LoginID, item.AttemptTime, item.PCNumber, item.IPAddress, item.DeviceId); } #endregion @@ -46,6 +47,20 @@ namespace HRM.DA "select * from BadLoginAttemptInfo where AttemptTime between %D AND %D order by AttemptTime", dtf, dtt); } + // System Audit Trail: every bad login attempt in the date range (both days + // inclusive), with the user's LoginID / Name, newest first. + internal static IDataReader GetAuditTrail(TransactionContext tc, DateTime dtFrom, DateTime dtTo) + { + string sql = SQLParser.MakeSQL( + @"SELECT a.*, u.LoginID, u.UserName + FROM BadLoginAttemptInfo a + LEFT JOIN Users u ON u.LoginID = a.LoginID + WHERE a.AttemptTime >= %d AND a.AttemptTime < %d + ORDER BY a.AttemptTime DESC", + dtFrom.Date, dtTo.Date.AddDays(1)); + return tc.ExecuteReader(sql); + } + #endregion } } \ No newline at end of file diff --git a/HRM.DA/DA/Basic/UserLogInInfoDA.cs b/HRM.DA/DA/Basic/UserLogInInfoDA.cs index 0eb4111..9e3547c 100644 --- a/HRM.DA/DA/Basic/UserLogInInfoDA.cs +++ b/HRM.DA/DA/Basic/UserLogInInfoDA.cs @@ -20,9 +20,10 @@ namespace HRM.DA internal static void Insert(TransactionContext tc, UserLogInInfo item) { string sql = SQLParser.MakeSQL( - @"INSERT INTO UserLoginInfo(SLID, UserID, LoginTime, PCNumber,LogoutTime,LogoutType) - VALUES(%n, %n, %D,%s, %D,%n)", - item.ID, item.UserID, item.LoginTime, item.PCNumber, item.LogoutTime, item.LogoutType); + @"INSERT INTO UserLoginInfo(SLID, UserID, LoginTime, PCNumber, LogoutTime, LogoutType, IPAddress, DeviceId) + VALUES(%n, %n, %D, %s, %D, %n, %s, %s)", + item.ID, item.UserID, item.LoginTime, item.PCNumber, item.LogoutTime, item.LogoutType, + item.IPAddress, item.DeviceId); tc.ExecuteNonQuery(sql); } @@ -91,6 +92,20 @@ namespace HRM.DA dtf, dtt); } + // System Audit Trail: every login in the date range (both days inclusive), + // with the user's LoginID / Name, newest first. + internal static IDataReader GetAuditTrail(TransactionContext tc, DateTime dtFrom, DateTime dtTo) + { + string sql = SQLParser.MakeSQL( + @"SELECT a.*, u.LoginID, u.UserName + FROM UserLoginInfo a + LEFT JOIN Users u ON u.UserID = a.UserID + WHERE a.LoginTime >= %d AND a.LoginTime < %d + ORDER BY a.LoginTime DESC", + dtFrom.Date, dtTo.Date.AddDays(1)); + return tc.ExecuteReader(sql); + } + internal static long NoofLogin(TransactionContext tc, int UserID) { string sql = SQLParser.MakeSQL("SELECT Count(*) FROM UserLoginInfo WHERE UserID=%n ", UserID); diff --git a/HRM.DA/Service/Basic/BadLoginAttemptInfoService.cs b/HRM.DA/Service/Basic/BadLoginAttemptInfoService.cs index 7b18a44..b2f07ca 100644 --- a/HRM.DA/Service/Basic/BadLoginAttemptInfoService.cs +++ b/HRM.DA/Service/Basic/BadLoginAttemptInfoService.cs @@ -16,9 +16,11 @@ namespace HRM.DA private void MapObject(BadLoginAttemptInfo oBadLoginAttemptInfo, DataReader oReader) { base.SetObjectID(oBadLoginAttemptInfo, oReader.GetInt32("SlID").Value); - oBadLoginAttemptInfo.UserID = oReader.GetInt32("UserID", 0); + oBadLoginAttemptInfo.LoginID = oReader.GetString("LoginID"); oBadLoginAttemptInfo.AttemptTime = oReader.GetDateTime("AttemptTime").Value; oBadLoginAttemptInfo.PCNumber = oReader.GetString("PCNumber"); + oBadLoginAttemptInfo.IPAddress = oReader.GetString("IPAddress"); + oBadLoginAttemptInfo.DeviceId = oReader.GetString("DeviceId"); } protected override T CreateObject(DataReader oReader) @@ -125,19 +127,58 @@ namespace HRM.DA return BadLoginAttemptInfos; } - public int Save(BadLoginAttemptInfo oBadLoginAttemptInfo) + public List GetAuditTrail(DateTime dtFrom, DateTime dtTo) + { + List items = new List(); + TransactionContext tc = null; + try + { + tc = TransactionContext.Begin(); + DataReader dr = new DataReader(BadLoginAttemptInfoDA.GetAuditTrail(tc, dtFrom, dtTo)); + while (dr.Read()) + { + BadLoginAttemptInfo item = this.CreateObject(dr); + item.LoginID = dr.GetString("LoginID"); + item.UserName = dr.GetString("UserName"); + items.Add(item); + } + dr.Close(); + tc.End(); + } + catch (Exception e) + { + #region Handle Exception + + if (tc != null) + tc.HandleError(); + ExceptionLog.Write(e); + throw new ServiceException(e.Message, e); + + #endregion + } + + return items; + } + + public void Save(BadLoginAttemptInfo oBadLoginAttemptInfo) { TransactionContext tc = null; try { + // IP / device id come from the request (only reachable here when Save runs on + // the request thread; SaveInThread captures them before it leaves it). The + // computer name is a reverse-DNS lookup of that IP, done here because it can + // take a moment and SaveInThread runs this off the request thread. + CaptureRequestInfo(oBadLoginAttemptInfo); + if (string.IsNullOrWhiteSpace(oBadLoginAttemptInfo.PCNumber)) + oBadLoginAttemptInfo.PCNumber = ClientRequestInfo.ResolveComputerName(oBadLoginAttemptInfo.IPAddress); + tc = TransactionContext.Begin(true); - int id = tc.GenerateID("BadLoginAttemptInfo", "SlID"); - base.SetObjectID(oBadLoginAttemptInfo, id); BadLoginAttemptInfoDA.Insert(tc, oBadLoginAttemptInfo); tc.End(); - return oBadLoginAttemptInfo.ID; + } catch (Exception e) { @@ -152,6 +193,30 @@ namespace HRM.DA } } + public void SaveInThread(BadLoginAttemptInfo oBadLoginAttemptInfo) + { + // Read the request NOW: by the time the thread runs, the request may be over. + CaptureRequestInfo(oBadLoginAttemptInfo); + + System.Threading.Thread saveThread = new System.Threading.Thread(() => Save(oBadLoginAttemptInfo)) + { + IsBackground = true + }; + + saveThread.Start(); + } + + /// + /// Fills IPAddress and DeviceId from the current request, keeping whatever the caller + /// already set (e.g. the mobile login knows the DeviceID from its request body). + /// + private static void CaptureRequestInfo(BadLoginAttemptInfo oBadLoginAttemptInfo) + { + if (string.IsNullOrWhiteSpace(oBadLoginAttemptInfo.IPAddress)) + oBadLoginAttemptInfo.IPAddress = ClientRequestInfo.GetIPAddress(); + if (string.IsNullOrWhiteSpace(oBadLoginAttemptInfo.DeviceId)) + oBadLoginAttemptInfo.DeviceId = ClientRequestInfo.GetDeviceId(); + } public void Delete(int id) { diff --git a/HRM.DA/Service/Basic/ClientRequestInfo.cs b/HRM.DA/Service/Basic/ClientRequestInfo.cs new file mode 100644 index 0000000..77aff0a --- /dev/null +++ b/HRM.DA/Service/Basic/ClientRequestInfo.cs @@ -0,0 +1,111 @@ +using System; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + +namespace HRM.DA +{ + /// + /// Who is on the other end of the current HTTP request: IP address, device id + /// (mobile / tab) and computer name. + /// + /// Services in HRM.DA are created with new, not through DI, so they read the + /// request through the one that Startup hands to + /// . Read it on the request thread only: once the request + /// has finished (e.g. inside a background save thread) there is no context left. + /// + /// Note Environment.MachineName / Dns.GetHostName() are the name of + /// the web SERVER, never the user's computer. + /// + public static class ClientRequestInfo + { + /// Headers a mobile / tab app may send its device id in (first one found wins). + private static readonly string[] DeviceIdHeaders = { "X-Device-Id", "DeviceId", "DeviceID", "Device-Id" }; + + /// A reverse-DNS lookup that has no answer can hang for seconds; never wait longer than this. + private static readonly TimeSpan HostLookupTimeout = TimeSpan.FromSeconds(2); + + private static IHttpContextAccessor _accessor; + + /// Called once from Startup.Configure. + public static void Configure(IHttpContextAccessor accessor) + { + _accessor = accessor; + } + + /// The current request, or null outside a request (background thread, console job). + private static HttpContext Current => _accessor?.HttpContext; + + /// + /// The client's IP: the first X-Forwarded-For entry when behind a proxy / load balancer + /// (the same rule as the login rate limiter in Startup), else the socket's remote address. + /// + public static string GetIPAddress() + { + HttpContext context = Current; + if (context == null) + return null; + + string forwarded = context.Request.Headers["X-Forwarded-For"].FirstOrDefault(); + if (!string.IsNullOrWhiteSpace(forwarded)) + { + string first = forwarded.Split(',')[0].Trim(); + if (first != string.Empty) + return first; + } + + IPAddress remote = context.Connection.RemoteIpAddress; + if (remote == null) + return null; + if (remote.IsIPv4MappedToIPv6) + remote = remote.MapToIPv4(); + return remote.Equals(IPAddress.IPv6Loopback) + ? IPAddress.Loopback.ToString() // "::1" -> "127.0.0.1" + : remote.ToString(); + } + + /// The device id a mobile / tab app sent as a request header, or null (browser). + public static string GetDeviceId() + { + HttpContext context = Current; + if (context == null) + return null; + + foreach (string header in DeviceIdHeaders) + { + string value = context.Request.Headers[header].FirstOrDefault(); + if (!string.IsNullOrWhiteSpace(value)) + return value.Trim(); + } + return null; + } + + /// + /// The client's computer name by reverse DNS of its IP. Works on a company network + /// whose DNS registers workstations; otherwise (internet, mobile data) there is no + /// name and the IP itself is returned. Blocks for at most , + /// so call it off the request thread where possible. + /// + public static string ResolveComputerName(string ipAddress) + { + if (string.IsNullOrWhiteSpace(ipAddress) || !IPAddress.TryParse(ipAddress, out IPAddress ip)) + return ipAddress; + + if (IPAddress.IsLoopback(ip)) + return Environment.MachineName; // the user is on the server itself + + try + { + Task lookup = Dns.GetHostEntryAsync(ip); + if (lookup.Wait(HostLookupTimeout) && !string.IsNullOrWhiteSpace(lookup.Result?.HostName)) + return lookup.Result.HostName; + } + catch (Exception) + { + // No PTR record / DNS unreachable: fall back to the IP. + } + return ipAddress; + } + } +} diff --git a/HRM.DA/Service/Basic/UserLogInInfoService.cs b/HRM.DA/Service/Basic/UserLogInInfoService.cs index 03a7ac8..b20d3f1 100644 --- a/HRM.DA/Service/Basic/UserLogInInfoService.cs +++ b/HRM.DA/Service/Basic/UserLogInInfoService.cs @@ -19,6 +19,8 @@ namespace HRM.DA oUserLogInInfo.UserID = oReader.GetInt32("UserID", 0); oUserLogInInfo.LoginTime = oReader.GetDateTime("LoginTime").Value; oUserLogInInfo.PCNumber = oReader.GetString("PCNumber"); + oUserLogInInfo.IPAddress = oReader.GetString("IPAddress"); + oUserLogInInfo.DeviceId = oReader.GetString("DeviceId"); if (oReader.GetDateTime("LogoutTime") != null) oUserLogInInfo.LogoutTime = Convert.ToDateTime(oReader.GetString("LogoutTime")); oUserLogInInfo.LogoutType = oReader.GetString("LogoutType") == null @@ -217,6 +219,39 @@ namespace HRM.DA return UserLogInInfos; } + public List GetAuditTrail(DateTime dtFrom, DateTime dtTo) + { + List items = new List(); + TransactionContext tc = null; + try + { + tc = TransactionContext.Begin(); + DataReader dr = new DataReader(UserLogInInfoDA.GetAuditTrail(tc, dtFrom, dtTo)); + while (dr.Read()) + { + UserLogInInfo item = this.CreateObject(dr); + item.LoginID = dr.GetString("LoginID"); + item.UserName = dr.GetString("UserName"); + items.Add(item); + } + dr.Close(); + tc.End(); + } + catch (Exception e) + { + #region Handle Exception + + if (tc != null) + tc.HandleError(); + ExceptionLog.Write(e); + throw new ServiceException(e.Message, e); + + #endregion + } + + return items; + } + public long NoofLogin(int nUserID) { long nCount = 0; @@ -247,6 +282,10 @@ namespace HRM.DA TransactionContext tc = null; try { + // Before the transaction: the computer-name lookup can take a moment. + if (oUserLogInInfo.IsNew) + FillClientInfo(oUserLogInInfo); + tc = TransactionContext.Begin(true); if (oUserLogInInfo.IsNew) { @@ -280,6 +319,7 @@ namespace HRM.DA { if (oUserLogInInfo.IsNew) { + FillClientInfo(oUserLogInInfo); UserLogInInfoDA.Insert(tc, oUserLogInInfo); } else UserLogInInfoDA.Update(tc, oUserLogInInfo); @@ -300,6 +340,31 @@ namespace HRM.DA + /// + /// Fills IPAddress and DeviceId from the current HTTP request, keeping whatever the + /// caller already set (e.g. the mobile login knows the DeviceID from its request body). + /// Call it on the request thread BEFORE handing the login to a background thread + /// (UserService.SaveLoginfo): once the request is over there is nothing left to read. + /// + public static void CaptureRequestInfo(UserLogInInfo oUserLogInInfo) + { + if (string.IsNullOrWhiteSpace(oUserLogInInfo.IPAddress)) + oUserLogInInfo.IPAddress = ClientRequestInfo.GetIPAddress(); + if (string.IsNullOrWhiteSpace(oUserLogInInfo.DeviceId)) + oUserLogInInfo.DeviceId = ClientRequestInfo.GetDeviceId(); + } + + /// + /// IP / device id from the request (when still reachable), then the computer name: + /// reverse DNS of that IP, or the IP itself when the network has no name for it. + /// + private static void FillClientInfo(UserLogInInfo oUserLogInInfo) + { + CaptureRequestInfo(oUserLogInInfo); + if (string.IsNullOrWhiteSpace(oUserLogInInfo.PCNumber)) + oUserLogInInfo.PCNumber = ClientRequestInfo.ResolveComputerName(oUserLogInInfo.IPAddress); + } + public void Delete(int id) { //Not Needed diff --git a/HRM.DA/Service/Users/UserService.cs b/HRM.DA/Service/Users/UserService.cs index d37d59a..b34c0aa 100644 --- a/HRM.DA/Service/Users/UserService.cs +++ b/HRM.DA/Service/Users/UserService.cs @@ -437,9 +437,7 @@ namespace HRM.DA UserLogInInfo login = new UserLogInInfo(); login.UserID = userID; login.LoginTime = DateTime.Now; - login.PCNumber = Environment.MachineName + " ," + - System.Net.Dns.GetHostName() + " ," + - Environment.GetEnvironmentVariable("COMPUTERNAME"); + UserLogInInfoService.CaptureRequestInfo(login); // on the request thread, before the save thread Thread myNewThread = new Thread(() => SaveLoginfo(login)); myNewThread.Start(); } @@ -496,6 +494,7 @@ namespace HRM.DA login.UserID = oUser.ID; login.LoginTime = DateTime.Now; + UserLogInInfoService.CaptureRequestInfo(login); // on the request thread, before the save thread Thread myNewThread = new Thread(() => SaveLoginfo(login)); myNewThread.Start(); @@ -552,6 +551,7 @@ namespace HRM.DA login.UserID = oUser.ID; login.LoginTime = DateTime.Now; + UserLogInInfoService.CaptureRequestInfo(login); // on the request thread, before the save thread Thread myNewThread = new Thread(() => SaveLoginfo(login)); myNewThread.Start(); } @@ -589,6 +589,7 @@ namespace HRM.DA login.UserID = oUser.ID; login.LoginTime = DateTime.Now; login.PCNumber = hostName; + UserLogInInfoService.CaptureRequestInfo(login); // on the request thread, before the save thread Thread myNewThread = new Thread(() => SaveLoginfo(login)); myNewThread.Start(); } @@ -640,9 +641,10 @@ namespace HRM.DA public void SaveLoginfo(UserLogInInfo oTran) { - oTran.PCNumber = Environment.MachineName + " ," + - System.Net.Dns.GetHostName() + " ," + - Environment.GetEnvironmentVariable("COMPUTERNAME"); + // PCNumber used to be Environment.MachineName / Dns.GetHostName() - the web + // SERVER's name, the same for every login. UserLogInInfoService.Save now fills it + // with the client's computer name (reverse DNS of its IP) unless the caller set it + // (GetByLoginIDAndPasswordAndHostName passes the host name it was given). new UserLogInInfoService().Save(oTran); //if(GlobalFunctions.defaultConfigVal == null) //{ @@ -983,7 +985,16 @@ namespace HRM.DA if (tc != null) tc.HandleError(); ExceptionLog.Write(e); - throw new ServiceException(e.Message, e); + + // Unique index Unique_EmpNo on dbo.USERS: this employee already has a user. + for (Exception inner = e; inner != null; inner = inner.InnerException) + { + if (inner.Message.IndexOf("Cannot insert duplicate key row", StringComparison.OrdinalIgnoreCase) >= 0 + && inner.Message.IndexOf("Unique_EmpNo", StringComparison.OrdinalIgnoreCase) >= 0) + throw new ServiceException("User already exist in the system", e); + } + + throw new ServiceException("Failed to Create/Update user.", e); #endregion } } @@ -1144,6 +1155,7 @@ namespace HRM.DA login.UserID = oUser.ID; login.LoginTime = DateTime.Now; + UserLogInInfoService.CaptureRequestInfo(login); // on the request thread, before the save thread Thread myNewThread = new Thread(() => SaveLoginfo(login)); myNewThread.Start(); } diff --git a/HRM.UI/ClientApp/src/app/_models/Authentication/auditTrail.ts b/HRM.UI/ClientApp/src/app/_models/Authentication/auditTrail.ts new file mode 100644 index 0000000..d2ec992 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/_models/Authentication/auditTrail.ts @@ -0,0 +1,49 @@ +import { BaseObject } from '../Basic/baseObject'; + +/** One successful login (dbo.UserLoginInfo), as returned by api/Authentication/getUserAuditTrail. */ +export class UserLogInInfo extends BaseObject { + userID: number; + loginTime: Date; + logoutTime?: Date; + logoutType?: number; + pcNumber: string; + ipAddress: string; + /** Mobile / tab device id; null for a browser login. */ + deviceId: string; + loginID: string; + userName: string; + constructor() { + super(); + this.userID = 0; + this.loginTime = undefined; + this.logoutTime = undefined; + this.logoutType = undefined; + this.pcNumber = ''; + this.ipAddress = ''; + this.deviceId = ''; + this.loginID = ''; + this.userName = ''; + } +} + +/** One failed login (dbo.BadLoginAttemptInfo), as returned by api/Authentication/getBadLoginAuditTrail. */ +export class BadLoginAttemptInfo extends BaseObject { + userID: number; + attemptTime: Date; + pcNumber: string; + ipAddress: string; + /** Mobile / tab device id; null for a browser login. */ + deviceId: string; + loginID: string; + userName: string; + constructor() { + super(); + this.userID = 0; + this.attemptTime = undefined; + this.pcNumber = ''; + this.ipAddress = ''; + this.deviceId = ''; + this.loginID = ''; + this.userName = ''; + } +} diff --git a/HRM.UI/ClientApp/src/app/_services/auth/auth.service.ts b/HRM.UI/ClientApp/src/app/_services/auth/auth.service.ts index 32122f3..56990b7 100644 --- a/HRM.UI/ClientApp/src/app/_services/auth/auth.service.ts +++ b/HRM.UI/ClientApp/src/app/_services/auth/auth.service.ts @@ -12,6 +12,7 @@ import { PayrollType } from '../../_models/Authentication/payrollType'; import { UserRole } from '../../_models/Authentication/UserRole'; import { UserAccessType } from '../../_models/Authentication/UserAccessType'; import { PasswordHistory } from '../../_models/Authentication/passwordHistory'; +import { UserLogInInfo, BadLoginAttemptInfo } from '../../_models/Authentication/auditTrail'; import { Router } from '@angular/router'; import { Bookmark } from '../../_models/Basic/bookmark'; import { Subject } from 'rxjs'; @@ -136,6 +137,15 @@ export class AuthService { GetAllUsers() { return this.apiService.httpGet('/Authentication/getAllUsers'); } + /** Dates are sent as dd-MMM-yyyy; both days are inclusive. */ + getUserAuditTrail(fromDate: Date, toDate: Date) { + return this.apiService.httpGet('/Authentication/getUserAuditTrail/' + + this.apiService.getApiDateString(fromDate) + '/' + this.apiService.getApiDateString(toDate)); + } + getBadLoginAuditTrail(fromDate: Date, toDate: Date) { + return this.apiService.httpGet('/Authentication/getBadLoginAuditTrail/' + + this.apiService.getApiDateString(fromDate) + '/' + this.apiService.getApiDateString(toDate)); + } getBookmarks() { return this.apiService.httpGet('/Authentication/getBookmarks'); } diff --git a/HRM.UI/ClientApp/src/app/authentication/authentication-routing.module.ts b/HRM.UI/ClientApp/src/app/authentication/authentication-routing.module.ts index f237c8f..b105506 100644 --- a/HRM.UI/ClientApp/src/app/authentication/authentication-routing.module.ts +++ b/HRM.UI/ClientApp/src/app/authentication/authentication-routing.module.ts @@ -9,6 +9,7 @@ import { UserRoleComponent } from './user-role/user-role.component'; import { UserAccessTypeComponent } from './user-access-type/user-access-type.component'; import {ChangePasswordComponent} from './change-password/change-password.component'; import { DataPermssionComponent } from './data-permssion/data-permssion.component'; +import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component'; @@ -20,6 +21,7 @@ export const routes: Routes = [ { path: 'user-access-type', component: UserAccessTypeComponent, canActivate: [AuthGuard] }, { path: 'change-password', component: ChangePasswordComponent, canActivate: [AuthGuard] }, { path: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] }, + { path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] }, ]; diff --git a/HRM.UI/ClientApp/src/app/authentication/authentication.module.ts b/HRM.UI/ClientApp/src/app/authentication/authentication.module.ts index df61079..27e348b 100644 --- a/HRM.UI/ClientApp/src/app/authentication/authentication.module.ts +++ b/HRM.UI/ClientApp/src/app/authentication/authentication.module.ts @@ -107,6 +107,9 @@ import { LoadingPanelModule } from '../hrm-loding panel/loading-panel.module'; import { DataPermssionComponent } from './data-permssion/data-permssion.component'; import { CheckBoxModule } from '@progress/kendo-angular-inputs'; import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview'; +import { LayoutModule } from '@progress/kendo-angular-layout'; +import { ExcelExportModule } from '@progress/kendo-angular-excel-export'; +import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component'; @NgModule({ @@ -201,6 +204,8 @@ import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview'; //SharedModule, //BodyModule, LoadingPanelModule, + LayoutModule, + ExcelExportModule, //InputTextareaModule, ], @@ -219,7 +224,8 @@ import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview'; UserAccessTypeComponent, ChangePasswordComponent, UserComponent, - DataPermssionComponent + DataPermssionComponent, + SystemAuditTrailComponent ], providers: [ AppWindowPopUp, diff --git a/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.html b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.html new file mode 100644 index 0000000..a0c3b56 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.html @@ -0,0 +1,169 @@ + + +
+ + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + + + {{ userGrid.filteredCount | number }} of {{ userGrid.rows.length | number }} records + + + + + + + + + + + + + + + {{ userGrid.loaded ? 'No login found for this date range.' : 'Select a date range and press Load.' }} + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + + + {{ badGrid.filteredCount | number }} of {{ badGrid.rows.length | number }} records + + + + + + + + + + + + + + {{ badGrid.loaded ? 'No bad login attempt found for this date range.' : 'Select a date range and press Load.' }} + + + + + + + + + + + + + + +
+
+ +
+
diff --git a/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.scss b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.scss new file mode 100644 index 0000000..16ce36b --- /dev/null +++ b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.scss @@ -0,0 +1,18 @@ +.audit-trail-filter { + margin: 0.5rem 0 0.75rem; + align-items: center; +} + +.audit-trail-label { + margin: auto; +} + +.audit-trail-search { + width: 280px; +} + +.audit-trail-count { + margin-left: 0.5rem; + font-size: 0.875rem; + opacity: 0.75; +} diff --git a/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.ts b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.ts new file mode 100644 index 0000000..88a2187 --- /dev/null +++ b/HRM.UI/ClientApp/src/app/authentication/system-audittrail/system.audittrail.component.ts @@ -0,0 +1,236 @@ +import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import { DataStateChangeEvent, GridComponent, GridDataResult } from '@progress/kendo-angular-grid'; +import { type ExcelExportData } from '@progress/kendo-angular-excel-export'; +import { process, State } from '@progress/kendo-data-query'; +import { ApiService } from '../../app.api.service'; +import { AuthService } from '../../_services/auth/auth.service'; +import { HRMNotificationService } from '../../app.notification.service'; +import { loadingPanelService } from '../../hrm-loding panel/loding.panel.service'; +import { UserLogInInfo, BadLoginAttemptInfo } from '../../_models/Authentication/auditTrail'; + +/** Rows per virtual "page" - enough to fill the grid viewport a few times over. */ +const PAGE_SIZE = 60; + +/** Above this many rows a PDF (every row is rendered to the DOM first) would hang the browser. */ +const PDF_ROW_LIMIT = 5000; + +/** One grid row, the same shape for both tabs. */ +export interface AuditTrailRow { + loginID: string; + userName: string; + punchTime: Date; + pcNumber: string; + ipAddress: string; + deviceId: string; +} + +/** + * State of one audit-trail grid: all loaded rows, the toolbar search, and the + * grid's sort / filter / virtual-scroll state. Everything is done client side over + * the rows of the selected date range. + */ +export class AuditTrailGrid { + rows: AuditTrailRow[] = []; + private searched: AuditTrailRow[] = []; + searchText = ''; + loaded = false; + state: State = { skip: 0, take: PAGE_SIZE, sort: [{ field: 'punchTime', dir: 'desc' }], filter: { logic: 'and', filters: [] } }; + view: GridDataResult = { data: [], total: 0 }; + + constructor(private searchFields: (keyof AuditTrailRow)[]) { } + + setRows(rows: AuditTrailRow[]): void { + this.rows = rows; + this.loaded = true; + this.state = { ...this.state, skip: 0 }; + this.applySearch(); + } + + onSearch(text: string): void { + this.searchText = text ?? ''; + this.state = { ...this.state, skip: 0 }; + this.applySearch(); + } + + /** Fired for virtual scrolling, sorting, column filters and the PDF export's "all pages" pass. */ + onStateChange(state: DataStateChangeEvent): void { + this.state = state; + this.refresh(); + } + + /** Rows left after the search and the column filters (what Excel / PDF export). */ + get filteredCount(): number { + return this.view.total; + } + + /** Excel exports every searched + filtered + sorted row, not just the rendered page. */ + allData = (): ExcelExportData => ({ + data: process(this.searched, { sort: this.state.sort, filter: this.state.filter }).data + }); + + private applySearch(): void { + const text = this.searchText.trim().toLowerCase(); + this.searched = text === '' + ? this.rows + : this.rows.filter(r => this.searchFields.some(f => AuditTrailGrid.searchValue(r, f).includes(text))); + this.refresh(); + } + + private refresh(): void { + this.view = process(this.searched, this.state); + } + + private static searchValue(row: AuditTrailRow, field: keyof AuditTrailRow): string { + const value = row[field]; + if (value === undefined || value === null) { + return ''; + } + if (value instanceof Date) { + return AuditTrailGrid.formatDate(value).toLowerCase(); + } + return value.toString().toLowerCase(); + } + + /** dd-MMM-yyyy hh:mm:ss AM - the same text the grid shows, so the search matches what is on screen. */ + static formatDate(d: Date): string { + const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + const pad = (n: number) => (n < 10 ? '0' : '') + n; + const h = d.getHours() % 12 === 0 ? 12 : d.getHours() % 12; + return pad(d.getDate()) + '-' + months[d.getMonth()] + '-' + d.getFullYear() + ' ' + + pad(h) + ':' + pad(d.getMinutes()) + ':' + pad(d.getSeconds()) + ' ' + (d.getHours() < 12 ? 'AM' : 'PM'); + } +} + +@Component({ + selector: 'app-system-audittrail', + templateUrl: './system.audittrail.component.html', + styleUrls: ['./system.audittrail.component.scss'], + changeDetection: ChangeDetectionStrategy.Eager, + standalone: false, +}) +export class SystemAuditTrailComponent implements OnInit { + + readonly pageSize = PAGE_SIZE; + readonly gridDateFormat = '{0:dd-MMM-yyyy hh:mm:ss a}'; + readonly excelDateFormat = 'dd-mmm-yyyy hh:mm:ss AM/PM'; + + userFromDate: Date; + userToDate: Date; + userGrid = new AuditTrailGrid(['loginID', 'userName', 'punchTime', 'pcNumber', 'ipAddress', 'deviceId']); + + badFromDate: Date; + badToDate: Date; + badGrid = new AuditTrailGrid(['loginID', 'punchTime', 'pcNumber', 'ipAddress', 'deviceId']); + + constructor(public apiService: ApiService, + public authService: AuthService, + public notificationService: HRMNotificationService, + public loadingPanel: loadingPanelService) { + this.apiService.selectedMenuName = 'System audit log'; + } + + ngOnInit(): void { + const today = new Date(); + today.setHours(0, 0, 0, 0); + const weekAgo = new Date(today); + weekAgo.setDate(weekAgo.getDate() - 7); + + this.userFromDate = new Date(weekAgo); + this.userToDate = new Date(today); + this.badFromDate = new Date(weekAgo); + this.badToDate = new Date(today); + this.loadingPanel.ShowLoadingPanel = false; + } + + // -- Tab 1: User Audit Trail --------------------------------------------- + + loadUserAuditTrail(): void { + if (!this.validDateRange(this.userFromDate, this.userToDate)) { + return; + } + this.loadingPanel.ShowLoadingPanel = true; + this.authService.getUserAuditTrail(this.userFromDate, this.userToDate).subscribe({ + next: (items: UserLogInInfo[]) => { + this.userGrid.setRows((items ?? []).map(x => ({ + loginID: x.loginID ?? '', + userName: x.userName ?? '', + punchTime: x.loginTime ? new Date(x.loginTime) : null, + pcNumber: x.pcNumber ?? '', + ipAddress: x.ipAddress ?? '', + deviceId: x.deviceId ?? '' + }))); + this.loadingPanel.ShowLoadingPanel = false; + }, + error: (err) => { + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showError(err?.error ?? 'Could not load the user audit trail.'); + } + }); + } + + // -- Tab 2: Bad Login Attempt -------------------------------------------- + + loadBadLoginAttempts(): void { + if (!this.validDateRange(this.badFromDate, this.badToDate)) { + return; + } + this.loadingPanel.ShowLoadingPanel = true; + this.authService.getBadLoginAuditTrail(this.badFromDate, this.badToDate).subscribe({ + next: (items: BadLoginAttemptInfo[]) => { + this.badGrid.setRows((items ?? []).map(x => ({ + loginID: x.loginID ?? '', + userName: x.userName ?? '', + punchTime: x.attemptTime ? new Date(x.attemptTime) : null, + pcNumber: x.pcNumber ?? '', + ipAddress: x.ipAddress ?? '', + deviceId: x.deviceId ?? '' + }))); + this.loadingPanel.ShowLoadingPanel = false; + }, + error: (err) => { + this.loadingPanel.ShowLoadingPanel = false; + this.notificationService.showError(err?.error ?? 'Could not load the bad login attempts.'); + } + }); + } + + // -- Shared ---------------------------------------------------------------- + + /** PDF renders every row into the page first, so refuse it for very large results. */ + exportPdf(grid: GridComponent, auditGrid: AuditTrailGrid): void { + if (auditGrid.filteredCount === 0) { + this.notificationService.showError('There is no data to export.'); + return; + } + if (auditGrid.filteredCount > PDF_ROW_LIMIT) { + this.notificationService.showError('PDF export is limited to ' + PDF_ROW_LIMIT.toLocaleString() + + ' rows (' + auditGrid.filteredCount.toLocaleString() + ' now). Narrow the date range, search or filter, or use Export to Excel.'); + return; + } + grid.saveAsPDF(); + } + + exportExcel(grid: GridComponent, auditGrid: AuditTrailGrid): void { + if (auditGrid.filteredCount === 0) { + this.notificationService.showError('There is no data to export.'); + return; + } + grid.saveAsExcel(); + } + + fileName(prefix: string, from: Date, to: Date, ext: string): string { + return prefix + '_' + this.apiService.getApiDateString(from) + '_to_' + this.apiService.getApiDateString(to) + '.' + ext; + } + + private validDateRange(from: Date, to: Date): boolean { + if (!from || !to) { + this.notificationService.showError('Please select From date and To date.'); + return false; + } + if (from.getTime() > to.getTime()) { + this.notificationService.showError('From date can not be after To date.'); + return false; + } + return true; + } +} diff --git a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html index 8d33723..a12cffd 100644 --- a/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html +++ b/HRM.UI/ClientApp/src/app/authentication/users/users-entry/users-entry.component.html @@ -40,7 +40,13 @@
- + + @if (fromValidator.get('email')?.invalid && fromValidator.get('email')?.value) { + + Please enter a valid e-mail address. + + }