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 b29123b..9610367 100644
--- a/src/app/views/masters/form-list/form-list.component.html
+++ b/src/app/views/masters/form-list/form-list.component.html
@@ -94,7 +94,7 @@
-
+
+
+ Document
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Status Name |
+ Type |
+ Status |
+ Action |
+
+
+
+
+ | {{document.statusName}} |
+ {{document.type}} |
+
+ {{document.status}}
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
Fees
diff --git a/src/app/views/masters/status-master/status-master.component.scss b/src/app/views/masters/status-master/status-master.component.scss
index cc75a4b..87c5967 100644
--- a/src/app/views/masters/status-master/status-master.component.scss
+++ b/src/app/views/masters/status-master/status-master.component.scss
@@ -8,5 +8,5 @@
cursor:pointer;
}
.saveBtn {
- padding-top: 28px;
+ padding-top: 29px;
}
\ No newline at end of file
diff --git a/src/app/views/masters/status-master/status-master.component.ts b/src/app/views/masters/status-master/status-master.component.ts
index 3092756..50c0cf5 100644
--- a/src/app/views/masters/status-master/status-master.component.ts
+++ b/src/app/views/masters/status-master/status-master.component.ts
@@ -12,6 +12,7 @@ export class StatusMasterComponent implements OnInit {
formStatus: any;
markCardStatus: any;
studyMaterialStatus: any;
+ documentStatus: any;
constructor() { }
ngOnInit() {
@@ -39,6 +40,18 @@ export class StatusMasterComponent implements OnInit {
status: 'Active'
},
]
+ this.documentStatus = [
+ {
+ statusName: 'Sent to SC ',
+ type: 'Document',
+ status: 'Active'
+ },
+ {
+ statusName: 'Received by SC',
+ type: 'Document',
+ status: 'Active'
+ },
+ ]
this.feesStatus = [
{
statusName: 'Paid',
diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
index ab1d6dd..22019b3 100644
--- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
+++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
@@ -107,7 +107,7 @@
-
+
diff --git a/src/app/views/studymaterial/studymaterial-routing.module.ts b/src/app/views/studymaterial/studymaterial-routing.module.ts
index 3c9bb7f..89ee790 100644
--- a/src/app/views/studymaterial/studymaterial-routing.module.ts
+++ b/src/app/views/studymaterial/studymaterial-routing.module.ts
@@ -4,7 +4,6 @@ import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.c
import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component';
import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component';
import { StudyMaterialComponent } from './study-material/study-material.component';
-
const routes: Routes = [
{
path: '',
@@ -33,6 +32,7 @@ const routes: Routes = [
title: 'Studymaterialstock'
}
},
+
{
path: 'studyMaterialStatus',
component: StudyMaterialComponent,
diff --git a/src/app/views/studymaterial/studymaterial.module.ts b/src/app/views/studymaterial/studymaterial.module.ts
index d5383fd..2f15a9b 100644
--- a/src/app/views/studymaterial/studymaterial.module.ts
+++ b/src/app/views/studymaterial/studymaterial.module.ts
@@ -12,6 +12,7 @@ import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.c
import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component';
import { StudyMaterialComponent } from './study-material/study-material.component';
import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component';
+import { ViewstockComponent}from './studymaterialstock/viewstock/viewstock.component';
@NgModule({
imports: [
@@ -24,6 +25,6 @@ import { StudymaterialstockComponent } from './studymaterialstock/studymaterials
],
declarations: [ReceivedmaterialComponent, AllocatematerialComponent,
StudyMaterialComponent,
- StudymaterialstockComponent]
+ StudymaterialstockComponent,ViewstockComponent]
})
export class StudymaterialModule { }
diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
index e704f32..6a0e564 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
@@ -76,48 +76,30 @@
Action |
-
-
- | Anna University |
- MCA |
- 1st Sem |
- 10 |
- 10 |
+
+
+ | {{stock.universityname}} |
+ {{stock.coursename}} |
+ {{stock.semyear}} |
+ {{stock.registration}} |
+ {{stock.stock}} |
-
+
|
-
- | Bharathi University |
- MBA |
- 2nd Sem |
- 15 |
- 15 |
-
-
- |
-
-
- | Thiruvalluvar University |
- BE |
- 3rd Sem |
- 20 |
- 20 |
-
-
- |
-
-
- | Kamaraj University |
- DE |
- 4th sem |
- 34 |
- 34 |
-
-
- |
-
+
+
+
+ | Date |
+ Details |
+ Incoming |
+ Outgoing |
+ Balance on Hand |
+
+
+
+
diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts
deleted file mode 100644
index aa3c885..0000000
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-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
index f42c1a8..bf75a3d 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
@@ -6,10 +6,67 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./studymaterialstock.component.scss']
})
export class StudymaterialstockComponent implements OnInit {
-
+ show = false;
+ closed = false;
+ public myModal;
+ public myModalData;
+ studymaterialDetails: any;
+ stockdetails:any;
constructor() { }
ngOnInit() {
+ this.studymaterialDetails = [
+ {
+ universityname: 'Anna University',
+ coursename: 'MCA',
+ semyear: '1st sem/2018',
+ registration: '30',
+ stock: '100'
+ },
+ {
+ universityname: 'Bharathi University',
+ coursename: 'MBA',
+ semyear: '2nd sem/2018',
+ registration: '10',
+ stock: '50'
+ },
+ {
+ universityname: 'Kamaraj University',
+ coursename: 'ME',
+ semyear: '3rd sem/2019',
+ registration: '20',
+ stock: '80'
+ }
+ ]
+
+ this.stockdetails = [
+ {
+ date: '10/08/2018',
+ details: 'MCA',
+ incoming: '100',
+ outgoing: '30',
+ balanceonhand: '70'
+ },
+ {
+ date: '12/08/2018',
+ details: 'MCA',
+ incoming: '60',
+ outgoing: '30',
+ balanceonhand: '30'
+ },
+ {
+ date: '14/08/2018',
+ details: 'MCA',
+ incoming: '50',
+ outgoing: '0',
+ balanceonhand: '50'
+ }
+ ]
}
-
+ viewId: any;
+ viewstock(i){
+ this.viewId = i;
+ this.show = !this.show;
+
}
+}
\ No newline at end of file
diff --git a/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.html b/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.html
new file mode 100644
index 0000000..856b4d0
--- /dev/null
+++ b/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.html
@@ -0,0 +1,3 @@
+
+ viewstock works!
+
diff --git a/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.scss b/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.ts b/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.ts
new file mode 100644
index 0000000..167f728
--- /dev/null
+++ b/src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-viewstock',
+ templateUrl: './viewstock.component.html',
+ styleUrls: ['./viewstock.component.scss']
+})
+export class ViewstockComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}