Skip to content

Commit 4d78882

Browse files
christyfernandeschristyfernandes
committed
Merge branch 'cbrelease-4.8.16' of https://github.com/sunbird-cb/sunbird-cb-orgportal into odcs-mapping
2 parents 1ceb59d + 513167c commit 4d78882

File tree

11 files changed

+376
-243
lines changed

11 files changed

+376
-243
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@sunbird-cb/micro-surveys": "2.0.13",
4848
"@sunbird-cb/rain-dashboards": "0.4.33",
4949
"@sunbird-cb/resolver": "^1.0.0",
50-
"@sunbird-cb/taxonomy-editor": "^0.0.15",
50+
"@sunbird-cb/taxonomy-editor": "^0.0.18",
5151
"@sunbird-cb/utils": "^1.0.18",
5252
"@types/file-saver": "^2.0.1",
5353
"brace": "^0.11.1",

‎project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,13 @@
8686
</mat-form-field>
8787
<mat-icon class="verified-icon margin-left-xs"
8888
*ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
89-
check_circle</mat-icon>
89+
check_circle</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'"
90+
class="mat-caption status-text ws-mat-black40-text"> Verified</span>
91+
9092
<mat-icon class="nonverified-icon margin-left-xs"
9193
*ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
92-
cancel</mat-icon>
94+
cancel</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
95+
class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
9396
</div>
9497
<div class="md:w-1/3">
9598
<label class="margin-remove-bottom form-label">Designation</label>
@@ -110,9 +113,13 @@
110113
<mat-icon class="verified-icon margin-left-xs"
111114
*ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
112115
check_circle</mat-icon>
116+
<span *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'"
117+
class="mat-caption status-text ws-mat-black40-text"> Verified</span>
113118
<mat-icon class="nonverified-icon margin-left-xs"
114119
*ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
115120
cancel</mat-icon>
121+
<span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
122+
class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
116123
</div>
117124
</div>
118125
</div>

‎project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,4 +368,9 @@ label {
368368
border-radius: 4px;
369369
border: 1px solid rgba(0, 0, 0, .14);
370370
font-family: Lato;
371+
}
372+
373+
.status-text {
374+
position: relative;
375+
top: -2px;
371376
}

‎project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html

Lines changed: 77 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,87 @@
1-
<div class="flex flex-4 flex-column">
2-
<mat-card>
3-
<mat-card-title class="flex-4 mobile-margin mat-h2">
4-
My Designation Master
5-
</mat-card-title>
6-
<mat-card-content class="designationTable pt-4">
7-
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
8-
<div class="w-full flex justify-between items-center mb-6">
9-
<div class="flex items-center">
10-
<div class="search">
11-
<div class=rsearch>
12-
<mat-icon class="color-60 search-icon">search</mat-icon>
13-
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
14-
</div>
1+
<div class="flex flex-column gap-4 pt-4">
2+
<div class="flex justify-between items-center">
3+
<div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
4+
<div>
5+
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
6+
Import from Igot master
7+
</button>
8+
</div>
9+
</div>
10+
11+
<mat-card class="mb-4">
12+
<mat-card-content class="flex gap-4">
13+
<div class="section-1">
14+
<div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
15+
<ng-container *ngFor="let step of designationConfig?.topsection?.steps">
16+
<div class="flex gap-4 mb-4">
17+
<div>
18+
<mat-icon class="infoIcon">info_outlined</mat-icon>
19+
</div>
20+
<div>
21+
<p>{{step.title}}</p>
1522
</div>
1623
</div>
17-
<div class="flex items-center">
18-
<button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
19-
[routerLink]="'import-designation'" type="button">
20-
Import from Igot master
21-
</button>
24+
</ng-container>
25+
</div>
26+
<ng-container *ngIf="designationConfig?.topsection?.guideVideo?.enabled">
27+
<video width="173" height="102" controls>
28+
<source src="{{designationConfig?.topsection?.guideVideo?.url}}"
29+
type="{{designationConfig?.topsection?.guideVideo?.type}}">
30+
</video>
31+
</ng-container>
32+
<!-- <div class="designationsDemo flex justify-end section-2">
33+
<div class="designationsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
34+
<mat-icon class="video_icon mb-2">play_circle</mat-icon>
35+
<div>
36+
Watch how it works
2237
</div>
2338
</div>
24-
<ng-container *ngIf="!showLoader">
25-
<ng-container *ngIf="designationsList.length === 0; else designationsTable">
26-
<div class="w-full flex flex-col justify-center items-center emptyDesignations">
27-
<div></div>
28-
<div>
29-
<p>No designations have been added to your master's list yet</p>
30-
</div>
31-
<div class="mt-4">
32-
<button mat-raised-button [routerLink]="'import-designation'">
33-
<mat-icon class="download-icon">download</mat-icon>Start Importing</button>
34-
</div>
39+
</div> -->
40+
</mat-card-content>
41+
</mat-card>
42+
43+
<div class="w-full">
44+
<ng-container *ngIf="!showCreateLoader; else fw_create_loader">
45+
<div class="w-full flex justify-between items-center mb-6">
46+
<div class="flex items-center">
47+
<div class="search">
48+
<div class=rsearch>
49+
<mat-icon class="color-60 search-icon">search</mat-icon>
50+
<input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
51+
</div>
52+
</div>
53+
</div>
54+
</div>
55+
<ng-container *ngIf="!showLoader">
56+
<ng-container *ngIf="designationsList.length === 0; else designationsTable">
57+
<div class="w-full flex flex-col justify-center items-center emptyDesignations">
58+
<img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
59+
<div>
60+
<p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
61+
</div>
62+
<div class="mt-4">
63+
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'">
64+
Start Importing</button>
3565
</div>
36-
</ng-container>
37-
<ng-template #designationsTable>
38-
<ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
39-
[actionMenuItem]="actionMenuItem" [isSearchBar]=false
40-
(actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
41-
</ng-template>
42-
</ng-container>
43-
<ng-container *ngIf="showLoader">
44-
<div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
45-
<mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
4666
</div>
4767
</ng-container>
68+
<ng-template #designationsTable>
69+
<ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
70+
[actionMenuItem]="actionMenuItem" [isSearchBar]=false
71+
(actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
72+
</ng-template>
4873
</ng-container>
49-
<ng-template #fw_create_loader>
50-
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
51-
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
52-
<p>{{loaderMsg}}</p>
74+
<ng-container *ngIf="showLoader">
75+
<div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
76+
<mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
5377
</div>
54-
</ng-template>
55-
</mat-card-content>
56-
</mat-card>
78+
</ng-container>
79+
</ng-container>
80+
<ng-template #fw_create_loader>
81+
<div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
82+
<mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
83+
<p>{{loaderMsg}}</p>
84+
</div>
85+
</ng-template>
86+
</div>
5787
</div>

‎project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,32 @@
44
}
55
}
66

7+
.importBtn {
8+
background: #1b4ca1 !important;
9+
color: #ffffff !important;
10+
font-family: "Lato";
11+
height: 40px;
12+
font-size: 14px;
13+
font-weight: 700;
14+
width: 220px;
15+
}
16+
17+
.designationsDemo {
18+
.designationsDemoVideo {
19+
width: 290px;
20+
height: 163px;
21+
border-radius: 5px;
22+
background-color: #FDEAD5;
23+
font-weight: 600;
24+
pointer-events: all;
25+
cursor: pointer;
26+
27+
.video_icon {
28+
font-size: 32px;
29+
}
30+
}
31+
}
32+
733
.organisation-lable {
834
font-family: 'lato';
935
font-weight: 700;
@@ -58,14 +84,25 @@
5884
}
5985
}
6086

87+
.empty-desigantions-img {
88+
height: 90px;
89+
width: 170px;
90+
}
91+
6192
.emptyDesignations{
62-
height: calc(100vh - 300px);
93+
height: calc(100vh - 600px);
94+
}
95+
96+
.empty-desigantions-text {
97+
font-size: 14px;
98+
font-weight: 600;
99+
font-family: Lato;
63100
}
64101

65102
.download-icon {
66103
margin-right: 5px;
67104
}
68105

69106
.designations-loader {
70-
height: 100px;
107+
height: calc(100vh - 600px);
71108
}

‎project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export class DesignationsComponent implements OnInit {
1919

2020
environment: any
2121
designationConfig: any
22-
frameworkConfig: any
2322
configSvc: any
2423
loaderMsg = ''
2524
showCreateLoader = false
@@ -84,8 +83,8 @@ export class DesignationsComponent implements OnInit {
8483
this.tableData = {
8584
columns: [
8685
{ displayName: 'Designation', key: 'name' },
87-
{ displayName: 'Imported by', key: 'Importedby' },
88-
{ displayName: 'Imported on', key: 'Importedon' },
86+
{ displayName: 'Imported by', key: 'importedByName' },
87+
{ displayName: 'Imported on', key: 'importedOn' },
8988
],
9089
needCheckBox: false,
9190
needHash: false,
@@ -100,7 +99,6 @@ export class DesignationsComponent implements OnInit {
10099
this.environment = environment
101100
this.activateRoute.data.subscribe(data => {
102101
this.designationConfig = data.pageData.data
103-
this.frameworkConfig = this.designationConfig.frameworkConfig
104102
})
105103

106104
// console.log('this.configSvc', this.configSvc.orgReadData)
@@ -135,7 +133,7 @@ export class DesignationsComponent implements OnInit {
135133
} else {
136134
setTimeout(() => {
137135
this.getOrgReadData()
138-
}, 10000)
136+
}, 10000)
139137
}
140138
// console.log('orgFramework Details', res)
141139
})
@@ -244,7 +242,12 @@ export class DesignationsComponent implements OnInit {
244242
descriptions: [
245243
{
246244
header: '',
247-
message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
245+
messages: [
246+
{
247+
msgClass: '',
248+
msg: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
249+
},
250+
],
248251
},
249252
],
250253
footerClass: 'items-center justify-end',
@@ -289,4 +292,6 @@ export class DesignationsComponent implements OnInit {
289292

290293
//#endregion
291294

295+
// openVideoPopup() { }
296+
292297
}

0 commit comments

Comments
 (0)