diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 42521f3..800cdf8 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -61,8 +61,9 @@ export const routes: Routes = [ loadChildren: './views/courier/courier.module#CourierModule' }, { - path: 'receivefees', - loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule', + path: 'paymentdetails', + loadChildren: './views/payment-details/payment-details.module#PaymentDetailsModule', + } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index 0e74865..cd5cc75 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -66,7 +66,7 @@ export class AppSidebar { icon: 'fa fa-book' }, { - name: 'Allocate Fees', + name: 'Fees Share', url: '/masters/shareallotmentmaster', icon: 'fa fa-adjust' }, @@ -90,17 +90,17 @@ export class AppSidebar { name: 'Fees', url: '/masters/FeesMaster', icon: 'fa fa-money' - }, - { - name: 'Document', - url: '/masters/DocumentMaster', - icon: 'fa fa-file' - }, - { - name: 'Exam Timetable', - url: '/masters/ExamTimetable', - icon: 'fa fa-calendar-minus-o' } + // { + // name: 'Document', + // url: '/masters/DocumentMaster', + // icon: 'fa fa-file' + // }, + // { + // name: 'Exam Timetable', + // url: '/masters/ExamTimetable', + // icon: 'fa fa-calendar-minus-o' + // } ] },{ name: 'Student Enrolment', @@ -118,11 +118,6 @@ export class AppSidebar { name: 'Documents', url: '/status/documents', icon: 'fa fa-file-pdf-o' - }, - { - name: 'PaymentDetails', - url: '/status/paymentdetails', - icon: 'fa fa-credit-card-alt' } ] },{ @@ -146,9 +141,20 @@ export class AppSidebar { url : '/courier', }, { - name: 'Fees Receive/Refund ', + name: 'Payment Details', icon: 'fa fa-money', - url: '/receivefees', + children: [ + { + name: 'Fees Receive/Transfer', + icon: 'fa fa-money', + url: '/paymentdetails/receivefees', + }, + { + name: 'Account Statement', + url: '/paymentdetails/accountstatement', + icon: 'fa fa-credit-card-alt' + } + ] } ]; } diff --git a/src/app/views/fees-details/fees-details-routing.module.ts b/src/app/views/fees-details/fees-details-routing.module.ts deleted file mode 100644 index 0276e2a..0000000 --- a/src/app/views/fees-details/fees-details-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { FeesDetailsComponent } from './fees-details.component'; - -const routes: Routes = [ - { - path: '', - component: FeesDetailsComponent, - data: { - title: "Fees Receive/Transfer" - } - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class FeesDetailsRoutingModule { } diff --git a/src/app/views/fees-details/fees-details.module.spec.ts b/src/app/views/fees-details/fees-details.module.spec.ts deleted file mode 100644 index db02933..0000000 --- a/src/app/views/fees-details/fees-details.module.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { FeesDetailsModule } from './fees-details.module'; - -describe('FeesDetailsModule', () => { - let feesDetailsModule: FeesDetailsModule; - - beforeEach(() => { - feesDetailsModule = new FeesDetailsModule(); - }); - - it('should create an instance', () => { - expect(feesDetailsModule).toBeTruthy(); - }); -}); diff --git a/src/app/views/fees-details/fees-details.module.ts b/src/app/views/fees-details/fees-details.module.ts deleted file mode 100644 index ceba56c..0000000 --- a/src/app/views/fees-details/fees-details.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -// Modal Component -import { ModalModule } from 'ngx-bootstrap/modal'; -// Tabs Component -import { TabsModule } from 'ngx-bootstrap/tabs'; -import { FeesDetailsRoutingModule } from './fees-details-routing.module'; -import { FeesDetailsComponent } from './fees-details.component'; -import { EditReceiveFeesComponent } from './edit-receive-fees/edit-receive-fees.component'; -import { TransferFeesDetailsComponent } from './transfer-fees-details/transfer-fees-details.component'; -@NgModule({ - imports: [ - CommonModule, - FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot() - ], - declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent] -}) -export class FeesDetailsModule { } 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 index 572e21c..a6925d5 100644 --- 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 @@ -30,10 +30,11 @@
- +
@@ -42,24 +43,24 @@
-
+
- + - + - + @@ -79,26 +80,14 @@ - - - - - - + - +
Fees Name Fees AmountOne Time / Per SemFees Type Action
Tution FeesAdmission Fees 15000 - One Time + New Registration @@ -67,7 +68,7 @@
Exam FeesTution Fees 5000
Late Fees - 2000 - - Per Sem - - - -
Other Fees 1000 - Per Sem + Re-registration diff --git a/src/app/views/masters/course-master/course-master.component.html b/src/app/views/masters/course-master/course-master.component.html index d1bc835..faf8082 100644 --- a/src/app/views/masters/course-master/course-master.component.html +++ b/src/app/views/masters/course-master/course-master.component.html @@ -97,7 +97,7 @@
L0022 Fashion TechnologyAnn UniversityAnna University SEM InActive @@ -155,14 +155,14 @@ Add Course
-
+
Course Details
-
+
-
+
-
+
-
+
-
- -
-
- -
-
- -
-
- -
- - -
+ -
-   - -
+
+
@@ -258,28 +224,28 @@ + +
+
+
+ + + diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.scss b/src/app/views/payment-details/account-statement/account-statement.component.scss similarity index 100% rename from src/app/views/status/paymentdetails/paymentdetails.component.scss rename to src/app/views/payment-details/account-statement/account-statement.component.scss diff --git a/src/app/views/payment-details/account-statement/account-statement.component.spec.ts b/src/app/views/payment-details/account-statement/account-statement.component.spec.ts new file mode 100644 index 0000000..0cf7be1 --- /dev/null +++ b/src/app/views/payment-details/account-statement/account-statement.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AccountStatementComponent } from './account-statement.component'; + +describe('AccountStatementComponent', () => { + let component: AccountStatementComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AccountStatementComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AccountStatementComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/payment-details/account-statement/account-statement.component.ts b/src/app/views/payment-details/account-statement/account-statement.component.ts new file mode 100644 index 0000000..6efa36b --- /dev/null +++ b/src/app/views/payment-details/account-statement/account-statement.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-account-statement', + templateUrl: './account-statement.component.html', + styleUrls: ['./account-statement.component.scss'] +}) +export class AccountStatementComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html similarity index 96% rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html index 139ee27..afeb917 100644 --- a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html +++ b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html @@ -18,7 +18,7 @@
- +
+
+ + +
@@ -173,7 +177,7 @@ 75000
- 25000 + 20000 Partially Paid diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.scss similarity index 100% rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.scss diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts similarity index 100% rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.ts similarity index 100% rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.ts diff --git a/src/app/views/fees-details/fees-details.component.html b/src/app/views/payment-details/fees-details/fees-details.component.html similarity index 97% rename from src/app/views/fees-details/fees-details.component.html rename to src/app/views/payment-details/fees-details/fees-details.component.html index 5d9eb2b..2ef2c66 100644 --- a/src/app/views/fees-details/fees-details.component.html +++ b/src/app/views/payment-details/fees-details/fees-details.component.html @@ -145,7 +145,7 @@
- +
+
+ + +
@@ -307,7 +311,7 @@ 75000
- 25000 + 20000 Partially Paid diff --git a/src/app/views/fees-details/fees-details.component.scss b/src/app/views/payment-details/fees-details/fees-details.component.scss similarity index 100% rename from src/app/views/fees-details/fees-details.component.scss rename to src/app/views/payment-details/fees-details/fees-details.component.scss diff --git a/src/app/views/fees-details/fees-details.component.spec.ts b/src/app/views/payment-details/fees-details/fees-details.component.spec.ts similarity index 100% rename from src/app/views/fees-details/fees-details.component.spec.ts rename to src/app/views/payment-details/fees-details/fees-details.component.spec.ts diff --git a/src/app/views/fees-details/fees-details.component.ts b/src/app/views/payment-details/fees-details/fees-details.component.ts similarity index 90% rename from src/app/views/fees-details/fees-details.component.ts rename to src/app/views/payment-details/fees-details/fees-details.component.ts index 3abb9bd..8420771 100644 --- a/src/app/views/fees-details/fees-details.component.ts +++ b/src/app/views/payment-details/fees-details/fees-details.component.ts @@ -18,8 +18,8 @@ export class FeesDetailsComponent implements OnInit { ngOnInit() { } saveFees() { - this.showFeesAllocateC= true; - this.hideFeesDetailsC= true; + this.showFeesAllocateC= false; + this.hideFeesDetailsC= false; } editFees() { this.showFeesAllocateC= true; diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html similarity index 92% rename from src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html rename to src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html index 1c8fc5d..ebd0f99 100644 --- a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html +++ b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html @@ -22,13 +22,13 @@
- +
- + - - - -
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- - - - -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DateDescriptionUniversityFormDebitCreditBalanceRemarks
10/08/2018Payment ReceivedAnna UniFormID 1010,00010,000Amount Received by studycenter A
11/08/2018Fees AdjustAnna UniFormID 2015,00025,000Amount Adjust studycenter A
12/08/2018RefundAnna UniFormID 35000020,000Amount Refund
- -
- -
- -
- - - - - - - - - - - - diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.ts b/src/app/views/status/paymentdetails/paymentdetails.component.ts deleted file mode 100644 index 567a639..0000000 --- a/src/app/views/status/paymentdetails/paymentdetails.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-paymentdetails', - templateUrl: './paymentdetails.component.html', - styleUrls: ['./paymentdetails.component.scss'] -}) -export class PaymentdetailsComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/views/status/status-routing.module.ts b/src/app/views/status/status-routing.module.ts index e397809..a9f3403 100644 --- a/src/app/views/status/status-routing.module.ts +++ b/src/app/views/status/status-routing.module.ts @@ -3,8 +3,6 @@ import { Routes, RouterModule } from '@angular/router'; import { DocumentsComponent } from './documents/documents.component'; import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; -import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; - const routes: Routes = [ { path: '', @@ -23,12 +21,6 @@ const routes: Routes = [ data: { title: 'Documents' } - },{ - path: 'paymentdetails', - component: PaymentdetailsComponent, - data: { - title: 'Paymentdetails' - } } ] } diff --git a/src/app/views/status/status.module.ts b/src/app/views/status/status.module.ts index 34c8ca5..b28db12 100644 --- a/src/app/views/status/status.module.ts +++ b/src/app/views/status/status.module.ts @@ -16,8 +16,6 @@ import { EditDocumentsComponent } from './documents/edit-documents/edit-document //answer-booklet import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component'; -//paymentdetails -import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; @NgModule({ imports: [ @@ -33,7 +31,6 @@ import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.compone EditDocumentsComponent, AnswerBookletComponent, EditAnswerBookletComponent, - PaymentdetailsComponent ] }) export class StatusModule { } diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html index 30d3b05..ab1d6dd 100644 --- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html @@ -238,7 +238,7 @@
- +
diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html index 8bb511b..63a6ced 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html @@ -6,7 +6,7 @@
- Received Study Materials + Study Materials On Hand
@@ -132,13 +132,15 @@ Received Study Materials + +
Study Material
-
+<<<<<<< HEAD
+
+ +
+ + + +
+ + +
+ +
diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts index 3e812e9..993948d 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts @@ -6,15 +6,18 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./receivedmaterial.component.scss'] }) export class ReceivedmaterialComponent implements OnInit { - + model: any = {}; constructor() { } ngOnInit() { } + ShowHideDiv(chkPassport) { alert('hai'); var dvPassport = document.getElementById("dvPassport"); dvPassport.style.display = chkPassport.checked ? "block" : "none"; } + } + \ No newline at end of file