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/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index f19a1f0..e189944 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -85,19 +85,15 @@ export class AppSidebar { url: '/masters/statusmaster', icon: 'fa fa-bullseye' }, - { - name: 'Document', - url: '/masters/DocumentMaster', - icon: 'fa fa-file-o' - }, + { name: 'Fees', url: '/masters/FeesMaster', icon: 'fa fa-money' }, { - name: 'Form', - url: '/masters/FormMaster', + name: 'Document', + url: '/masters/DocumentMaster', icon: 'fa fa-file' }, 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 3db708d..38fe9dd 100644 --- a/src/app/views/masters/batch-master/batch-master.component.html +++ b/src/app/views/masters/batch-master/batch-master.component.html @@ -181,14 +181,14 @@
-
- +
+
-
+
@@ -203,7 +203,7 @@
- +
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 611d75d..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,14 +12,15 @@ - View Document   + View Document   -
+
Document List
-
-
+ +
+
@@ -29,66 +30,55 @@
-
+
- - - - - - + + + + + + - - - - - + + + + - - - - - - - - - + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - + + + +
Document NameDocument DescriptionStatusAction
DocumentNameDescriptionStatusAction
SFSemester Fess Document Inactive - | - +
Transfer certificateTransfer certificate Doc + Active + +
MFMarksheet Document Inactive - | - +
Provisional CertificateProvisional Certificate Doc + Active + +
EFExam Fees Active - | - +
Degree CertificateDegree Certificate Doc + Inactive + +
HTHall Ticket - Active - | - -
-
+
@@ -109,14 +99,15 @@ Add Document -
+
- Document + Document
- -
+ +
+
@@ -125,7 +116,7 @@
-
+

-
- - - -
+
+

-
+
- +   - +
-
+
-
+
+
@@ -162,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 aab09ae..507bd9a 100644 --- a/src/app/views/masters/examtime-table/examtime-table.component.html +++ b/src/app/views/masters/examtime-table/examtime-table.component.html @@ -85,10 +85,10 @@ - + - + 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 b5df52a..0000000 --- a/src/app/views/masters/form-master/form-master.component.html +++ /dev/null @@ -1,172 +0,0 @@ - - - Back to List - - -
- - -
- -
- - - - View Form   - -
-
- Form List -
- -
-
-
-
- - - - -
-
-
-
- -
-
-
University NameUniversity Name Course Document NameDescriptionDescription Action
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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 9b43443..f9b69f5 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -9,7 +9,6 @@ import { UniversityMasterComponent } from './university-master/university-master import { BatchMasterComponent } from './batch-master/batch-master.component'; import { DocumentMasterComponent } from './document-master/document-master.component'; import { FeesMasterComponent } from './fees-master/fees-master.component'; -import { FormMasterComponent } from './form-master/form-master.component'; import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; import { StudyMaterialComponent } from './study-material/study-material.component'; import { CourseMasterComponent } from './course-master/course-master.component'; @@ -60,18 +59,11 @@ const routes: Routes = [ } }, { - path: 'BatchMaster', + path: 'BatchMaster', component: BatchMasterComponent, data: { title: 'Batch' } - }, - { - path: 'DocumentMaster', - component: DocumentMasterComponent, - data: { - title: 'Document' - } }, { path: 'FeesMaster', @@ -81,10 +73,10 @@ const routes: Routes = [ } }, { - path: 'FormMaster', - component: FormMasterComponent, + path: 'DocumentMaster', + component: DocumentMasterComponent, data: { - title: 'Form' + title: 'Document' } }, { diff --git a/src/app/views/masters/masters.module.ts b/src/app/views/masters/masters.module.ts index 52cfaf9..3df85b8 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -23,12 +23,12 @@ import { EditStudyCenterComponent } from './study-center/edit-study-center/edit- import { UniversityMasterComponent } from './university-master/university-master.component'; //Batch import { BatchMasterComponent } from './batch-master/batch-master.component'; -//Document + import { DocumentMasterComponent } from './document-master/document-master.component'; //Fees import { FeesMasterComponent } from './fees-master/fees-master.component'; //Form -import { FormMasterComponent } from './form-master/form-master.component'; + //Study import { StudyMaterialComponent } from './study-material/study-material.component'; import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; @@ -61,9 +61,9 @@ import { StatusMasterComponent } from './status-master/status-master.component'; FormListComponent, UniversityMasterComponent, BatchMasterComponent, - DocumentMasterComponent, + FeesMasterComponent, - FormMasterComponent, +DocumentMasterComponent, StudyMaterialComponent, ExamtimeTableComponent, CourseMasterComponent, diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.html b/src/app/views/status/paymentdetails/paymentdetails.component.html index b72e3eb..760e475 100644 --- a/src/app/views/status/paymentdetails/paymentdetails.component.html +++ b/src/app/views/status/paymentdetails/paymentdetails.component.html @@ -25,7 +25,7 @@
-
+
-
+
+
+
+ +
+
@@ -81,58 +89,64 @@ + Date Description + University + Form Debit Credit Balance + Remarks + 10/08/2018 + Payment Received + Anna Uni FormID 1 0 10,000 10,000 + Amount Received by studycenter A + 11/08/2018 + Fees Adjust + Anna Uni FormID 2 0 15,000 25,000 + Amount Adjust studycenter A + 12/08/2018 + Refund + Anna Uni FormID 3 5000 0 20,000 - + Amount Refund + - - 16/08/2018 - FormID 4 - 10,000 - 0 - 10,000 - - - - - + diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html index 04b3761..310c329 100644 --- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html @@ -244,8 +244,8 @@ Batch C BE - 0 - + 20 + @@ -254,7 +254,7 @@ Batch D DE - 0 + 34