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:
gayathri1990 2018-08-10 19:48:21 +05:30
commit 5c36a18764
7 changed files with 270 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/views/courier/courier/courier.component.html
View File

@ -11,7 +11,7 @@
<i class="fa fa-align-justify"></i> Courier Details List <i class="fa fa-align-justify"></i> Courier Details List
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="input-prepend input-group"> <div class="input-prepend input-group">
<span class="input-group-addon"> <span class="input-group-addon">
@ -73,13 +73,21 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<i class="fa fa-align-justify"></i> Add Courier Details <i class="fa fa-align-justify"></i> Add Courier Details
</div> </div>
<form> <form>
<div class="card-body"> <div class="card-body">
<fieldset> <fieldset>
<div class="container"> <div class="container">
<div class="row"> <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"> <div class="form-group col-md-4">
<label for="cname">Courier Name <span class="danger">*</span></label> <label for="cname">Courier Name <span class="danger">*</span></label>
<input type="text" class="form-control" id="cname" placeholder="Enter Courier name"> <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> <label for="lname">Docket No. <span class="danger">*</span></label>
<input type="text" class="form-control" id="lname" placeholder="Enter Docket No"> <input type="text" class="form-control" id="lname" placeholder="Enter Docket No">
</div> </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>
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="pmobile">Type<span class="danger">*</span></label> <label for="motherName">Date<span class="danger">*</span></label>
<select id="disabledSelect" class="form-control"> <input type="text" placeholder="dd/mm/yyyy" class="form-control" id="motherName">
<option value="0">Please Select Type</option>
<option value="1">Received</option>
<option value="2">Dispatched</option>
</select>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="sendFor">Send To / Receive From <span class="danger"> *</span></label> <label for="sendFor">Send To / Receive From <span class="danger"> *</span></label>
@ -115,7 +116,7 @@
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="sendFor">Select Study Center<span class="danger"> *</span></label> <label for="sendFor">Select Study Center<span class="danger"> *</span></label>
<div class="input-prepend input-group"> <div class="input-prepend input-group">
<select id="disabledSelect" class="form-control"> <select id="disabledSelect" class="form-control">
<option value="0">Please Select SC</option> <option value="0">Please Select SC</option>
@ -126,11 +127,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <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"> <div class="form-group col-md-4">
<label for="email">Qty <span class="danger">*</span></label> <label for="email">Qty <span class="danger">*</span></label>
<input type="text" class="form-control" id="email" placeholder="Enter Qty"> <input type="text" class="form-control" id="email" placeholder="Enter Qty">
@ -139,13 +136,18 @@
<label for="fatherName">Amount</label> <label for="fatherName">Amount</label>
<input type="text" class="form-control" id="fatherName" placeholder="Enter Amount"> <input type="text" class="form-control" id="fatherName" placeholder="Enter Amount">
</div> </div>
</div>
<div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="motherName">Received By / Dispatched By<span class="danger">*</span></label> <label for="motherName">Received By / Dispatched By<span class="danger">*</span></label>
<input type="text" class="form-control" id="motherName" placeholder="Enter Name"> <input type="text" class="form-control" id="motherName" placeholder="Enter Name">
</div> </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>
</div> </div>
</fieldset> </fieldset>
</div> </div>
@ -195,7 +197,7 @@
<label><b>Weight : </b> </label> {{myModalData.weight}} <label><b>Weight : </b> </label> {{myModalData.weight}}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label><b>Amount : </b> </label> {{myModalData.amt}} <label><b>Amount : </b> </label> {{myModalData.amt}}
</div> </div>
@ -203,7 +205,7 @@
<label><b>Date : </b> </label> {{myModalData.date}} <label><b>Date : </b> </label> {{myModalData.date}}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<label for="name"> Status</label> <label for="name"> Status</label>
<select id="disabledSelect" class="form-control"> <select id="disabledSelect" class="form-control">

156
src/app/views/enrolment/student/student.component.html
View File

@ -5,7 +5,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Student Enrolment</ng-template> <ng-template tabHeading>Student Enrolment</ng-template>
<div class="form-group line-height"> <div class="form-group">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="name"> Select Study Center</label> <label for="name"> Select Study Center</label>
@ -21,7 +21,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Student List</ng-template> <ng-template tabHeading>Student List</ng-template>
<div class="card line-height"> <div class="card">
<div class="card-header"> <div class="card-header">
<i class="fa fa-align-justify"></i> Student Details List <i class="fa fa-align-justify"></i> Student Details List
</div> </div>
@ -30,7 +30,7 @@
<div class="col-md-2"> <div class="col-md-2">
<div class="input-prepend input-group"> <div class="input-prepend input-group">
<select id="disabledSelect" class="form-control"> <select id="disabledSelect" class="form-control">
<option value="0">Batch</option> <option value="0">Session</option>
<option value="1">Jan 2017</option> <option value="1">Jan 2017</option>
<option value="2">Jul 2017</option> <option value="2">Jul 2017</option>
<option value="3">Jan 2018</option> <option value="3">Jan 2018</option>
@ -86,10 +86,10 @@
</div> </div>
</div> </div>
<br> <br>
<table class="table table-bordered table-responsive line-height-table"> <table class="table table-bordered table-responsive">
<thead> <thead>
<tr> <tr>
<th>Batch</th> <th>Session</th>
<th>Form Id</th> <th>Form Id</th>
<th>Student Name</th> <th>Student Name</th>
<th>Father Name</th> <th>Father Name</th>
@ -111,13 +111,22 @@
<td>{{app.course}} / {{app.univ}}</td> <td>{{app.course}} / {{app.univ}}</td>
<td>{{app.sem}}</td> <td>{{app.sem}}</td>
<td> <td>
<span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span> {{app.status}}
<span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span> <!--<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>
<td>{{app.comments}}</td> <td>{{app.comments}}</td>
<td> <td>
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> | <div *ngIf="app.feesStatus==1;else pending_content">
<i class="fa fa-money line-height-table" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i> <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></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>--> <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
</td> </td>
@ -366,11 +375,12 @@
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive">
<thead> <thead>
<tr> <tr>
<th>Batch</th> <th>Session</th>
<th>Form Id</th> <th>Form Id</th>
<th>Course</th> <th>Course</th>
<th>University</th> <th>University</th>
<th>Sem/Year</th> <th>Sem/Year</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -380,6 +390,8 @@
<td>B.Com</td> <td>B.Com</td>
<td>KR Univ</td> <td>KR Univ</td>
<td>3</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>
<tr> <tr>
<td>Jul 2017</td> <td>Jul 2017</td>
@ -387,6 +399,10 @@
<td>B.Com</td> <td>B.Com</td>
<td>KR Univ</td> <td>KR Univ</td>
<td>2</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>
<tr> <tr>
<td>Jan 2017</td> <td>Jan 2017</td>
@ -394,6 +410,10 @@
<td>B.Com</td> <td>B.Com</td>
<td>KR Univ</td> <td>KR Univ</td>
<td>1</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> </tr>
</tbody> </tbody>
</table> </table>
@ -446,7 +466,7 @@
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive">
<thead> <thead>
<tr> <tr>
<th>Batch</th> <th>Session</th>
<th>Form Id</th> <th>Form Id</th>
<th>Course</th> <th>Course</th>
<th>University</th> <th>University</th>
@ -491,13 +511,14 @@
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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"> <button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label><b> Student Name : </b> </label> XYZ <label><b> Student Name : </b> </label> XYZ
@ -552,6 +573,105 @@
</div> </div>
<!-- /.modal --> <!-- /.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">&times;</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--> <!-- start student fees modal-->
<div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@ -564,6 +684,7 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label for="feesName">Fees Name <span class="danger">*</span></label> <label for="feesName">Fees Name <span class="danger">*</span></label>
@ -605,6 +726,17 @@
</div> </div>
<!--/.col--> <!--/.col-->
</div> </div>
<div class="row">
<div class="col-md-3">
<label class="text-info">Payable Amount&nbsp;:&nbsp;</label><span>25800</span>
</div>
<div class="col-md-3">
<label class="text-success">Paid Amount&nbsp;:&nbsp;</label><span>25000</span>
</div>
<div class="col-md-3">
<label class="text-danger">Balance Amount&nbsp;:&nbsp;</label><span>800</span>
</div>
</div><!--/.row-->
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" (click)="feesModal.hide()">Close</button> <button type="button" class="btn btn-secondary" (click)="feesModal.hide()">Close</button>

16
src/app/views/enrolment/student/student.component.ts
View File

@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
closed = false; closed = false;
public myModal; public myModal;
public myModalData; public myModalData;
public myModelReReg;
students: any; students: any;
oldReg: boolean = false; oldReg: boolean = false;
public feesModal; public feesModal;
@ -23,11 +24,12 @@ export class StudentComponent implements OnInit {
fatherName: 'mmm mmm', fatherName: 'mmm mmm',
mobile: '+919876543210', mobile: '+919876543210',
course: 'B.Sc', course: 'B.Sc',
univ: 'KR university', univ: 'KR univ',
sem: 2, sem: 2,
batch: 'Jan 2018', batch: 'Jan 2018',
status: '1', status: 'Send To Univ',
comments: 'approved by Univ', comments: 'approved by Univ',
feesStatus: 0,
feesDetails:[ feesDetails:[
{ {
feesName:"Tution Fees", feesName:"Tution Fees",
@ -48,11 +50,12 @@ export class StudentComponent implements OnInit {
fatherName: 'sss sss', fatherName: 'sss sss',
mobile: '+919876511111', mobile: '+919876511111',
course: 'B.Sc', course: 'B.Sc',
univ: 'KR university', univ: 'KR univ',
sem: 4, sem: 4,
batch: 'Jan 2018', batch: 'Jan 2018',
status: '1', status: 'Approved by Univ',
comments: 'approved by Univ', comments: 'approved by Univ',
feesStatus: 1,
feesDetails:[ feesDetails:[
{ {
feesName:"Tution Fees", feesName:"Tution Fees",
@ -73,11 +76,12 @@ export class StudentComponent implements OnInit {
fatherName: 'nnn nnn', fatherName: 'nnn nnn',
mobile: '+919876500000', mobile: '+919876500000',
course: 'B.Sc', course: 'B.Sc',
univ: 'KR university', univ: 'KR univ',
sem: 8, sem: 8,
batch: 'Jan 2018', batch: 'Jan 2018',
status: '0', status: 'rejected by Univ',
comments: 'rejected by Univ', comments: 'rejected by Univ',
feesStatus: 1,
feesDetails:[ feesDetails:[
{ {
feesName:"Tution Fees", feesName:"Tution Fees",

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

@ -94,7 +94,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <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"> <select id="disabledSelect" class="form-control">
<option value="0">Please Select Course</option> <option value="0">Please Select Course</option>

77
src/app/views/masters/status-master/status-master.component.html
View File

@ -159,6 +159,83 @@
</div><!--/.col--> </div><!--/.col-->
</div> </div>
</tab> </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>&nbsp;
<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> <tab>
<ng-template tabHeading> Fees</ng-template> <ng-template tabHeading> Fees</ng-template>
<div class="row"> <div class="row">

2
src/app/views/masters/status-master/status-master.component.scss
View File

@ -8,5 +8,5 @@
cursor:pointer; cursor:pointer;
} }
.saveBtn { .saveBtn {
padding-top: 28px; padding-top: 29px;
} }

13
src/app/views/masters/status-master/status-master.component.ts
View File

@ -12,6 +12,7 @@ export class StatusMasterComponent implements OnInit {
formStatus: any; formStatus: any;
markCardStatus: any; markCardStatus: any;
studyMaterialStatus: any; studyMaterialStatus: any;
documentStatus: any;
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {
@ -39,6 +40,18 @@ export class StatusMasterComponent implements OnInit {
status: 'Active' status: 'Active'
}, },
] ]
this.documentStatus = [
{
statusName: 'Sent to SC ',
type: 'Document',
status: 'Active'
},
{
statusName: 'Received by SC',
type: 'Document',
status: 'Active'
},
]
this.feesStatus = [ this.feesStatus = [
{ {
statusName: 'Paid', statusName: 'Paid',