Skip to content

Commit

Permalink
Merge pull request #577 from mansurskTarento/odcs-designations
Browse files Browse the repository at this point in the history
Odcs designations
  • Loading branch information
christyfernandes authored Jul 24, 2024
2 parents cb955fb + 490dbe5 commit 4839091
Show file tree
Hide file tree
Showing 8 changed files with 354 additions and 238 deletions.
Original file line number Diff line number Diff line change
@@ -1,57 +1,87 @@
<div class="flex flex-4 flex-column">
<mat-card>
<mat-card-title class="flex-4 mobile-margin mat-h2">
My Designation Master
</mat-card-title>
<mat-card-content class="designationTable pt-4">
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
<div class="w-full flex justify-between items-center mb-6">
<div class="flex items-center">
<div class="search">
<div class=rsearch>
<mat-icon class="color-60 search-icon">search</mat-icon>
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
</div>
<div class="flex flex-column gap-4 pt-4">
<div class="flex justify-between items-center">
<div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
<div>
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
Import from Igot master
</button>
</div>
</div>

<mat-card class="mb-4">
<mat-card-content class="flex gap-4">
<div class="section-1">
<div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
<ng-container *ngFor="let step of designationConfig?.topsection?.steps">
<div class="flex gap-4 mb-4">
<div>
<mat-icon class="infoIcon">info_outlined</mat-icon>
</div>
<div>
<p>{{step.title}}</p>
</div>
</div>
<div class="flex items-center">
<button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
[routerLink]="'import-designation'" type="button">
Import from Igot master
</button>
</ng-container>
</div>
<ng-container *ngIf="designationConfig?.topsection?.guideVideo?.enabled">
<video width="173" height="102" controls>
<source src="{{designationConfig?.topsection?.guideVideo?.url}}"
type="{{designationConfig?.topsection?.guideVideo?.type}}">
</video>
</ng-container>
<!-- <div class="designationsDemo flex justify-end section-2">
<div class="designationsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
<mat-icon class="video_icon mb-2">play_circle</mat-icon>
<div>
Watch how it works
</div>
</div>
<ng-container *ngIf="!showLoader">
<ng-container *ngIf="designationsList.length === 0; else designationsTable">
<div class="w-full flex flex-col justify-center items-center emptyDesignations">
<div></div>
<div>
<p>No designations have been added to your master's list yet</p>
</div>
<div class="mt-4">
<button mat-raised-button [routerLink]="'import-designation'">
<mat-icon class="download-icon">download</mat-icon>Start Importing</button>
</div>
</div> -->
</mat-card-content>
</mat-card>

<div class="w-full">
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
<div class="w-full flex justify-between items-center mb-6">
<div class="flex items-center">
<div class="search">
<div class=rsearch>
<mat-icon class="color-60 search-icon">search</mat-icon>
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
</div>
</div>
</div>
</div>
<ng-container *ngIf="!showLoader">
<ng-container *ngIf="designationsList.length === 0; else designationsTable">
<div class="w-full flex flex-col justify-center items-center emptyDesignations">
<img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
<div>
<p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
</div>
<div class="mt-4">
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'">
Start Importing</button>
</div>
</ng-container>
<ng-template #designationsTable>
<ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
[actionMenuItem]="actionMenuItem" [isSearchBar]=false
(actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
</ng-template>
</ng-container>
<ng-container *ngIf="showLoader">
<div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
<mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
</div>
</ng-container>
<ng-template #designationsTable>
<ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
[actionMenuItem]="actionMenuItem" [isSearchBar]=false
(actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
</ng-template>
</ng-container>
<ng-template #fw_create_loader>
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
<p>{{loaderMsg}}</p>
<ng-container *ngIf="showLoader">
<div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
<mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
</div>
</ng-template>
</mat-card-content>
</mat-card>
</ng-container>
</ng-container>
<ng-template #fw_create_loader>
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
<p>{{loaderMsg}}</p>
</div>
</ng-template>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@
}
}

.importBtn {
background: #1b4ca1 !important;
color: #ffffff !important;
font-family: "Lato";
height: 40px;
font-size: 14px;
font-weight: 700;
width: 220px;
}

.designationsDemo {
.designationsDemoVideo {
width: 290px;
height: 163px;
border-radius: 5px;
background-color: #FDEAD5;
font-weight: 600;
pointer-events: all;
cursor: pointer;

.video_icon {
font-size: 32px;
}
}
}

.organisation-lable {
font-family: 'lato';
font-weight: 700;
Expand Down Expand Up @@ -58,14 +84,25 @@
}
}

.empty-desigantions-img {
height: 90px;
width: 170px;
}

.emptyDesignations{
height: calc(100vh - 300px);
height: calc(100vh - 600px);
}

.empty-desigantions-text {
font-size: 14px;
font-weight: 600;
font-family: Lato;
}

.download-icon {
margin-right: 5px;
}

.designations-loader {
height: 100px;
height: calc(100vh - 600px);
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export class DesignationsComponent implements OnInit {

environment: any
designationConfig: any
frameworkConfig: any
configSvc: any
loaderMsg = ''
showCreateLoader = false
Expand Down Expand Up @@ -84,8 +83,8 @@ export class DesignationsComponent implements OnInit {
this.tableData = {
columns: [
{ displayName: 'Designation', key: 'name' },
{ displayName: 'Imported by', key: 'Importedby' },
{ displayName: 'Imported on', key: 'Importedon' },
{ displayName: 'Imported by', key: 'importedByName' },
{ displayName: 'Imported on', key: 'importedOn' },
],
needCheckBox: false,
needHash: false,
Expand All @@ -100,7 +99,6 @@ export class DesignationsComponent implements OnInit {
this.environment = environment
this.activateRoute.data.subscribe(data => {
this.designationConfig = data.pageData.data
this.frameworkConfig = this.designationConfig.frameworkConfig
})

// console.log('this.configSvc', this.configSvc.orgReadData)
Expand Down Expand Up @@ -289,4 +287,6 @@ export class DesignationsComponent implements OnInit {

//#endregion

// openVideoPopup() { }

}
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
<div class="flex flex-4 flex-column">
<mat-card>
<mat-card-title class="flex-4 mobile-margin mat-h2">
Import from Igot Master
</mat-card-title>
<mat-card-content class="master-designations pt-4">
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
<div class="w-full flex justify-between items-center mb-6">
<div class="flex items-center">
<div class="search">
<div class=rsearch>
<mat-icon class="color-60 search-icon">search</mat-icon>
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
</div>
<div class="flex flex-column">
<div class="flex w-full justify-between items-center">
<div class="flex gap-5 items-center">
<mat-icon class="backicon" (click)="navigateToMyDesignations()">arrow_back</mat-icon>
<div class="text-capitalize mat-h2 header-text">Import From Igot Master</div>
</div>

<div class="flex gap-5">
<button mat-raised-button (click)="navigateToMyDesignations()" class="cancel-btn">
Cancel</button>
<button [ngClass]="selectedDesignationsList.length === 0 ? 'disabl-btn' : 'importBtn'" mat-raised-button
(click)="importDesignations()" class="importBtn">Import
Selected
Designations</button>
</div>
</div>
<div class="master-designations pt-4">
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
<div class="w-full flex justify-between items-center mb-6">
<div class="flex items-center">
<div class="search">
<div class=rsearch>
<mat-icon class="color-60 search-icon">search</mat-icon>
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
</div>
</div>
</div>
<ng-container *ngIf="selctedDesignationsCount > 0">
<div class="flex flex-row mb-4">
</div>
<ng-container *ngIf="selctedDesignationsCount > 0">
<div class="flex flex-row mb-4 gap-4 items-center w-full">
<div class="flex flex-row gap-4 w-full">
<div class="flex flex-2 flex-middle w-full flex-wrap gap-4">
<div class="selected-designation-label">Selected designations - </div>
<ng-container *ngFor="let item of selectedDesignationsList | slice : 0 : 10">
Expand All @@ -31,52 +43,50 @@
</ng-container>
<ng-container *ngIf="selctedDesignationsCount > 10">
<a mat-button class="select-more-link margin-left-m"
(click)="openPreviewPoup()">+{{selctedDesignationsCount - 10}} more</a>
(click)="openPreviewPoup()">+{{selctedDesignationsCount
-
10}} more</a>
</ng-container>
</div>
<!-- <div class="flex flex-1 flex-row right-section flex-middle">
<a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
</div> -->
</div>
</ng-container>
<div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
<ng-container *ngFor="let designation of igotDesignationsList let i = index">
<div class="flex flex-4 custom-user-card items-center justify-center"
[ngClass]="{'active-card': designation?.selected, 'disableCard': designation?.isOrgDesignation}">
<div class="custom-user-desc">
<p>{{designation?.designation | titlecase}}</p>
</div>
<div class="flex items-center">
<!-- <button></button> -->
<a mat-button (click)="removeDesignation(selectedDesignationsList)" class="clearAll">Clear all</a>
</div>
</div>
</ng-container>
<div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
<ng-container *ngFor="let designation of igotDesignationsList let i = index">
<div class="flex flex-4 custom-user-card items-center justify-center" [ngClass]="{'active-card': (designation?.selected && !designation?.isOrgDesignation),
'disableCard': designation?.isOrgDesignation}">
<div class="custom-user-desc">
<p>{{designation?.designation | titlecase}}</p>
</div>

<div class="check-action">
<mat-checkbox [checked]="designation?.selected" [disabled]="designation?.isOrgDesignation"
(change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
</div>
<div class="check-action">
<mat-checkbox [checked]="designation?.selected" [disabled]="designation?.isOrgDesignation"
(change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
</div>
</ng-container>
<ng-container *ngIf="igotDesignationsList.length === 0">
<div class=" w-full flex justify-center items-center">
<div class="my-8 mx-4">
<p>No designations found</p>
</div>
</div>
</ng-container>
<ng-container *ngIf="igotDesignationsList.length === 0">
<div class=" w-full flex justify-center items-center">
<div class="my-8 mx-4">
<p>No designations found</p>
</div>
</ng-container>
</div>
<div class="flex flex-row justify-center">
<mat-paginator [length]="deisgnationsCount" [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
(page)="onChangePage($event)"></mat-paginator>
</div>
<div class="flex justify-end items-center">
<button mat-raised-button (click)="importDesignations()"
class="importBtn flex items-center justify-center">Import selected
designations</button>
</div>
</ng-container>
<ng-template #fw_create_loader>
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
<p>{{loaderMsg}}</p>
</div>
</ng-template>
</mat-card-content>
</mat-card>
</div>
</ng-container>
</div>
<div class="flex flex-row justify-center">
<mat-paginator [length]="deisgnationsCount" [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
(page)="onChangePage($event)"></mat-paginator>
</div>
</ng-container>
<ng-template #fw_create_loader>
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
<p>{{loaderMsg}}</p>
</div>
</ng-template>
</div>
</div>
Loading

0 comments on commit 4839091

Please sign in to comment.