From fa599323bcc6451f510777d375b458d88d52bd72 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Mon, 30 Jul 2018 09:50:04 +0530 Subject: [PATCH] courier and form master list added : kdk --- .../app-sidebar/app-sidebar.component.ts | 9 + .../masters/employee/employee.component.html | 2 +- .../form-list/form-list.component.html | 156 ++++++++++++++ .../masters/form-list/form-list.component.ts | 43 ++++ .../views/masters/masters-routing.module.ts | 9 +- src/app/views/masters/masters.module.ts | 5 +- .../answer-booklet.component.html | 54 ++++- .../answer-booklet.component.ts | 24 ++- .../status/courier/courier.component.html | 203 ++++++++++++++++++ .../status/courier/courier.component.scss | 1 + .../views/status/courier/courier.component.ts | 63 ++++++ .../status/documents/documents.component.html | 49 ++++- .../status/documents/documents.component.ts | 24 ++- .../edit-documents.component.html | 13 +- src/app/views/status/status-routing.module.ts | 7 + src/app/views/status/status.module.ts | 5 +- 16 files changed, 628 insertions(+), 39 deletions(-) create mode 100644 src/app/views/masters/form-list/form-list.component.html create mode 100644 src/app/views/masters/form-list/form-list.component.ts create mode 100644 src/app/views/status/courier/courier.component.html create mode 100644 src/app/views/status/courier/courier.component.scss create mode 100644 src/app/views/status/courier/courier.component.ts diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index e061cd5..e75b593 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -50,6 +50,10 @@ export class AppSidebar { name: 'Study Center', url: '/masters/studyCenter', icon: 'fa fa-language' + },{ + name: 'Form List Master', + url: '/masters/formList', + icon: 'fa fa-language' } ] },{ @@ -60,6 +64,11 @@ export class AppSidebar { 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', diff --git a/src/app/views/masters/employee/employee.component.html b/src/app/views/masters/employee/employee.component.html index 8073b4e..711b9c1 100644 --- a/src/app/views/masters/employee/employee.component.html +++ b/src/app/views/masters/employee/employee.component.html @@ -31,7 +31,7 @@ Mobile Number Role Status - Activity + Action diff --git a/src/app/views/masters/form-list/form-list.component.html b/src/app/views/masters/form-list/form-list.component.html new file mode 100644 index 0000000..89abcf3 --- /dev/null +++ b/src/app/views/masters/form-list/form-list.component.html @@ -0,0 +1,156 @@ +
+ + + From List +
+
+ Form List +
+
+
+
+
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
From NameFrom TypeDescriptionStatusAction
{{form.formName}}{{form.formType}}{{form.description}} + Active + In-Active + + | + +
+ +
+
+ + + Add From +
+
+ Form Details +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ Upload Form : + +
+
+ Active/De-Active : +
+
+
+
+
+ + +
+
+ + +
+ + + \ No newline at end of file diff --git a/src/app/views/masters/form-list/form-list.component.ts b/src/app/views/masters/form-list/form-list.component.ts new file mode 100644 index 0000000..ce8d371 --- /dev/null +++ b/src/app/views/masters/form-list/form-list.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalDirective } from 'ngx-bootstrap/modal'; + +@Component({ + templateUrl: 'form-list.component.html' +}) +export class FormListComponent implements OnInit { + show = false; + closed = false; + public myModal; + public myModalData; + formsList: any; + constructor() { } + ngOnInit(){ + this.formsList = [ + { + formName: 'KR Univ Student Registration Form', + formType: 'Registration Form', + description: 'KR univ students registration form for upcomming batch', + status: '1' + }, + { + formName: 'KR Univ Re-registration form', + formType: 'Registration Form', + description: 'KR univ re-registration form for arts students', + status: '1' + }, + { + formName: 'PML Univ Re-registration form', + formType: 'Registration Form', + description: 'PML univ re-registration form for arts students', + status: '0' + } + ] + } + getModelWindowDetails(emp) { + this.myModalData = emp||null; + } + + editEmployee(){ + this.show = !this.show; + } +} diff --git a/src/app/views/masters/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts index d24eca2..0625b5d 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -4,7 +4,7 @@ import { Routes, RouterModule } from '@angular/router'; 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'; const routes: Routes = [ { path: '', @@ -32,6 +32,13 @@ const routes: Routes = [ data: { title: 'Study Center' } + }, + { + path: 'formList', + component: FormListComponent, + data: { + title: 'Form List' + } } ] } diff --git a/src/app/views/masters/masters.module.ts b/src/app/views/masters/masters.module.ts index 36b3239..9e18941 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -20,6 +20,8 @@ import { EditEmployeeComponent } from './employee/edit-employee/edit-employee.co import { StudyCenterComponent } from './study-center/study-center.component'; import { EditStudyCenterComponent } from './study-center/edit-study-center/edit-study-center.component'; +// Form list +import { FormListComponent } from './form-list/form-list.component'; @NgModule({ imports: [ CommonModule, @@ -35,7 +37,8 @@ import { EditStudyCenterComponent } from './study-center/edit-study-center/edit- EmployeeComponent, EditEmployeeComponent, StudyCenterComponent, - EditStudyCenterComponent + EditStudyCenterComponent, + FormListComponent ] }) export class MastersModule { } diff --git a/src/app/views/status/answer-booklet/answer-booklet.component.html b/src/app/views/status/answer-booklet/answer-booklet.component.html index 280a4f7..25c060b 100644 --- a/src/app/views/status/answer-booklet/answer-booklet.component.html +++ b/src/app/views/status/answer-booklet/answer-booklet.component.html @@ -24,7 +24,7 @@
-
+
-
+
-
+
+
+ +
+
+
+
+ +
+
+
@@ -65,22 +85,30 @@ - + + + + + - + + + + + @@ -107,7 +135,7 @@
-

{{ myModalData.applicationId }}

+

{{ myModalData.formId }}

@@ -119,22 +147,26 @@ {{myModalData.studentName}}
- {{myModalData.courseName}} + {{myModalData.course}}
{{myModalData.sem}}
+
+ {{myModalData.batch}} +
diff --git a/src/app/views/status/answer-booklet/answer-booklet.component.ts b/src/app/views/status/answer-booklet/answer-booklet.component.ts index 578357e..cb98258 100644 --- a/src/app/views/status/answer-booklet/answer-booklet.component.ts +++ b/src/app/views/status/answer-booklet/answer-booklet.component.ts @@ -15,22 +15,34 @@ export class AnswerBookletComponent implements OnInit { ngOnInit(){ this.applicationDetails = [ { - entrollemntId: '0001', + formId: '0001', studentName: 'xyz', + fatherName: 'SSS', mobile: '+91 9999999999', - course: 'B.Com' + course: 'B.Com', + sem: '2', + batch: 'Jun 2017', + status: 'Sent to SC' }, { - entrollemntId: '0002', + formId: '0002', studentName: 'svs', + fatherName: 'MMM', mobile: '+91 9999911111', - course: 'BSc' + course: 'BSc', + sem: '3', + batch: 'Jun 2017', + status: 'Sent to SC' }, { - entrollemntId: '0003', + formId: '0003', studentName: 'pns', + fatherName: 'VVV', mobile: '+91 9999900000', - course: 'MCA' + course: 'MCA', + sem: '1', + batch: 'Jun 2017', + status: 'Sent to SC' } ] } diff --git a/src/app/views/status/courier/courier.component.html b/src/app/views/status/courier/courier.component.html new file mode 100644 index 0000000..4a460ac --- /dev/null +++ b/src/app/views/status/courier/courier.component.html @@ -0,0 +1,203 @@ + + +
+ + + Courier Details List +
+
+ Courier Details List +
+
+
+
+
+ + + + +
+
+
+
+
Entrollment IdForm Id Student NameFather Name Mobile CourseSem/YearBatchStatus Activity
{{app.entrollemntId}}{{app.formId}} {{app.studentName}}{{app.fatherName}} {{app.mobile}} {{app.course}}{{app.sem}}{{app.batch}}{{app.status}} - - + +
+ + + + + + + + + + + + + + + + + + + + + + +
Courier NameDocket No.TypeCommentsReceived By/ Dispatched ByStatusAction
{{cour.courierName}}{{cour.docketNo}}{{cour.type}}{{cour.comments}}{{cour.receiveBy}}{{cour.status}} + + +
+ +
+
+ + + Add Courier +
+
+
+
+
+ Add Courier Details +
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/views/status/courier/courier.component.scss b/src/app/views/status/courier/courier.component.scss new file mode 100644 index 0000000..ec8889d --- /dev/null +++ b/src/app/views/status/courier/courier.component.scss @@ -0,0 +1 @@ +//courier \ No newline at end of file diff --git a/src/app/views/status/courier/courier.component.ts b/src/app/views/status/courier/courier.component.ts new file mode 100644 index 0000000..50c19bd --- /dev/null +++ b/src/app/views/status/courier/courier.component.ts @@ -0,0 +1,63 @@ +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', + 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', + status: 'received by SC', + date: '28/06/2018', + qt: 120, + weight: '12kgm', + amt : 120 + }, + { + courierName: 'Forms', + docketNo: '8855435', + type: 'Dispatched', + comments: 'details', + receiveBy: 'abc', + 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/status/documents/documents.component.html b/src/app/views/status/documents/documents.component.html index a50271d..6852a80 100644 --- a/src/app/views/status/documents/documents.component.html +++ b/src/app/views/status/documents/documents.component.html @@ -24,7 +24,7 @@
-
+
-
+
-
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ + + + +
+
+

- + + + + + - + + + + +
Entrollment IdForm Id Student NameFather Name Mobile CourseSem/YearBatchStatus Activity
{{app.entrollemntId}}{{app.formId}} {{app.studentName}}{{app.fatherName}} {{app.mobile}} {{app.course}}{{app.sem}}{{app.batch}}{{app.status}} diff --git a/src/app/views/status/documents/documents.component.ts b/src/app/views/status/documents/documents.component.ts index dbdc6e3..0794502 100644 --- a/src/app/views/status/documents/documents.component.ts +++ b/src/app/views/status/documents/documents.component.ts @@ -15,22 +15,34 @@ export class DocumentsComponent implements OnInit { ngOnInit(){ this.documentsDetails = [ { - entrollemntId: '0001', + formId: '0001', studentName: 'xyz', + fatherName: 'SSS', mobile: '+91 9999999999', - course: 'B.Com' + course: 'B.Com', + sem: '2', + batch: 'Jun 2017', + status: 'Sent to SC' }, { - entrollemntId: '0002', + formId: '0002', studentName: 'svs', + fatherName: 'MMM', mobile: '+91 9999911111', - course: 'BSc' + course: 'BSc', + sem: '3', + batch: 'Jun 2017', + status: 'Sent to SC' }, { - entrollemntId: '0003', + formId: '0003', studentName: 'pns', + fatherName: 'VVV', mobile: '+91 9999900000', - course: 'MCA' + course: 'MCA', + sem: '1', + batch: 'Jun 2017', + status: 'Sent to SC' } ] } diff --git a/src/app/views/status/documents/edit-documents/edit-documents.component.html b/src/app/views/status/documents/edit-documents/edit-documents.component.html index f3a8f97..89dce17 100644 --- a/src/app/views/status/documents/edit-documents/edit-documents.component.html +++ b/src/app/views/status/documents/edit-documents/edit-documents.component.html @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -66,12 +66,11 @@
- +
diff --git a/src/app/views/status/status-routing.module.ts b/src/app/views/status/status-routing.module.ts index 4baad11..6d93c9c 100644 --- a/src/app/views/status/status-routing.module.ts +++ b/src/app/views/status/status-routing.module.ts @@ -5,6 +5,7 @@ import { ApplicationComponent } from './application/application.component'; import { StudyMaterialComponent } from './study-material/study-material.component'; import { DocumentsComponent } from './documents/documents.component'; import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; +import { CourierComponent } from './courier/courier.component'; const routes: Routes = [ { @@ -19,6 +20,12 @@ const routes: Routes = [ data: { title: 'Application' } + },{ + path: 'courier', + component: CourierComponent, + data: { + title: 'Couriers' + } },{ path: 'studyMaterial', component: StudyMaterialComponent, diff --git a/src/app/views/status/status.module.ts b/src/app/views/status/status.module.ts index 8d1c433..cc9c563 100644 --- a/src/app/views/status/status.module.ts +++ b/src/app/views/status/status.module.ts @@ -18,6 +18,8 @@ import { EditDocumentsComponent } from './documents/edit-documents/edit-document //answer-booklet import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component'; +//courier +import { CourierComponent } from './courier/courier.component'; @NgModule({ imports: [ @@ -34,7 +36,8 @@ import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet DocumentsComponent, EditDocumentsComponent, AnswerBookletComponent, - EditAnswerBookletComponent + EditAnswerBookletComponent, + CourierComponent ] }) export class StatusModule { }
Form Id Document Type Status Comments
{{app.formId}} {{app.documentType}} {{app.status}} {{app.comments}}