From a5d67e9dac6cd25838bcef45a7cc797768188e52 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 1 Aug 2018 19:08:00 +0530 Subject: [PATCH] application nav changes : kdk --- src/app/app.module.ts | 4 +- src/app/app.routing.ts | 4 +- .../app-sidebar/app-sidebar.component.html | 13 +-- .../enrolment-routing.module.ts} | 14 +-- .../enrolment.module.ts} | 6 +- .../student/student.component.html | 85 +++++++++---------- .../student/student.component.scss | 0 .../student/student.component.ts | 3 + 8 files changed, 57 insertions(+), 72 deletions(-) rename src/app/views/{entrollment/entrollment-routing.module.ts => enrolment/enrolment-routing.module.ts} (59%) rename src/app/views/{entrollment/entrollment.module.ts => enrolment/enrolment.module.ts} (81%) rename src/app/views/{entrollment => enrolment}/student/student.component.html (93%) rename src/app/views/{entrollment => enrolment}/student/student.component.scss (100%) rename src/app/views/{entrollment => enrolment}/student/student.component.ts (92%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index dbacb36..fb6681f 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,7 +5,7 @@ import { AppComponent } from './app.component'; import { StatusModule } from './views/status/status.module'; -import { EntrollmentModule } from './views/entrollment/entrollment.module'; +import { EnrolmentModule } from './views/enrolment/enrolment.module'; // Import containers import { @@ -65,7 +65,7 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; TooltipModule.forRoot(), ChartsModule, StatusModule, - EntrollmentModule + EnrolmentModule ], declarations: [ AppComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 31bb330..c522ae4 100755 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -53,8 +53,8 @@ export const routes: Routes = [ loadChildren: './views/status/status.module#StatusModule' }, { - path: 'entrollment', - loadChildren: './views/entrollment/entrollment.module#EntrollmentModule' + path: 'enrolment', + loadChildren: './views/enrolment/enrolment.module#EnrolmentModule' } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.html b/src/app/components/app-sidebar/app-sidebar.component.html index c4d5165..09d7ec6 100755 --- a/src/app/components/app-sidebar/app-sidebar.component.html +++ b/src/app/components/app-sidebar/app-sidebar.component.html @@ -79,16 +79,11 @@
  • Dashboard
    • -
  • - Entrollment - -
  • - Share Allocate + Student Enrolment +
    • +
  • + Allocate Fees
  • Fees Calculator diff --git a/src/app/views/entrollment/entrollment-routing.module.ts b/src/app/views/enrolment/enrolment-routing.module.ts similarity index 59% rename from src/app/views/entrollment/entrollment-routing.module.ts rename to src/app/views/enrolment/enrolment-routing.module.ts index 56c0f45..40bf6b0 100644 --- a/src/app/views/entrollment/entrollment-routing.module.ts +++ b/src/app/views/enrolment/enrolment-routing.module.ts @@ -7,15 +7,9 @@ const routes: Routes = [ { path: '', data: { - title: 'Entrollment' - }, - children: [{ - path: 'student', - component: StudentComponent, - data : { - title: 'Student Entollement' - } - }] + title: 'Student Enrolment', + }, + component: StudentComponent, } ]; @@ -23,4 +17,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class EntrollmentRoutingModule {} +export class EnrolmentRoutingModule {} diff --git a/src/app/views/entrollment/entrollment.module.ts b/src/app/views/enrolment/enrolment.module.ts similarity index 81% rename from src/app/views/entrollment/entrollment.module.ts rename to src/app/views/enrolment/enrolment.module.ts index 83976cd..dc81123 100644 --- a/src/app/views/entrollment/entrollment.module.ts +++ b/src/app/views/enrolment/enrolment.module.ts @@ -7,7 +7,7 @@ import { TabsModule } from 'ngx-bootstrap/tabs'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; import { ModalModule } from 'ngx-bootstrap/modal'; -import { EntrollmentRoutingModule } from './entrollment-routing.module'; +import { EnrolmentRoutingModule } from './enrolment-routing.module'; // Student import { StudentComponent } from './student/student.component'; @@ -18,10 +18,10 @@ import { StudentComponent } from './student/student.component'; TabsModule, ModalModule.forRoot(), TooltipModule, - EntrollmentRoutingModule + EnrolmentRoutingModule ], declarations: [ StudentComponent ] }) -export class EntrollmentModule { } +export class EnrolmentModule { } diff --git a/src/app/views/entrollment/student/student.component.html b/src/app/views/enrolment/student/student.component.html similarity index 93% rename from src/app/views/entrollment/student/student.component.html rename to src/app/views/enrolment/student/student.component.html index c8c1466..bccbd2c 100644 --- a/src/app/views/entrollment/student/student.component.html +++ b/src/app/views/enrolment/student/student.component.html @@ -2,26 +2,11 @@ Back to List -->
    - - - Student Entrollment - + Student List -
    +
    Student Details List
    @@ -86,14 +71,14 @@

    - +
    - + @@ -106,15 +91,17 @@ - + + Active + In-Active + @@ -136,14 +123,14 @@ Add Student
    - - +

    -
    +
    - Add Student Personal Details + Personal Details
    @@ -156,6 +143,18 @@
    +
    + + +
    + + +
    +
    @@ -186,16 +185,7 @@
    -
    - - - - -
    +
    @@ -208,12 +198,13 @@
    - +
    - + + Same as Permanent Address
    @@ -221,9 +212,9 @@
    -
    +
    - Add Course Details + Course Details
    @@ -287,8 +278,12 @@
    -
    -
    + + + + Re-registertion +
    +
    Re-registration
    @@ -366,8 +361,6 @@
    - -
    Form Id Student Name Father Name MobileCourseCourse/University Sem/Year Batch Status{{app.studentName}} {{app.fatherName}} {{app.mobile}}{{app.course}}{{app.course}} / {{app.univ}} {{app.sem}} {{app.batch}} - Active - In-Active - - + | + | +