Apollo-DEC/apollosc
Apollo-DEC/apollosc
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollosc

Browse Source
This commit is contained in:
gandhimathi 2018-08-01 17:25:32 +05:30
commit 3e23c29ac9
24 changed files with 707 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/app.module.ts
View File

@ -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,

8
src/app/app.routing.ts
View File

@ -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',

2
src/app/components/app-sidebar/app-sidebar.component.html
View File

@ -8,7 +8,7 @@
<a class="nav-link nav-dropdown-toggle" href="#" appNavDropdownToggle><i class="{{nav.icon}}"></i> {{nav.name}}</a>
<ul class="nav-dropdown-items" *ngFor="let sub of nav.children">
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="[sub.url]"><i class="{{sub.icon}}"></i> {{sub.name}}</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="[sub.url]"> {{sub.name}}</a>
</li>
</ul>
</li>

38
src/app/components/app-sidebar/app-sidebar.component.ts
View File

@ -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 ',

19
src/app/views/courier/courier-routing.module.ts Normal file
View File

@ -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 {}

27
src/app/views/courier/courier.module.ts Normal file
View File

@ -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 { }

230
src/app/views/courier/courier/courier.component.html Normal file
View File

@ -0,0 +1,230 @@
<!--<span *ngIf="show" class="backToList">
<a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
</span>-->
<div class="col-lg-12" *ngIf="!show">
<tabset>
<tab>
<ng-template tabHeading> Courier Details List</ng-template>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Courier Details List
</div>
<div class="card-body">
<div class="row">
<div class="col-md-4">
<div class="input-prepend input-group">
<span class="input-group-addon">
<i class="fa fa-search"></i>
</span>
<input id="search" class="form-control" type="text" placeholder="search">
</div>
</div>
</div>
<br>
<table class="table table-bordered table-responsive">
<thead>
<tr>
<th>Courier Name</th>
<th>Docket No.</th>
<th>Date</th>
<th>Type</th>
<th>Comments</th>
<th>Send To / Received From</th>
<th>Received By/ Dispatched By</th>
<th>Status</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let cour of courier">
<td>{{cour.courierName}}</td>
<td>{{cour.docketNo}}</td>
<td>{{cour.date}}</td>
<td>{{cour.type}}</td>
<td>{{cour.comments}}</td>
<td>{{cour.sendTo}}</td>
<td>{{cour.receiveBy}}</td>
<td>{{cour.status}}</td>
<td>
<!--<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |-->
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(cour)"></i>
</td>
</tr>
</tbody>
</table>
<ul class="pagination">
<li class="page-item"><a class="page-link" href="#">Prev</a></li>
<li class="page-item active">
<a class="page-link" href="#">1</a>
</li>
<li class="page-item"><a class="page-link" href="#">2</a></li>
<li class="page-item"><a class="page-link" href="#">3</a></li>
<li class="page-item"><a class="page-link" href="#">4</a></li>
<li class="page-item"><a class="page-link" href="#">Next</a></li>
</ul>
</div>
</div>
</tab>
<tab>
<ng-template tabHeading> Add Courier</ng-template>
<div class="animated fadeIn">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Add Courier Details
</div>
<form>
<fieldset>
<div class="container">
<div class="row">
<div class="form-group col-md-4">
<label for="cname">Courier Name <span class="danger">*</span></label>
<input type="text" class="form-control" id="cname" placeholder="Enter Courier name">
</div>
<div class="form-group col-md-4">
<label for="lname">Docket No. <span class="danger">*</span></label>
<input type="text" class="form-control" id="lname" placeholder="Enter Docket No">
</div>
<div class="form-group col-md-4">
<label for="motherName">Date<span class="danger">*</span></label>
<input type="date" class="form-control" id="motherName" placeholder="Enter Date">
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label for="pmobile">Type<span class="danger">*</span></label>
<select id="disabledSelect" class="form-control">
<option value="0">Please Select Type</option>
<option value="1">Received</option>
<option value="2">Dispatched</option>
</select>
</div>
<div class="form-group col-md-4">
<label for="sendFor">Send To / Receive From <span class="danger"> *</span></label>
<div>
<label class="radio" for="gender">
<input type="radio" id="univ" name="inline-radios" value="univ"> University
</label>&nbsp;&nbsp;
<label class="radio" for="inline-radio2">
<input type="radio" id="sc" name="inline-radios" value="Sc"> Study Center
</label>
</div>
</div>
<div class="form-group col-md-4">
<label for="sendFor">Select Study Center<span class="danger"> *</span></label>
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Please Select SC</option>
<option value="1">SC 1</option>
<option value="2">SC 2</option>
<option value="3">SC 3</option>
</select>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label for="smobile">Comments</label>
<textarea type="text" class="form-control" id="smobile" placeholder="Enter Comments"></textarea>
</div>
<div class="form-group col-md-4">
<label for="email">Qty <span class="danger">*</span></label>
<input type="text" class="form-control" id="email" placeholder="Enter Qty">
</div>
<div class="form-group col-md-4">
<label for="fatherName">Amount</label>
<input type="text" class="form-control" id="fatherName" placeholder="Enter Amount">
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label for="motherName">Received By / Dispatched By<span class="danger">*</span></label>
<input type="text" class="form-control" id="motherName" placeholder="Enter Name">
</div>
</div>
</div>
</fieldset>
<div class="card-footer" align="right">
<button type="submit" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>
</form>
</div>
</div>
</div>
</div>
</tab>
</tabset>
</div>
<div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document" *ngIf="myModalData">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{{ myModalData.courierName }}</h4>
<button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container">
<div class="row">
<div class="col-md-6">
<label><b>Docket No. : </b> </label> {{myModalData.docketNo}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b>Type : </b> </label> {{myModalData.type}}
</div>
<div class="col-md-6">
<label><b>Comments : </b> </label> {{myModalData.comments}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b>Qty : </b> </label> {{myModalData.qt}}
</div>
<div class="col-md-6">
<label><b>Weight : </b> </label> {{myModalData.weight}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b>Amount : </b> </label> {{myModalData.amt}}
</div>
<div class="col-md-6">
<label><b>Date : </b> </label> {{myModalData.date}}
</div>
</div>
<div class="row">
<div class="col-md-4">
<label for="name"> Status</label>
<select id="disabledSelect" class="form-control">
<option value="0">Select Status</option>
<option value="2">Sent to SC</option>
<option value="3">Rejection</option>
</select>
</div>
<div class="col-md-4">
<label for="comment">Comments <span class="danger">*</span></label>
<textarea class="form-control" id="comments" placeholder="Enter Comments"></textarea>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" (click)="myModal.hide()">Close</button>
<!--<button type="button" class="btn btn-primary">Save changes</button>-->
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->

0
src/app/views/entrollment/student/student.component.scss → src/app/views/courier/courier/courier.component.scss
View File

66
src/app/views/courier/courier/courier.component.ts Normal file
View File

@ -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;
}
}

21
src/app/views/entrollment/entrollment-routing.module.ts → src/app/views/enrolment/enrolment-routing.module.ts
View File

@ -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 {}

6
src/app/views/entrollment/entrollment.module.ts → src/app/views/enrolment/enrolment.module.ts
View File

@ -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 { }

50
src/app/views/entrollment/student/student.component.html → src/app/views/enrolment/student/student.component.html
View File

@ -4,7 +4,7 @@
<div class="col-lg-12" *ngIf="!show">
<tabset>
<tab>
<ng-template tabHeading>Student Entrollment</ng-template>
<ng-template tabHeading>Student Enrolment</ng-template>
<div class="form-group">
<div class="row">
<div class="form-group col-md-4">
@ -93,7 +93,7 @@
<th>Student Name</th>
<th>Father Name</th>
<th>Mobile</th>
<th>Course</th>
<th>Course/University</th>
<th>Sem/Year</th>
<th>Batch</th>
<th>Status</th>
@ -106,13 +106,13 @@
<td>{{app.studentName}}</td>
<td>{{app.fatherName}}</td>
<td>{{app.mobile}}</td>
<td>{{app.course}}</td>
<td>{{app.course}} / {{app.univ}}</td>
<td>{{app.sem}}</td>
<td>{{app.batch}}</td>
<td>
<span *ngIf="app.status == 1" class="badge badge-success">Active</span>
<span *ngIf="app.status == 0" class="badge badge-danger">In-Active</span>
</td>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i>
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
@ -136,14 +136,14 @@
<tab>
<ng-template tabHeading>Add Student</ng-template>
<div align="right">
<button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
<button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>
<!--<button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
<button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>-->
</div>
<br>
<div *ngIf="!oldReg">
<div class="card">
<div class="card-header">
Add Student Personal Details
Personal Details
</div>
<div class="card-body">
<div class="container">
@ -156,6 +156,18 @@
<label for="lname">Last Name <span class="danger">*</span></label>
<input type="text" class="form-control" id="lname" placeholder="Enter Last name">
</div>
<div class="form-group col-md-4">
<label for="gender">Gender <span class="danger">*</span></label>
<!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
<div>
<label class="radio" for="gender">
<input type="radio" id="gender-male" name="inline-radios" value="Male"> Male
</label>
<label class="radio" for="inline-radio2">
<input type="radio" id="gender-female" name="inline-radios" value="Female"> Female
</label>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
@ -186,16 +198,7 @@
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label for="gender">Gender <span class="danger">*</span></label>
<!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
<label class="radio" for="gender">
<input type="radio" id="gender-male" name="inline-radios" value="Male"> Male
</label>
<label class="radio" for="inline-radio2">
<input type="radio" id="gender-female" name="inline-radios" value="Female"> Female
</label>
</div>
<div class="form-group col-md-4">
<label for="adhar">Aadhar Number <span class="danger">*</span></label>
<input type="text" class="form-control" id="adhar" placeholder="Enter Aadhar Number">
@ -208,12 +211,13 @@
<!--/.row-->
<div class="row">
<div class="form-group col-md-4">
<label for="premanentAddress">Premanent Address <span class="danger">*</span></label>
<label for="premanentAddress">Permanent Address <span class="danger">*</span></label>
<textarea class="form-control" id="premanentAddress" placeholder="Enter Permanent Address"></textarea>
</div>
<div class="form-group col-md-4">
<label for="currentAddress">Current Address <span class="danger">*</span></label>
<label for="currentAddress">Current Address<span class="danger">*</span> </label>
<textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea>
Same as Permanent Address <span><input type="checkbox"></span>
</div>
</div>
</div>
@ -223,7 +227,7 @@
</div>
<div class="card">
<div class="card-header">
Add Course Details
Course Details
</div>
<div class="card-body">
<div class="container">
@ -287,7 +291,11 @@
</div>
</div>
</div>
<div *ngIf="oldReg">
</tab>
<tab>
<ng-template tabHeading>Re-registertion</ng-template>
<div>
<div class="card">
<div class="card-header">
Re-registration

0
src/app/views/enrolment/student/student.component.scss Normal file
View File

3
src/app/views/entrollment/student/student.component.ts → src/app/views/enrolment/student/student.component.ts
View File

@ -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'

30
src/app/views/masters/form-list/form-list.component.html
View File

@ -23,6 +23,7 @@
<tr>
<th>From Name</th>
<th>From Type</th>
<th>Course / University</th>
<th>Description</th>
<th>Status</th>
<th>Action</th>
@ -32,6 +33,7 @@
<tr *ngFor="let form of formsList">
<td>{{form.formName}}</td>
<td>{{form.formType}}</td>
<td>{{form.course}} / {{form.univ}}</td>
<td>{{form.description}}</td>
<td>
<span *ngIf="form.status == 1" class="badge badge-success">Active</span>
@ -78,17 +80,39 @@
<option>Admission Form</option>
</select>
</div>
<div class="col-md-4">
<label for="formType">Select University<span class="danger">*</span></label>
<select id="disabledSelect" class="form-control">
<option value="0">Please Select University</option>
<option value="1">MMM univ</option>
<option value="2">PPP univ</option>
<option value="3">SSS univ</option>
</select>
</div>
</div>
<div class="row">
<div class="col-md-4">
<label for="formType">Select Course<span class="danger">*</span></label>
<select id="disabledSelect" class="form-control">
<option value="0">Please Select Course</option>
<option value="1">B.com</option>
<option value="2">MCA</option>
<option value="3">M.Sc</option>
</select>
</div>
<div class="form-group col-md-4">
<label for="formDescription">Description</label>
<textarea class="form-control" id="formDescription" placeholder="Enter Description"></textarea>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
Upload Form :
<input type="file" class="file-input">
</div>
<div class="form-group col-md-4">
</div>
<div class="row">
<div class="form-group col-md-4">
Active/De-Active : <label class="switch switch-default switch-pill switch-primary">
<input type="checkbox" class="switch-input" checked>
<span class="switch-label"></span>

10
src/app/views/masters/form-list/form-list.component.ts
View File

@ -17,19 +17,25 @@ export class FormListComponent implements OnInit {
formName: 'KR Univ Student Registration Form',
formType: 'Registration Form',
description: 'KR univ students registration form for upcomming batch',
univ: 'KR univ',
course: 'B.Sc',
status: '1'
},
{
formName: 'KR Univ Re-registration form',
formType: 'Registration Form',
description: 'KR univ re-registration form for arts students',
status: '1'
status: '1',
univ: 'KR univ',
course: 'MCA',
},
{
formName: 'PML Univ Re-registration form',
formType: 'Registration Form',
description: 'PML univ re-registration form for arts students',
status: '0'
status: '0',
univ: 'KR univ',
course: 'BCA',
}
]
}

27
src/app/views/status/status-routing.module.ts
View File

@ -1,11 +1,8 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
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';
import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
const routes: Routes = [
@ -14,26 +11,7 @@ const routes: Routes = [
data: {
title: 'Status'
},
children: [
{
path: 'application',
component: ApplicationComponent,
data: {
title: 'Application'
}
},{
path: 'courier',
component: CourierComponent,
data: {
title: 'Couriers'
}
},{
path: 'studyMaterial',
component: StudyMaterialComponent,
data: {
title: 'Study Material'
}
},{
children: [{
path: 'answerBooklet',
component: AnswerBookletComponent,
data: {
@ -45,8 +23,7 @@ const routes: Routes = [
data: {
title: 'Documents'
}
}
,{
},{
path: 'paymentdetails',
component: PaymentdetailsComponent,
data: {

9
src/app/views/status/status.module.ts
View File

@ -9,17 +9,13 @@ import { ModalModule } from 'ngx-bootstrap/modal';
import { StatusRoutingModule } from './status-routing.module';
//application
import { ApplicationComponent } from './application/application.component';
//study material
import { StudyMaterialComponent } from './study-material/study-material.component';
// import { ApplicationComponent } from './application/application.component';
//documents
import { DocumentsComponent } from './documents/documents.component';
import { EditDocumentsComponent } from './documents/edit-documents/edit-documents.component';
//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';
//paymentdetails
import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
@ -33,13 +29,10 @@ import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.compone
StatusRoutingModule
],
declarations: [
ApplicationComponent,
StudyMaterialComponent,
DocumentsComponent,
EditDocumentsComponent,
AnswerBookletComponent,
EditAnswerBookletComponent,
CourierComponent,
PaymentdetailsComponent
]
})

54
src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
View File

@ -35,10 +35,10 @@
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Batch</option>
<option value="1">Jan 2017</option>
<option value="2">Jul 2017</option>
<option value="3">Jan 2018</option>
<option value="0">Sem/Year</option>
<option value="1">1st Sem/2018</option>
<option value="2">2nd Sem/2018</option>
<option value="3">3rd Sem/2019</option>
</select>
</div>
</div>
@ -67,7 +67,7 @@
<thead>
<tr>
<th>Study Center Name</th>
<th>Batch Name</th>
<th>Sem/Year</th>
<th>Course Name</th>
<th> Quantity</th>
<th>Status</th>
@ -78,7 +78,7 @@
<tbody>
<tr>
<td>Center A</td>
<td>Batch A</td>
<td>1st Sem / 2018</td>
<td>MCA</td>
<td>10</td>
@ -88,7 +88,7 @@
</tr>
<tr>
<td>Center B</td>
<td>Batch B</td>
<td>2nd Sem / 2018</td>
<td>MBA</td>
<td>15</td>
@ -98,7 +98,7 @@
</tr>
<tr>
<td>Center C</td>
<td>Batch C</td>
<td>3rd Sem / 2019</td>
<td>BE</td>
<td>20</td>
@ -108,7 +108,7 @@
</tr>
<tr>
<td>Center D</td>
<td>Batch D</td>
<td>4th Sem / 2019</td>
<td>DE</td>
<td>34</td>
@ -148,10 +148,10 @@
<div class="col-md-3">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Please Select Styducenter</option>
<option value="1">MMM Stydycenter</option>
<option value="2">PPP Stydycenter</option>
<option value="3">SSS Stydycenter</option>
<option value="0">Please Select University</option>
<option value="1">MMM University</option>
<option value="2">PPP University</option>
<option value="3">SSS University</option>
</select>
</div>
</div>
@ -169,10 +169,10 @@
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Batch</option>
<option value="1">Jan 2017</option>
<option value="2">Jul 2017</option>
<option value="3">Jan 2018</option>
<option value="0">Sem/Year</option>
<option value="1">1st Sem/2018</option>
<option value="2">2nd Sem/2018</option>
<option value="3">3rd Sem/2019</option>
</select>
</div>
</div>
@ -197,7 +197,7 @@
<br>
<div class="row">
<div class="col-md-4">
<label for="company"><strong>Total Materials</strong></label>
<label for="company"><strong>Total StudyMaterials</strong></label>
<input type="text" class="form-control" id="company" placeholder="150">
</div>
</div>
@ -209,10 +209,10 @@
<tr>
<th>Select</th>
<th>Study Center Name</th>
<th>Batch Name</th>
<th>Sem/Year</th>
<th>Course Name</th>
<th>Request Quantity</th>
<th>Register Forms</th>
<th>Paid Forms</th>
<th>Allocate Quantity</th>
</tr>
@ -225,6 +225,7 @@
<td>MCA</td>
<td>10</td>
<td>10</td>
<td><input type="text" value="10"></td>
</tr>
@ -233,8 +234,8 @@
<td>Center B</td>
<td>Batch B</td>
<td>MBA</td>
<td>15</td>
<td>15</td>
<td>15</td>
<td><input type="text" value="15"></td>
</tr>
@ -243,9 +244,9 @@
<td>Center C</td>
<td>Batch C</td>
<td>BE</td>
<td>20</td>
<td><input type="text" value="0"></td>
<td>20</td>
<td>18</td>
<td><input type="text" value="18"></td>
</tr>
<tr>
@ -255,6 +256,7 @@
<td>DE</td>
<td>34</td>
<td>34</td>
<td><input type="text" value="34"></td>
</tr>

37
src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html
View File

@ -36,10 +36,10 @@
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Batch</option>
<option value="1">Jan 2017</option>
<option value="2">Jul 2017</option>
<option value="3">Jan 2018</option>
<option value="0">Sem/Year</option>
<option value="1">1st Sem/2018</option>
<option value="2">2nd Sem/2018</option>
<option value="3">3rd Sem/2019</option>
</select>
</div>
</div>
@ -69,7 +69,7 @@
<tr>
<th>University Name</th>
<th>Course Name</th>
<th>Courier No</th>
<th>Sem/Year</th>
<th>Quantity</th>
<th>Received Date</th>
</tr>
@ -78,28 +78,28 @@
<tr>
<td>Anna University</td>
<td>MCA</td>
<td>1A</td>
<td>1st Sem</td>
<td>10</td>
<td>10/10/2018</td>
</tr>
<tr>
<td>Bharathi University</td>
<td>MBA</td>
<td>1B</td>
<td>2nd Sem</td>
<td>15</td>
<td>15/10/2018</td>
</tr>
<tr>
<td>Thiruvalluvar University</td>
<td>BE</td>
<td>1C</td>
<td>3rd Sem</td>
<td>20</td>
<td>10/11/2018</td>
</tr>
<tr>
<td>Kamaraj University</td>
<td>DE</td>
<td>1D</td>
<td>4th sem</td>
<td>34</td>
<td>12/11/2018</td>
</tr>
@ -170,25 +170,20 @@
<div class="form-group row">
<div class="col-md-4">
<label for="company">Courier Number<span class="required">*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Courier Number">
</div>
<div class="col-md-4">
<label for="company">Courier Name<span class="required">*</span></label>
<input type="text" class="form-control" id="company" placeholder="Courier Name"> </div>
<div class="col-md-4">
<label for="company">Quantity<span class="required">*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Quantity"> </div>
</div>
<div class="form-group row">
<div class=" col-md-4 ">
<input type="text" class="form-control" id="company" placeholder="Enter Quantity">
</div>
<div class=" col-md-4 ">
<label for="company">Received Date<span class="required">*</span></label>
<input type="date" class="form-control" id="date" placeholder="Enter Batch Date">
</div>
</div>
</div>
<div class="card-footer">

152
src/app/views/studymaterial/study-material/study-material.component.html Normal file
View File

@ -0,0 +1,152 @@
<div class="col-lg-12" *ngIf="!show">
<tabset>
<tab>
<ng-template tabHeading>Study Material Status</ng-template>
<div class="form-group">
<div class="row">
<div class="form-group col-md-4">
<label for="name"> Study Material Center</label>
<select id="disabledSelect" class="form-control">
<option value="0">Please select Study Center</option>
<option value="1">SC 001</option>
<option value="2">SC 002</option>
<option value="3">SC 003</option>
</select>
</div>
</div>
</div>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Study Matrial Status List
</div>
<div class="card-body">
<div class="row">
<div class="col-md-4">
<div class="input-prepend input-group">
<span class="input-group-addon">
<i class="fa fa-search"></i>
</span>
<input id="search" class="form-control" type="text" placeholder="search">
</div>
</div>
</div>
<br>
<table class="table table-bordered table-responsive">
<thead>
<tr>
<th>ID</th>
<th>Study Material Details</th>
<th>University</th>
<th>Course</th>
<th>Total</th>
<th>Status</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let app of studyMaterialDetails">
<td>{{app.applicationId}}</td>
<td>{{app.details}}</td>
<td>{{app.univ}}</td>
<td>{{app.course}}</td>
<td>{{app.total}}</td>
<td>
<span *ngIf="app.status == 1" class="badge badge-success">Received</span>
<span *ngIf="app.status == 0" class="badge badge-danger">Sent</span>
</td>
<td>
<!--<i class="fa fa-edit" tooltip="Edit" (click)="editStudyCenter()"></i> |-->
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
</td>
</tr>
</tbody>
</table>
<ul class="pagination">
<li class="page-item"><a class="page-link" href="#">Prev</a></li>
<li class="page-item active">
<a class="page-link" href="#">1</a>
</li>
<li class="page-item"><a class="page-link" href="#">2</a></li>
<li class="page-item"><a class="page-link" href="#">3</a></li>
<li class="page-item"><a class="page-link" href="#">4</a></li>
<li class="page-item"><a class="page-link" href="#">Next</a></li>
</ul>
</div>
</div>
</tab>
</tabset>
</div>
<div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document" *ngIf="myModalData">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{{ myModalData.applicationId }}</h4>
<button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container">
<div class="row">
<div class="col-md-6">
<label><b> Student Material Details : </b> </label> {{myModalData.details}}
</div>
<div class="col-md-6">
<label><b>University : </b> </label> {{myModalData.univ}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Course : </b> </label> {{myModalData.course}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Total : </b> </label> {{myModalData.total}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Sent Date : </b> </label>
</div>
<div class="col-md-6">
<label><b> Comments : </b> </label>
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Recive Date : </b> </label>
</div>
<div class="col-md-6">
<label><b> Comments : </b> </label>
</div>
</div>
<div class="row">
<div class="col-md-4">
<label for="name"> Status</label>
<select id="disabledSelect" class="form-control">
<option value="0">Select Status</option>
<option value="1">Sent</option>
<option value="2">Received</option>
</select>
</div>
<div class="col-md-4">
<label for="comment">Comments <span class="danger">*</span></label>
<textarea class="form-control" id="comments" placeholder="Enter Comments"></textarea>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" (click)="myModal.hide()">Close</button>
<button type="button" class="btn btn-primary">Save</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->

50
src/app/views/studymaterial/study-material/study-material.component.ts Normal file
View File

@ -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;
}
}

10
src/app/views/studymaterial/studymaterial-routing.module.ts
View File

@ -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'
}
}
]
}];

4
src/app/views/studymaterial/studymaterial.module.ts
View File

@ -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 { }