diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index fc5e2b1..1257477 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -55,6 +55,10 @@ export const routes: Routes = [ { path: 'studymaterial', loadChildren: './views/studymaterial/studymaterial.module#StudymaterialModule' + }, + { + path: 'receivefees', + loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule', } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index 2b65cf8..6c80eb7 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -51,32 +51,52 @@ export class AppSidebar { url: '/masters/studyCenter', icon: 'fa fa-language' },{ - name: 'Form List Master', + name: 'Form List', url: '/masters/formList', icon: 'fa fa-language' }, - { - name: 'University Master', + { + name: 'University', url: '/masters/UniversityMaster', icon: 'fa fa-language' }, - { - name: 'Batch Master', + { + name: 'Course', + url: '/masters/coursemaster', + icon: 'fa fa-book' + }, + { + name: 'Share Allocate', + url: '/masters/shareallotmentmaster', + icon: 'fa fa-adjust' + }, + { + name: 'Batch', url: '/masters/BatchMaster', icon: 'fa fa-language' + }, + { + name: 'Session', + url: '/masters/sessionmaster', + icon: 'fa fa-support' + }, + { + name: 'Status', + url: '/masters/statusmaster', + icon: 'fa fa-bullseye' }, { - name: 'Document Master', + name: 'Document', url: '/masters/DocumentMaster', icon: 'fa fa-language' }, { - name: 'Fees Master', + name: 'Fees', url: '/masters/FeesMaster', icon: 'fa fa-language' }, { - name: 'Form Master', + name: 'Form', url: '/masters/FormMaster', icon: 'fa fa-language' }, @@ -144,6 +164,11 @@ export class AppSidebar { icon: 'fa fa-user-secret' } ] + }, + { + name: 'Fees Receive/Refund ', + icon: 'fa fa-money', + url: '/receivefees', } ]; } diff --git a/src/app/views/entrollment/student/student.component.html b/src/app/views/entrollment/student/student.component.html index f4938dc..59aca34 100644 --- a/src/app/views/entrollment/student/student.component.html +++ b/src/app/views/entrollment/student/student.component.html @@ -109,7 +109,10 @@ {{app.course}} {{app.sem}} {{app.batch}} - {{app.status}} + + Active + In-Active + diff --git a/src/app/views/entrollment/student/student.component.ts b/src/app/views/entrollment/student/student.component.ts index 51cd36c..0958466 100644 --- a/src/app/views/entrollment/student/student.component.ts +++ b/src/app/views/entrollment/student/student.component.ts @@ -43,7 +43,7 @@ export class StudentComponent implements OnInit { course: 'B.Sc', sem: 8, batch: 'Jan 2018', - status: '1' + status: '0' } ] } diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html new file mode 100644 index 0000000..0d4fcc8 --- /dev/null +++ b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html @@ -0,0 +1,227 @@ +
+
+
+
+
+
+ Manually Change Allocated Student Fees Details +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Form IdStudent NamePayable AmountPaid AmountBalance AmountStatus
+ + +   + Form001 + Preetha - Srinivasan + + 50000 + + 50000 + + 0 + + Paid +
+ + +   + Form002 + + Ram - Ganesh + + 25000 + + 25000 + + 0 + + Paid +
+ + +   + Form003 + + Moorthy - Saminathan + + 50000 + + 50000 + + 0 + + Paid +
+ + +   + Form004 + + Mohan - Saravanan + + 100000 + + 75000 + + 25000 + + Partially Paid +
+ + +   + Form005 + + Renu - Sathish + + 50000 + + 0 + + 50000 + + Pending +
+
+ +
+
+
+
+   + +
+
+
+
+
+ +
+
+ + diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss @@ -0,0 +1,16 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + .endBtn { + padding-right: 0px; +} +saveBtnDiv { + margin-top: 28px; + +} +a:hover { + cursor:pointer; + } \ No newline at end of file diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts new file mode 100644 index 0000000..d83b736 --- /dev/null +++ b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditReceiveFeesComponent } from './edit-receive-fees.component'; + +describe('EditReceiveFeesComponent', () => { + let component: EditReceiveFeesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditReceiveFeesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditReceiveFeesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts new file mode 100644 index 0000000..241c288 --- /dev/null +++ b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts @@ -0,0 +1,21 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-edit-receive-fees', + templateUrl: './edit-receive-fees.component.html', + styleUrls: ['./edit-receive-fees.component.scss'] +}) +export class EditReceiveFeesComponent implements OnInit { + hideFeesAllocateC: boolean; + constructor() { + this.hideFeesAllocateC= false; + } + + ngOnInit() { + + } + cancel() { + this.hideFeesAllocateC= true; + } + +} diff --git a/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.html b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.html new file mode 100644 index 0000000..c6bffc0 --- /dev/null +++ b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.html @@ -0,0 +1,203 @@ +
+
+
+
+
+
+ Manually Change Allocated Student Fees Details +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Form IdStudent NamePayable AmountPaid AmountBalance AmountStatus
+ + +   + Form006 + Preetha - Srinivasan + + 25000 + + 25000 + + 0 + + Paid +
+ + +   + Form002 + + Ram - Ganesh + + 25000 + + 25000 + + 0 + + Paid +
+ + +   + Form008 + + Moorthy - Saminathan + + 50000 + + 0 + + 50000 + + Pending +
+ + +   + Form009 + + Mohan - Saravanan + + 100000 + + 0 + + 100000 + + Pending +
+
+ +
+
+
+
+   + +
+
+
+
+
+ +
+
+ + diff --git a/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.scss b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.scss @@ -0,0 +1,16 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + .endBtn { + padding-right: 0px; +} +saveBtnDiv { + margin-top: 28px; + +} +a:hover { + cursor:pointer; + } \ No newline at end of file diff --git a/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.spec.ts b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.spec.ts new file mode 100644 index 0000000..f252708 --- /dev/null +++ b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditRefundFeesDetailsComponent } from './edit-refund-fees-details.component'; + +describe('EditRefundFeesDetailsComponent', () => { + let component: EditRefundFeesDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditRefundFeesDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditRefundFeesDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.ts b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.ts new file mode 100644 index 0000000..17b6a2e --- /dev/null +++ b/src/app/views/fees-details/edit-refund-fees-details/edit-refund-fees-details.component.ts @@ -0,0 +1,20 @@ +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; + } + +} diff --git a/src/app/views/fees-details/fees-details-routing.module.ts b/src/app/views/fees-details/fees-details-routing.module.ts new file mode 100644 index 0000000..048461b --- /dev/null +++ b/src/app/views/fees-details/fees-details-routing.module.ts @@ -0,0 +1,19 @@ +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/Refund" + } + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class FeesDetailsRoutingModule { } diff --git a/src/app/views/fees-details/fees-details.component.html b/src/app/views/fees-details/fees-details.component.html new file mode 100644 index 0000000..5e88ca6 --- /dev/null +++ b/src/app/views/fees-details/fees-details.component.html @@ -0,0 +1,331 @@ +
+ +
+ +
+ + + + View Received Fees +
+
+
+
+ View Received Fees Details +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Bill NoReceipt NoBill Amount Received AmountAdvance AmountReceived OnMode Of PaymentStudy CenterAction
CHE-00001200000200000014-07-2019CASHChennai + +    + + +
CHE-00002100000500005000014-07-2019CASHCoimbatore + +    + +
CHE-00005400000400000014-07-2019CASHSalem + +    + +
+ +
+ +
+ +
+
+
+
+ + + Add Receive Fees +
+
+
+
+
+
+ Add Receive Fees For Study Center +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+   + +
+
+
+
+
+
+
+ +
+
+ +
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/app/views/fees-details/fees-details.component.scss b/src/app/views/fees-details/fees-details.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/fees-details/fees-details.component.scss @@ -0,0 +1,16 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + .endBtn { + padding-right: 0px; +} +saveBtnDiv { + margin-top: 28px; + +} +a:hover { + cursor:pointer; + } \ No newline at end of file diff --git a/src/app/views/fees-details/fees-details.component.spec.ts b/src/app/views/fees-details/fees-details.component.spec.ts new file mode 100644 index 0000000..60c3d6d --- /dev/null +++ b/src/app/views/fees-details/fees-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FeesDetailsComponent } from './fees-details.component'; + +describe('FeesDetailsComponent', () => { + let component: FeesDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FeesDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FeesDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/fees-details.component.ts b/src/app/views/fees-details/fees-details.component.ts new file mode 100644 index 0000000..1935dc9 --- /dev/null +++ b/src/app/views/fees-details/fees-details.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-fees-details', + templateUrl: './fees-details.component.html', + styleUrls: ['./fees-details.component.scss'] +}) +export class FeesDetailsComponent implements OnInit { + hideFeesDetailsC: boolean; + showFeesAllocateC: boolean; + showFeesRefundC: boolean; + constructor() { + this.showFeesAllocateC= false; + this.showFeesRefundC= false; + this.hideFeesDetailsC= false; + } + + ngOnInit() { + } + saveFees() { + this.showFeesAllocateC= true; + this.hideFeesDetailsC= true; + } + editFees() { + this.showFeesAllocateC= true; + this.hideFeesDetailsC= true; + } + + refundFees() { + this.showFeesRefundC= true; + this.hideFeesDetailsC= true; + } + +} diff --git a/src/app/views/fees-details/fees-details.module.spec.ts b/src/app/views/fees-details/fees-details.module.spec.ts new file mode 100644 index 0000000..db02933 --- /dev/null +++ b/src/app/views/fees-details/fees-details.module.spec.ts @@ -0,0 +1,13 @@ +import { FeesDetailsModule } from './fees-details.module'; + +describe('FeesDetailsModule', () => { + let feesDetailsModule: FeesDetailsModule; + + beforeEach(() => { + feesDetailsModule = new FeesDetailsModule(); + }); + + it('should create an instance', () => { + expect(feesDetailsModule).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/fees-details.module.ts b/src/app/views/fees-details/fees-details.module.ts new file mode 100644 index 0000000..95dced1 --- /dev/null +++ b/src/app/views/fees-details/fees-details.module.ts @@ -0,0 +1,19 @@ +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 { RefundFeesDetailsComponent } from './refund-fees-details/refund-fees-details.component'; +import { EditRefundFeesDetailsComponent } from './edit-refund-fees-details/edit-refund-fees-details.component'; +@NgModule({ + imports: [ + CommonModule, + FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot() + ], + declarations: [FeesDetailsComponent, EditReceiveFeesComponent, RefundFeesDetailsComponent, EditRefundFeesDetailsComponent] +}) +export class FeesDetailsModule { } diff --git a/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.html b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.html new file mode 100644 index 0000000..2a93e6c --- /dev/null +++ b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.html @@ -0,0 +1,52 @@ +
+
+
+
+
+
+ Fees Refund From Paid Details +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+   + +
+
+
+
+
+ +
+
+ + diff --git a/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.scss b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.scss @@ -0,0 +1,16 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + .endBtn { + padding-right: 0px; +} +saveBtnDiv { + margin-top: 28px; + +} +a:hover { + cursor:pointer; + } \ No newline at end of file diff --git a/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.spec.ts b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.spec.ts new file mode 100644 index 0000000..da97b9c --- /dev/null +++ b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RefundFeesDetailsComponent } from './refund-fees-details.component'; + +describe('RefundFeesDetailsComponent', () => { + let component: RefundFeesDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RefundFeesDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RefundFeesDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.ts b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.ts new file mode 100644 index 0000000..5af1d01 --- /dev/null +++ b/src/app/views/fees-details/refund-fees-details/refund-fees-details.component.ts @@ -0,0 +1,19 @@ +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; + } +} diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html new file mode 100644 index 0000000..572e21c --- /dev/null +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html @@ -0,0 +1,127 @@ +
+
+
+
+
+
+ Add Fees Details Of Anna University / Information Technology +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fees NameFees AmountOne Time / Per SemAction
Tution Fees + 15000 + + One Time + + + +
Exam Fees + 5000 + + Per Sem + + + +
Late Fees + 2000 + + Per Sem + + + +
Other Fees + 1000 + + Per Sem + + + +
+
+ +
+
+
+
+   + +
+
+
+
+
+ +
+
+ diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.scss b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.scss @@ -0,0 +1,16 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + .endBtn { + padding-right: 0px; +} +saveBtnDiv { + margin-top: 28px; + +} +a:hover { + cursor:pointer; + } \ No newline at end of file diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.spec.ts b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.spec.ts new file mode 100644 index 0000000..5a22f74 --- /dev/null +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddSemyearFeesComponent } from './add-semyear-fees.component'; + +describe('AddSemyearFeesComponent', () => { + let component: AddSemyearFeesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AddSemyearFeesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AddSemyearFeesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.ts b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.ts new file mode 100644 index 0000000..3689c71 --- /dev/null +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.ts @@ -0,0 +1,31 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-add-semyear-fees', + templateUrl: './add-semyear-fees.component.html', + styleUrls: ['./add-semyear-fees.component.scss'] +}) +export class AddSemyearFeesComponent implements OnInit { + + showAddCard: boolean; + hideSemYearC: boolean; + + constructor() { + this.showAddCard= false; + this.hideSemYearC= true; + } + + ngOnInit() { + } + + // show sem/year fees + showSemYearFees() { + this.showAddCard= true; + } + + // load course details component + loadCourseDetails() { + this.hideSemYearC= false; + } + +} diff --git a/src/app/views/masters/course-master/course-master.component.html b/src/app/views/masters/course-master/course-master.component.html new file mode 100644 index 0000000..d1bc835 --- /dev/null +++ b/src/app/views/masters/course-master/course-master.component.html @@ -0,0 +1,325 @@ +
+ +
+ +
+ + + + View Course + + +
+
+ View Course Details +
+
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Course CodeCourse NameUniversity NameSem / YearStatusCourse ActionFees Action
CB001Information TechnologySRM UniversitySEM + Active + +    + + +    +    + + +
CHE002Computer Science And EnggAnna UniversitySEM + Active + +    + + +    +    + + +
MP0200Mechanical EnggKarpagam UniversitySEM + Active + +    + + +    +    + + +
L0022Fashion TechnologyAnn UniversitySEM + InActive + +    + + +    +    + + +
CB001Information TechnologySRM UniversitySEM + Active + +    + + +    +    + + +
+ +
+ +
+ +
+
+ + + Add Course +
+
+
+
+
+ Course Details +
+
+
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+
+
+
+ +
+
+
+ Fees Details +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + +
+
+ +
+
+   + +
+
+
+
+ + +
+
+ +
+
+
+ +
+
+ + + + + + + diff --git a/src/app/views/masters/course-master/course-master.component.scss b/src/app/views/masters/course-master/course-master.component.scss new file mode 100644 index 0000000..55a12e4 --- /dev/null +++ b/src/app/views/masters/course-master/course-master.component.scss @@ -0,0 +1,17 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + a:hover { + cursor:pointer; + } + .endBtn { + padding-right: 2px; + } + .backBtn { + margin-top: -9px; + + +} \ No newline at end of file diff --git a/src/app/views/masters/course-master/course-master.component.spec.ts b/src/app/views/masters/course-master/course-master.component.spec.ts new file mode 100644 index 0000000..c897eb7 --- /dev/null +++ b/src/app/views/masters/course-master/course-master.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CourseMasterComponent } from './course-master.component'; + +describe('CourseMasterComponent', () => { + let component: CourseMasterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CourseMasterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CourseMasterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/course-master/course-master.component.ts b/src/app/views/masters/course-master/course-master.component.ts new file mode 100644 index 0000000..d57176f --- /dev/null +++ b/src/app/views/masters/course-master/course-master.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; +@Component({ + selector: 'app-course-master', + templateUrl: 'course-master.component.html', + styleUrls: ['./course-master.component.scss'] +}) +export class CourseMasterComponent implements OnInit { + hideCourseMasterC: boolean; + viewSemYearCard: boolean; + textValue: string; + constructor() { + this.hideCourseMasterC= true; + this.viewSemYearCard= false; + this.textValue='karthi'; + } + + ngOnInit() { + } + + // load addsem year fees component + loadAddSemYearFees() { + this.hideCourseMasterC= false; + } + + // hide all child components + hideAllChildComponent() { + this.hideCourseMasterC= true; + } + + //view sem year fees card + viewSemYearFees() { + this.viewSemYearCard= true; + } +} diff --git a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html new file mode 100644 index 0000000..c84e13a --- /dev/null +++ b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html @@ -0,0 +1,216 @@ +
+ +
+ +
+ + + + View Share +
+ +
+
+
+ View Share Allocate Details +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Study CenterUniversityCourseEffective FromPercentageAction
ChennaiAnna UniversityInformation Technology14-09-2019 + 10 + + + +
ChennaiSRM UniversityFashion Technology14-09-2019 + 15 + + + +
ChennaiKarpagam UniversityComputer Science And Engg + 10 + + + +
ChennaiAnna UniversityFashion Technology14-09-2019 + 10 + + + +
+ +
+ +
+ +
+
+
+
+ + + Add Share +
+
+
+
+
+
+ Add Study Center Share Details +
+
+
+ +
+ + +
+ +
+ + +
+
+ + +
+ +
+ +
+
+ +
+
+
+
+ +
+   + +
+
+
+
+
+
+
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.scss b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.scss new file mode 100644 index 0000000..58b264e --- /dev/null +++ b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.scss @@ -0,0 +1,12 @@ +a:hover { + cursor:pointer; + } + .symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + //font-size: large; + } + .endBtn { + padding-right: 0px; +} \ No newline at end of file diff --git a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.spec.ts b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.spec.ts new file mode 100644 index 0000000..e723ce2 --- /dev/null +++ b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FeesShareAllotmentMasterComponent } from './fees-share-allotment-master.component'; + +describe('FeesShareAllotmentMasterComponent', () => { + let component: FeesShareAllotmentMasterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FeesShareAllotmentMasterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FeesShareAllotmentMasterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.ts b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.ts new file mode 100644 index 0000000..6957176 --- /dev/null +++ b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-fees-share-allotment-master', + templateUrl: './fees-share-allotment-master.component.html', + styleUrls: ['./fees-share-allotment-master.component.scss'] +}) +export class FeesShareAllotmentMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts index 35e2d10..8c85eb9 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -12,6 +12,10 @@ 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'; +import { FeesShareAllotmentMasterComponent } from './fees-share-allotment-master/fees-share-allotment-master.component'; +import { SessionMasterComponent } from './session-master/session-master.component'; +import { StatusMasterComponent } from './status-master/status-master.component'; const routes: Routes = [ { path: '', @@ -89,7 +93,35 @@ const routes: Routes = [ data: { title: 'Exam Timetable' } - } + }, + { + path: "coursemaster", + component: CourseMasterComponent, + data: { + title: "Course" + } + }, + { + path: "shareallotmentmaster", + component: FeesShareAllotmentMasterComponent, + data: { + title: "Share Allocate" + } + }, + { + path: "sessionmaster", + component: SessionMasterComponent, + data: { + title: "Session" + } + }, + { + path: "statusmaster", + component: StatusMasterComponent, + data: { + title: "Status" + } + } ] } ]; diff --git a/src/app/views/masters/masters.module.ts b/src/app/views/masters/masters.module.ts index 1fcd278..52cfaf9 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -35,6 +35,13 @@ import { ExamtimeTableComponent } from './examtime-table/examtime-table.componen // Form list import { FormListComponent } from './form-list/form-list.component'; +// import course ,status ,session fees share allotment +import { CourseMasterComponent } from './course-master/course-master.component'; + +import { AddSemyearFeesComponent } from './course-master/add-semyear-fees/add-semyear-fees.component'; +import { FeesShareAllotmentMasterComponent } from './fees-share-allotment-master/fees-share-allotment-master.component'; +import { SessionMasterComponent } from './session-master/session-master.component'; +import { StatusMasterComponent } from './status-master/status-master.component'; @NgModule({ imports: [ CommonModule, @@ -58,7 +65,12 @@ import { FormListComponent } from './form-list/form-list.component'; FeesMasterComponent, FormMasterComponent, StudyMaterialComponent, - ExamtimeTableComponent + ExamtimeTableComponent, + CourseMasterComponent, + AddSemyearFeesComponent, + FeesShareAllotmentMasterComponent, + SessionMasterComponent, + StatusMasterComponent ] }) export class MastersModule { } diff --git a/src/app/views/masters/session-master/session-master.component.html b/src/app/views/masters/session-master/session-master.component.html new file mode 100644 index 0000000..a63cbe2 --- /dev/null +++ b/src/app/views/masters/session-master/session-master.component.html @@ -0,0 +1,198 @@ +
+ +
+ +
+ + + + View Session +
+ +
+
+
+ View Session Details +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Session NameSession DateStatusAction
Jul-2018 20-07-2018 + Active + +   + +
June-2018 20-06-2018 + Active + +   + +
Apr-2018 20-05-2018 + Active + +   + +
+ +
+ +
+ +
+
+
+
+ + + Add Session +
+
+
+
+
+
+ Add Session Details +
+
+
+
+ + +
+
+ +
+
+ + +
+ +
+
+
+ +
+   + +
+
+
+
+
+
+
+ +
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/src/app/views/masters/session-master/session-master.component.scss b/src/app/views/masters/session-master/session-master.component.scss new file mode 100644 index 0000000..ceb2bdf --- /dev/null +++ b/src/app/views/masters/session-master/session-master.component.scss @@ -0,0 +1,12 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + a:hover { + cursor:pointer; + } + .endBtn { + padding-right: 2px; + } \ No newline at end of file diff --git a/src/app/views/masters/session-master/session-master.component.spec.ts b/src/app/views/masters/session-master/session-master.component.spec.ts new file mode 100644 index 0000000..9ec08b8 --- /dev/null +++ b/src/app/views/masters/session-master/session-master.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SessionMasterComponent } from './session-master.component'; + +describe('SessionMasterComponent', () => { + let component: SessionMasterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SessionMasterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SessionMasterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/session-master/session-master.component.ts b/src/app/views/masters/session-master/session-master.component.ts new file mode 100644 index 0000000..b89e2c0 --- /dev/null +++ b/src/app/views/masters/session-master/session-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-session-master', + templateUrl: './session-master.component.html', + styleUrls: ['./session-master.component.scss'] +}) +export class SessionMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/status-master/status-master.component.html b/src/app/views/masters/status-master/status-master.component.html new file mode 100644 index 0000000..fb6997b --- /dev/null +++ b/src/app/views/masters/status-master/status-master.component.html @@ -0,0 +1,111 @@ +
+ +
+
+
+
+
+
+ +
+ + +
+
+   + +
+
+ + + +
+
+
+
+
+
+ +
+
+
+ View Status Details +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Status NameStatusAction
Open + Active + + +
Close + Active + + +
Pending + Active + + +
+ +
+ +
+ +
+
+
+
+ + + +
+ + + \ No newline at end of file diff --git a/src/app/views/masters/status-master/status-master.component.scss b/src/app/views/masters/status-master/status-master.component.scss new file mode 100644 index 0000000..a2c8c52 --- /dev/null +++ b/src/app/views/masters/status-master/status-master.component.scss @@ -0,0 +1,13 @@ +// form input symbol +.symbol.required:before { + content: "*"; + display: inline; + color: #f86c6b; + } + a:hover { + cursor:pointer; + } + .endBtn { + padding-right: 100px; + margin-top: -50px; + } \ No newline at end of file diff --git a/src/app/views/masters/status-master/status-master.component.spec.ts b/src/app/views/masters/status-master/status-master.component.spec.ts new file mode 100644 index 0000000..801b9a4 --- /dev/null +++ b/src/app/views/masters/status-master/status-master.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StatusMasterComponent } from './status-master.component'; + +describe('StatusMasterComponent', () => { + let component: StatusMasterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StatusMasterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StatusMasterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/status-master/status-master.component.ts b/src/app/views/masters/status-master/status-master.component.ts new file mode 100644 index 0000000..e7ced8d --- /dev/null +++ b/src/app/views/masters/status-master/status-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-status-master', + templateUrl: './status-master.component.html', + styleUrls: ['./status-master.component.scss'] +}) +export class StatusMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/status/application/application.component.html b/src/app/views/status/application/application.component.html index 8de1cab..39c4396 100644 --- a/src/app/views/status/application/application.component.html +++ b/src/app/views/status/application/application.component.html @@ -6,7 +6,7 @@
- @@ -20,6 +20,57 @@ Application Status List
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
@@ -34,8 +85,9 @@ - + + @@ -46,6 +98,7 @@ +
ApplicationForm Id Student NameFather Name Course Sem/Year Status
{{app.applicationId}} {{app.studentName}}{{app.fatherName}} {{app.courseName}} {{app.sem}} @@ -101,20 +154,20 @@
-
- +
+ -
-
- - - -
+
+
+ + + +
diff --git a/src/app/views/status/application/application.component.ts b/src/app/views/status/application/application.component.ts index 27e5074..f903509 100644 --- a/src/app/views/status/application/application.component.ts +++ b/src/app/views/status/application/application.component.ts @@ -16,6 +16,7 @@ export class ApplicationComponent implements OnInit { { applicationId: '0001', studentName: 'xyz', + fatherName: 'sss sss', courseName: 'B.Com', sem: '1', status: '1' @@ -23,6 +24,7 @@ export class ApplicationComponent implements OnInit { { applicationId: '0002', studentName: 'xss', + fatherName: 'mmm mmm', courseName: 'BE(CSE)', sem: '5', status: '1' @@ -30,6 +32,7 @@ export class ApplicationComponent implements OnInit { { applicationId: '0003', studentName: 'fys', + fatherName: 'sss vvv', courseName: 'M.SC', sem: '2', status: '0'