From 75b830bc459a06b4c26396c81de682044e67cd83 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Mon, 30 Jul 2018 19:12:49 +0530 Subject: [PATCH] main file changes by bala --- src/app/app.module.ts | 4 +- src/app/app.routing.ts | 4 ++ .../app-sidebar/app-sidebar.component.ts | 51 +++++++++++++++++++ .../views/masters/masters-routing.module.ts | 50 ++++++++++++++++++ src/app/views/masters/masters.module.ts | 22 +++++++- src/app/views/status/status-routing.module.ts | 8 +++ src/app/views/status/status.module.ts | 5 +- 7 files changed, 141 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ad9da14..f4cd3d9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,6 +8,7 @@ import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { StatusModule } from './views/status/status.module'; import { EntrollmentModule } from './views/entrollment/entrollment.module'; +import { StudymaterialModule } from './views/studymaterial/studymaterial.module'; import { AppComponent } from './app.component'; @@ -74,7 +75,8 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; TooltipModule.forRoot(), ChartsModule, StatusModule, - EntrollmentModule + EntrollmentModule, + StudymaterialModule ], declarations: [ AppComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index e023a92..fc5e2b1 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -51,6 +51,10 @@ export const routes: Routes = [ { path: 'entrollment', loadChildren: './views/entrollment/entrollment.module#EntrollmentModule' + }, + { + path: 'studymaterial', + loadChildren: './views/studymaterial/studymaterial.module#StudymaterialModule' } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index a316a3e..2b65cf8 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -54,6 +54,37 @@ export class AppSidebar { name: 'Form List Master', url: '/masters/formList', icon: 'fa fa-language' + }, + { + name: 'University Master', + url: '/masters/UniversityMaster', + icon: 'fa fa-language' + }, + { + name: 'Batch Master', + url: '/masters/BatchMaster', + icon: 'fa fa-language' + }, + { + name: 'Document Master', + url: '/masters/DocumentMaster', + icon: 'fa fa-language' + }, + { + name: 'Fees Master', + url: '/masters/FeesMaster', + icon: 'fa fa-language' + }, + { + name: 'Form Master', + url: '/masters/FormMaster', + icon: 'fa fa-language' + }, + + { + name: 'Exam Timetable', + url: '/masters/ExamTimetable', + icon: 'fa fa-language' } ] },{ @@ -81,6 +112,11 @@ export class AppSidebar { name: 'Documents', url: '/status/documents', icon: 'fa fa-file-pdf-o' + }, + { + name: 'PaymentDetails', + url: '/status/paymentdetails', + icon: 'fa fa-user-secret' } ] },{ @@ -93,6 +129,21 @@ export class AppSidebar { icon: 'fa fa-user' } ] + },{ + name: 'Study Material', + icon: 'fa fa-gear', + children: [ + { + name: 'ReceivedMaterial', + url: '/studymaterial/receivedmaterial', + icon: 'fa fa-user-secret' + }, + { + name: 'AllocateMaterial', + url: '/studymaterial/allocatematerial', + icon: 'fa fa-user-secret' + } + ] } ]; } diff --git a/src/app/views/masters/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts index 0625b5d..35e2d10 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -5,6 +5,13 @@ import { EmployeeComponent } from './employee/employee.component'; import { RoleComponent } from './role/role.component'; import { StudyCenterComponent } from './study-center/study-center.component'; import { FormListComponent } from './form-list/form-list.component'; +import { UniversityMasterComponent } from './university-master/university-master.component'; +import { BatchMasterComponent } from './batch-master/batch-master.component'; +import { DocumentMasterComponent } from './document-master/document-master.component'; +import { FeesMasterComponent } from './fees-master/fees-master.component'; +import { FormMasterComponent } from './form-master/form-master.component'; +import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; +import { StudyMaterialComponent } from './study-material/study-material.component'; const routes: Routes = [ { path: '', @@ -40,6 +47,49 @@ const routes: Routes = [ title: 'Form List' } } + , + { + path: 'UniversityMaster', + component: UniversityMasterComponent, + data: { + title: 'University Master' + } + }, + { + path: 'BatchMaster', + component: BatchMasterComponent, + data: { + title: 'Batch Master' + } + }, + { + path: 'DocumentMaster', + component: DocumentMasterComponent, + data: { + title: 'Document Master' + } + }, + { + path: 'FeesMaster', + component: FeesMasterComponent, + data: { + title: 'Fees Master' + } + }, + { + path: 'FormMaster', + component: FormMasterComponent, + data: { + title: 'Form Master' + } + }, + { + path: 'ExamTimetable', + component: ExamtimeTableComponent, + data: { + title: 'Exam Timetable' + } + } ] } ]; diff --git a/src/app/views/masters/masters.module.ts b/src/app/views/masters/masters.module.ts index 9e18941..1fcd278 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -19,6 +19,19 @@ import { EditEmployeeComponent } from './employee/edit-employee/edit-employee.co // Study Center import { StudyCenterComponent } from './study-center/study-center.component'; import { EditStudyCenterComponent } from './study-center/edit-study-center/edit-study-center.component'; +//University +import { UniversityMasterComponent } from './university-master/university-master.component'; +//Batch +import { BatchMasterComponent } from './batch-master/batch-master.component'; +//Document +import { DocumentMasterComponent } from './document-master/document-master.component'; +//Fees +import { FeesMasterComponent } from './fees-master/fees-master.component'; +//Form +import { FormMasterComponent } from './form-master/form-master.component'; +//Study +import { StudyMaterialComponent } from './study-material/study-material.component'; +import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; // Form list import { FormListComponent } from './form-list/form-list.component'; @@ -38,7 +51,14 @@ import { FormListComponent } from './form-list/form-list.component'; EditEmployeeComponent, StudyCenterComponent, EditStudyCenterComponent, - FormListComponent + FormListComponent, + UniversityMasterComponent, + BatchMasterComponent, + DocumentMasterComponent, + FeesMasterComponent, + FormMasterComponent, + StudyMaterialComponent, + ExamtimeTableComponent ] }) export class MastersModule { } diff --git a/src/app/views/status/status-routing.module.ts b/src/app/views/status/status-routing.module.ts index 6d93c9c..09d2c18 100644 --- a/src/app/views/status/status-routing.module.ts +++ b/src/app/views/status/status-routing.module.ts @@ -6,6 +6,7 @@ import { StudyMaterialComponent } from './study-material/study-material.componen import { DocumentsComponent } from './documents/documents.component'; import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; import { CourierComponent } from './courier/courier.component'; +import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; const routes: Routes = [ { @@ -44,6 +45,13 @@ const routes: Routes = [ data: { title: 'Documents' } + } + ,{ + path: 'paymentdetails', + component: PaymentdetailsComponent, + data: { + title: 'Paymentdetails' + } } ] } diff --git a/src/app/views/status/status.module.ts b/src/app/views/status/status.module.ts index cc9c563..1338b38 100644 --- a/src/app/views/status/status.module.ts +++ b/src/app/views/status/status.module.ts @@ -20,6 +20,8 @@ import { AnswerBookletComponent } from './answer-booklet/answer-booklet.componen import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component'; //courier import { CourierComponent } from './courier/courier.component'; +//paymentdetails +import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; @NgModule({ imports: [ @@ -37,7 +39,8 @@ import { CourierComponent } from './courier/courier.component'; EditDocumentsComponent, AnswerBookletComponent, EditAnswerBookletComponent, - CourierComponent + CourierComponent, + PaymentdetailsComponent ] }) export class StatusModule { }