-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #574 from sunbird-cb/odcs-mapping
Odcs mapping
- Loading branch information
Showing
38 changed files
with
2,099 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ | |
| } | ||
|
|
||
| ::ng-deep .mat-drawer-container { | ||
| z-index: 999; | ||
| // z-index: 999; | ||
| } | ||
|
|
||
| .sidenav-wrap { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...rc/lib/routes/home/routes/designation/components/designations/designations.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <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> | ||
| </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> | ||
| </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> | ||
| </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-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> |
71 changes: 71 additions & 0 deletions
71
...rc/lib/routes/home/routes/designation/components/designations/designations.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| :host ::ng-deep .designationTable { | ||
| .mat-column-CBP-Menu { | ||
| max-width: 100px; | ||
| } | ||
| } | ||
|
|
||
| .organisation-lable { | ||
| font-family: 'lato'; | ||
| font-weight: 700; | ||
| font-size: 14px; | ||
| line-height: 21px; | ||
| } | ||
|
|
||
| .organisation { | ||
| width: 300px; | ||
| } | ||
|
|
||
| .btn-upload { | ||
| background: #1b4ca1 !important; | ||
| color: white !important; | ||
| font-family: 'Lato'; | ||
| font-weight: 700; | ||
| font-size: 14px; | ||
| height: 40px; | ||
| } | ||
|
|
||
| .btn-create-designation { | ||
| width: auto; | ||
| border: 1px solid #0075B7; | ||
| border-radius: 4px; | ||
| color: #0075B7 !important; | ||
| height: 40px; | ||
| } | ||
|
|
||
| .search { | ||
|
|
||
| .search-icon { | ||
| position: absolute; | ||
| top: 9px; | ||
| font-size: 20px; | ||
| left: 10px; | ||
| } | ||
|
|
||
| .rsearch { | ||
| display: flex; | ||
| position: relative; | ||
| flex: 1 1 auto; | ||
| } | ||
|
|
||
| .sinput { | ||
| width: 315px; | ||
| border-radius: 4px; | ||
| border: 1px solid #d5d0d0; | ||
| padding: 9px 9px 9px 35px; | ||
| margin-top: 0; | ||
| font: normal 14px Lato; | ||
| font-weight: 400; | ||
| } | ||
| } | ||
|
|
||
| .emptyDesignations{ | ||
| height: calc(100vh - 300px); | ||
| } | ||
|
|
||
| .download-icon { | ||
| margin-right: 5px; | ||
| } | ||
|
|
||
| .designations-loader { | ||
| height: 100px; | ||
| } |
25 changes: 25 additions & 0 deletions
25
...lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing' | ||
|
|
||
| import { DesignationsComponent } from './designations.component' | ||
|
|
||
| describe('DesignationsComponent', () => { | ||
| let component: DesignationsComponent | ||
| let fixture: ComponentFixture<DesignationsComponent> | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [DesignationsComponent], | ||
| }) | ||
| .compileComponents() | ||
| })) | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(DesignationsComponent) | ||
| component = fixture.componentInstance | ||
| fixture.detectChanges() | ||
| }) | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy() | ||
| }) | ||
| }) |
Oops, something went wrong.