Index: src/app/company/settings/department/add-supervisor/add-supervisor.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/settings/department/add-supervisor/add-supervisor.component.ts b/src/app/company/settings/department/add-supervisor/add-supervisor.component.ts new file mode 100644 --- /dev/null (date 1694696926549) +++ b/src/app/company/settings/department/add-supervisor/add-supervisor.component.ts (date 1694696926549) @@ -0,0 +1,57 @@ +import {Component, Inject} from '@angular/core'; +import {ShortUser} from "../../../../models/user.model"; +import {Department} from "../../../../models/department.model"; +import {FormControl, FormGroup, Validators} from "@angular/forms"; +import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; +import {GlobalVariables} from "../../../../global-variables"; +import {DepartmentService} from "../../../../services/department.service"; +import {EmployeeService} from "../../../../services/employee.service"; + +@Component({ + selector: 'app-add-supervisor', + templateUrl: './add-supervisor.component.html', + styleUrls: ['./add-supervisor.component.scss'] +}) +export class AddSupervisorComponent { + isSubmitClicked = false; + users :ShortUser[]=[] + dep!:Department + supervisorId : any + editDepartment = new FormGroup({ + name : new FormControl('' , Validators.required), + users : new FormControl(null), + }) + members : any[]=[] + constructor( public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any, + private glovar : GlobalVariables, + private service : DepartmentService, + private employeeService : EmployeeService){ + employeeService.getAllEmployeesNoPag().then((res)=>{ + this.users=res + console.log(this.users) + }) + this.dep = data + this.supervisorId = this.dep.supervisorId + console.log(data) + service.getUsersByDepID(this.dep.id).then((res)=>{ + this.members = res.map(obj => obj.id); + }) + + } + + Submit(){ + if(this.supervisorId && this.supervisorId!=this.dep.supervisorId){ + this.isSubmitClicked = true + this.service.changeSupervisor(this.dep.id,this.supervisorId).then((res) => { + this.isSubmitClicked=false; + this.glovar.showMsg("supervisor saved successfully") + this.dialogRef.close(res) + }).catch(()=> this.dialogRef.close()) + } + else{ + this.dialogRef.close() + } + } + +} + Index: src/app/company/settings/department/add-supervisor/add-supervisor.component.html IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/settings/department/add-supervisor/add-supervisor.component.html b/src/app/company/settings/department/add-supervisor/add-supervisor.component.html new file mode 100644 --- /dev/null (date 1694696926548) +++ b/src/app/company/settings/department/add-supervisor/add-supervisor.component.html (date 1694696926548) @@ -0,0 +1,35 @@ +
+
+
+
+

{{'Add Supervisor'.toLowerCase()|translate}}

+
+
+ + +
+ +
+
+
+ + +
+
+ + + +
+
{{ user.name }}
+
{{ user.id }}
+
+ + +
+ +
+
+
+ +
+
\ No newline at end of file Index: src/app/company/settings/department/add-supervisor/add-supervisor.component.spec.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/settings/department/add-supervisor/add-supervisor.component.spec.ts b/src/app/company/settings/department/add-supervisor/add-supervisor.component.spec.ts new file mode 100644 --- /dev/null (date 1694696926549) +++ b/src/app/company/settings/department/add-supervisor/add-supervisor.component.spec.ts (date 1694696926549) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddSupervisorComponent } from './add-supervisor.component'; + +describe('AddSupervisorComponent', () => { + let component: AddSupervisorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AddSupervisorComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(AddSupervisorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: src/app/company/settings/department/department.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/settings/department/department.component.ts b/src/app/company/settings/department/department.component.ts --- a/src/app/company/settings/department/department.component.ts +++ b/src/app/company/settings/department/department.component.ts (date 1694696926550) @@ -7,6 +7,7 @@ import {Company} from "../../../models/company"; import {ActivatedRoute} from "@angular/router"; import {SharedService} from "../../../services/shared.service"; +import {AddSupervisorComponent} from "./add-supervisor/add-supervisor.component"; @Component({ selector: 'app-department', @@ -45,6 +46,21 @@ this.dataSource = [...this.dataSource]; } }) + } + addSupervisor(data:any){ + this.matDialog.open(AddSupervisorComponent,{ + width:'40%', + panelClass: 'bg-color', + data: data + }).afterClosed().subscribe((res)=>{ + if(res){ + let i = this.dataSource.findIndex((dep)=>dep.id==data.id) + if(i>-1){ + this.dataSource[i] = res + this.dataSource = [...this.dataSource]; + } + } + }) } updateDepartment(data : any){ this.matDialog.open(EditDepartmentComponent,{ Index: src/app/company/settings/department/department.component.html IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/settings/department/department.component.html b/src/app/company/settings/department/department.component.html --- a/src/app/company/settings/department/department.component.html +++ b/src/app/company/settings/department/department.component.html (date 1694696926550) @@ -1,0 +1,44 @@ +
+
+ +
{{'Department'.toLowerCase()|translate}}
+
+
+ + +
+
+
+ +
+ +
+
+ logo + + + + + + + + + + + + + +
+ {{'Name'.toLowerCase()|translate}} + + {{data.name}} + + {{'Actions'.toLowerCase()|translate}} + +
+ + +
+
+
+
\ No newline at end of file Index: src/app/company/company.module.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/company/company.module.ts b/src/app/company/company.module.ts --- a/src/app/company/company.module.ts +++ b/src/app/company/company.module.ts (date 1694696926547) @@ -33,6 +33,7 @@ import {HttpLoaderFactory, SharedModule} from "../app.module"; import { CompanybankaccountComponent } from './settings/companybankaccount/companybankaccount.component'; import { AddnewpankacoundComponent } from './settings/companybankaccount/addnewpankacound/addnewpankacound.component'; +import { AddSupervisorComponent } from './settings/department/add-supervisor/add-supervisor.component'; @@ -56,7 +57,8 @@ EditDepartmentComponent, ProfileComponent, CompanybankaccountComponent, - AddnewpankacoundComponent + AddnewpankacoundComponent, + AddSupervisorComponent ], imports: [ Index: src/app/requests/afterbiddetials/afterbiddetials.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/requests/afterbiddetials/afterbiddetials.component.ts b/src/app/requests/afterbiddetials/afterbiddetials.component.ts new file mode 100644 --- /dev/null (date 1694707631665) +++ b/src/app/requests/afterbiddetials/afterbiddetials.component.ts (date 1694707631665) @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-afterbiddetials', + templateUrl: './afterbiddetials.component.html', + styleUrls: ['./afterbiddetials.component.scss'] +}) +export class AfterbiddetialsComponent { + +} Index: src/app/requests/afterbiddetials/afterbiddetials.component.html IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/requests/afterbiddetials/afterbiddetials.component.html b/src/app/requests/afterbiddetials/afterbiddetials.component.html new file mode 100644 --- /dev/null (date 1694707631663) +++ b/src/app/requests/afterbiddetials/afterbiddetials.component.html (date 1694707631663) @@ -0,0 +1,1 @@ +

afterbiddetials works!

Index: src/app/requests/afterbiddetials/afterbiddetials.component.spec.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/requests/afterbiddetials/afterbiddetials.component.spec.ts b/src/app/requests/afterbiddetials/afterbiddetials.component.spec.ts new file mode 100644 --- /dev/null (date 1694707631664) +++ b/src/app/requests/afterbiddetials/afterbiddetials.component.spec.ts (date 1694707631664) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AfterbiddetialsComponent } from './afterbiddetials.component'; + +describe('AfterbiddetialsComponent', () => { + let component: AfterbiddetialsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AfterbiddetialsComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(AfterbiddetialsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: src/app/services/employee.service.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/services/employee.service.ts b/src/app/services/employee.service.ts --- a/src/app/services/employee.service.ts +++ b/src/app/services/employee.service.ts (date 1694696926560) @@ -21,6 +21,9 @@ addEmployee( data :any) { return lastValueFrom(this.http.post(environment.baseUrl+ `/api/v1/admin_employee_controller/add_employee`,data )) } + getCustomEmployee( id:any) { + return lastValueFrom(this.http.get(environment.baseUrl+ `/api/v1/admin_employee_controller/get_employee_by/${id}`,{} )) + } addBankInfo(id:any , data :any) { return lastValueFrom(this.http.post(environment.baseUrl+ `/api/v1/admin_employee_controller/add_bank_info/${id}`,data )) } Index: src/app/services/department.service.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/services/department.service.ts b/src/app/services/department.service.ts --- a/src/app/services/department.service.ts +++ b/src/app/services/department.service.ts (date 1694696926559) @@ -17,6 +17,9 @@ updateDepartemnt( id:any,data :any) { return lastValueFrom(this.http.patch(environment.baseUrl+ `/api/v1/admin_company_controller/update_department/${id}`,data )) } + changeSupervisor( department_id:any,user_id :any) { + return lastValueFrom(this.http.patch(environment.baseUrl+ `/api/v1/admin_company_controller/change_supervisor/${department_id}/${user_id}`,{} )) + } deleteDepartment( id:any) { return lastValueFrom(this.http.delete(environment.baseUrl+ `/api/v1/admin_company_controller/delete_department/${id}`)) } Index: src/app/services/organization-chart.service.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/services/organization-chart.service.ts b/src/app/services/organization-chart.service.ts --- a/src/app/services/organization-chart.service.ts +++ b/src/app/services/organization-chart.service.ts (date 1694696926560) @@ -19,6 +19,9 @@ getEmployeeOrganizationChartStaffByid(id:any) { return lastValueFrom(this.http.get(environment.baseUrl+ `/api/v1/organization_chart/get_employee_organization_chart_staff_by/${id}`)) } + getSupervisorOrganizationChartStaffByid(id:any) { + return lastValueFrom(this.http.get(environment.baseUrl+ `/api/v1/admin_company_controller/get_employee_organization_chart_staff_by/${id}`)) + } } Index: src/app/app.module.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/app.module.ts b/src/app/app.module.ts --- a/src/app/app.module.ts +++ b/src/app/app.module.ts (date 1694707631666) @@ -47,7 +47,8 @@ RtlPaddingDirective, ForgetpasswordComponent, VerificationCodeComponent, - NewPasswordComponent,], + NewPasswordComponent, + AfterbiddetialsComponent,], imports: [ BrowserModule, AppRoutingModule, @@ -103,6 +104,7 @@ import { ForgetpasswordComponent } from './forgetpassword/forgetpassword.component'; import { VerificationCodeComponent } from './verification-code/verification-code.component'; import { NewPasswordComponent } from './new-password/new-password.component'; +import { AfterbiddetialsComponent } from './requests/afterbiddetials/afterbiddetials.component'; @NgModule({ declarations: [ Index: src/app/human-resources/chat/chat-rooms/chat-rooms.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/human-resources/chat/chat-rooms/chat-rooms.component.ts b/src/app/human-resources/chat/chat-rooms/chat-rooms.component.ts --- a/src/app/human-resources/chat/chat-rooms/chat-rooms.component.ts +++ b/src/app/human-resources/chat/chat-rooms/chat-rooms.component.ts (date 1694696926552) @@ -45,7 +45,7 @@ selectedIndexType=0 loading : boolean company : Company - department : Department = {id:165670} + department : Department departmentID : any constructor( private wsService: WebSocketService, Index: src/app/human-resources/meeting/video-meeting/video-meeting.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/human-resources/meeting/video-meeting/video-meeting.component.ts b/src/app/human-resources/meeting/video-meeting/video-meeting.component.ts --- a/src/app/human-resources/meeting/video-meeting/video-meeting.component.ts +++ b/src/app/human-resources/meeting/video-meeting/video-meeting.component.ts (date 1694696926557) @@ -43,7 +43,7 @@ /************************LOCAL*********************/ localAudioStream: MediaStream; localVideoStream: MediaStream|null; - remoteStreams: any[][] = [] + remoteStreams: MediaStream[][] = [] videoChatContainer !: HTMLElement /************************REMOTE*********************/ @@ -359,13 +359,17 @@ console.log("handleRemoteTrackRemoval") console.log("removedTrackId",removedTrackId) console.log("streams",this.remoteStreams[remotePeerId]) - let stream = this.remoteStreams[remotePeerId].find((s)=>s.getTracks().find((t)=>t.id==removedTrackId)) + let stream = this.remoteStreams[remotePeerId].find((s) => { + console.log("tracks" , s.getTracks()) + return s.getTracks().some((t) => t.id === removedTrackId) + }); console.log("stream",stream) if(stream){ let track = stream.getTracks().find((t)=>t.id==removedTrackId) + stream.removeTrack(track) console.log("track",track) if(track) { - stream.removeTrack(track) + track.stop() console.log(`Remote track ${removedTrackId} has been removed for PeerConnection`); if(track.kind=='video'){ this.addNoVideoContainer(remotePeerId) Index: src/app/human-resources/employees/employee-tree/employee-tree.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/human-resources/employees/employee-tree/employee-tree.component.ts b/src/app/human-resources/employees/employee-tree/employee-tree.component.ts --- a/src/app/human-resources/employees/employee-tree/employee-tree.component.ts +++ b/src/app/human-resources/employees/employee-tree/employee-tree.component.ts (date 1694696926553) @@ -1,40 +1,59 @@ -import {Component, ComponentFactoryResolver, ViewChild, ViewContainerRef} from '@angular/core'; +import {Component, ComponentFactoryResolver, Input, OnInit, ViewChild, ViewContainerRef} from '@angular/core'; import {OrganizationChartService} from "../../../services/organization-chart.service"; import {TreeNode} from "primeng/api"; import {OrganizationChartUser} from "../../../models/organization-chart-user.model"; import {OrganizationChart} from "primeng/organizationchart"; import {GlobalVariables} from "../../../global-variables"; +import {DepartmentService} from "../../../services/department.service"; +import {EmployeeService} from "../../../services/employee.service"; +import {NgxSpinnerService} from "ngx-spinner"; @Component({ selector: 'app-employee-tree', templateUrl: './employee-tree.component.html', styleUrls: ['./employee-tree.component.scss'] }) -export class EmployeeTreeComponent { +export class EmployeeTreeComponent implements OnInit{ + @Input() supervisor : any @ViewChild('orgChart') orgChart: OrganizationChart; - - directors = [ - {id:1 , role : 'CPO' , name :'Mohamed'}, - {id:2 , role : 'COO' , name :'Aymen'}, - {id:3 , role : 'Team-leader' , name :'Habib'}, - {id:4 , role : 'CPO2' , name :'Rayen'}, - {id:5 , role : 'Team-leader' , name :'Mohamed'}, - {id:6 , role : 'Art director' , name :'Mohamed'}, - ] users : OrganizationChartUser[]=[] ChartUsers : TreeNode[]=[] constructor(private organizationChartService : OrganizationChartService , + private spinner : NgxSpinnerService, + private departmentService : DepartmentService, + private employeeService : EmployeeService, private glovar : GlobalVariables, private viewContainerRef: ViewContainerRef) { - organizationChartService.getEmployeeOrganizationChart().then((res)=>{ - this.users = res - organizationChartService.getEmployeeOrganizationChartStaff().then((res)=>{ - this.users = glovar.mergeItems(this.users,res) - this.generateChart() - }) - }) - } + + + } + + ngOnInit(): void { + if(this.supervisor){ + this.spinner.show() + this.employeeService.getCustomEmployee(this.supervisor).then((res)=>{ + this.users=[res] + this.generateChart() + this.getSupervisorStaffbyId(this.supervisor) + }).finally(()=>{ + this.spinner.hide() + }) + } else{ + this.spinner.show() + this.organizationChartService.getEmployeeOrganizationChart().then((res)=>{ + this.users = res + this.organizationChartService.getEmployeeOrganizationChartStaff().then((res)=>{ + this.users = this.glovar.mergeItems(this.users,res) + this.generateChart() + }).finally(()=>{ + this.spinner.hide() + }) + }).finally(()=>{ + this.spinner.hide() + }) + } } getEmployeeStaffbyId(e:any){ + this.spinner.show() this.organizationChartService.getEmployeeOrganizationChartStaffByid(e.node.data.id).then((res)=>{ if(res.length>0){ this.users = this.glovar.mergeItems(this.users,res) @@ -45,6 +64,24 @@ else{ this.glovar.showMsg('this employee has no sub-employees') } + }).finally(()=>{ + this.spinner.hide() + }) + } + getSupervisorStaffbyId(id:any){ + this.spinner.show() + this.organizationChartService.getSupervisorOrganizationChartStaffByid(id).then((res)=>{ + if(res.length>0){ + this.users = this.glovar.mergeItems(this.users,res) + this.generateChart() + this.orgChart.value = []; + this.orgChart.value = this.ChartUsers + } + else{ + this.glovar.showMsg('this employee has no sub-employees') + } + }).finally(()=>{ + this.spinner.hide() }) } generateChart(): void { Index: src/app/human-resources/employees/employees.component.ts IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/human-resources/employees/employees.component.ts b/src/app/human-resources/employees/employees.component.ts --- a/src/app/human-resources/employees/employees.component.ts +++ b/src/app/human-resources/employees/employees.component.ts (date 1694696926556) @@ -8,7 +8,10 @@ import { MatDialog } from '@angular/material/dialog'; import { PaginatedAsset } from 'src/app/models/asset'; import {ExportService} from "../../services/export.service"; -import * as FileSaver from 'file-saver'; // Import the file-saver library +import * as FileSaver from 'file-saver'; +import {DepartmentService} from "../../services/department.service"; +import {Department} from "../../models/department.model"; +import {GlobalVariables} from "../../global-variables"; // Import the file-saver library export const ELEMENT_DATA: any[] = [ {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'}, @@ -28,19 +31,22 @@ displayedColumns: string[] = ['name', 'for', 'type', 'date' , 'expiry-date' ,'actions']; - dataSource = ELEMENT_DATA; + departments : Department[]=[]; + selectedDep !:Department constructor(private router : Router,private route : ActivatedRoute, private employeeService : EmployeeService, private shared : SharedService, private spinner : NgxSpinnerService, private exportService: ExportService, - private dialog : MatDialog) { + private departmentService : DepartmentService, + private dialog : MatDialog, + private glovar : GlobalVariables) { route.queryParams.subscribe((res)=>{ if(res['page']) { if(res['chart']){ switch (res['chart']) { case 'directors' : this.selectedIndex2 = 0 ;break ; - case 'administration' : this.selectedIndex2 = 1 ;break ; + case 'administration' : this.selectedIndex2 = 1 ; this.getDepartments();this.selectedDep=undefined;break ; } }else{ if(res['page']=='Organization_chart'){ @@ -79,6 +85,15 @@ paginatedEmployees : PaginatedUsers = {size:4,nb_users:0,page:-1,users:[],pages:1} active_page=0 + getDepartments(){ + this.spinner.show() + this.departmentService.getAllDepartments().then((res)=>{ + this.departments = res + }).catch((err) => { + }).finally(()=>{ + this.spinner.hide() + }) + } onSelectionChange(value: number) { // console.log('Selected value:', value); this.active_page=0 @@ -268,7 +283,13 @@ data: empl }) } - + getDepChart(dep:Department){ + if(dep.supervisorId){ + this.selectedDep=dep + }else{ + this.glovar.showMsg('No supervisor set for this department') + } + } active_pageOffBo = 0 Index: src/app/human-resources/employees/employees.component.html IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/app/human-resources/employees/employees.component.html b/src/app/human-resources/employees/employees.component.html --- a/src/app/human-resources/employees/employees.component.html +++ b/src/app/human-resources/employees/employees.component.html (date 1694696926554) @@ -80,11 +80,27 @@ -
+
+
+
+
- + +
+ +
+
+
+ Department + {{dep.name}} + ({{dep.id}}) +
+
+ + +
Index: src/styles.scss IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/styles.scss b/src/styles.scss --- a/src/styles.scss +++ b/src/styles.scss (date 1694696926561) @@ -90,16 +90,23 @@ } } -button,input,select,textarea { +button,input,select,textarea{ outline: none !important; border: none !important; padding: 0.5em 1em !important; border-radius: 2rem !important; height: 100%; - line-height: 1.5 !important; - min-height: 2rem; + line-height: 1.5 !important; + min-height: 2rem; } -select{ +.p-dropdown{ + outline: none !important; + border: none !important; + border-radius: 2rem !important; + height: 100%; + line-height: 1 !important; + } +select,{ padding: 0.5em 2em 0.5em 1em !important; } @@ -110,7 +117,7 @@ } .mat-mdc-dialog-container .mdc-dialog__content { - button, input, select, textarea { + button, input, select, textarea,.p-dropdown { background-color: var(--color10); } } @@ -242,7 +249,7 @@ --color8 : #535390; --color9 : #44A790; - --color10 : #ffffff; + --color10 : #fafafa; --color12 : #E8F2F9; --color18 : #31317a80; --color13 : #c7c7c7; diff --git a/src/app/company/settings/department/add-supervisor/add-supervisor.component.scss b/src/app/company/settings/department/add-supervisor/add-supervisor.component.scss new file mode 100644 diff --git a/src/app/requests/afterbiddetials/afterbiddetials.component.scss b/src/app/requests/afterbiddetials/afterbiddetials.component.scss new file mode 100644