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:
dineshkumarkannan 2018-08-09 17:11:45 +05:30
commit 04dea2603b
10 changed files with 198 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html
View File

@ -30,10 +30,11 @@
<input type="text" class="form-control" value="15000" id="feesAmount" placeholder="Enter fees amount"> <input type="text" class="form-control" value="15000" id="feesAmount" placeholder="Enter fees amount">
</div> </div>
<div class="form-group col-sm-2"> <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"> <select class="form-control" id="semyear">
<option>Select One Time / Per Sem</option> <option>Select</option>
<option>One Time</option> <option>New Registration</option>
<option>Re-registration</option>
<option>Per Sem</option> <option>Per Sem</option>
</select> </select>
</div> </div>
@ -42,24 +43,24 @@
</div> </div>
</div><!--/.row--> </div><!--/.row-->
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-10">
<table class="table table-bordered table-responive table-hover"> <table class="table table-bordered table-responive table-hover">
<thead> <thead>
<tr> <tr>
<th>Fees Name</th> <th>Fees Name</th>
<th>Fees Amount</th> <th>Fees Amount</th>
<th>One Time / Per Sem</th> <th>Fees Type</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>Tution Fees</td> <td>Admission Fees</td>
<td> <td>
<span>15000</span> <span>15000</span>
</td> </td>
<td> <td>
<span>One Time</span> <span>New Registration</span>
</td> </td>
<td> <td>
<a><i class="fa fa-trash"></i></a> <a><i class="fa fa-trash"></i></a>
@ -67,7 +68,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Exam Fees</td> <td>Tution Fees</td>
<td> <td>
<span>5000</span> <span>5000</span>
</td> </td>
@ -79,26 +80,14 @@
</td> </td>
</tr> </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> <tr>
<td>Other Fees</td> <td>Other Fees</td>
<td> <td>
<span>1000</span> <span>1000</span>
</td> </td>
<td> <td>
<span>Per Sem</span> <span>Re-registration</span>
</td> </td>
<td> <td>
<a><i class="fa fa-trash"></i></a> <a><i class="fa fa-trash"></i></a>

25
src/app/views/masters/course-master/course-master.component.html
View File

@ -224,28 +224,28 @@
<div class="modal-body"> <div class="modal-body">
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-10">
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Fees Name</th> <th>Fees Name</th>
<th>Fees Amount</th> <th>Fees Amount</th>
<th>One Time / Per Sem</th> <th>Fees Type</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>Tution Fees</td> <td>Admission Fees</td>
<td> <td>
<span>15000</span> <span>15000</span>
</td> </td>
<td> <td>
<span>One Time</span> <span>New Registration</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Exam Fees</td> <td>Tution Fees</td>
<td> <td>
<span>5000</span> <span>5000</span>
</td> </td>
@ -254,23 +254,16 @@
</td> </td>
</tr> </tr>
<tr>
<td>Late Fees</td>
<td>
<span>2000</span>
</td>
<td>
<span>Per Sem</span>
</td>
</tr>
<tr> <tr>
<td>Other Fees</td> <td>Other Fees</td>
<td> <td>
<span>1000</span> <span>1000</span>
</td> </td>
<td> <td>
<span>Per Sem</span> <span>Re-registration</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>

8
src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html
View File

@ -18,7 +18,7 @@
</select> </select>
</div> </div>
<div class="form-group col-sm-3"> <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> <select class="form-control" id="edituniversity" disabled>
<!-- <option>Select University</option> --> <!-- <option>Select University</option> -->
<option>Anna University</option> <option>Anna University</option>
@ -27,6 +27,10 @@
<option>Hindustan University</option> <option>Hindustan University</option>
</select> </select>
</div> </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"> <div class="form-group col-sm-3">
<label for="billNo">Bill No </label> <label for="billNo">Bill No </label>
<input type="text" class="form-control" id="billNo" value="CHE-00001" placeholder="Enter bill no" readonly> <input type="text" class="form-control" id="billNo" value="CHE-00001" placeholder="Enter bill no" readonly>
@ -173,7 +177,7 @@
<span>75000</span> <span>75000</span>
</td> </td>
<td> <td>
<span>25000</span> <span>20000</span>
</td> </td>
<td> <td>
<span>Partially Paid</span> <span>Partially Paid</span>

8
src/app/views/payment-details/fees-details/fees-details.component.html
View File

@ -145,7 +145,7 @@
</select> </select>
</div> </div>
<div class="form-group col-sm-3"> <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"> <select class="form-control" id="adduniversity">
<!-- <option>Select University</option> --> <!-- <option>Select University</option> -->
<option>Anna University</option> <option>Anna University</option>
@ -154,6 +154,10 @@
<option>Hindustan University</option> <option>Hindustan University</option>
</select> </select>
</div> </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"> <div class="form-group col-sm-3">
<label for="receiptNo">Receipt No </label> <label for="receiptNo">Receipt No </label>
<input type="text" class="form-control" id="receiptNo" placeholder="Enter receipt no"> <input type="text" class="form-control" id="receiptNo" placeholder="Enter receipt no">
@ -307,7 +311,7 @@
<span>75000</span> <span>75000</span>
</td> </td>
<td> <td>
<span>25000</span> <span>20000</span>
</td> </td>
<td> <td>
<span>Partially Paid</span> <span>Partially Paid</span>

6
src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html
View File

@ -22,13 +22,13 @@
<input type="text" value="50000" class="form-control" id="advanceAmount" placeholder="Enter advance amount" readonly> <input type="text" value="50000" class="form-control" id="advanceAmount" placeholder="Enter advance amount" readonly>
</div> </div>
<div class="form-group col-sm-3"> <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> <select class="form-control" id="fromtransferuniversity" disabled>
<option>Anna University</option> <option>Anna University </option>
</select> </select>
</div> </div>
<div class="form-group col-sm-3"> <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"> <select class="form-control" id="transferuniversity">
<option>SRM University</option> <option>SRM University</option>
<option>Anna University</option> <option>Anna University</option>

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

@ -1,7 +1,8 @@
<div class="animated fadeIn">
<div class="col-md-12">
<tabset> <tabset>
<tab> <tab>
<div class="col-lg-12" *ngIf="!show">
<ng-template tabHeading> View Allocation of Study Materials &nbsp;</ng-template> <ng-template tabHeading> View Allocation of Study Materials &nbsp;</ng-template>
<!--/.row--> <!--/.row-->
<div class="card"> <div class="card">
@ -76,46 +77,17 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr *ngFor="let app of studyMaterialDetails">
<td>Center A</td> <td>{{app.studycentername}}</td>
<td>1st Sem / 2018</td> <td>{{app.sem}}</td>
<td>MCA</td> <td>{{app.course}}</td>
<td style="color:blue;"><a (click)="myModal.show(); getModelWindowDetails(app,'answerBooklet')">{{app.Quantity}} </a></td>
<td>10</td>
<td> <td>
<span class="badge badge-danger">sent</span> <span class="badge badge-danger">sent</span>
</td> </td>
</tr> </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> </tbody>
</table> </table>
@ -135,7 +107,76 @@
<!--/.col--> <!--/.col-->
</div> </div>
<!--/.row--> <!--/.row-->
</div>
</tab> </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">&times;</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> <tab>
<ng-template tabHeading>Allocate Study Materials</ng-template> <ng-template tabHeading>Allocate Study Materials</ng-template>
<div class="card"> <div class="card">
@ -285,4 +326,5 @@
</div> </div>
</div> </div>
<!--/.col--> <!--/.col-->
</div> </div>

38
src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts
View File

@ -7,9 +7,43 @@ import { Component, OnInit } from '@angular/core';
}) })
export class AllocatematerialComponent implements OnInit { 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;
} }
} }

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

@ -10,6 +10,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -70,7 +71,8 @@
<th>University Name</th> <th>University Name</th>
<th>Course Name</th> <th>Course Name</th>
<th>Sem/Year</th> <th>Sem/Year</th>
<th>Quantity</th> <th>Received Quantity</th>
<th>Balance Quantity</th>
<th>Received Date</th> <th>Received Date</th>
</tr> </tr>
</thead> </thead>
@ -80,6 +82,7 @@
<td>MCA</td> <td>MCA</td>
<td>1st Sem</td> <td>1st Sem</td>
<td>10</td> <td>10</td>
<td>0</td>
<td>10/10/2018</td> <td>10/10/2018</td>
</tr> </tr>
<tr> <tr>
@ -87,6 +90,7 @@
<td>MBA</td> <td>MBA</td>
<td>2nd Sem</td> <td>2nd Sem</td>
<td>15</td> <td>15</td>
<td>2</td>
<td>15/10/2018</td> <td>15/10/2018</td>
</tr> </tr>
<tr> <tr>
@ -94,6 +98,7 @@
<td>BE</td> <td>BE</td>
<td>3rd Sem</td> <td>3rd Sem</td>
<td>20</td> <td>20</td>
<td>0</td>
<td>10/11/2018</td> <td>10/11/2018</td>
</tr> </tr>
<tr> <tr>
@ -101,6 +106,7 @@
<td>DE</td> <td>DE</td>
<td>4th sem</td> <td>4th sem</td>
<td>34</td> <td>34</td>
<td>10</td>
<td>12/11/2018</td> <td>12/11/2018</td>
</tr> </tr>
@ -134,6 +140,27 @@
</div> </div>
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
<div class="card-body"> <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">&nbsp;*</span></label>
<input type="text" class="form-control" id="vdetails" placeholder="Vendor Details">
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<label for="chkPassport" class="col-md-12 form-control-label"><strong>Received by</strong></label> <label for="chkPassport" class="col-md-12 form-control-label"><strong>Received by</strong></label>
<div class="col-md-6"> <div class="col-md-6">
@ -150,9 +177,10 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-4 "> <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">&nbsp;*</span></label>
<select id="select" name="select" class="form-control"> <select id="select" name="select" class="form-control">
<option value="0">Please select</option> <option value="0">Please select</option>
@ -163,7 +191,7 @@
</select> </select>
</div> </div>
<div class="col-md-4 "> <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">&nbsp;*</span></label>
<select id="select" name="select" class="form-control"> <select id="select" name="select" class="form-control">
<option value="0">Please select</option> <option value="0">Please select</option>
@ -173,7 +201,7 @@
</select> </select>
</div> </div>
<div class="col-md-4 "> <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">&nbsp;*</span></label>
<select id="select" name="select" class="form-control"> <select id="select" name="select" class="form-control">
<option value="0">Please select</option> <option value="0">Please select</option>
@ -191,12 +219,12 @@
<div class="col-md-4"> <div class="col-md-4">
<label for="company">Quantity<span class="required">*</span></label> <label for="company">Quantity<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Quantity"> <input type="text" class="form-control" id="company" placeholder="Enter Quantity">
</div> </div>
<div class=" col-md-4 "> <div class=" col-md-4 ">
<label for="company">Received Date<span class="required">*</span></label> <label for="company">Received Date<span class="required">&nbsp;*</span></label>
<input type="date" class="form-control" id="date" placeholder="Enter Batch Date"> <input type="text" class="form-control" id="date" placeholder="dd/mm/yyyy">
</div> </div>
</div> </div>

4
src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss
View File

@ -0,0 +1,4 @@
.required{
color:red;
}

15
src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts
View File

@ -11,14 +11,13 @@ export class ReceivedmaterialComponent implements OnInit {
ngOnInit() { ngOnInit() {
} }
save()
{
alert('testing');
}
ShowHideDiv(chkPassport) { ShowHideDiv(chkPassport) {
alert('hai');
var dvPassport = document.getElementById("chkPassport"); var dvPassport = document.getElementById("dvPassport");
dvPassport.style.display = chkPassport.isTrusted ? "block" : "none"; dvPassport.style.display = chkPassport.checked ? "block" : "none";
} }
} }