diff --git a/dist.rar b/dist.rar new file mode 100644 index 0000000..9478259 Binary files /dev/null and b/dist.rar differ diff --git a/e2e/app/paymentmodule/paymentmodule-routing.module.ts b/e2e/app/paymentmodule/paymentmodule-routing.module.ts new file mode 100644 index 0000000..d37a207 --- /dev/null +++ b/e2e/app/paymentmodule/paymentmodule-routing.module.ts @@ -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 { } diff --git a/e2e/app/paymentmodule/paymentmodule.module.spec.ts b/e2e/app/paymentmodule/paymentmodule.module.spec.ts new file mode 100644 index 0000000..ee103d0 --- /dev/null +++ b/e2e/app/paymentmodule/paymentmodule.module.spec.ts @@ -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(); + }); +}); diff --git a/e2e/app/paymentmodule/paymentmodule.module.ts b/e2e/app/paymentmodule/paymentmodule.module.ts new file mode 100644 index 0000000..16f1110 --- /dev/null +++ b/e2e/app/paymentmodule/paymentmodule.module.ts @@ -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 { } diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index ace28d4..42521f3 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -59,6 +59,10 @@ export const routes: Routes = [ { path: 'courier', loadChildren: './views/courier/courier.module#CourierModule' + }, + { + 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 5c51bef..4c89d61 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -51,39 +51,55 @@ 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' + icon: 'fa fa-university' }, - { - 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' + icon: 'fa fa-tasks' }, - { - name: 'Document Master', - url: '/masters/DocumentMaster', - icon: 'fa fa-language' + { + name: 'Session', + url: '/masters/sessionmaster', + icon: 'fa fa-support' }, + { + name: 'Status', + url: '/masters/statusmaster', + icon: 'fa fa-bullseye' + }, + { - name: 'Fees Master', + name: 'Fees', url: '/masters/FeesMaster', - icon: 'fa fa-language' + icon: 'fa fa-money' }, { - name: 'Form Master', - url: '/masters/FormMaster', - icon: 'fa fa-language' + name: 'Document', + url: '/masters/DocumentMaster', + icon: 'fa fa-file' }, { name: 'Exam Timetable', url: '/masters/ExamTimetable', - icon: 'fa fa-language' + icon: 'fa fa-calendar-minus-o' } ] },{ @@ -106,17 +122,17 @@ export class AppSidebar { { name: 'PaymentDetails', url: '/status/paymentdetails', - icon: 'fa fa-user-secret' + icon: 'fa fa-credit-card-alt' } ] },{ name: 'Study Material', - icon: 'fa fa-gear', + icon: 'fa fa-book', children: [ { name: 'ReceivedMaterial', url: '/studymaterial/receivedmaterial', - icon: 'fa fa-user-secret' + icon: 'fa fa-file-text-o' }, { name: 'AllocateMaterial', @@ -132,7 +148,12 @@ export class AppSidebar { },{ name: 'Courier', icon: 'fa fa-suitcase', - url : '/courier' + url : '/courier', + }, + { + name: 'Fees Receive/Refund ', + icon: 'fa fa-money', + url: '/receivefees', } ]; } 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..139ee27 --- /dev/null +++ b/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html @@ -0,0 +1,227 @@ +
+
+
+
+
+
+ Manually Change Received 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/fees-details-routing.module.ts b/src/app/views/fees-details/fees-details-routing.module.ts new file mode 100644 index 0000000..0276e2a --- /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/Transfer" + } + } +]; + +@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..5d9eb2b --- /dev/null +++ b/src/app/views/fees-details/fees-details.component.html @@ -0,0 +1,335 @@ +
+ +
+ +
+ + + + Received Fees +
+
+
+
+ Received Fees Details +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Bill NoReceipt NoBill Amount Received AmountAdvance AmountReceived OnMode Of PaymentStudy CenterUniversityAction
CHE-00001200000200000014-07-2019CASHChennaiAnna University + +    + + +
CHE-00002100000500005000014-07-2019CASHCoimbatoreAnna University + +    + +
CHE-000025000050000014-07-2019TRANSFERChennaiSRM University + +    + +
+ +
+ +
+ +
+
+
+
+ + + Receive Fees +
+
+
+
+
+
+ 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..3abb9bd --- /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; + showFeesTransferC: boolean; + constructor() { + this.showFeesAllocateC= false; + this.showFeesTransferC= false; + this.hideFeesDetailsC= false; + } + + ngOnInit() { + } + saveFees() { + this.showFeesAllocateC= true; + this.hideFeesDetailsC= true; + } + editFees() { + this.showFeesAllocateC= true; + this.hideFeesDetailsC= true; + } + + refundFees() { + this.showFeesTransferC= 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..ceba56c --- /dev/null +++ b/src/app/views/fees-details/fees-details.module.ts @@ -0,0 +1,18 @@ +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 { } diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html new file mode 100644 index 0000000..1c8fc5d --- /dev/null +++ b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html @@ -0,0 +1,63 @@ +
+
+
+
+
+
+ Fees Transfer From Paid Details +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+   + +
+
+
+
+
+ +
+
diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.scss b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.scss new file mode 100644 index 0000000..a2e7691 --- /dev/null +++ b/src/app/views/fees-details/transfer-fees-details/transfer-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/transfer-fees-details/transfer-fees-details.component.spec.ts b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts new file mode 100644 index 0000000..b882906 --- /dev/null +++ b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TransferFeesDetailsComponent } from './transfer-fees-details.component'; + +describe('TransferFeesDetailsComponent', () => { + let component: TransferFeesDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TransferFeesDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TransferFeesDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts new file mode 100644 index 0000000..a4f50ce --- /dev/null +++ b/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-transfer-fees-details', + templateUrl: './transfer-fees-details.component.html', + styleUrls: ['./transfer-fees-details.component.scss'] +}) +export class TransferFeesDetailsComponent implements OnInit { + + constructor() { + } + + ngOnInit() { + } + transfer() { + } + +} diff --git a/src/app/views/masters/batch-master/batch-master.component.html b/src/app/views/masters/batch-master/batch-master.component.html index d552f67..38fe9dd 100644 --- a/src/app/views/masters/batch-master/batch-master.component.html +++ b/src/app/views/masters/batch-master/batch-master.component.html @@ -12,9 +12,14 @@ - View Batch  13 + View Batch   +
+
+ Batch List +
+
@@ -160,6 +165,8 @@
  • Next
    • +
    +
    @@ -168,34 +175,45 @@ Add Batch
    - Batch + Batch
    -
    - - -
    -
    - - -
    - -
    - -
    -
    - -
    -
    - +
    +
    +
    + + +
    +
    + + +
    + + +
    + +
    +
    + + +
    +
    + +
    + +
    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/document-master/document-master.component.html b/src/app/views/masters/document-master/document-master.component.html index 0d59cf1..02ed163 100644 --- a/src/app/views/masters/document-master/document-master.component.html +++ b/src/app/views/masters/document-master/document-master.component.html @@ -1,10 +1,10 @@ - + Back to List
    - +
    @@ -12,8 +12,14 @@ - View Document  13 + View Document   +
    +
    + Document List +
    + +
    @@ -24,68 +30,55 @@
    -
    +
    - - - - - - + + + + + + - - - - - + + + + - - - - - - - - - + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - + + + +
    Document NameDocument DescriptionDocument DateAction
    DocumentNameDescriptionStatusAction
    SFSemester Fess Document12/12/2018 - - - | - +
    Transfer certificateTransfer certificate Doc + Active + +
    MFMarksheet Document12/12/2018 - | - +
    Provisional CertificateProvisional Certificate Doc + Active + +
    EFExam Fees12/12/2018 - | - +
    Degree CertificateDegree Certificate Doc + Inactive + +
    HTHall Ticket12/12/2018 - | - -
    +
    +
    Add Document -
    +
    - Document + Document
    -
    +
    +
    - +
    - +
    - - - -
    - -
    - -
    - - - -
    -
    +
    + +
    + +
    +

    -
    +
    - +   - +
    -
    +
    -
    +
    +
    @@ -157,3 +151,9 @@ + + + + + + \ No newline at end of file diff --git a/src/app/views/masters/examtime-table/examtime-table.component.html b/src/app/views/masters/examtime-table/examtime-table.component.html index cd762a2..507bd9a 100644 --- a/src/app/views/masters/examtime-table/examtime-table.component.html +++ b/src/app/views/masters/examtime-table/examtime-table.component.html @@ -12,8 +12,61 @@ - Exam TimeTable  13 + Exam TimeTable   +
    +
    + ExamTimetable List +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    @@ -32,76 +85,70 @@ - - + - - - - + + - + - - - - + + + - + - - - - + + + - - - - - - + + + + + - - - - - - + + + + + + @@ -121,6 +168,8 @@ + + @@ -134,21 +183,21 @@
    - +
    - +
    - +
    diff --git a/src/app/views/masters/examtime-table/examtime-table.component.scss b/src/app/views/masters/examtime-table/examtime-table.component.scss index d1e861b..bf81b59 100644 --- a/src/app/views/masters/examtime-table/examtime-table.component.scss +++ b/src/app/views/masters/examtime-table/examtime-table.component.scss @@ -27,4 +27,7 @@ p.example::after { content: ""; clear: both; display: table; -} \ No newline at end of file +} +.required{ + color:red; +} diff --git a/src/app/views/masters/fees-master/fees-master.component.html b/src/app/views/masters/fees-master/fees-master.component.html index 8bfbca6..970d8db 100644 --- a/src/app/views/masters/fees-master/fees-master.component.html +++ b/src/app/views/masters/fees-master/fees-master.component.html @@ -12,8 +12,13 @@ - View Fees  13 + View Fees   +
    +
    + Fees List +
    +
    @@ -97,6 +102,8 @@
  • Next
    • +
    +
    @@ -105,7 +112,7 @@ Add Fees
    - Fees + Fees
    @@ -113,13 +120,22 @@
    - +
    - +
    +
    + +
    + +

    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 +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    University NameBatch NameUniversity Name CourseSubject NameDateFrom TimeTo TimeDocument NameDescription Action
    DMSBatch BMCAData Structure10/01/20181.00 PM4.00 PMMCA Timetable2017 1batch MCA - | - + +
    AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PMMBA Timetable2017 1batch MBA - | - + +
    AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PMMEME Timetable2017 1batch ME - | - + +
    AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PMMTECHMTECH Timetable2017 1batch MTECH - | - + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    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/form-list/form-list.component.html b/src/app/views/masters/form-list/form-list.component.html index a70301f..d61f9e6 100644 --- a/src/app/views/masters/form-list/form-list.component.html +++ b/src/app/views/masters/form-list/form-list.component.html @@ -37,13 +37,13 @@ Active In-Active - + | - + - +
    • Prev
    • diff --git a/src/app/views/masters/form-master/form-master.component.html b/src/app/views/masters/form-master/form-master.component.html deleted file mode 100644 index 75d7c97..0000000 --- a/src/app/views/masters/form-master/form-master.component.html +++ /dev/null @@ -1,155 +0,0 @@ - - - Back to List - - -
      - - -
      - -
      - - - - View Fees  13 - -
      -
      -
      - - - - -
      -
      -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      FormNameDescriptionStatusAction
      TCTransfer certificate - Active - - | - -
      PCProvisional Certificate - Active - - | - -
      DCDegree Certificate - Inactive - - | - -
      MSMark Sheet - Inactive - - | - -
      - -
      - -
      - -       - - Add Form -
      -
      - Form -
      - -
      -
      -
      - -
      - - -
      -
      - - -
      -
      -
      -
      -
      -
      -
      - - -   - -
      -
      -
      -
      - -
      - -       -       -
      -
      -
      - - - - - - - - - - \ No newline at end of file diff --git a/src/app/views/masters/form-master/form-master.component.scss b/src/app/views/masters/form-master/form-master.component.scss deleted file mode 100644 index afeb7c4..0000000 --- a/src/app/views/masters/form-master/form-master.component.scss +++ /dev/null @@ -1,4 +0,0 @@ - -.required{ - color:red; -} diff --git a/src/app/views/masters/form-master/form-master.component.ts b/src/app/views/masters/form-master/form-master.component.ts deleted file mode 100644 index 2e80640..0000000 --- a/src/app/views/masters/form-master/form-master.component.ts +++ /dev/null @@ -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() { - } - -} diff --git a/src/app/views/masters/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts index 35e2d10..f9b69f5 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -9,9 +9,12 @@ 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'; +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: '', @@ -52,44 +55,65 @@ const routes: Routes = [ path: 'UniversityMaster', component: UniversityMasterComponent, data: { - title: 'University Master' + title: 'University' } }, { - path: 'BatchMaster', + path: 'BatchMaster', component: BatchMasterComponent, data: { - title: 'Batch Master' - } - }, - { - path: 'DocumentMaster', - component: DocumentMasterComponent, - data: { - title: 'Document Master' + title: 'Batch' } }, { path: 'FeesMaster', component: FeesMasterComponent, data: { - title: 'Fees Master' + title: 'Fees' } }, { - path: 'FormMaster', - component: FormMasterComponent, + path: 'DocumentMaster', + component: DocumentMasterComponent, data: { - title: 'Form Master' + title: 'Document' } }, { path: 'ExamTimetable', component: ExamtimeTableComponent, data: { - title: 'Exam Timetable' + title: 'ExamTimetable' } - } + }, + { + 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..3df85b8 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -23,18 +23,25 @@ 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'; // 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, @@ -54,11 +61,16 @@ import { FormListComponent } from './form-list/form-list.component'; FormListComponent, UniversityMasterComponent, BatchMasterComponent, - DocumentMasterComponent, + FeesMasterComponent, - FormMasterComponent, +DocumentMasterComponent, 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/masters/university-master/university-master.component.html b/src/app/views/masters/university-master/university-master.component.html index 56a5c48..917c9e5 100644 --- a/src/app/views/masters/university-master/university-master.component.html +++ b/src/app/views/masters/university-master/university-master.component.html @@ -8,6 +8,11 @@ View University  29 +
      +
      + University List +
      +
      @@ -105,6 +110,8 @@
    • Next
    + + @@ -113,33 +120,34 @@ Add University
    - University + University
    - -
    + + +
    - +
    - +

    - +
    - +
    - +
    @@ -152,7 +160,7 @@
    - +