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

study material ,merge changes

Browse Source
This commit is contained in:
gayathri1990 2018-08-09 16:29:57 +05:30
commit 2a85169d6e
39 changed files with 561 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/app.routing.ts
View File

@ -61,8 +61,9 @@ export const routes: Routes = [
loadChildren: './views/courier/courier.module#CourierModule'
},
{
path: 'receivefees',
loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule',
path: 'paymentdetails',
loadChildren: './views/payment-details/payment-details.module#PaymentDetailsModule',
}
]
},

42
src/app/components/app-sidebar/app-sidebar.component.ts
View File

@ -66,7 +66,7 @@ export class AppSidebar {
icon: 'fa fa-book'
},
{
name: 'Allocate Fees',
name: 'Fees Share',
url: '/masters/shareallotmentmaster',
icon: 'fa fa-adjust'
},
@ -90,17 +90,17 @@ export class AppSidebar {
name: 'Fees',
url: '/masters/FeesMaster',
icon: 'fa fa-money'
},
{
name: 'Document',
url: '/masters/DocumentMaster',
icon: 'fa fa-file'
},
{
name: 'Exam Timetable',
url: '/masters/ExamTimetable',
icon: 'fa fa-calendar-minus-o'
}
// {
// name: 'Document',
// url: '/masters/DocumentMaster',
// icon: 'fa fa-file'
// },
// {
// name: 'Exam Timetable',
// url: '/masters/ExamTimetable',
// icon: 'fa fa-calendar-minus-o'
// }
]
},{
name: 'Student Enrolment',
@ -118,11 +118,6 @@ export class AppSidebar {
name: 'Documents',
url: '/status/documents',
icon: 'fa fa-file-pdf-o'
},
{
name: 'PaymentDetails',
url: '/status/paymentdetails',
icon: 'fa fa-credit-card-alt'
}
]
},{
@ -146,9 +141,20 @@ export class AppSidebar {
url : '/courier',
},
{
name: 'Fees Receive/Refund ',
name: 'Payment Details',
icon: 'fa fa-money',
url: '/receivefees',
children: [
{
name: 'Fees Receive/Transfer',
icon: 'fa fa-money',
url: '/paymentdetails/receivefees',
},
{
name: 'Account Statement',
url: '/paymentdetails/accountstatement',
icon: 'fa fa-credit-card-alt'
}
]
}
];
}

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

@ -1,19 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { FeesDetailsComponent } from './fees-details.component';
const routes: Routes = [
{
path: '',
component: FeesDetailsComponent,
data: {
title: "Fees Receive/Transfer"
}
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class FeesDetailsRoutingModule { }

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

@ -1,13 +0,0 @@
import { FeesDetailsModule } from './fees-details.module';
describe('FeesDetailsModule', () => {
let feesDetailsModule: FeesDetailsModule;
beforeEach(() => {
feesDetailsModule = new FeesDetailsModule();
});
it('should create an instance', () => {
expect(feesDetailsModule).toBeTruthy();
});
});

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

@ -1,18 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
// Modal Component
import { ModalModule } from 'ngx-bootstrap/modal';
// Tabs Component
import { TabsModule } from 'ngx-bootstrap/tabs';
import { FeesDetailsRoutingModule } from './fees-details-routing.module';
import { FeesDetailsComponent } from './fees-details.component';
import { EditReceiveFeesComponent } from './edit-receive-fees/edit-receive-fees.component';
import { TransferFeesDetailsComponent } from './transfer-fees-details/transfer-fees-details.component';
@NgModule({
imports: [
CommonModule,
FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot()
],
declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent]
})
export class FeesDetailsModule { }

31
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">
</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>

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

@ -97,7 +97,7 @@
<tr>
<td>L0022</td>
<td>Fashion Technology</td>
<td>Ann University</td>
<td>Anna University</td>
<td>SEM</td>
<td>
<span class="badge badge-danger">InActive</span>
@ -155,14 +155,14 @@
<ng-template tabHeading> Add Course</ng-template>
<form action="" method="post" class="form-horizontal">
<div class="form-group row">
<div class="col-md-6">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Course Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-6">
<div class="form-group col-sm-3">
<label for="university">University <span class="symbol required"></span></label>
<select class="form-control" id="university">
<!-- <option>Select University</option> -->
@ -172,13 +172,13 @@
<option>Hindustan University</option>
</select>
</div>
<div class="form-group col-sm-6">
<div class="form-group col-sm-2">
<label for="coursecode">Course Code <span class="symbol required"></span></label>
<input type="text" class="form-control" id="coursecode" placeholder="Enter course code"> </div>
<div class="form-group col-sm-6">
<div class="form-group col-sm-5">
<label for="coursename">Course Name <span class="symbol required"></span></label>
<input type="text" class="form-control" id="coursename" placeholder="Enter course name"> </div>
<div class="form-group col-sm-6">
<div class="form-group col-sm-2">
<label for="semyear">Sem / Year <span class="symbol required"></span></label>
<select class="form-control" id="semyear" (change)="getCourseFeesStructure()">
<option>Select Sem / Year</option>
@ -188,49 +188,15 @@
</div>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Fees Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-4">
<label for="pc">Prov Cert Fees</label>
<input type="text" class="form-control" id="pc" placeholder="Enter tc amt"> </div>
<div class="form-group col-sm-4">
<label for="tc">Transfer Cert Fees</label>
<input type="text" class="form-control" id="tc" placeholder="Enter tc amt"> </div>
<div class="form-group col-sm-4">
<label for="dc">Degree Cert Fees</label>
<input type="text" class="form-control" id="dc" placeholder="Enter dc amt"> </div>
<div class="form-group col-sm-4">
<label for="mc">Migration Cert Fees</label>
<input type="text" class="form-control" id="mc" placeholder="Enter mc amt"> </div>
<div class="form-group col-sm-4">
<label for="other">Other Fees</label>
<input type="text" class="form-control" id="other" placeholder="Enter others amt"> </div>
</div><!--/.row-->
</div>
<!-- <div class="card-footer">
<div class="col-lg-12 col-xs-12" align="right">
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Add</button>&nbsp;
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</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"><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>
</form>
</tab>
</tabset>
@ -258,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>
@ -288,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>

12
src/app/views/masters/fees-master/fees-master.component.html
View File

@ -111,35 +111,37 @@
<i class="fa fa-align-justify"></i>Fees
</div>
<form action="" method="post" class="form-horizontal">
<form #signupForm="ngForm" (ngSubmit)="onSubmit()" #f="ngForm" novalidate>
<div class="card-body">
<div class="form-group row">
<div class=" col-md-4 ">
<label for="company">Fees Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Document Name">
<input type="text" class="form-control" name="feesName" id="feesName" [(ngModel)]="model.feesName" placeholder="Enter Fees Name">
</div>
<div class=" col-md-4 ">
<label for="company">Fees Description<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Document description">
<input type="text" class="form-control" name="Feesdes" id="Feesdes" [(ngModel)]="model.Feesdes" placeholder="Fees description">
</div>
<div class="col-md-4">
<label for="company">Active/De-Active<span class="required">&nbsp;*</span></label>
<br>
<label class="switch switch-3d switch-primary">
<input type="checkbox" class="switch-input" checked>
<input type="checkbox" name="active" id="active" [(ngModel)]="model.active" class="switch-input" checked>
<span class="switch-label"></span>
<span class="switch-handle"></span>
</label>
</div>
</div>
</div>
<br>
<div class="card-footer">
<div class="form-group row">
<div class=" col-md-12" align="right">
<button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
<button style="margin-bottom: -14px" class="btn btn-sm btn-success" ><i class="fa fa-dot-circle-o" ></i> Submit</button>
&nbsp;
<button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>

48
src/app/views/masters/fees-master/fees-master.component.ts
View File

@ -1,4 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormsModule} from '@angular/forms';
@Component({
selector: 'app-fees-master',
@ -6,10 +8,54 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./fees-master.component.scss']
})
export class FeesMasterComponent implements OnInit {
model: any = {};
a;
msg = 'Hello world';
constructor() { }
ngOnInit() {
}
onSubmit() {
alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model))
// alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.Feesdes))
// alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.active))
var agesArr = [{a:1}, {a:2}, {a:3},
{a:4}];
var roots = agesArr.filter(function(ages){
return ages.a>2;
});
function root()
{
var agAr=[1,2,3,4];
var abc = agAr.map(Math.sqrt);
return abc;
}
var playersArr = [
{name: 'Jason', footedness: 'left', position: 'forward'},
{name: 'Blake', footedness: 'right', position: 'defense'},
{name: 'Philip', footedness: 'right', position: 'goalie'},
{name: 'Logan', footedness: 'left', position: 'defense'},
{name: 'Will', footedness: 'right', position: 'forward'}
];
var leftFootArr = playersArr.filter(function(player){
return player.footedness === 'right';
});
console.log(leftFootArr);
}
}

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

@ -1,7 +1,7 @@
<div class="col-lg-12" *ngIf="!show">
<tabset>
<tab>
<ng-template tabHeading> From List</ng-template>
<ng-template tabHeading> Form List</ng-template>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Form List
@ -60,7 +60,7 @@
</div>
</tab>
<tab>
<ng-template tabHeading> Add From</ng-template>
<ng-template tabHeading> Add Form</ng-template>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Form Details
@ -78,6 +78,7 @@
<select class="form-control" id="formType" placeholder="Select Form Type">
<option disabled>Select Form Type</option>
<option>Admission Form</option>
<option>Exam Timetable</option>
</select>
</div>
<div class="col-md-4">

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

@ -97,7 +97,7 @@ const routes: Routes = [
path: "shareallotmentmaster",
component: FeesShareAllotmentMasterComponent,
data: {
title: "Share Allocate"
title: "Fees Share"
}
},
{

146
src/app/views/masters/university-master/university-master.component.html
View File

@ -10,7 +10,7 @@
<!--/.row-->
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>University List
<i class="fa fa-align-justify"></i>View University Details
</div>
<div class="card-body">
<div class="row">
@ -31,16 +31,20 @@
<tr>
<th>University ID</th>
<th>University Name</th>
<th>University Short Name</th>
<th>Email ID</th>
<th>Mobile Number</th>
<th>Status</th>
<th>Activity</th>
</tr>
</thead>
<tbody>
<tr>
<td>KSOU</td>
<td>Karnataka university</td>
<td>U0005</td>
<td>Karnataka University</td>
<td>KU</td>
<td>ks@uni.com</td>
<td>9527777319</td>
<td>
<span class="badge badge-success">Active</span>
</td>
@ -50,9 +54,11 @@
</td>
</tr>
<tr>
<td>AUT</td>
<td>Anna university</td>
<td>U0004</td>
<td>Anna University</td>
<td>AU</td>
<td>au@uni.com</td>
<td>9327777319</td>
<td>
<span class="badge badge-success">Active</span>
</td>
@ -62,9 +68,11 @@
</td>
</tr>
<tr>
<td>BUT</td>
<td>U0003</td>
<td>Bharathi University</td>
<td>BU</td>
<td>bu@uni.com</td>
<td>9399993111</td>
<td>
<span class="badge badge-danger">Inactive</span>
</td>
@ -74,9 +82,11 @@
</td>
</tr>
<tr>
<td>TUT</td>
<td>Tamilnadu university</td>
<td>U0002</td>
<td>Tamilnadu University</td>
<td>TU</td>
<td>ta@uni.com</td>
<td>9399993000</td>
<td>
<span class="badge badge-danger">Inactive</span>
</td>
@ -86,9 +96,11 @@
</td>
</tr>
<tr>
<td>THUT</td>
<td>Thiruvalluvar university</td>
<td>U0001</td>
<td>Thiruvalluvar University</td>
<td>THU</td>
<td>thu@uni.com</td>
<td>9399993999</td>
<td>
<span class="badge badge-success">Active</span>
</td>
@ -118,73 +130,91 @@
</tab>
<tab>
<ng-template tabHeading> Add University</ng-template>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>University
</div>
<form action="" method="post" class="form-horizontal">
<div class="card-body">
<div ng-app="myApp" ng-controller="myCtrl">
<div class="form-group row">
<div class="col-md-4">
<div class="col-md-6">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>University Details
</div>
<div class="card-body">
<div class="row">
<!-- <div class="form-group col-md-6">
<label for="company">University ID<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="university" placeholder="Enter your University ID">
</div> -->
<div class="form-group col-md-6">
<label for="universityName">University Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="universityName" placeholder="Enter univ name"> </div>
<div class="form-group col-md-6">
<label for="universityShortName">University Short Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="universityShortName" placeholder="Enter university short name"> </div>
<div class="form-group col-md-6">
<label for="mobile">Mobile Number<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="mobile" placeholder="Enter university mobile number"> </div>
<div class="form-group col-md-6">
<label for="email">Email ID<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="email" placeholder="Enter university email id">
</div>
<div class="col-md-4">
<label for="company">University Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter your University Name"> </div>
<div class="col-md-4">
<label for="company">University Short Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter your University Short Name"> </div>
<br>
<div class="form-group col-md-6">
<label for="universityAddress">University Address <span class="required">&nbsp;*</span></label>
<textarea class="form-control" id="universityAddress" placeholder="Enter university address"></textarea>
</div>
<div class="form-group row">
<div class="col-md-4">
<label for="company">Mobile Number<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter University Mobile Number"> </div>
<div class="col-md-4">
<label for="company">Email ID<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter University Email ID">
</div>
<div class="form-group col-md-4">
<label for="premanentAddress">University Address <span class="required">&nbsp;*</span></label>
<textarea class="form-control" id="premanentAddress" placeholder="Enter University Address"></textarea>
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<label class="form-control-label" for="file-input">University Logo</label>
<br>
<input type="file" id="file-input" name="file-input">
</div>
<div class="col-md-4">
<label for="company">Active/De-Active<span class="required">&nbsp;*</span></label>
<br>
<label class="switch switch-3d switch-primary">
<div class="form-group col-md-6">
<label for="status">Active/De-Active<span class="required">&nbsp;*</span></label> <label class="switch switch-3d switch-primary" style="display: block">
<input type="checkbox" class="switch-input" checked>
<span class="switch-label"></span>
<span class="switch-handle"></span>
</label>
</div>
<div class="form-group col-md-6">
<label class="form-control-label" for="file-input">University Logo</label>
<input type="file" id="file-input" name="file-input">
</div>
</div>
</div>
<div class="card-footer">
<div class="form-group row">
<div class=" col-md-12" align="right">
<button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success" (click)="universitydetail()"><i class="fa fa-dot-circle-o"></i> Submit</button>
&nbsp;
<button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Fees Details
</div>
<div class="card-body">
<div class="row">
<div class="form-group col-sm-4">
<label for="pc">Prov Cert Fees</label>
<input type="text" class="form-control" id="pc" placeholder="Enter tc amt"> </div>
<div class="form-group col-sm-4">
<label for="tc">Transfer Cert Fees</label>
<input type="text" class="form-control" id="tc" placeholder="Enter tc amt"> </div>
<div class="form-group col-sm-4">
<label for="dc">Degree Cert Fees</label>
<input type="text" class="form-control" id="dc" placeholder="Enter dc amt"> </div>
<div class="form-group col-sm-4">
<label for="mc">Migration Cert Fees</label>
<input type="text" class="form-control" id="mc" placeholder="Enter mc amt"> </div>
<div class="form-group col-sm-4">
<label for="other">Other Fees</label>
<input type="text" class="form-control" id="other" placeholder="Enter others amt"> </div>
</div><!--/.row-->
</div>
</div>
<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="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>
</div>
</div>
</form>
</div> </tab>
</tab>
</tabset>
</div><!--/.col-->
</div>

3
src/app/views/masters/university-master/university-master.component.scss
View File

@ -2,3 +2,6 @@
.required{
color:red;
}
.endBtn {
padding-right: 2px;
}

188
src/app/views/payment-details/account-statement/account-statement.component.html Normal file
View File

@ -0,0 +1,188 @@
<span *ngIf="show" class="backToList">
<a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
</span>
<div class="col-lg-12" *ngIf="!show">
<!--/.row-->
<div class="row">
<!--/.col-->
<div class="col-md-12 mb-4">
<!-- Nav tabs -->
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>View Account Statement Details
</div>
<br>
<div class="card-body">
<div class="row">
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">From Date</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">To Date</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">StudyCenter</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">University</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Amount</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-md-4">
<div class="input-prepend input-group">
<span class="input-group-addon">
<i class="fa fa-search"></i>
</span>
<input id="search" class="form-control" type="text" placeholder="search">
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-lg-12 col-xs-12">
<table class="table table-bordered">
<thead>
<tr>
<th>Date</th>
<th>Description</th>
<th>University</th>
<th>Form</th>
<th>Debit</th>
<th>Credit</th>
<th>Balance</th>
<th>Remarks</th>
</tr>
</thead>
<tbody>
<tr>
<td>10/08/2018</td>
<td>Payment Received</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 1</a></td>
<td>0</td>
<td>10,000</td>
<td>10,000</td>
<td>Amount Received by studycenter A</td>
</tr>
<tr>
<td>11/08/2018</td>
<td>Fees Adjust</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 2</a></td>
<td>0</td>
<td>15,000</td>
<td>25,000</td>
<td>Amount Adjust studycenter A</td>
</tr>
<tr>
<td>12/08/2018</td>
<td>Refund</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 3</a></td>
<td>5000</td>
<td>0</td>
<td>20,000</td>
<td>Amount Refund</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>
</div>
<br>
<!-- <div class="card-footer">
<div class="form-group row">
<div class=" col-md-12" align="right">
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
&nbsp;
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>
</div>
</div> -->
</div>
</div><!--/.col-->
</div>
</div>
<!--/.row-->

0
src/app/views/status/paymentdetails/paymentdetails.component.scss → src/app/views/payment-details/account-statement/account-statement.component.scss
View File

25
src/app/views/payment-details/account-statement/account-statement.component.spec.ts Normal file
View File

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

15
src/app/views/payment-details/account-statement/account-statement.component.ts Normal file
View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-account-statement',
templateUrl: './account-statement.component.html',
styleUrls: ['./account-statement.component.scss']
})
export class AccountStatementComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}

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

@ -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>

0
src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss → src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.scss
View File

0
src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts → src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts
View File

0
src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts → src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.ts
View File

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

@ -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>

0
src/app/views/fees-details/fees-details.component.scss → src/app/views/payment-details/fees-details/fees-details.component.scss
View File

0
src/app/views/fees-details/fees-details.component.spec.ts → src/app/views/payment-details/fees-details/fees-details.component.spec.ts
View File

4
src/app/views/fees-details/fees-details.component.ts → src/app/views/payment-details/fees-details/fees-details.component.ts
View File

@ -18,8 +18,8 @@ export class FeesDetailsComponent implements OnInit {
ngOnInit() {
}
saveFees() {
this.showFeesAllocateC= true;
this.hideFeesDetailsC= true;
this.showFeesAllocateC= false;
this.hideFeesDetailsC= false;
}
editFees() {
this.showFeesAllocateC= true;

4
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html → 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>
</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>
</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>

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

0
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts → src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts
View File

0
src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts → src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.ts
View File

36
src/app/views/payment-details/payment-details-routing.module.ts Normal file
View File

@ -0,0 +1,36 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { FeesDetailsComponent } from './fees-details/fees-details.component';
import { AccountStatementComponent } from './account-statement/account-statement.component';
const routes: Routes = [
{
path: '',
data: {
title: 'Payment Details'
},
children: [
{
path: 'receivefees',
component: FeesDetailsComponent,
data: {
title: 'Fees Receive/Transfer'
}
},
{
path: 'accountstatement',
component: AccountStatementComponent,
data: {
title: 'Account Statement'
}
},
]
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class PaymentDetailsRoutingModule { }

13
src/app/views/payment-details/payment-details.module.spec.ts Normal file
View File

@ -0,0 +1,13 @@
import { PaymentDetailsModule } from './payment-details.module';
describe('PaymentDetailsModule', () => {
let paymentDetailsModule: PaymentDetailsModule;
beforeEach(() => {
paymentDetailsModule = new PaymentDetailsModule();
});
it('should create an instance', () => {
expect(paymentDetailsModule).toBeTruthy();
});
});

22
src/app/views/payment-details/payment-details.module.ts Normal file
View File

@ -0,0 +1,22 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
// Tabs Component
import { TabsModule } from 'ngx-bootstrap/tabs';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { ModalModule } from 'ngx-bootstrap/modal';
import { PaymentDetailsRoutingModule } from './payment-details-routing.module';
import { FeesDetailsComponent } from './fees-details/fees-details.component';
import { EditReceiveFeesComponent } from './fees-details/edit-receive-fees/edit-receive-fees.component';
import { TransferFeesDetailsComponent } from './fees-details/transfer-fees-details/transfer-fees-details.component';
import { AccountStatementComponent } from './account-statement/account-statement.component';
@NgModule({
imports: [
CommonModule,
PaymentDetailsRoutingModule, TabsModule,
ModalModule.forRoot(),
TooltipModule,
],
declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent, AccountStatementComponent]
})
export class PaymentDetailsModule { }

188
src/app/views/status/paymentdetails/paymentdetails.component.html
View File

@ -1,188 +0,0 @@
<span *ngIf="show" class="backToList">
<a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
</span>
<div class="col-lg-12" *ngIf="!show">
<!--/.row-->
<div class="row">
<!--/.col-->
<div class="col-md-12 mb-4">
<!-- Nav tabs -->
<div class="card">
<div class="card-header">
<strong>PaymentDetails</strong>
</div>
<br>
<div class="card-body">
<div class="row">
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">From Date</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">To Date</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">University</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">StudyCenter</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Amount</option>
</select>
</div>
</div>
<div class="col-md-2">
<div class="input-prepend input-group">
<button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Filter</button>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-md-4">
<div class="input-prepend input-group">
<span class="input-group-addon">
<i class="fa fa-search"></i>
</span>
<input id="search" class="form-control" type="text" placeholder="search">
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-lg-12 col-xs-12">
<table class="table table-bordered">
<thead>
<tr>
<th>Date</th>
<th>Description</th>
<th>University</th>
<th>Form</th>
<th>Debit</th>
<th>Credit</th>
<th>Balance</th>
<th>Remarks</th>
</tr>
</thead>
<tbody>
<tr>
<td>10/08/2018</td>
<td>Payment Received</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 1</a></td>
<td>0</td>
<td>10,000</td>
<td>10,000</td>
<td>Amount Received by studycenter A</td>
</tr>
<tr>
<td>11/08/2018</td>
<td>Fees Adjust</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 2</a></td>
<td>0</td>
<td>15,000</td>
<td>25,000</td>
<td>Amount Adjust studycenter A</td>
</tr>
<tr>
<td>12/08/2018</td>
<td>Refund</td>
<td>Anna Uni</td>
<td><a href="page-link" href="#">FormID 3</a></td>
<td>5000</td>
<td>0</td>
<td>20,000</td>
<td>Amount Refund</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>
</div>
<br>
<!-- <div class="card-footer">
<div class="form-group row">
<div class=" col-md-12" align="right">
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
&nbsp;
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div>
</div>
</div> -->
</div>
</div><!--/.col-->
</div>
</div>
<!--/.row-->

15
src/app/views/status/paymentdetails/paymentdetails.component.ts
View File

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

8
src/app/views/status/status-routing.module.ts
View File

@ -3,8 +3,6 @@ import { Routes, RouterModule } from '@angular/router';
import { DocumentsComponent } from './documents/documents.component';
import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component';
import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
const routes: Routes = [
{
path: '',
@ -23,12 +21,6 @@ const routes: Routes = [
data: {
title: 'Documents'
}
},{
path: 'paymentdetails',
component: PaymentdetailsComponent,
data: {
title: 'Paymentdetails'
}
}
]
}

3
src/app/views/status/status.module.ts
View File

@ -16,8 +16,6 @@ import { EditDocumentsComponent } from './documents/edit-documents/edit-document
//answer-booklet
import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component';
import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component';
//paymentdetails
import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
@NgModule({
imports: [
@ -33,7 +31,6 @@ import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.compone
EditDocumentsComponent,
AnswerBookletComponent,
EditAnswerBookletComponent,
PaymentdetailsComponent
]
})
export class StatusModule { }

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

@ -238,7 +238,7 @@
<br>
<div class="row">
<div class="col-md-4">
<label for="company"><strong>Total StudyMaterials</strong></label>
<label for="company"><strong>Total StudyMaterials On Hand</strong></label>
<input type="text" class="form-control" id="company" placeholder="150">
</div>
</div>

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

@ -6,7 +6,7 @@
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>Received Study Materials
<i class="fa fa-align-justify"></i>Study Materials On Hand
</div>
<div class="card-body">
@ -132,13 +132,15 @@
<tab>
<ng-template tabHeading>Received Study Materials</ng-template>
<div class="card">
<div class="card-header">
<strong>Study Material</strong>
</div>
<br>
<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" />
@ -159,6 +161,23 @@
<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">
<label class="checkbox-inline" for="inline-checkbox1">
<input type="checkbox" id="chkPassport" name="vendor" [(ngModel)]="model.Feesdes" (click)="ShowHideDiv($event)">&nbsp;&nbsp;Vendor
</label>
</div>
<div id="dvPassport" style="display: none">
Vendor Details:
<input type="text" id="txtPassportNumber" />
</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">&nbsp;*</span></label>

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

@ -6,15 +6,18 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./receivedmaterial.component.scss']
})
export class ReceivedmaterialComponent implements OnInit {
model: any = {};
constructor() { }
ngOnInit() {
}
ShowHideDiv(chkPassport) {
alert('hai');
var dvPassport = document.getElementById("dvPassport");
dvPassport.style.display = chkPassport.checked ? "block" : "none";
}
}