From 7e33af39425889725d24c16c4f0aa8de003a76bd Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 10 Aug 2018 13:08:26 +0530 Subject: [PATCH 1/4] other registration changes in student enrolment --- src/app/views/enrolment/student/student.component.html | 2 +- src/app/views/enrolment/student/student.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html index c160a22..15c0f10 100644 --- a/src/app/views/enrolment/student/student.component.html +++ b/src/app/views/enrolment/student/student.component.html @@ -440,7 +440,7 @@
- +
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts index d870705..842ff4b 100644 --- a/src/app/views/enrolment/student/student.component.ts +++ b/src/app/views/enrolment/student/student.component.ts @@ -102,7 +102,6 @@ export class StudentComponent implements OnInit { } // open student fees modal getFeesModelWindowDetails(details) { - console.log(details) this.feesModalData = details.feesDetails||null; } } From c04d636afaa33603dd6e127893822513d080b25c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 10 Aug 2018 13:09:16 +0530 Subject: [PATCH 2/4] merge changes --- .../app-sidebar/app-sidebar.component.ts | 5 + .../studymaterial-routing.module.ts | 8 + .../studymaterial/studymaterial.module.ts | 6 +- .../studymaterialstock.component.html | 294 ++++++++++++++++++ .../studymaterialstock.component.scss | 0 .../studymaterialstock.component.spec.ts | 25 ++ .../studymaterialstock.component.ts | 15 + 7 files changed, 351 insertions(+), 2 deletions(-) create mode 100644 src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html create mode 100644 src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.scss create mode 100644 src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts create mode 100644 src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index cd5cc75..6a15335 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -133,6 +133,11 @@ export class AppSidebar { name: 'AllocateMaterial', url: '/studymaterial/allocatematerial', icon: 'fa fa-user-secret' + }, + { + name: 'Studymaterial Stock', + url: '/studymaterial/studymaterialstock', + icon: 'fa fa-user-secret' } ] },{ diff --git a/src/app/views/studymaterial/studymaterial-routing.module.ts b/src/app/views/studymaterial/studymaterial-routing.module.ts index afa5d60..3c9bb7f 100644 --- a/src/app/views/studymaterial/studymaterial-routing.module.ts +++ b/src/app/views/studymaterial/studymaterial-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; +import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component'; import { StudyMaterialComponent } from './study-material/study-material.component'; const routes: Routes = [ @@ -24,6 +25,13 @@ const routes: Routes = [ data: { title: 'AllocateMaterial' } + }, + { + path: 'studymaterialstock', + component: StudymaterialstockComponent, + data: { + title: 'Studymaterialstock' + } }, { path: 'studyMaterialStatus', diff --git a/src/app/views/studymaterial/studymaterial.module.ts b/src/app/views/studymaterial/studymaterial.module.ts index b706e6a..d5383fd 100644 --- a/src/app/views/studymaterial/studymaterial.module.ts +++ b/src/app/views/studymaterial/studymaterial.module.ts @@ -11,17 +11,19 @@ import { StudymaterialRoutingModule } from './studymaterial-routing.module'; import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; import { StudyMaterialComponent } from './study-material/study-material.component'; +import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component'; @NgModule({ imports: [ CommonModule, FormsModule, TooltipModule, - ModalModule, + ModalModule, TabsModule, StudymaterialRoutingModule ], declarations: [ReceivedmaterialComponent, AllocatematerialComponent, - StudyMaterialComponent] + StudyMaterialComponent, + StudymaterialstockComponent] }) export class StudymaterialModule { } diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html new file mode 100644 index 0000000..e704f32 --- /dev/null +++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html @@ -0,0 +1,294 @@ +
+
+ + + Stock on Hand   + +
+
+ Study Materials On Hand +
+ +
+ + +
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ + + + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
University NameCourse NameSem/YearCurrent RegistrationStock on HandAction
Anna UniversityMCA1st Sem1010 + +
Bharathi UniversityMBA2nd Sem1515 + +
Thiruvalluvar UniversityBE3rd Sem2020 + +
Kamaraj UniversityDE4th sem3434 + +
+ +
+ + + + + + + + + + Studymaterial Status + + + +
+
+ Studymaterials Status +
+ +
+ + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ + + + +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Studycenter NameUniversity NameCourse NameSem/YearRegistrationStudymaterial SentBalance
SC 1Anna UniversityMCA1st Sem10100
SC 2Bharathi UniversityMBA2nd Sem15105
SC 3Thiruvalluvar UniversityBE3rd Sem20200
SC 4Kamaraj UniversityDE4th sem34304
+ +
+
+
+ +
+ + + + \ No newline at end of file diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.scss b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts new file mode 100644 index 0000000..aa3c885 --- /dev/null +++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StudymaterialstockComponent } from './studymaterialstock.component'; + +describe('StudymaterialstockComponent', () => { + let component: StudymaterialstockComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StudymaterialstockComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StudymaterialstockComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts new file mode 100644 index 0000000..f42c1a8 --- /dev/null +++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-studymaterialstock', + templateUrl: './studymaterialstock.component.html', + styleUrls: ['./studymaterialstock.component.scss'] +}) +export class StudymaterialstockComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} From 4b0af8fc3cefe5732d17f3172edcda7edbabaed6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 10 Aug 2018 14:38:20 +0530 Subject: [PATCH 3/4] form list master changes --- src/app/views/masters/form-list/form-list.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f6cca6c..b29123b 100644 --- a/src/app/views/masters/form-list/form-list.component.html +++ b/src/app/views/masters/form-list/form-list.component.html @@ -21,8 +21,8 @@ - - + + @@ -74,7 +74,7 @@
- + -
-
- - -
-
- - -
- -
-
- - -
-
- -
-    - +
+
+
+
+
+ + +
+
+ + +
+
+ +
+
+
+ + +
+
+ +
+    + +
+
+
+ + +
+ +
+
+
+
- - -
- + + +
+
+ + +
+
+ + +
+
+
+
+ +
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
-
-
+ +
From NameFrom TypeForm NameForm Type Course / University Description Status