Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollosc
This commit is contained in:
gayathri1990
commit
5c36a18764
@ -80,6 +80,14 @@
|
||||
<fieldset>
|
||||
<div class="container">
|
||||
<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="cname">Courier Name <span class="danger">*</span></label>
|
||||
<input type="text" class="form-control" id="cname" placeholder="Enter Courier name">
|
||||
@ -88,19 +96,12 @@
|
||||
<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>
|
||||
<label for="motherName">Date<span class="danger">*</span></label>
|
||||
<input type="text" placeholder="dd/mm/yyyy" class="form-control" id="motherName">
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label for="sendFor">Send To / Receive From <span class="danger"> *</span></label>
|
||||
@ -127,10 +128,6 @@
|
||||
</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">
|
||||
@ -139,13 +136,18 @@
|
||||
<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 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>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<tabset>
|
||||
<tab>
|
||||
<ng-template tabHeading>Student Enrolment</ng-template>
|
||||
<div class="form-group line-height">
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="name"> Select Study Center</label>
|
||||
@ -21,7 +21,7 @@
|
||||
<tabset>
|
||||
<tab>
|
||||
<ng-template tabHeading>Student List</ng-template>
|
||||
<div class="card line-height">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<i class="fa fa-align-justify"></i> Student Details List
|
||||
</div>
|
||||
@ -30,7 +30,7 @@
|
||||
<div class="col-md-2">
|
||||
<div class="input-prepend input-group">
|
||||
<select id="disabledSelect" class="form-control">
|
||||
<option value="0">Batch</option>
|
||||
<option value="0">Session</option>
|
||||
<option value="1">Jan 2017</option>
|
||||
<option value="2">Jul 2017</option>
|
||||
<option value="3">Jan 2018</option>
|
||||
@ -86,10 +86,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<table class="table table-bordered table-responsive line-height-table">
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Batch</th>
|
||||
<th>Session</th>
|
||||
<th>Form Id</th>
|
||||
<th>Student Name</th>
|
||||
<th>Father Name</th>
|
||||
@ -111,13 +111,22 @@
|
||||
<td>{{app.course}} / {{app.univ}}</td>
|
||||
<td>{{app.sem}}</td>
|
||||
<td>
|
||||
<span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
|
||||
<span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>
|
||||
{{app.status}}
|
||||
<!--<span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
|
||||
<span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>-->
|
||||
</td>
|
||||
<td>{{app.comments}}</td>
|
||||
<td>
|
||||
<div *ngIf="app.feesStatus==1;else pending_content">
|
||||
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
|
||||
<i class="fa fa-money line-height-table" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
|
||||
<i class="fa fa-money line-height-table text-success" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
|
||||
</div>
|
||||
<ng-template #pending_content>
|
||||
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
|
||||
<i class="fa fa-money line-height-table text-danger" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
|
||||
</ng-template>
|
||||
|
||||
|
||||
|
||||
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
|
||||
</td>
|
||||
@ -366,11 +375,12 @@
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Batch</th>
|
||||
<th>Session</th>
|
||||
<th>Form Id</th>
|
||||
<th>Course</th>
|
||||
<th>University</th>
|
||||
<th>Sem/Year</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -380,6 +390,8 @@
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>3</td>
|
||||
<td> <i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Jul 2017</td>
|
||||
@ -387,6 +399,10 @@
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>2</td>
|
||||
<td>
|
||||
<i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Jan 2017</td>
|
||||
@ -394,6 +410,10 @@
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>1</td>
|
||||
<td>
|
||||
<i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -446,7 +466,7 @@
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Batch</th>
|
||||
<th>Session</th>
|
||||
<th>Form Id</th>
|
||||
<th>Course</th>
|
||||
<th>University</th>
|
||||
@ -491,13 +511,14 @@
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Re-registertion</h4>
|
||||
<h4 class="modal-title">Re-registration</h4>
|
||||
<button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label><b> Student Name : </b> </label> XYZ
|
||||
@ -552,6 +573,105 @@
|
||||
</div>
|
||||
<!-- /.modal -->
|
||||
|
||||
<div bsModal #myModelReReg="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Re-registration Form</h4>
|
||||
<button type="button" class="close" (click)="myModelReReg.hide()" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label><b> Form ID : </b> </label> KES08432
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label><b> Student Name : </b> </label> XYZ
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label><b>Enrolment Number : </b> </label> UNIV120876
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label><b> Course : </b> </label> B.Com
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label><b> University : </b> </label> KR Univ
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label for="name"> <b>Sem/Year :</b> </label> 3
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label for="name"><b>Session :</b></label> Jan 2018
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<th>Subject Code</th>
|
||||
<th>Subject Name</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 1</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 2</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 3</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 4</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 5</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>SFJK000021</td>
|
||||
<td>Subject 6</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" (click)="myModelReReg.hide()">Close</button>
|
||||
<!--<button type="button" class="btn btn-primary">Save</button>-->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.modal-content -->
|
||||
</div>
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
<!-- /.modal -->
|
||||
|
||||
<!-- start student fees modal-->
|
||||
|
||||
<div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
@ -564,6 +684,7 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="feesName">Fees Name <span class="danger">*</span></label>
|
||||
@ -605,6 +726,17 @@
|
||||
</div>
|
||||
<!--/.col-->
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label class="text-info">Payable Amount : </label><span>25800</span>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="text-success">Paid Amount : </label><span>25000</span>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="text-danger">Balance Amount : </label><span>800</span>
|
||||
</div>
|
||||
</div><!--/.row-->
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" (click)="feesModal.hide()">Close</button>
|
||||
|
||||
@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
|
||||
closed = false;
|
||||
public myModal;
|
||||
public myModalData;
|
||||
public myModelReReg;
|
||||
students: any;
|
||||
oldReg: boolean = false;
|
||||
public feesModal;
|
||||
@ -23,11 +24,12 @@ export class StudentComponent implements OnInit {
|
||||
fatherName: 'mmm mmm',
|
||||
mobile: '+919876543210',
|
||||
course: 'B.Sc',
|
||||
univ: 'KR university',
|
||||
univ: 'KR univ',
|
||||
sem: 2,
|
||||
batch: 'Jan 2018',
|
||||
status: '1',
|
||||
status: 'Send To Univ',
|
||||
comments: 'approved by Univ',
|
||||
feesStatus: 0,
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
@ -48,11 +50,12 @@ export class StudentComponent implements OnInit {
|
||||
fatherName: 'sss sss',
|
||||
mobile: '+919876511111',
|
||||
course: 'B.Sc',
|
||||
univ: 'KR university',
|
||||
univ: 'KR univ',
|
||||
sem: 4,
|
||||
batch: 'Jan 2018',
|
||||
status: '1',
|
||||
status: 'Approved by Univ',
|
||||
comments: 'approved by Univ',
|
||||
feesStatus: 1,
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
@ -73,11 +76,12 @@ export class StudentComponent implements OnInit {
|
||||
fatherName: 'nnn nnn',
|
||||
mobile: '+919876500000',
|
||||
course: 'B.Sc',
|
||||
univ: 'KR university',
|
||||
univ: 'KR univ',
|
||||
sem: 8,
|
||||
batch: 'Jan 2018',
|
||||
status: '0',
|
||||
status: 'rejected by Univ',
|
||||
comments: 'rejected by Univ',
|
||||
feesStatus: 1,
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
|
||||
@ -94,7 +94,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="formType">Select Course<span class="danger">*</span></label>
|
||||
<label for="formType">Select Course</label>
|
||||
|
||||
<select id="disabledSelect" class="form-control">
|
||||
<option value="0">Please Select Course</option>
|
||||
|
||||
@ -157,6 +157,83 @@
|
||||
</div>
|
||||
</div>
|
||||
</div><!--/.col-->
|
||||
</div>
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading> Document </ng-template>
|
||||
<div class="row">
|
||||
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="statusName">Status Name <span class="symbol required"></span></label>
|
||||
<input type="text" class="form-control" id="statusName" placeholder="Enter status name">
|
||||
</div>
|
||||
<div class="form-group col-sm-4 saveBtn">
|
||||
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-plus-circle"></i> Save</button>
|
||||
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<i class="fa fa-align-justify"></i> View Document Status
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-3 ">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
<input type="text" id="input1-group1" name="input1-group1" class="form-control" placeholder="Search">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-3 ">
|
||||
<button type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i> Search</button>
|
||||
</div>
|
||||
|
||||
</div><!--/.row-->
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-xs-12">
|
||||
<table class="table table-bordered table-responsive table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Status Name</th>
|
||||
<th>Type</th>
|
||||
<th>Status</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let document of documentStatus">
|
||||
<td>{{document.statusName}}</td>
|
||||
<td>{{document.type}}</td>
|
||||
<td>
|
||||
<span class="badge badge-success">{{document.status}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<a><i class="fa fa-pencil-square-o"></i></a>
|
||||
</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>
|
||||
<!--/.col-->
|
||||
</div>
|
||||
<!--/.row-->
|
||||
</div>
|
||||
</div>
|
||||
</div><!--/.col-->
|
||||
</div>
|
||||
</tab>
|
||||
<tab>
|
||||
|
||||
@ -8,5 +8,5 @@
|
||||
cursor:pointer;
|
||||
}
|
||||
.saveBtn {
|
||||
padding-top: 28px;
|
||||
padding-top: 29px;
|
||||
}
|
||||
@ -12,6 +12,7 @@ export class StatusMasterComponent implements OnInit {
|
||||
formStatus: any;
|
||||
markCardStatus: any;
|
||||
studyMaterialStatus: any;
|
||||
documentStatus: any;
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
@ -39,6 +40,18 @@ export class StatusMasterComponent implements OnInit {
|
||||
status: 'Active'
|
||||
},
|
||||
]
|
||||
this.documentStatus = [
|
||||
{
|
||||
statusName: 'Sent to SC ',
|
||||
type: 'Document',
|
||||
status: 'Active'
|
||||
},
|
||||
{
|
||||
statusName: 'Received by SC',
|
||||
type: 'Document',
|
||||
status: 'Active'
|
||||
},
|
||||
]
|
||||
this.feesStatus = [
|
||||
{
|
||||
statusName: 'Paid',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user