Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shutov / Create interface to upload employee #2633

Open
wants to merge 81 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
cb4c633
create import/export module
MarianS23 Mar 26, 2024
4be1720
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Mar 26, 2024
0fb1610
install xlsx library
MarianS23 Mar 28, 2024
687383d
Added styles and translation
MarianS23 Mar 31, 2024
f017051
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Mar 31, 2024
8158017
added guards for tech-admin
MarianS23 Apr 1, 2024
07efb25
added validation to input field and compliance of headers with entere…
MarianS23 Apr 1, 2024
a20c26a
added filters for invalid providers
MarianS23 Apr 2, 2024
81e9d64
paginator
MarianS23 Apr 4, 2024
ce73703
added export function
MarianS23 Apr 7, 2024
c64f6ac
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 7, 2024
0834950
export providers completed
MarianS23 Apr 8, 2024
8d719a1
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 9, 2024
bbd2983
import-export data module beta
MarianS23 Apr 10, 2024
ef2dd1e
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 10, 2024
f46df26
added all validators and tooltip
MarianS23 Apr 19, 2024
71df2d7
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 19, 2024
5481ded
truncate pipe and paginator
MarianS23 Apr 23, 2024
8a4d98e
manual update
MarianS23 Apr 23, 2024
aba74d7
modify tooltip
MarianS23 Apr 23, 2024
d02d053
deleted truncate pipe ,added truncate directive and uploaded file-len…
MarianS23 Apr 25, 2024
a847405
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 25, 2024
2c2f7d3
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Apr 25, 2024
ca2ccaa
added interfaces
MarianS23 Apr 27, 2024
8d2a154
before unit-tests in import component
MarianS23 May 9, 2024
6532cbc
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 May 9, 2024
856dac1
migration update manual merge
MarianS23 May 9, 2024
0b474eb
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 May 15, 2024
149cb12
added new tests
MarianS23 May 16, 2024
790592d
added validators service
MarianS23 May 23, 2024
47aeb39
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 May 24, 2024
9c9d5b7
wrote test for import-validation service
MarianS23 May 24, 2024
e5e6f70
added rest of unit test to import-validation service
MarianS23 May 24, 2024
f76df3a
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Jun 6, 2024
8a2e7fb
added unit tests to import-providers.component
MarianS23 Jun 7, 2024
25b15fb
code improvement
MarianS23 Jun 17, 2024
f578e03
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Jun 17, 2024
bef6170
send providers method added
MarianS23 Jun 18, 2024
36cac43
code improvement,fixed formatting
MarianS23 Jun 19, 2024
62a47a8
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Jun 19, 2024
e9ccdbb
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Jul 6, 2024
d105231
Merge branch 'develop' into #2426_Create_interfase_to_upload_Excel_data
MarianS23 Aug 21, 2024
55bf4ce
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Aug 28, 2024
f3e31f1
created base component and upload employees component
MarianS23 Sep 14, 2024
7ebccb9
provider-employee-upload code improvement
MarianS23 Sep 15, 2024
c1bf13e
the base component and validation service logic is complete.Remove al…
MarianS23 Sep 21, 2024
872fa5a
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Sep 21, 2024
5ca5902
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Oct 6, 2024
6f52620
added test for base component
MarianS23 Oct 6, 2024
a6d0524
changed project domain
MarianS23 Oct 10, 2024
2c9071d
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Oct 10, 2024
703bf2a
added test for validation service
MarianS23 Oct 10, 2024
c8151da
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
MarianS23 Oct 23, 2024
1d6849d
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Oct 24, 2024
408ab02
code improvement
MarianS23 Nov 13, 2024
1a46ccf
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
MarianS23 Dec 1, 2024
3bd430a
installed tailwind dependencies
darynkka Nov 27, 2024
958a74f
shared components updated
darynkka Nov 29, 2024
b7ee1f0
shell components were updated
darynkka Dec 1, 2024
6a9d627
made changes that requested in comments
darynkka Dec 1, 2024
5de5fd2
remove flex-layout imports in some files
darynkka Dec 1, 2024
bee9f97
remove flex-flayout dependency in yarn.lock
darynkka Dec 2, 2024
3a86d49
removed custom go-to-top button and added existing in project go-to-t…
MarianS23 Dec 2, 2024
6c1ec5e
created excel processor service,moved all associated with excel logic…
MarianS23 Dec 2, 2024
a8f0b3c
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
MarianS23 Dec 2, 2024
6b1d23c
updated yarn.lock
MarianS23 Dec 2, 2024
27f727d
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Dec 2, 2024
8cbf1ab
modified excel-processor service;added duplicate validation in valida…
MarianS23 Dec 27, 2024
3464537
added load statuses
MarianS23 Dec 28, 2024
f93f4c5
added employee upload service and added few feachers
MarianS23 Jan 11, 2025
cd694b0
manual merge
MarianS23 Jan 11, 2025
86a6f96
updated yarn.lock
MarianS23 Jan 11, 2025
4efee10
update branch
MarianS23 Jan 11, 2025
8b37033
Merge branch 'develop' of https://github.com/ita-social-projects/OoS-…
MarianS23 Jan 22, 2025
e530322
branch update
MarianS23 Jan 23, 2025
e5bb3dc
update 24/01/25
MarianS23 Jan 24, 2025
cadd65e
pass tests coverage
MarianS23 Jan 26, 2025
5571fcd
update excel-upload.component.spec.ts
MarianS23 Jan 26, 2025
755f2ad
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Jan 26, 2025
f650822
Merge branch 'develop' into create_interface_to_upload_employee
MarianS23 Jan 29, 2025
bcba375
deleted all .css and css.map files
MarianS23 Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"ngx-window-token": "^7.0.0",
"rxjs": "~7.8.0",
"tslib": "^2.6.2",
"xlsx": "^0.18.5",
"zone.js": "~0.13.0"
},
"devDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ <h2 class="header-descr">{{ headerSubtitle }}</h2>
{{ 'ENUM.NAV_BAR_NAME.ADMINISTRATION' | translate }}
</button>
</a>
<a
*ngIf="user.role === Role.provider || user.role === Role.providerDeputy"
[routerLink]="'./personal-cabinet/provider/provider-employees'">
<button mat-menu-item>
{{ 'ENUM.NAV_BAR_NAME.EMPLOYEES' | translate }}
</button>
</a>
<a *ngIf="user.role === Role.provider" [routerLink]="'./personal-cabinet/provider/positions'">
<button mat-menu-item>
{{ 'ENUM.NAV_BAR_NAME.POSITIONS' | translate }}
Expand Down
2 changes: 1 addition & 1 deletion src/app/header/header.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
min-height: auto !important;
}

::ng-deep .mat-mdc-menu-item-text{
::ng-deep .mat-mdc-menu-item-text {
font-size: 13px !important;
font-family: 'Innerspace';
font-weight: 700 !important;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
@import 'src/app/shared/styles/buttons.scss';

$duplicated-value: #fd0707b3;
$empty-field: #fd07071a;
$wrong-length: #0d138980;
$wrong-language: #22b01280;
$wrong-format: #ffff0080;
$length-warning-message: #ff0000;

::ng-deep .custom-color-toggle .mdc-switch__track::before {
background-color: #e5e9f2 !important;
}
.import-buttons {
display: flex;
align-items: center;
justify-content: space-between;
.submit-btn {
margin-left: 1px;
}
.file-name {
margin-left: 1rem;
}
.btn {
text-transform: uppercase;
height: 40px;
margin-bottom: 10px;
}
.mat-raised-button {
border-radius: 20px;
height: 40px;
margin-bottom: 10px;
&:hover {
color: white;
background-color: #3849f9;
}
}
}
.file-actions {
display: flex;
}
.errors-menu {
display: flex;
width: fit-content;
.length-warning {
max-width: 200px;
line-height: 15px;
mat-card-subtitle {
color: $length-warning-message !important;
animation: pulse 3s infinite;
}
}
mat-slide-toggle {
padding-top: 5px;
}
.incorrect-row {
color: red;
}
.incorrect-row-number {
color: red;
}
}
.errors-types-tooltip {
font-size: 20px;
margin-bottom: 10px;
display: flex;
}
.errors-types {
margin: 20px 20px;
ul {
padding: 0;
list-style-type: none;
li {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
.color-box {
width: 30px;
height: 15px;
border-radius: 50px;
border: 1px solid inherit;
margin-right: 15px;
}
}
}
}
.wrapper-provider-list {
position: relative;
margin-top: 2rem;
display: flex;
justify-content: center;
}
.wrapper-provider-list-container {
display: flex;
flex-direction: row;
margin-bottom: 30px;
width: 95%;
}
.table-container {
width: 100%;
height: fit-content;
}
.custom-table-style {
width: inherit;
th,
td {
padding-left: 5px;
}
td {
max-width: 150px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
.load-result {
display: flex;
p {
line-height: 13px;
margin-left: 5px;
}
&.load-result-success > span {
color: #3849f9;
font-size: 40px;
}
&.load-result-error > span {
color: red;
font-size: 40px;
}
}
.error-field {
&-empty {
background-color: $empty-field;
}
&-duplicate {
background-color: $duplicated-value;
}
&-wrong-length {
background-color: $wrong-length;
}
&-wrong-format {
background-color: $wrong-format;
}
&-wrong-language {
background-color: $wrong-language;
}
}
.loader-container {
height: 50px;
margin-left: 15px;
display: flex;
align-items: center;
}
.loader {
align-self: baseline;
margin: 15px;
width: 8px;
aspect-ratio: 1;
border-radius: 50%;
animation: loader 1s infinite linear alternate;
}
@keyframes loader {
MarianS23 marked this conversation as resolved.
Show resolved Hide resolved
0% {
box-shadow:
10px 0 #3849f9,
-10px 0 #3849f933;
background: #3849f9;
}
33% {
box-shadow:
10px 0 #3849f9,
-10px 0 #3849f933;
background: #3849f933;
}
66% {
box-shadow:
10px 0 #3849f933,
-10px 0 #3849f9;
background: #3849f933;
}
100% {
box-shadow:
10px 0 #3849f933,
-10px 0 #3849f9;
background: #3849f9;
}
}
@keyframes pulse {
0% {
color: $length-warning-message;
}
50% {
opacity: 0.2;
}
100% {
color: $length-warning-message;
}
}
::ng-deep .import-providers-table-tooltip {
color: #f6f6f6;
background-color: #505050;
border-radius: 4px;
font-size: 12px;
margin: 14px 14px 14px 5px;
max-width: 300px;
padding-left: 8px;
padding-right: 8px;
overflow: hidden;
text-overflow: unset !important;
transform: scale(1.3) !important;
}
@media screen and (max-width: 930px) {
.import-buttons {
align-items: flex-start;
justify-content: space-between;
}
.errors-menu {
padding-top: 5px;
}
mat-slide-toggle {
position: relative;
.incorrect-row {
display: none !important;
}
}
}
Loading
Loading