From d0b252e3814a69a32dd069f766269ebbb54a2cdd Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 10 Aug 2018 14:59:28 +0530
Subject: [PATCH 1/4] stock view in studymaterial

---
 .../allocatematerial.component.html           |  2 +-
 .../studymaterial-routing.module.ts           |  2 +-
 .../studymaterial/studymaterial.module.ts     |  3 +-
 .../studymaterialstock.component.html         | 46 ++++---------------
 .../studymaterialstock.component.spec.ts      | 25 ----------
 .../studymaterialstock.component.ts           | 36 ++++++++++++++-
 .../viewstock/viewstock.component.html        |  3 ++
 .../viewstock/viewstock.component.scss        |  0
 .../viewstock/viewstock.component.ts          | 15 ++++++
 9 files changed, 65 insertions(+), 67 deletions(-)
 delete mode 100644 src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.spec.ts
 create mode 100644 src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.html
 create mode 100644 src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.scss
 create mode 100644 src/app/views/studymaterial/studymaterialstock/viewstock/viewstock.component.ts

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 @@
     <!--/.col-->
   </div>
   <!--/.row-->
- </div>
+ </div>   
     </tab>
 
      <div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
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..45f7c96 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
@@ -77,47 +77,19 @@
           </tr>
         </thead>
         <tbody>
-          <tr>
-            <td>Anna University</td>
-            <td>MCA</td>
-            <td>1st Sem</td>
-            <td>10</td>
-		     	<td>10</td>
+         <tr *ngFor="let stock of studymaterialDetails">
+            <td>{{stock.universityname}}</td>
+             <td>{{stock.coursename}}</td>
+             <td>{{stock.semyear}}</td>
+            <td>{{stock.registration}}</td>
+		      	<td>{{stock.stock}}</td>
          <td>
-            <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
+            <i class="fa fa-eye" tooltip="View More"  (click)="viewstock()"></i>
           </td>
 
           </tr>
-          <tr>
-            <td>Bharathi University</td>
-            <td>MBA</td>
-            <td>2nd Sem</td>
-		     	<td>15</td>
-           <td>15</td>
-			 <td>
-            <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
-          </td>
-          </tr>
-          <tr>
-            <td>Thiruvalluvar University</td>
-            <td>BE</td>
-            <td>3rd Sem</td>
-			<td>20</td>
-           <td>20</td>
-			 <td>
-            <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
-          </td>
-          </tr>
-          <tr>
-            <td>Kamaraj University</td>
-            <td>DE</td>
-            <td>4th sem</td>
-			<td>34</td>
-           <td>34</td>
-		 <td>
-            <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
-          </td>
-          </tr>
+         
+         
           
         </tbody>
       </table>
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<StudymaterialstockComponent>;
-
-  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..b9b31cc 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
@@ -6,10 +6,42 @@ 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;
   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'
+      }
+    ]
   }
-    
+  getModelWindowDetails(stuCent) {
+    this.myModalData = stuCent||null;
+  }
+    viewstock(){
+     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 @@
+<p>
+  viewstock works!
+</p>
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() {
+  }
+
+}

From 26a6344f38fe12f2b4351dd69c325b41954253ce Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 10 Aug 2018 15:58:57 +0530
Subject: [PATCH 2/4] studymaterial stock

---
 .../studymaterialstock.component.html         | 16 +++++++--
 .../studymaterialstock.component.ts           | 33 ++++++++++++++++---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
index 45f7c96..6a0e564 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.html
@@ -76,19 +76,29 @@
            <th>Action</th>
           </tr>
         </thead>
-        <tbody>
-         <tr *ngFor="let stock of studymaterialDetails">
+        <tbody  *ngFor="let stock of studymaterialDetails; let i = index">
+         <tr>
             <td>{{stock.universityname}}</td>
              <td>{{stock.coursename}}</td>
              <td>{{stock.semyear}}</td>
             <td>{{stock.registration}}</td>
 		      	<td>{{stock.stock}}</td>
          <td>
-            <i class="fa fa-eye" tooltip="View More"  (click)="viewstock()"></i>
+            <i class="fa fa-eye" tooltip="View More"  (click)="viewstock(i); showDetails = true"></i>
           </td>
 
           </tr>
          
+         <tr *ngIf="showDetails && viewId === i" style="background-color:lightblue">
+            
+             <td><strong>Date</strong></td>
+             <td><strong>Details</strong></td>
+             <td><strong>Incoming</strong></td>
+             <td><strong>Outgoing</strong></td>
+             <td><strong>Balance on Hand</strong></td>
+           <button (click)="showDetails = false"  class="btn btn-sm btn-danger"><i class="fa fa-ban"></i>cancel</button>
+          
+         </tr>
          
           
         </tbody>
diff --git a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
index b9b31cc..bf75a3d 100644
--- a/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
+++ b/src/app/views/studymaterial/studymaterialstock/studymaterialstock.component.ts
@@ -11,6 +11,7 @@ export class StudymaterialstockComponent implements OnInit {
   public myModal;
   public myModalData;
   studymaterialDetails: any;
+  stockdetails:any;
   constructor() { }
 
   ngOnInit() {
@@ -37,11 +38,35 @@ export class StudymaterialstockComponent implements OnInit {
         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'
+      }
+    ]
   }
-  getModelWindowDetails(stuCent) {
-    this.myModalData = stuCent||null;
-  }
-    viewstock(){
+  viewId: any;
+    viewstock(i){
+      this.viewId = i;
      this.show = !this.show;
+
 }
 }
\ No newline at end of file

From 719ba857091d1f1bb6e4c4d7180c95f0f8f8113e Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 10 Aug 2018 17:02:04 +0530
Subject: [PATCH 3/4] form list changes

---
 src/app/views/masters/form-list/form-list.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
                         </div>
                         <div class="row">
                               <div class="col-md-4">
-                                <label for="formType">Select Course<span class="danger">*</span></label>
+                                <label for="formType">Select Course</label>
                                 
                                 <select id="disabledSelect" class="form-control">
                                     <option value="0">Please Select Course</option>

From ed306c1ff1814ef4fe61de728a3b14c8762d9398 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 10 Aug 2018 17:47:22 +0530
Subject: [PATCH 4/4] document status master added

---
 .../status-master.component.html              | 77 +++++++++++++++++++
 .../status-master.component.scss              |  2 +-
 .../status-master/status-master.component.ts  | 13 ++++
 3 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/src/app/views/masters/status-master/status-master.component.html b/src/app/views/masters/status-master/status-master.component.html
index d59f635..95e34c3 100644
--- a/src/app/views/masters/status-master/status-master.component.html
+++ b/src/app/views/masters/status-master/status-master.component.html
@@ -159,6 +159,83 @@
                       </div><!--/.col-->
                 </div>
                   </tab>
+                  <tab>
+                    <ng-template tabHeading> Document </ng-template> 
+                    <div class="row">
+                    
+                        <div class="form-group col-sm-3">
+                            <label for="statusName">Status Name <span class="symbol required"></span></label>
+                            <input type="text" class="form-control" id="statusName" placeholder="Enter status name">            
+                          </div>
+                          <div class="form-group col-sm-4 saveBtn">
+                              <button type="button" class="btn btn-sm btn-success"><i class="fa fa-plus-circle"></i> Save</button>&nbsp;
+                              <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
+                          </div>
+                          
+                  </div>
+                    <div class="row">
+      
+                        <div class="col-md-12">
+                          <div class="card">
+                            <div class="card-header">
+                                <i class="fa fa-align-justify"></i> View Document Status
+                            </div>
+                            <div class="card-body">
+                              <div class="row">
+                                  <div class="form-group col-sm-3 ">
+                                      <div class="input-group">
+                                          <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                                          <input type="text" id="input1-group1" name="input1-group1" class="form-control" placeholder="Search">
+                                        </div>
+                                </div>
+                                      <div class="form-group col-sm-3 ">
+                                          <button type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i> Search</button>
+                                        </div>
+                                       
+                              </div><!--/.row-->
+                                  <div class="row">
+                                      <div class="col-lg-12 col-xs-12">
+                                        <table class="table table-bordered table-responsive table-hover">
+                                          <thead>
+                                            <tr>
+                                              <th>Status Name</th>
+                                              <th>Type</th>
+                                              <th>Status</th>
+                                              <th>Action</th>
+                                            </tr>
+                                          </thead>
+                                          <tbody>
+                                            <tr *ngFor="let document of documentStatus">
+                                                <td>{{document.statusName}}</td>
+                                                <td>{{document.type}}</td>
+                                                <td>
+                                                  <span class="badge badge-success">{{document.status}}</span>
+                                                </td>
+                                                <td>
+                                                    <a><i class="fa fa-pencil-square-o"></i></a>
+                                                </td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                        <ul class="pagination">
+                                          <li class="page-item"><a class="page-link" href="#">Prev</a></li>
+                                          <li class="page-item active">
+                                            <a class="page-link" href="#">1</a>
+                                          </li>
+                                          <li class="page-item"><a class="page-link" href="#">2</a></li>
+                                          <li class="page-item"><a class="page-link" href="#">3</a></li>
+                                          <li class="page-item"><a class="page-link" href="#">4</a></li>
+                                          <li class="page-item"><a class="page-link" href="#">Next</a></li>
+                                        </ul>
+                                      </div>
+                                      <!--/.col-->
+                                    </div>
+                                    <!--/.row-->
+                            </div>
+                          </div>
+                        </div><!--/.col-->
+                  </div>
+                    </tab>
                   <tab>
                       <ng-template tabHeading> Fees</ng-template> 
                       <div class="row">
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',