Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollosc
This commit is contained in:
dineshkumarkannan
commit
04dea2603b
@ -30,10 +30,11 @@
|
||||
<input type="text" class="form-control" value="15000" id="feesAmount" placeholder="Enter fees amount">
|
||||
</div>
|
||||
<div class="form-group col-sm-2">
|
||||
<label for="feesType">One Time / Per Sem <span class="symbol required"></span></label>
|
||||
<label for="feesType">Fees Type <span class="symbol required"></span></label>
|
||||
<select class="form-control" id="semyear">
|
||||
<option>Select One Time / Per Sem</option>
|
||||
<option>One Time</option>
|
||||
<option>Select</option>
|
||||
<option>New Registration</option>
|
||||
<option>Re-registration</option>
|
||||
<option>Per Sem</option>
|
||||
</select>
|
||||
</div>
|
||||
@ -42,24 +43,24 @@
|
||||
</div>
|
||||
</div><!--/.row-->
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-10">
|
||||
<table class="table table-bordered table-responive table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Fees Name</th>
|
||||
<th>Fees Amount</th>
|
||||
<th>One Time / Per Sem</th>
|
||||
<th>Fees Type</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Tution Fees</td>
|
||||
<td>Admission Fees</td>
|
||||
<td>
|
||||
<span>15000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>One Time</span>
|
||||
<span>New Registration</span>
|
||||
</td>
|
||||
<td>
|
||||
<a><i class="fa fa-trash"></i></a>
|
||||
@ -67,7 +68,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Exam Fees</td>
|
||||
<td>Tution Fees</td>
|
||||
<td>
|
||||
<span>5000</span>
|
||||
</td>
|
||||
@ -79,26 +80,14 @@
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Late Fees</td>
|
||||
<td>
|
||||
<span>2000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Per Sem</span>
|
||||
</td>
|
||||
<td>
|
||||
<a><i class="fa fa-trash"></i></a>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Other Fees</td>
|
||||
<td>
|
||||
<span>1000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Per Sem</span>
|
||||
<span>Re-registration</span>
|
||||
</td>
|
||||
<td>
|
||||
<a><i class="fa fa-trash"></i></a>
|
||||
|
||||
@ -224,28 +224,28 @@
|
||||
<div class="modal-body">
|
||||
<form action="" method="post" class="form-horizontal">
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-10">
|
||||
<table class="table table-bordered table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Fees Name</th>
|
||||
<th>Fees Amount</th>
|
||||
<th>One Time / Per Sem</th>
|
||||
<th>Fees Type</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Tution Fees</td>
|
||||
<td>Admission Fees</td>
|
||||
<td>
|
||||
<span>15000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>One Time</span>
|
||||
<span>New Registration</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Exam Fees</td>
|
||||
<td>Tution Fees</td>
|
||||
<td>
|
||||
<span>5000</span>
|
||||
</td>
|
||||
@ -254,23 +254,16 @@
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Late Fees</td>
|
||||
<td>
|
||||
<span>2000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Per Sem</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Other Fees</td>
|
||||
<td>
|
||||
<span>1000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Per Sem</span>
|
||||
<span>Re-registration</span>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="edituniversity">University</label>
|
||||
<label for="edituniversity">University <span class="symbol required"></span></label>
|
||||
<select class="form-control" id="edituniversity" disabled>
|
||||
<!-- <option>Select University</option> -->
|
||||
<option>Anna University</option>
|
||||
@ -27,6 +27,10 @@
|
||||
<option>Hindustan University</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="scEditBalanceAmt">Balance for SC / University</label>
|
||||
<input type="text" value="0" class="form-control" id="scEditBalanceAmt" placeholder="Enter sc balance Amt" readonly>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="billNo">Bill No </label>
|
||||
<input type="text" class="form-control" id="billNo" value="CHE-00001" placeholder="Enter bill no" readonly>
|
||||
@ -173,7 +177,7 @@
|
||||
<span>75000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>25000</span>
|
||||
<span>20000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Partially Paid</span>
|
||||
|
||||
@ -145,7 +145,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="adduniversity">University</label>
|
||||
<label for="adduniversity">University <span class="symbol required"></span></label>
|
||||
<select class="form-control" id="adduniversity">
|
||||
<!-- <option>Select University</option> -->
|
||||
<option>Anna University</option>
|
||||
@ -154,6 +154,10 @@
|
||||
<option>Hindustan University</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="scBalanceAmt">Balance for SC / University</label>
|
||||
<input type="text" value="5000" class="form-control" id="scBalanceAmt" placeholder="Enter sc balance Amt" readonly>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="receiptNo">Receipt No </label>
|
||||
<input type="text" class="form-control" id="receiptNo" placeholder="Enter receipt no">
|
||||
@ -307,7 +311,7 @@
|
||||
<span>75000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>25000</span>
|
||||
<span>20000</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>Partially Paid</span>
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<input type="text" value="50000" class="form-control" id="advanceAmount" placeholder="Enter advance amount" readonly>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="fromtransferuniversity">Transfer From University</label>
|
||||
<label for="fromtransferuniversity">Transfer From University <span class="symbol required"></span></label>
|
||||
<select class="form-control" id="fromtransferuniversity" disabled>
|
||||
<option>Anna University</option>
|
||||
<option>Anna University </option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="transferuniversity">Transfer To University</label>
|
||||
<label for="transferuniversity">Transfer To University <span class="symbol required"></span></label>
|
||||
<select class="form-control" id="transferuniversity">
|
||||
<option>SRM University</option>
|
||||
<option>Anna University</option>
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
<div class="animated fadeIn">
|
||||
<div class="col-md-12">
|
||||
|
||||
<tabset>
|
||||
|
||||
<tab>
|
||||
<div class="col-lg-12" *ngIf="!show">
|
||||
<ng-template tabHeading> View Allocation of Study Materials </ng-template>
|
||||
<!--/.row-->
|
||||
<div class="card">
|
||||
@ -76,46 +77,17 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Center A</td>
|
||||
<td>1st Sem / 2018</td>
|
||||
<td>MCA</td>
|
||||
|
||||
<td>10</td>
|
||||
<tr *ngFor="let app of studyMaterialDetails">
|
||||
<td>{{app.studycentername}}</td>
|
||||
<td>{{app.sem}}</td>
|
||||
<td>{{app.course}}</td>
|
||||
<td style="color:blue;"><a (click)="myModal.show(); getModelWindowDetails(app,'answerBooklet')">{{app.Quantity}} </a></td>
|
||||
|
||||
<td>
|
||||
<span class="badge badge-danger">sent</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Center B</td>
|
||||
<td>2nd Sem / 2018</td>
|
||||
<td>MBA</td>
|
||||
|
||||
<td>15</td>
|
||||
<td>
|
||||
<span class="badge badge-success">Received</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Center C</td>
|
||||
<td>3rd Sem / 2019</td>
|
||||
<td>BE</td>
|
||||
|
||||
<td>20</td>
|
||||
<td>
|
||||
<span class="badge badge-success">Received</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Center D</td>
|
||||
<td>4th Sem / 2019</td>
|
||||
<td>DE</td>
|
||||
|
||||
<td>34</td>
|
||||
<td>
|
||||
<span class="badge badge-success">Received</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
@ -135,7 +107,76 @@
|
||||
<!--/.col-->
|
||||
</div>
|
||||
<!--/.row-->
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
<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">
|
||||
<strong>Student List</strong>
|
||||
<h4 class="modal-title" *ngIf="modelType == 'markCard'"> Mark Card Status</h4>
|
||||
<h4 class="modal-title" *ngIf="modelType == 'answerBooklet'"> Answer Booklet Status</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">
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Form ID</th>
|
||||
<th>Student Name</th>
|
||||
<th>Batch Name</th>
|
||||
<th>Session</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Form001</td>
|
||||
<td>Vikram</td>
|
||||
<td><b>{{ modelType | uppercase }} </b> Batch A</td>
|
||||
<td>1st/2018</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Form002</td>
|
||||
<td>Raj</td>
|
||||
<td><b>{{ modelType | uppercase }} </b> Batch A</td>
|
||||
<td>1st/2018</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Form003</td>
|
||||
<td>John</td>
|
||||
<td><b>{{ modelType | uppercase }} </b> Batch A</td>
|
||||
<td>1st/2018</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Form004</td>
|
||||
<td>Karthik</td>
|
||||
<td><b>{{ modelType | uppercase }} </b> Batch A</td>
|
||||
<td>1st/2018</td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</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 -->
|
||||
|
||||
<tab>
|
||||
<ng-template tabHeading>Allocate Study Materials</ng-template>
|
||||
<div class="card">
|
||||
@ -285,4 +326,5 @@
|
||||
</div>
|
||||
</div>
|
||||
<!--/.col-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -7,9 +7,43 @@ import { Component, OnInit } from '@angular/core';
|
||||
})
|
||||
export class AllocatematerialComponent implements OnInit {
|
||||
|
||||
constructor() { }
|
||||
show = false;
|
||||
closed = false;
|
||||
public myModal;
|
||||
public myModalData;
|
||||
studyMaterialDetails: any;
|
||||
constructor() { }
|
||||
ngOnInit(){
|
||||
this.studyMaterialDetails = [
|
||||
{
|
||||
studycentername: 'Studycenter A',
|
||||
sem:'1st Sem/2018',
|
||||
course: 'BE',
|
||||
Quantity: '30',
|
||||
|
||||
},
|
||||
{
|
||||
studycentername: 'Studycenter B',
|
||||
sem:'2nd Sem/2018',
|
||||
course: 'MCA',
|
||||
Quantity: '10',
|
||||
},
|
||||
{
|
||||
studycentername: 'Studycenter C',
|
||||
sem:'1st Sem/2018',
|
||||
course: 'MBA',
|
||||
Quantity: '20',
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
ngOnInit() {
|
||||
getModelWindowDetails(stuCent) {
|
||||
this.myModalData = stuCent||null;
|
||||
}
|
||||
editStudyCenter(){
|
||||
this.show = !this.show;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
@ -70,7 +71,8 @@
|
||||
<th>University Name</th>
|
||||
<th>Course Name</th>
|
||||
<th>Sem/Year</th>
|
||||
<th>Quantity</th>
|
||||
<th>Received Quantity</th>
|
||||
<th>Balance Quantity</th>
|
||||
<th>Received Date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -80,6 +82,7 @@
|
||||
<td>MCA</td>
|
||||
<td>1st Sem</td>
|
||||
<td>10</td>
|
||||
<td>0</td>
|
||||
<td>10/10/2018</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -87,6 +90,7 @@
|
||||
<td>MBA</td>
|
||||
<td>2nd Sem</td>
|
||||
<td>15</td>
|
||||
<td>2</td>
|
||||
<td>15/10/2018</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -94,6 +98,7 @@
|
||||
<td>BE</td>
|
||||
<td>3rd Sem</td>
|
||||
<td>20</td>
|
||||
<td>0</td>
|
||||
<td>10/11/2018</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -101,6 +106,7 @@
|
||||
<td>DE</td>
|
||||
<td>4th sem</td>
|
||||
<td>34</td>
|
||||
<td>10</td>
|
||||
<td>12/11/2018</td>
|
||||
</tr>
|
||||
|
||||
@ -134,6 +140,27 @@
|
||||
</div>
|
||||
<form action="" method="post" class="form-horizontal">
|
||||
<div class="card-body">
|
||||
<<<<<<< HEAD
|
||||
<div id="dvPassport" style="display: none">
|
||||
Passport Number:
|
||||
<input type="text" id="txtPassportNumber" />
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-md-4">
|
||||
<label class="col-md-12 form-control-label"><strong>Received by</strong></label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label for="chkPassport">
|
||||
<input type="checkbox" id="chkPassport" onclick="ShowHideDiv(this)" />
|
||||
Vendor
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div id="dvPassport" style="display: none" class=" col-md-4 ">
|
||||
<label for="company">Vendor Details<span class="required"> *</span></label>
|
||||
<input type="text" class="form-control" id="vdetails" placeholder="Vendor Details">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="chkPassport" class="col-md-12 form-control-label"><strong>Received by</strong></label>
|
||||
<div class="col-md-6">
|
||||
@ -150,9 +177,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-md-4 ">
|
||||
<label class="col-md-6 form-control-label" for="select">Select University<span class="required">*</span></label>
|
||||
<label class="col-md-6 form-control-label" for="select">Select University<span class="required"> *</span></label>
|
||||
|
||||
<select id="select" name="select" class="form-control">
|
||||
<option value="0">Please select</option>
|
||||
@ -163,7 +191,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4 ">
|
||||
<label class="col-md-6 form-control-label" for="select">Select Course<span class="required">*</span></label>
|
||||
<label class="col-md-6 form-control-label" for="select">Select Course<span class="required"> *</span></label>
|
||||
|
||||
<select id="select" name="select" class="form-control">
|
||||
<option value="0">Please select</option>
|
||||
@ -173,7 +201,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4 ">
|
||||
<label class="col-md-8 form-control-label" for="select">Select Sem/Year<span class="required">*</span></label>
|
||||
<label class="col-md-8 form-control-label" for="select">Select Sem/Year<span class="required"> *</span></label>
|
||||
|
||||
<select id="select" name="select" class="form-control">
|
||||
<option value="0">Please select</option>
|
||||
@ -191,12 +219,12 @@
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="company">Quantity<span class="required">*</span></label>
|
||||
<label for="company">Quantity<span class="required"> *</span></label>
|
||||
<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">
|
||||
<label for="company">Received Date<span class="required"> *</span></label>
|
||||
<input type="text" class="form-control" id="date" placeholder="dd/mm/yyyy">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
|
||||
.required{
|
||||
color:red;
|
||||
}
|
||||
@ -11,14 +11,13 @@ export class ReceivedmaterialComponent implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
save()
|
||||
{
|
||||
alert('testing');
|
||||
}
|
||||
|
||||
ShowHideDiv(chkPassport) {
|
||||
|
||||
var dvPassport = document.getElementById("chkPassport");
|
||||
dvPassport.style.display = chkPassport.isTrusted ? "block" : "none";
|
||||
alert('hai');
|
||||
var dvPassport = document.getElementById("dvPassport");
|
||||
dvPassport.style.display = chkPassport.checked ? "block" : "none";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user