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:
gandhimathi 2018-08-01 15:47:25 +05:30
commit 61aeefb73f
14 changed files with 152 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/app/paymentmodule/paymentmodule-routing.module.ts Normal file
View File

@ -0,0 +1,10 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class PaymentmoduleRoutingModule { }

13
e2e/app/paymentmodule/paymentmodule.module.spec.ts Normal file
View File

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

13
e2e/app/paymentmodule/paymentmodule.module.ts Normal file
View File

@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { PaymentmoduleRoutingModule } from './paymentmodule-routing.module';
@NgModule({
imports: [
CommonModule,
PaymentmoduleRoutingModule
],
declarations: []
})
export class PaymentmoduleModule { }

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

@ -85,19 +85,15 @@ export class AppSidebar {
url: '/masters/statusmaster',
icon: 'fa fa-bullseye'
},
{
name: 'Document',
url: '/masters/DocumentMaster',
icon: 'fa fa-file-o'
},
{
name: 'Fees',
url: '/masters/FeesMaster',
icon: 'fa fa-money'
},
{
name: 'Form',
url: '/masters/FormMaster',
name: 'Document',
url: '/masters/DocumentMaster',
icon: 'fa fa-file'
},

8
src/app/views/masters/batch-master/batch-master.component.html
View File

@ -181,14 +181,14 @@
<form action="" method="post" class="form-horizontal">
<div class="card-body">
<div class="form-group row">
<div class="col-md-offset-2 col-md-4 ">
<label class="col-md-6 form-control-label" for="select">Select University<span class="required">&nbsp;*</span></label>
<div class=" col-md-4 ">
<label class="form-control-label" for="select">Select University<span class="required">&nbsp;*</span></label>
<select id="select" name="select" class="form-control">
<option *ngFor="let i of university">{{i}}</option>
</select>
</div>
<div class="col-md-offset-2 col-md-4 ">
<div class=" col-md-4 ">
<label for="company">Batch Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Batch Name">
</div>
@ -203,7 +203,7 @@
<div class="form-group row">
<div class="col-md-4 ">
<label for="company">Batch Date<span class="required">&nbsp;*</span></label>
<input type="date" class="form-control" id="date" placeholder="Enter Batch Date" onchange="mydate1();">
<input type="text" class="form-control" id="date" placeholder="dd/mm/yyyy" >
</div>
<div class="col-md-4">
<label for="company">Active/De-Active<span class="required">&nbsp;*</span></label>

139
src/app/views/masters/document-master/document-master.component.html
View File

@ -1,10 +1,10 @@
<span *ngIf="show" class="backToList">
<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-->
@ -12,14 +12,15 @@
<!-- Nav tabs -->
<tabset>
<tab>
<ng-template tabHeading> View Document &nbsp;</ng-template>
<ng-template tabHeading> View Document &nbsp;<span class="badge badge-pill badge-success"></span></ng-template>
<!--/.row-->
<div class="card">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>Document List
</div>
<div class="card-body">
<div class="row">
<div class="card-body">
<div class="row">
<div class="col-md-4">
<div class="input-prepend input-group">
<span class="input-group-addon">
@ -29,66 +30,55 @@
</div>
</div>
</div>
<br>
<br>
<div class="row">
<div class="col-lg-12 col-xs-12">
<table class="table table-bordered">
<thead>
<tr>
<th>Document Name</th>
<th>Document Description</th>
<th>Status</th>
<th>Action</th>
</tr>
<tr>
<th>DocumentName</th>
<th>Description</th>
<th>Status</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td>SF</td>
<td>Semester Fess Document</td>
<td> <span class="badge badge-danger">Inactive</span></td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
<tr>
<td>Transfer certificate</td>
<td>Transfer certificate Doc</td>
<td>
<span class="badge badge-success">Active</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
</td>
</tr>
<tr>
<td>MF</td>
<td>Marksheet Document</td>
<td> <span class="badge badge-danger">Inactive</span></td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</tr>
<tr>
<td>Provisional Certificate</td>
<td>Provisional Certificate Doc</td>
<td>
<span class="badge badge-success">Active</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
</td>
</tr>
<tr>
<td>EF</td>
<td>Exam Fees</td>
<td> <span class="badge badge-success">Active</span></td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</tr>
<tr>
<td>Degree Certificate</td>
<td>Degree Certificate Doc</td>
<td>
<span class="badge badge-danger">Inactive</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
</td>
</tr>
<tr>
<td>HT</td>
<td>Hall Ticket</td>
<td>
<span class="badge badge-success">Active</span></td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td>
</tr>
</tbody>
</tr>
</tbody>
</table>
<ul class="pagination">
<li class="page-item"><a class="page-link" href="#">Prev</a></li>
@ -100,7 +90,7 @@
<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>
</div>
</div>
</div>
<!--/.col-->
@ -109,14 +99,15 @@
</tab>
<tab>
<ng-template tabHeading> Add Document</ng-template>
<div class="card">
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>Document
<i class="fa fa-align-justify"></i>Document
</div>
<form action="" method="post" class="form-horizontal">
<div class="card-body">
<form action="" method="post" class="form-horizontal">
<div class="card-body">
<div class="form-group row">
<div class=" col-md-4 ">
<label for="company">Document Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Document Name">
@ -125,7 +116,7 @@
<label for="company">Document Description<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Document description">
</div>
<div class="col-md-4">
<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">
@ -133,26 +124,24 @@
<span class="switch-label"></span>
<span class="switch-handle"></span>
</label>
</div>
</div>
</div>
</div>
</div>
<br>
<div class="card-footer">
<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>
<button type="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" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
<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>
</form>
</div>
</div>
</tab>
</tabset>
</div><!--/.col-->
@ -162,3 +151,9 @@
<!--/.row-->

4
src/app/views/masters/examtime-table/examtime-table.component.html
View File

@ -85,10 +85,10 @@
<table class="table table-bordered">
<thead>
<tr>
<th>University Name</th>
<th>University Name</th>
<th>Course</th>
<th>Document Name</th>
<th>Description</th>
<th>Description</th>
<th>Action</th>
</tr>
</thead>

172
src/app/views/masters/form-master/form-master.component.html
View File

@ -1,172 +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 -->
<tabset>
<tab>
<ng-template tabHeading> View Form &nbsp;<span class="badge badge-pill badge-success"></span></ng-template>
<!--/.row-->
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i> Form List
</div>
<div class="card-body">
<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>FormName</th>
<th>Description</th>
<th>Status</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td>TC</td>
<td>Transfer certificate</td>
<td>
<span class="badge badge-success">Active</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td>
</tr>
<tr>
<td>PC</td>
<td>Provisional Certificate</td>
<td>
<span class="badge badge-success">Active</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td>
</tr>
<tr>
<td>DC</td>
<td>Degree Certificate</td>
<td>
<span class="badge badge-danger">Inactive</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td>
</tr>
<tr>
<td>MS</td>
<td>Mark Sheet</td>
<td>
<span class="badge badge-danger">Inactive</span>
</td>
<td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</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>
</div>
</div>
<!--/.col-->
</div>
<!--/.row-->
</tab>
<tab>
<ng-template tabHeading> Add Form</ng-template>
<div class="card">
<div class="card-header">
<i class="fa fa-align-justify"></i>Form
</div>
<form action="" method="post" class="form-horizontal">
<div class="card-body">
<div class="form-group row">
<div class=" col-md-4 ">
<label for="company">Form Name<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter Form Name">
</div>
<div class=" col-md-4 ">
<label for="company">Form Description<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Form 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>
<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>
&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>
</form>
</div>
</tab>
</tabset>
</div><!--/.col-->
</div>
</div>
<!--/.row-->

4
src/app/views/masters/form-master/form-master.component.scss
View File

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

15
src/app/views/masters/form-master/form-master.component.ts
View File

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

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

@ -9,7 +9,6 @@ import { UniversityMasterComponent } from './university-master/university-master
import { BatchMasterComponent } from './batch-master/batch-master.component';
import { DocumentMasterComponent } from './document-master/document-master.component';
import { FeesMasterComponent } from './fees-master/fees-master.component';
import { FormMasterComponent } from './form-master/form-master.component';
import { ExamtimeTableComponent } from './examtime-table/examtime-table.component';
import { StudyMaterialComponent } from './study-material/study-material.component';
import { CourseMasterComponent } from './course-master/course-master.component';
@ -60,18 +59,11 @@ const routes: Routes = [
}
},
{
path: 'BatchMaster',
path: 'BatchMaster',
component: BatchMasterComponent,
data: {
title: 'Batch'
}
},
{
path: 'DocumentMaster',
component: DocumentMasterComponent,
data: {
title: 'Document'
}
},
{
path: 'FeesMaster',
@ -81,10 +73,10 @@ const routes: Routes = [
}
},
{
path: 'FormMaster',
component: FormMasterComponent,
path: 'DocumentMaster',
component: DocumentMasterComponent,
data: {
title: 'Form'
title: 'Document'
}
},
{

8
src/app/views/masters/masters.module.ts
View File

@ -23,12 +23,12 @@ import { EditStudyCenterComponent } from './study-center/edit-study-center/edit-
import { UniversityMasterComponent } from './university-master/university-master.component';
//Batch
import { BatchMasterComponent } from './batch-master/batch-master.component';
//Document
import { DocumentMasterComponent } from './document-master/document-master.component';
//Fees
import { FeesMasterComponent } from './fees-master/fees-master.component';
//Form
import { FormMasterComponent } from './form-master/form-master.component';
//Study
import { StudyMaterialComponent } from './study-material/study-material.component';
import { ExamtimeTableComponent } from './examtime-table/examtime-table.component';
@ -61,9 +61,9 @@ import { StatusMasterComponent } from './status-master/status-master.component';
FormListComponent,
UniversityMasterComponent,
BatchMasterComponent,
DocumentMasterComponent,
FeesMasterComponent,
FormMasterComponent,
DocumentMasterComponent,
StudyMaterialComponent,
ExamtimeTableComponent,
CourseMasterComponent,

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

@ -25,7 +25,7 @@
<div class="card-body">
<div class="row">
<div class="col-md-3">
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">From Date</option>
@ -33,7 +33,7 @@
</select>
</div>
</div>
<div class="col-md-3">
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">To Date</option>
@ -41,10 +41,18 @@
</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">Form ID</option>
<option value="0">StudyCenter</option>
</select>
</div>
@ -81,58 +89,64 @@
<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>
<tr>
<td>16/08/2018</td>
<td><a href="page-link" href="#">FormID 4</a></td>
<td>10,000</td>
<td>0</td>
<td>10,000</td>
</tr>
</tbody>
</table>

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

@ -244,8 +244,8 @@
<td>Batch C</td>
<td>BE</td>
<td>0</td>
<td><input type="text" value="20"></td>
<td>20</td>
<td><input type="text" value="0"></td>
</tr>
<tr>
@ -254,7 +254,7 @@
<td>Batch D</td>
<td>DE</td>
<td>0</td>
<td>34</td>
<td><input type="text" value="34"></td>
</tr>