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

fees changes

Browse Source
This commit is contained in:
gandhimathi 2018-08-01 15:44:47 +05:30
parent f2a36c5d43
commit 3595bba7d6
15 changed files with 129 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.html
View File

@ -1,203 +0,0 @@
<div class="animated fadeIn" *ngIf="!hideEditRefundFeesC">
<form action="" method="post" class="form-horizontal">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Manually Change Allocated Student Fees Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-3">
<label for="editRefundastudycenter">Study Center <span class="symbol required"></span></label>
<select class="form-control" id="editRefundastudycenter" disabled>
<!-- <option>Select Study Center</option> -->
<option>CHE001-Chennai</option>
<option>CBE002-Coimbatore</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="editRefundauniversity">University</label>
<select class="form-control" id="editRefundauniversity" disabled>
<!-- <option>Select University</option> -->
<option>Anna University</option>
<option>SRM University</option>
<option>Karpagam University</option>
<option>Hindustan University</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="editRefundabillNo">Bill No </label>
<input type="text" class="form-control" id="editRefundabillNo" value="CHE-00002" placeholder="Enter bill no" readonly>
</div>
<div class="form-group col-sm-3">
<label for="editRefundabillAmount">Bill Amount <span class="symbol required"></span></label>
<input type="text" value="100000" class="form-control" id="editRefundabillAmount" placeholder="Enter bill amount" readonly>
</div>
<div class="form-group col-sm-3">
<label for="editRefundareceivedAmount">Refund Received Amount <span class="symbol required"></span></label>
<input type="text" value="50000" class="form-control" id="editRefundareceivedAmount" placeholder="Enter received amount" readonly>
</div>
<div class="form-group col-sm-3">
<label for="editRefundadvanceAmount">Advance Amount <span class="symbol required"></span></label>
<input type="text" value="0" class="form-control" id="editRefundadvanceAmount" placeholder="Enter advance amount" readonly>
</div>
<div class="form-group col-sm-3">
<label for="editRefundreceiptNo">Receipt No </label>
<input type="text" class="form-control" id="editRefundreceiptNo" placeholder="Enter receipt no" readonly>
</div>
<div class="form-group col-sm-3">
<label for="editpaymentMode">Mode Of Payment <span class="symbol required"></span></label>
<select class="form-control" id="editpaymentMode" disabled>
<!-- <option>Select Payment</option> -->
<option>CASH</option>
<option>CHEQUE</option>
<option>ONLINE TRANSACTION</option>
<option>CREDIT / DEBIT CARD</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="editRefundcomments">Comments <span class="symbol required"></span></label>
<textarea maxlength="100" placeholder="Enter Comments" class="form-control" name="editRefundcomments" id="editRefundcomments" readonly></textarea>
</div>
</div>
<div class="row">
<div class="col-md-12">
<table class="table table-bordered table-responsive table-hover">
<thead>
<tr>
<th>Form Id</th>
<th>Student Name</th>
<th>Payable Amount</th>
<th>Paid Amount</th>
<th>Balance Amount</th>
<th>Status</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<span class="checkbox">
<label for="checkbox1">
<input type="checkbox" id="checkbox1" name="checkbox1" value="option1" checked>
</label>
</span> &nbsp;
<a title="Click to view student course details">Form006</a></td>
<td>
<span>Preetha - Srinivasan</span>
</td>
<td>
<span>25000</span>
</td>
<td>
<span>25000</span>
</td>
<td>
<span>0</span>
</td>
<td>
<span>Paid</span>
</td>
</tr>
<tr>
<td>
<span class="checkbox">
<label for="checkbox2">
<input type="checkbox" id="checkbox1" name="checkbox2" value="option2" checked>
</label>
</span> &nbsp;
<a title="Click to view student course details">Form002</a>
</td>
<td>
<span>Ram - Ganesh</span>
</td>
<td>
<span>25000</span>
</td>
<td>
<span>25000</span>
</td>
<td>
<span>0</span>
</td>
<td>
<span>Paid</span>
</td>
</tr>
<tr>
<td>
<span class="checkbox">
<label for="checkbox3">
<input type="checkbox" id="checkbox1" name="checkbox3" value="option3">
</label>
</span> &nbsp;
<a title="Click to view student course details">Form008</a>
</td>
<td>
<span>Moorthy - Saminathan</span>
</td>
<td>
<span>50000</span>
</td>
<td>
<span>0</span>
</td>
<td>
<span>50000</span>
</td>
<td>
<span>Pending</span>
</td>
</tr>
<tr>
<td>
<span class="checkbox">
<label for="checkbox4">
<input type="checkbox" id="checkbox4" name="checkbox4" value="option4">
</label>
</span> &nbsp;
<a title="Click to view student course details">Form009</a>
</td>
<td>
<span>Mohan - Saravanan</span>
</td>
<td>
<span>100000</span>
</td>
<td>
<span>0</span>
</td>
<td>
<span>100000</span>
</td>
<td>
<span>Pending</span>
</td>
</tr>
</tbody>
</table>
</div>
<!--/.col-->
</div>
</div>
<div class="card-footer">
<div class="col-lg-12 col-xs-12 endBtn" align="right">
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-plus-circle"></i> Save</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" (click)="cancel()"><i class="fa fa-ban"></i> Cancel</button>
</div>
</div>
</div>
</div>
</div><!--/.row-->
</form>
</div>
<app-fees-details *ngIf="hideEditRefundFeesC"></app-fees-details>

25
src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.spec.ts
View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { EditRefundFeesDetailsComponent } from './edit-refund-fees-details.component';
describe('EditRefundFeesDetailsComponent', () => {
let component: EditRefundFeesDetailsComponent;
let fixture: ComponentFixture<EditRefundFeesDetailsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EditRefundFeesDetailsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EditRefundFeesDetailsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

20
src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.ts
View File

@ -1,20 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-edit-refund-fees-details',
templateUrl: './edit-refund-fees-details.component.html',
styleUrls: ['./edit-refund-fees-details.component.scss']
})
export class EditRefundFeesDetailsComponent implements OnInit {
hideEditRefundFeesC: boolean;
constructor() {
this.hideEditRefundFeesC=false;
}
ngOnInit() {
}
cancel() {
this.hideEditRefundFeesC=true;
}
}

2
src/app/views/fees-details/fees-details-routing.module.ts
View File

@ -7,7 +7,7 @@ const routes: Routes = [
path: '', path: '',
component: FeesDetailsComponent, component: FeesDetailsComponent,
data: { data: {
title: "Fees Receive/Refund" title: "Fees Receive/Transfer"
} }
} }
]; ];

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

@ -6,12 +6,12 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading> View Received Fees</ng-template> <ng-template tabHeading>Received Fees</ng-template>
<div class="row"> <div class="row">
<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> View Received Fees Details <i class="fa fa-align-justify"></i>Received Fees Details
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -47,6 +47,7 @@
<th>Received On</th> <th>Received On</th>
<th>Mode Of Payment</th> <th>Mode Of Payment</th>
<th>Study Center</th> <th>Study Center</th>
<th>University</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -56,10 +57,11 @@
<td></td> <td></td>
<td>200000</td> <td>200000</td>
<td>200000</td> <td>200000</td>
<td><a title="Click to refund amount" (click)="refundFees()">0</a></td> <td><a title="Click to transfer amount" (click)="refundFees()">0</a></td>
<td>14-07-2019</td> <td>14-07-2019</td>
<td>CASH</td> <td>CASH</td>
<td>Chennai</td> <td>Chennai</td>
<td>Anna University</td>
<td> <td>
<a (click)="editFees()"><i class="fa fa-pencil-square-o"></i></a> <a (click)="editFees()"><i class="fa fa-pencil-square-o"></i></a>
&nbsp;&nbsp; &nbsp;&nbsp;
@ -72,10 +74,11 @@
<td></td> <td></td>
<td>100000</td> <td>100000</td>
<td>50000</td> <td>50000</td>
<td><a title="Click to refund amount" (click)="refundFees()">50000</a></td> <td><a title="Click to transfer amount" (click)="refundFees()">50000</a></td>
<td>14-07-2019</td> <td>14-07-2019</td>
<td>CASH</td> <td>CASH</td>
<td>Coimbatore</td> <td>Coimbatore</td>
<td>Anna University</td>
<td> <td>
<a><i class="fa fa-pencil-square-o" (click)="editFees()"></i></a> <a><i class="fa fa-pencil-square-o" (click)="editFees()"></i></a>
&nbsp;&nbsp; &nbsp;&nbsp;
@ -83,14 +86,15 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>CHE-00005</td> <td>CHE-00002</td>
<td></td> <td></td>
<td>400000</td> <td>50000</td>
<td>400000</td> <td>50000</td>
<td><a title="Click to refund amount" (click)="refundFees()">0</a></td> <td><a title="Click to transfer amount" (click)="refundFees()">0</a></td>
<td>14-07-2019</td> <td>14-07-2019</td>
<td>CASH</td> <td>TRANSFER</td>
<td>Salem</td> <td>Chennai</td>
<td>SRM University</td>
<td> <td>
<a><i class="fa fa-pencil-square-o" (click)="editFees()"></i></a> <a><i class="fa fa-pencil-square-o" (click)="editFees()"></i></a>
&nbsp;&nbsp; &nbsp;&nbsp;
@ -120,14 +124,14 @@
</div> </div>
</tab> </tab>
<tab> <tab>
<ng-template tabHeading> Add Receive Fees</ng-template> <ng-template tabHeading>Receive Fees</ng-template>
<div class="col-md-12"> <div class="col-md-12">
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
<div class="form-group row"> <div class="form-group row">
<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 Receive Fees For Study Center <i class="fa fa-align-justify"></i>Receive Fees For Study Center
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -195,7 +199,7 @@
<!--/.row--> <!--/.row-->
</div> </div>
<app-edit-receive-fees *ngIf="showFeesAllocateC"></app-edit-receive-fees> <app-edit-receive-fees *ngIf="showFeesAllocateC"></app-edit-receive-fees>
<app-refund-fees-details *ngIf="showFeesRefundC"></app-refund-fees-details> <app-transfer-fees-details *ngIf="showFeesTransferC"></app-transfer-fees-details>
<!-- view fees details modal--> <!-- view fees details modal-->
<div bsModal #viewFeesDetailsModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div bsModal #viewFeesDetailsModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

6
src/app/views/fees-details/fees-details.component.ts
View File

@ -8,10 +8,10 @@ import { Component, OnInit } from '@angular/core';
export class FeesDetailsComponent implements OnInit { export class FeesDetailsComponent implements OnInit {
hideFeesDetailsC: boolean; hideFeesDetailsC: boolean;
showFeesAllocateC: boolean; showFeesAllocateC: boolean;
showFeesRefundC: boolean; showFeesTransferC: boolean;
constructor() { constructor() {
this.showFeesAllocateC= false; this.showFeesAllocateC= false;
this.showFeesRefundC= false; this.showFeesTransferC= false;
this.hideFeesDetailsC= false; this.hideFeesDetailsC= false;
} }
@ -27,7 +27,7 @@ export class FeesDetailsComponent implements OnInit {
} }
refundFees() { refundFees() {
this.showFeesRefundC= true; this.showFeesTransferC= true;
this.hideFeesDetailsC= true; this.hideFeesDetailsC= true;
} }

5
src/app/views/fees-details/fees-details.module.ts
View File

@ -7,13 +7,12 @@ import { TabsModule } from 'ngx-bootstrap/tabs';
import { FeesDetailsRoutingModule } from './fees-details-routing.module'; import { FeesDetailsRoutingModule } from './fees-details-routing.module';
import { FeesDetailsComponent } from './fees-details.component'; import { FeesDetailsComponent } from './fees-details.component';
import { EditReceiveFeesComponent } from './edit-receive-fees/edit-receive-fees.component'; import { EditReceiveFeesComponent } from './edit-receive-fees/edit-receive-fees.component';
import { RefundFeesDetailsComponent } from './refund-fees-details/refund-fees-details.component'; import { TransferFeesDetailsComponent } from './transfer-fees-details/transfer-fees-details.component';
import { EditRefundFeesDetailsComponent } from './edit-refund-fees-details/edit-refund-fees-details.component';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot() FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot()
], ],
declarations: [FeesDetailsComponent, EditReceiveFeesComponent, RefundFeesDetailsComponent, EditRefundFeesDetailsComponent] declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent]
}) })
export class FeesDetailsModule { } export class FeesDetailsModule { }

52
src/app/views/fees-details/refund-fees-details/refund-fees-details.component.html
View File

@ -1,52 +0,0 @@
<div class="animated fadeIn" *ngIf="!hideRefundFeesC">
<form action="" method="post" class="form-horizontal">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Fees Refund From Paid Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-3">
<label for="refundstudycenter">Study Center <span class="symbol required"></span></label>
<select class="form-control" id="refundstudycenter" disabled>
<!-- <option>Select Study Center</option> -->
<option>CHE001-Chennai</option>
<option>CBE002-Coimbatore</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="refundadvanceAmount">Advance Amount <span class="symbol required"></span></label>
<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="refunduniversity">University</label>
<select class="form-control" id="refunduniversity">
<option>Anna University</option>
<option>SRM University</option>
<option>Karpagam University</option>
<option>Hindustan University</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="refundAmount">Refund Amount <span class="symbol required"></span></label>
<input type="text" value="50000" class="form-control" id="refundAmount" placeholder="Enter refund amount">
</div>
</div>
</div>
<div class="card-footer">
<div class="col-lg-12 col-xs-12 endBtn" align="right">
<button type="button" class="btn btn-sm btn-success" (click)="refund()"><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>
</div>
</div><!--/.row-->
</form>
</div>
<app-edit-refund-fees-details *ngIf="hideRefundFeesC"></app-edit-refund-fees-details>

16
src/app/views/fees-details/refund-fees-details/refund-fees-details.component.scss
View File

@ -1,16 +0,0 @@
// form input symbol
.symbol.required:before {
content: "*";
display: inline;
color: #f86c6b;
}
.endBtn {
padding-right: 0px;
}
saveBtnDiv {
margin-top: 28px;
}
a:hover {
cursor:pointer;
}

25
src/app/views/fees-details/refund-fees-details/refund-fees-details.component.spec.ts
View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { RefundFeesDetailsComponent } from './refund-fees-details.component';
describe('RefundFeesDetailsComponent', () => {
let component: RefundFeesDetailsComponent;
let fixture: ComponentFixture<RefundFeesDetailsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ RefundFeesDetailsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(RefundFeesDetailsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

19
src/app/views/fees-details/refund-fees-details/refund-fees-details.component.ts
View File

@ -1,19 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-refund-fees-details',
templateUrl: './refund-fees-details.component.html',
styleUrls: ['./refund-fees-details.component.scss']
})
export class RefundFeesDetailsComponent implements OnInit {
hideRefundFeesC: boolean;
constructor() {
this.hideRefundFeesC= false;
}
ngOnInit() {
}
refund() {
this.hideRefundFeesC= true;
}
}

63
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html Normal file
View File

@ -0,0 +1,63 @@
<div class="animated fadeIn">
<form action="" method="post" class="form-horizontal">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Fees Transfer From Paid Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-3">
<label for="transferstudycenter">Study Center <span class="symbol required"></span></label>
<select class="form-control" id="transferstudycenter" disabled>
<!-- <option>Select Study Center</option> -->
<option>CHE001-Chennai</option>
<option>CBE002-Coimbatore</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="transferadvanceAmount">Advance Amount <span class="symbol required"></span></label>
<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>
<select class="form-control" id="fromtransferuniversity" disabled>
<option>Anna University</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="transferuniversity">Transfer To University</label>
<select class="form-control" id="transferuniversity">
<option>SRM University</option>
<option>Anna University</option>
<option>Karpagam University</option>
<option>Hindustan University</option>
</select>
</div>
<div class="form-group col-sm-3">
<label for="transferAmount">Transfer Amount <span class="symbol required"></span></label>
<input type="text" value="50000" class="form-control" id="transferAmount" placeholder="Enter transfer amount">
</div>
<div class="form-group col-sm-3">
<label for="paymentMode">Mode Of Payment <span class="symbol required"></span></label>
<select class="form-control" id="paymentMode">
<!-- <option>Select Payment</option> -->
<option>TRANSFER</option>
</select>
</div>
</div>
</div>
<div class="card-footer">
<div class="col-lg-12 col-xs-12 endBtn" align="right">
<button type="button" class="btn btn-sm btn-success" (click)="transfer()"><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>
</div>
</div><!--/.row-->
</form>
</div>

0
src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.scss → src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.scss
View File

25
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { TransferFeesDetailsComponent } from './transfer-fees-details.component';
describe('TransferFeesDetailsComponent', () => {
let component: TransferFeesDetailsComponent;
let fixture: ComponentFixture<TransferFeesDetailsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TransferFeesDetailsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(TransferFeesDetailsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

18
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts Normal file
View File

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-transfer-fees-details',
templateUrl: './transfer-fees-details.component.html',
styleUrls: ['./transfer-fees-details.component.scss']
})
export class TransferFeesDetailsComponent implements OnInit {
constructor() {
}
ngOnInit() {
}
transfer() {
}
}