Skip to content

Commit 2e570b6

Browse files
vishnubansaltarentovishnubansaltarento
authored
Merge pull request #212 from venkykandagaddala/create-sectors
Create sectors - KB-3249
2 parents 9de2241 + 0d9d960 commit 2e570b6

33 files changed

+3725
-7
lines changed

‎project/ws/app/src/lib/routes/home/home.module.ts‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CommsComponent } from './routes/comms/comms.component'
22
import { NgModule } from '@angular/core'
33
import { CommonModule } from '@angular/common'
4-
import { PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule, ImageCropModule } from '@sunbird-cb/utils'
4+
import { PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule } from '@sunbird-cb/utils'
55
import { MatGridListModule } from '@angular/material/grid-list'
66
import { MatExpansionModule } from '@angular/material/expansion'
77
import { MatDividerModule } from '@angular/material/divider'
@@ -27,6 +27,7 @@ import {
2727
MAT_DIALOG_DATA,
2828
MatDatepickerModule,
2929
MatNativeDateModule,
30+
MatButtonToggleModule,
3031
} from '@angular/material'
3132
import { MatCardModule } from '@angular/material/card'
3233
import { ReactiveFormsModule, FormsModule } from '@angular/forms'
@@ -43,6 +44,8 @@ import {
4344
UIORGTableModule,
4445
ScrollspyLeftMenuModule,
4546
} from '@sunbird-cb/collection'
47+
// TO-DO need to enable for image crop
48+
//import { ImageCropModule } from './routes/image-crop/image-crop.module'
4649
import { AboutComponent } from './routes/about/about.component'
4750
import { RolesAccessComponent } from './routes/roles-access/roles-access.component'
4851
import { DirectoryViewComponent } from './routes/directory/directroy.component'
@@ -74,6 +77,11 @@ import { EditEventComponent } from './routes/events/edit-event/edit-event.compon
7477
import { PipePublicURLModule } from './pipes/pipe-public-URL/pipe-public-URL.module'
7578
import { AcbpReportsComponent } from './routes/acbp-reports/acbp-reports.component'
7679
import { GeneralReportsComponent } from './routes/general-reports/general-reports.component'
80+
import { SectorsComponent } from './routes/sectors/sectors.component'
81+
import { SectorListViewComponent } from './routes/sectors/sector-list-view/sector-list-view.component'
82+
import { AddSectorComponent } from './routes/sectors/add-sector/add-sector.component'
83+
import { EditSectorComponent } from './routes/sectors/edit-sector/edit-sector.component'
84+
import { AddThumbnailComponent } from './routes/add-thumbnail/add-thumbnail.component'
7785
@NgModule({
7886
declarations: [
7987
HomeComponent,
@@ -96,10 +104,15 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
96104
CommsComponent,
97105
AcbpReportsComponent,
98106
GeneralReportsComponent,
107+
SectorsComponent,
108+
AddSectorComponent,
109+
EditSectorComponent,
110+
AddThumbnailComponent,
99111
EventsListComponent,
100112
EventListViewComponent,
101113
EventThumbnailComponent,
102114
CreateEventComponent,
115+
SectorListViewComponent,
103116
EditEventComponent,
104117
ParticipantsComponent,
105118
SuccessComponent,
@@ -130,6 +143,7 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
130143
MatInputModule,
131144
MatDialogModule,
132145
MatButtonModule,
146+
MatButtonToggleModule,
133147
MatSidenavModule,
134148
MatCheckboxModule,
135149
MatProgressSpinnerModule,
@@ -145,7 +159,8 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
145159
BtnPageBackModuleAdmin,
146160
WidgetResolverModule,
147161
UserAutocompleteModule,
148-
ImageCropModule,
162+
// TO-DO need to enable for image crop
163+
//ImageCropModule,
149164
UIAdminTableModule,
150165
UIORGTableModule,
151166
MatTableModule,
@@ -154,6 +169,8 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
154169
MatPaginatorModule,
155170
PipePublicURLModule,
156171
ScrollspyLeftMenuModule,
172+
// TO-DO need to enable for image crop
173+
//ImageCropModule,
157174
NgMultiSelectDropDownModule.forRoot(),
158175
],
159176
entryComponents: [
@@ -163,6 +180,7 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
163180
RejectReasonDialogComponent,
164181
EventThumbnailComponent,
165182
ParticipantsComponent,
183+
AddThumbnailComponent,
166184
SuccessComponent],
167185
providers: [
168186
// CKEditorService,
@@ -171,6 +189,7 @@ import { GeneralReportsComponent } from './routes/general-reports/general-report
171189
{ provide: MAT_DIALOG_DATA, useValue: {} },
172190
MatDatepickerModule, MatNativeDateModule,
173191
],
192+
exports: [AddThumbnailComponent],
174193
})
175194
export class HomeModule {
176195

‎project/ws/app/src/lib/routes/home/home.rounting.module.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ import { CreateEventComponent } from './routes/events/create-event/create-event.
2727
import { EditEventComponent } from './routes/events/edit-event/edit-event.component'
2828
import { CommsComponent } from './routes/comms/comms.component'
2929
import { AcbpReportsComponent } from './routes/acbp-reports/acbp-reports.component'
30+
import { SectorsComponent } from './routes/sectors/sectors.component'
31+
import { AddSectorComponent } from './routes/sectors/add-sector/add-sector.component'
32+
import { EditSectorComponent } from './routes/sectors/edit-sector/edit-sector.component'
3033

3134
const routes: Routes = [
3235
{
@@ -287,6 +290,45 @@ const routes: Routes = [
287290
configService: ConfigResolveService,
288291
},
289292
},
293+
{
294+
path: 'sectors',
295+
component: SectorsComponent,
296+
data: {
297+
pageId: 'home/sectors',
298+
module: 'Sectors',
299+
pageType: 'feature',
300+
pageKey: 'Sectors',
301+
},
302+
resolve: {
303+
configService: ConfigResolveService,
304+
},
305+
},
306+
{
307+
path: 'sectors/new',
308+
component: AddSectorComponent,
309+
data: {
310+
pageId: 'home/sectors/new',
311+
module: 'Sectors',
312+
pageType: 'feature',
313+
pageKey: 'Sectors',
314+
},
315+
resolve: {
316+
configService: ConfigResolveService,
317+
},
318+
},
319+
{
320+
path: 'sectors/:id/sub-sectors',
321+
component: EditSectorComponent,
322+
data: {
323+
pageId: 'home/sectors/edit',
324+
module: 'Sectors',
325+
pageType: 'feature',
326+
pageKey: 'Sectors',
327+
},
328+
resolve: {
329+
configService: ConfigResolveService,
330+
},
331+
},
290332
{
291333
path: 'reports',
292334
component: ReportsComponent,

‎project/ws/app/src/lib/routes/home/routes/add-thumbnail/add-thumbnail.component.html‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<!-- <form [formGroup]="startForm"> -->
2+
3+
<div class="card" *ngIf="showMainContent">
4+
<mat-card class="card-simple">
5+
<mat-card-header>
6+
<mat-icon>photo</mat-icon>
7+
<mat-card-title>Select Icons</mat-card-title>
8+
</mat-card-header>
9+
</mat-card>
10+
<mat-card class="mt-5">
11+
<mat-dialog-content>
12+
13+
<ng-container>
14+
<mat-card class="recent-tabs">
15+
<div class="flex flex-1 flex-column">
16+
<div class="flex flex-1 filter flex-wrap">
17+
<a href="javascript:void(0)" role="button" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'all',
18+
'ws-mat-accent-border font-medium':currentFilter !== 'all'}"
19+
mat-button (click)="filter('all')">
20+
All Icons </a>
21+
</div>
22+
</div>
23+
</mat-card>
24+
</ng-container>
25+
26+
27+
<ng-container *ngIf="imageList && imageList.length">
28+
<div class="imageCard">
29+
<mat-button-toggle-group class="category-card" #group="matButtonToggleGroup"
30+
(change)="onValChange(group.value)" *ngFor="let image of imageList" [value]="toggle">
31+
<mat-button-toggle [(value)]="image">
32+
<img mat-card-image [src]="image.artifactUrl" alt="code.image" class="custom-img"
33+
(error)="changeToDefaultImg">
34+
<mat-icon mat-card-avatar *ngIf="isChecked && thumbanilSelectval == image.identifier"
35+
class="checkbox">check_circle</mat-icon>
36+
</mat-button-toggle>
37+
38+
</mat-button-toggle-group>
39+
</div>
40+
41+
</ng-container>
42+
43+
44+
<ng-container *ngIf="!(imageList && imageList.length)">
45+
<mat-card class="mat-card margin-bottom-l">
46+
<mat-card-header>
47+
<mat-card-title>No result found.
48+
</mat-card-title>
49+
</mat-card-header>
50+
<mat-card-content>
51+
<span>&nbsp;</span>
52+
</mat-card-content>
53+
</mat-card>
54+
</ng-container>
55+
</mat-dialog-content>
56+
</mat-card>
57+
<!-- <mat-card> -->
58+
<!-- <ng-container> -->
59+
<div class="mt-5 extra-padding">
60+
61+
<div mat-card-actions class="footer">
62+
<span class="itemleft">
63+
</span>
64+
<span class="itemright">
65+
<button mat-button class="mr-2" [mat-dialog-close]="true">
66+
<span class="noocoments"> Cancel</span>
67+
</button>
68+
<button mat-raised-button type="button" (click)="uploadThumbnail()"
69+
class="text-white ws-mat-primary-background upload-btn flex-auto-display" [disabled]="!isChecked">
70+
<span class="text-white" i18n>Upload</span>
71+
</button>
72+
</span>
73+
</div>
74+
</div>
75+
</div>
76+
77+
<div class="card" *ngIf="!showMainContent">
78+
<mat-card class="mt-5">
79+
</mat-card>
80+
<mat-card class="mt-5">
81+
<mat-dialog-content>
82+
<span style="color:red;" *ngIf="message">{{message}}</span>
83+
<input #file type="file" (change)="onFileSelected(file.files)" />
84+
</mat-dialog-content>
85+
</mat-card>
86+
87+
<mat-card class="mt-5">
88+
89+
<div mat-card-actions class="footer">
90+
<span class="itemleft">
91+
<button mat-raised-button type="button" (click)="showHideButton()"
92+
class="text-white ws-mat-primary-background flex-auto-display">
93+
<span class="text-white" i18n>Back</span>
94+
</button>
95+
</span>
96+
<span class="itemright">
97+
<button mat-button class="mr-2" [mat-dialog-close]="true">
98+
<span class="noocoments"> Cancel</span>
99+
</button>
100+
<button mat-raised-button type="button" (click)="uploadSelectedThumbnail()"
101+
class="text-white ws-mat-primary-background upload-btn flex-auto-display" [disabled]="!isChecked">
102+
<span class="text-white" i18n>Upload</span>
103+
</button>
104+
</span>
105+
</div>
106+
</mat-card>
107+
</div>

0 commit comments

Comments
 (0)