diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f4cd3d9..ce2a5af 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,8 +7,9 @@ import { HttpClientModule } from '@angular/common/http'; import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { StatusModule } from './views/status/status.module'; -import { EntrollmentModule } from './views/entrollment/entrollment.module'; +import { EnrolmentModule } from './views/enrolment/enrolment.module'; import { StudymaterialModule } from './views/studymaterial/studymaterial.module'; +import { CourierModule } from './views/courier/courier.module'; import { AppComponent } from './app.component'; @@ -75,8 +76,9 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; TooltipModule.forRoot(), ChartsModule, StatusModule, - EntrollmentModule, - StudymaterialModule + EnrolmentModule, + StudymaterialModule, + CourierModule ], declarations: [ AppComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 1257477..42521f3 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -49,13 +49,17 @@ 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' }, { path: 'studymaterial', loadChildren: './views/studymaterial/studymaterial.module#StudymaterialModule' }, + { + path: 'courier', + loadChildren: './views/courier/courier.module#CourierModule' + }, { path: 'receivefees', loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule', diff --git a/src/app/components/app-sidebar/app-sidebar.component.html b/src/app/components/app-sidebar/app-sidebar.component.html index 2c1f853..5fa20f2 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.html +++ b/src/app/components/app-sidebar/app-sidebar.component.html @@ -8,7 +8,7 @@ {{nav.name}} diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index e189944..0e74865 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -66,7 +66,7 @@ export class AppSidebar { icon: 'fa fa-book' }, { - name: 'Share Allocate', + name: 'Allocate Fees', url: '/masters/shareallotmentmaster', icon: 'fa fa-adjust' }, @@ -96,31 +96,21 @@ export class AppSidebar { url: '/masters/DocumentMaster', icon: 'fa fa-file' }, - { name: 'Exam Timetable', url: '/masters/ExamTimetable', icon: 'fa fa-calendar-minus-o' } ] + },{ + name: 'Student Enrolment', + icon: 'fa fa-graduation-cap', + url : '/enrolment' },{ name: 'Status', icon: 'fa fa-tasks', children: [ { - name: 'Application', - url: '/status/application', - icon: 'fa fa-sticky-note' - }, - { - name: 'Courier', - url: '/status/courier', - icon: 'fa fa-suitcase' - },{ - name: 'Study Material', - url: '/status/studyMaterial', - icon: 'fa fa-square-o' - },{ name: 'Answer Booklet', url: '/status/answerBooklet', icon: 'fa fa-file-word-o' @@ -129,22 +119,12 @@ export class AppSidebar { url: '/status/documents', icon: 'fa fa-file-pdf-o' }, - { + { name: 'PaymentDetails', url: '/status/paymentdetails', icon: 'fa fa-credit-card-alt' } ] - },{ - name: 'Entrollment', - icon: 'fa fa-graduation-cap', - children: [ - { - name: 'Student Entrollment', - url: '/entrollment/student', - icon: 'fa fa-user' - } - ] },{ name: 'Study Material', icon: 'fa fa-book', @@ -157,9 +137,13 @@ export class AppSidebar { { name: 'AllocateMaterial', url: '/studymaterial/allocatematerial', - icon: 'fa fa-file' + icon: 'fa fa-user-secret' } ] + },{ + name: 'Courier', + icon: 'fa fa-suitcase', + url : '/courier', }, { name: 'Fees Receive/Refund ', diff --git a/src/app/views/courier/courier-routing.module.ts b/src/app/views/courier/courier-routing.module.ts new file mode 100644 index 0000000..62f0e66 --- /dev/null +++ b/src/app/views/courier/courier-routing.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +// Courier +import { CourierComponent } from './courier/courier.component'; +const routes: Routes = [ + { + path: '', + component: CourierComponent, + data: { + title: 'Courier' + } + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class CourierRoutingModule {} diff --git a/src/app/views/courier/courier.module.ts b/src/app/views/courier/courier.module.ts new file mode 100644 index 0000000..b199f48 --- /dev/null +++ b/src/app/views/courier/courier.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import {CommonModule} from '@angular/common'; +import { FormsModule } from '@angular/forms'; +// import { BrowserModule } from '@angular/platform-browser'; +// Tabs Component +import { TabsModule } from 'ngx-bootstrap/tabs'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { ModalModule } from 'ngx-bootstrap/modal'; + +import { CourierRoutingModule } from './courier-routing.module'; + +// Courier +import { CourierComponent } from './courier/courier.component'; +@NgModule({ + imports: [ + CommonModule, + FormsModule, + TabsModule, + ModalModule.forRoot(), + TooltipModule, + CourierRoutingModule + ], + declarations: [ + CourierComponent + ] +}) +export class CourierModule { } diff --git a/src/app/views/courier/courier/courier.component.html b/src/app/views/courier/courier/courier.component.html new file mode 100644 index 0000000..4aa3730 --- /dev/null +++ b/src/app/views/courier/courier/courier.component.html @@ -0,0 +1,230 @@ + + +
+ + + Courier Details List +
+
+ Courier Details List +
+
+
+
+
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Courier NameDocket No.DateTypeCommentsSend To / Received FromReceived By/ Dispatched ByStatusAction
{{cour.courierName}}{{cour.docketNo}}{{cour.date}}{{cour.type}}{{cour.comments}}{{cour.sendTo}}{{cour.receiveBy}}{{cour.status}} + + +
+ +
+
+ + + Add Courier +
+
+
+
+
+ Add Courier Details +
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+    + +
+
+
+ + +
+ +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/views/entrollment/student/student.component.scss b/src/app/views/courier/courier/courier.component.scss similarity index 100% rename from src/app/views/entrollment/student/student.component.scss rename to src/app/views/courier/courier/courier.component.scss diff --git a/src/app/views/courier/courier/courier.component.ts b/src/app/views/courier/courier/courier.component.ts new file mode 100644 index 0000000..d27058b --- /dev/null +++ b/src/app/views/courier/courier/courier.component.ts @@ -0,0 +1,66 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + templateUrl: 'courier.component.html', + styleUrls: ['./courier.component.scss'] +}) + +export class CourierComponent implements OnInit { + show = false; + closed = false; + public myModal; + public myModalData; + courier: any; + constructor() { } + ngOnInit(){ + this.courier = [ + { + courierName: 'Documents', + docketNo: '234dsf', + type: 'Received', + comments: 'Documents Details', + receiveBy: 'sss', + sendTo: 'KR Univ', + status: 'sent', + date: '20/07/2018', + qt: 120, + weight: '12kgm', + amt : 120 + }, + { + courierName: 'Answer Booklets', + docketNo: '43526345', + type: 'Dispatched', + comments: 'answer booklets details', + receiveBy: 'asd', + sendTo: 'SC 2', + status: 'received by SC', + date: '28/06/2018', + qt: 120, + weight: '12kgm', + amt : 120 + }, + { + courierName: 'Forms', + docketNo: '8855435', + type: 'Dispatched', + comments: 'details', + receiveBy: 'abc', + sendTo: 'SC 1', + status: 'Sent by SC', + date: '12/06/2018', + qt: 120, + weight: '12kgm', + amt : 120 + } + ] + } + + getModelWindowDetails(stuCent) { + this.myModalData = stuCent||null; + } + editDocuments(){ + this.show = !this.show; + } + +} diff --git a/src/app/views/entrollment/entrollment-routing.module.ts b/src/app/views/enrolment/enrolment-routing.module.ts similarity index 54% rename from src/app/views/entrollment/entrollment-routing.module.ts rename to src/app/views/enrolment/enrolment-routing.module.ts index 56c0f45..b3f31a0 100644 --- a/src/app/views/entrollment/entrollment-routing.module.ts +++ b/src/app/views/enrolment/enrolment-routing.module.ts @@ -6,16 +6,17 @@ import { StudentComponent } from './student/student.component'; const routes: Routes = [ { path: '', + component: StudentComponent, data: { - title: 'Entrollment' - }, - children: [{ - path: 'student', - component: StudentComponent, - data : { - title: 'Student Entollement' - } - }] + title: 'Student Enrolment' + } + // children: [{ + // path: 'student', + // component: StudentComponent, + // data : { + // title: 'Student Enrolment' + // } + // }] } ]; @@ -23,4 +24,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 96% rename from src/app/views/entrollment/student/student.component.html rename to src/app/views/enrolment/student/student.component.html index 59aca34..ea47bb9 100644 --- a/src/app/views/entrollment/student/student.component.html +++ b/src/app/views/enrolment/student/student.component.html @@ -4,7 +4,7 @@
- Student Entrollment + Student Enrolment
@@ -93,7 +93,7 @@ Student Name Father Name Mobile - Course + Course/University Sem/Year Batch Status @@ -106,13 +106,13 @@ {{app.studentName}} {{app.fatherName}} {{app.mobile}} - {{app.course}} + {{app.course}} / {{app.univ}} {{app.sem}} {{app.batch}} Active In-Active - + @@ -136,14 +136,14 @@ Add Student
- - +

- Add Student Personal Details + Personal Details
@@ -156,6 +156,18 @@
+
+ + +
+ + +
+
@@ -186,16 +198,7 @@
-
- - - - -
+
@@ -208,12 +211,13 @@
- +
- + + Same as Permanent Address
@@ -223,7 +227,7 @@
- Add Course Details + Course Details
@@ -287,7 +291,11 @@
-
+ + + + Re-registertion +
Re-registration diff --git a/src/app/views/enrolment/student/student.component.scss b/src/app/views/enrolment/student/student.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/views/entrollment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts similarity index 92% rename from src/app/views/entrollment/student/student.component.ts rename to src/app/views/enrolment/student/student.component.ts index 0958466..4885938 100644 --- a/src/app/views/entrollment/student/student.component.ts +++ b/src/app/views/enrolment/student/student.component.ts @@ -21,6 +21,7 @@ export class StudentComponent implements OnInit { fatherName: 'mmm mmm', mobile: '+919876543210', course: 'B.Sc', + univ: 'KR university', sem: 2, batch: 'Jan 2018', status: '1' @@ -31,6 +32,7 @@ export class StudentComponent implements OnInit { fatherName: 'sss sss', mobile: '+919876511111', course: 'B.Sc', + univ: 'KR university', sem: 4, batch: 'Jan 2018', status: '1' @@ -41,6 +43,7 @@ export class StudentComponent implements OnInit { fatherName: 'nnn nnn', mobile: '+919876500000', course: 'B.Sc', + univ: 'KR university', sem: 8, batch: 'Jan 2018', status: '0' diff --git a/src/app/views/masters/form-list/form-list.component.html b/src/app/views/masters/form-list/form-list.component.html index d61f9e6..fed3447 100644 --- a/src/app/views/masters/form-list/form-list.component.html +++ b/src/app/views/masters/form-list/form-list.component.html @@ -23,6 +23,7 @@ From Name From Type + Course / University Description Status Action @@ -32,6 +33,7 @@ {{form.formName}} {{form.formType}} + {{form.course}} / {{form.univ}} {{form.description}} Active @@ -78,17 +80,39 @@
+
+ + + +
+
+
+
+ + + +
-
-
Upload Form :
-
+
+
+
Active/De-Active :
diff --git a/src/app/views/studymaterial/study-material/study-material.component.html b/src/app/views/studymaterial/study-material/study-material.component.html new file mode 100644 index 0000000..3e39fd6 --- /dev/null +++ b/src/app/views/studymaterial/study-material/study-material.component.html @@ -0,0 +1,152 @@ +
+ + + Study Material Status +
+
+
+ + +
+
+
+
+
+ Study Matrial Status List +
+
+
+
+
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
IDStudy Material DetailsUniversityCourseTotalStatusAction
{{app.applicationId}}{{app.details}}{{app.univ}}{{app.course}}{{app.total}} + Received + Sent + + + +
+ +
+
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/views/studymaterial/study-material/study-material.component.ts b/src/app/views/studymaterial/study-material/study-material.component.ts new file mode 100644 index 0000000..7ff1f5d --- /dev/null +++ b/src/app/views/studymaterial/study-material/study-material.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + templateUrl: 'study-material.component.html' +}) + +export class StudyMaterialComponent implements OnInit { + show = false; + closed = false; + public myModal; + public myModalData; + studyMaterialDetails: any; + constructor() { } + ngOnInit(){ + this.studyMaterialDetails = [ + { + applicationId: '1', + details: 'xyz', + univ: 'kr university', + course: 'B.com', + total: '12', + status: '1' + }, + { + applicationId: '2', + details: 'xyz', + univ: 'kr university', + course: 'B.Sc', + total: '12', + status: '1' + }, + { + applicationId: '3', + details: 'xyz', + univ: 'kr university', + course: 'MCA', + total: '12', + status: '0' + } + ] + } + + getModelWindowDetails(stuCent) { + this.myModalData = stuCent||null; + } + editStudyCenter(){ + this.show = !this.show; + } + +} diff --git a/src/app/views/studymaterial/studymaterial-routing.module.ts b/src/app/views/studymaterial/studymaterial-routing.module.ts index 53f7fe8..afa5d60 100644 --- a/src/app/views/studymaterial/studymaterial-routing.module.ts +++ b/src/app/views/studymaterial/studymaterial-routing.module.ts @@ -2,12 +2,13 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; +import { StudyMaterialComponent } from './study-material/study-material.component'; const routes: Routes = [ { path: '', data: { - title: 'Studymaterial' + title: 'Study Material' }, children: [ { @@ -23,6 +24,13 @@ const routes: Routes = [ data: { title: 'AllocateMaterial' } + }, + { + path: 'studyMaterialStatus', + component: StudyMaterialComponent, + data: { + title: 'Study Material Status' + } } ] }]; diff --git a/src/app/views/studymaterial/studymaterial.module.ts b/src/app/views/studymaterial/studymaterial.module.ts index 6db115d..b706e6a 100644 --- a/src/app/views/studymaterial/studymaterial.module.ts +++ b/src/app/views/studymaterial/studymaterial.module.ts @@ -10,6 +10,7 @@ import { ModalModule } from 'ngx-bootstrap/modal'; import { StudymaterialRoutingModule } from './studymaterial-routing.module'; import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; +import { StudyMaterialComponent } from './study-material/study-material.component'; @NgModule({ imports: [ @@ -20,6 +21,7 @@ import { AllocatematerialComponent } from './allocatematerial/allocatematerial.c TabsModule, StudymaterialRoutingModule ], - declarations: [ReceivedmaterialComponent, AllocatematerialComponent] + declarations: [ReceivedmaterialComponent, AllocatematerialComponent, + StudyMaterialComponent] }) export class StudymaterialModule { }