From ae58b28363f1fae7721d1ab29a11182fb545c59d Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Wed, 1 Aug 2018 17:43:01 +0530
Subject: [PATCH 1/3] fees,university

---
 .../fees-master/fees-master.component.html    | 20 ++++++++-----------
 .../university-master.component.html          | 18 +++++++++--------
 .../university-master.component.ts            |  3 ++-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/app/views/masters/fees-master/fees-master.component.html b/src/app/views/masters/fees-master/fees-master.component.html
index 970d8db..1106445 100644
--- a/src/app/views/masters/fees-master/fees-master.component.html
+++ b/src/app/views/masters/fees-master/fees-master.component.html
@@ -43,49 +43,45 @@
         </thead>
         <tbody>
            <tr>
-                <td>TF</td>
+                <td>Tution Fees</td>
                 <td>Tution Fees</td>
                 <td>
                   <span class="badge badge-success">Active</span>
                 </td>
 				  <td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> 
                                 </td>
               </tr>
               <tr>
-                <td>SF</td>
+                <td>Semester Fees</td>
                 <td>Semester Fees</td>
                
                <td>
                   <span class="badge badge-success">Active</span>
                 </td>
 				  <td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> 
                                 </td>
               </tr>
               <tr>
-                <td>EF</td>
+                <td>Exam Fees</td>
                 <td>Exam Fees</td>
                
                 <td>
               <span class="badge badge-danger">Inactive</span>
             </td>
 			  <td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> 
                                 </td>
               </tr>
               <tr>
-                <td>MF </td>
+                <td>Mark Sheet Fees </td>
                 <td>Mark Sheet Fees</td>
                 <td>
               <span class="badge badge-danger">Inactive</span>
                 </td>
                 <td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> 
                                 </td>
               </tr>
          
diff --git a/src/app/views/masters/university-master/university-master.component.html b/src/app/views/masters/university-master/university-master.component.html
index 917c9e5..96dee07 100644
--- a/src/app/views/masters/university-master/university-master.component.html
+++ b/src/app/views/masters/university-master/university-master.component.html
@@ -6,7 +6,7 @@
   <!-- Nav tabs -->
   <tabset>
     <tab>
-      <ng-template tabHeading> View University &nbsp;<span class="badge badge-pill badge-success">29</span></ng-template>
+      <ng-template tabHeading> View University &nbsp;</ng-template>
       <!--/.row-->
        <div class="card">
           <div class="card-header">
@@ -45,7 +45,7 @@
               <span class="badge badge-success">Active</span>
             </td>
 			<td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
                                     <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
                                 </td>
           </tr>
@@ -57,7 +57,7 @@
               <span class="badge badge-success">Active</span>
             </td>
 			<td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
                                     <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
                                 </td>
           </tr>
@@ -69,7 +69,7 @@
               <span class="badge badge-danger">Inactive</span>
             </td>
 			<td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
                                     <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
                                 </td>
           </tr>
@@ -81,7 +81,7 @@
               <span class="badge badge-danger">Inactive</span>
             </td>
 			<td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
                                     <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
                                 </td>
           </tr>
@@ -93,7 +93,7 @@
               <span class="badge badge-success">Active</span>
             </td>
 			<td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |
+                                    <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
                                     <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
                                 </td>
           </tr>
@@ -125,10 +125,11 @@
       
         <form action="" method="post" class="form-horizontal">
           <div class="card-body"> 
+            <div ng-app="myApp" ng-controller="myCtrl">
           <div class="form-group row">
             <div class="col-md-4">
               <label for="company">University ID<span class="required">&nbsp;*</span></label>
-              <input type="text" class="form-control" id="company" placeholder="Enter your University ID">         
+              <input type="text" class="form-control" id="university" placeholder="Enter your University ID">         
                  </div>
             <div class="col-md-4">
               <label for="company">University Name<span class="required">&nbsp;*</span></label>
@@ -168,13 +169,14 @@
 						  <span class="switch-handle"></span>
 					     </label>
 		            </div>
+          </div>
           </div>
 		  </div>
            <div class="card-footer">
           <div class="form-group row">
             <div class=" col-md-12" align="right">
 			
-                <button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
+                <button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success" (click)="universitydetail()"><i class="fa fa-dot-circle-o"></i> Submit</button>
 				&nbsp;
                 <button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
             </div>
diff --git a/src/app/views/masters/university-master/university-master.component.ts b/src/app/views/masters/university-master/university-master.component.ts
index 1700a37..c8a54b1 100644
--- a/src/app/views/masters/university-master/university-master.component.ts
+++ b/src/app/views/masters/university-master/university-master.component.ts
@@ -14,5 +14,6 @@ export class UniversityMasterComponent implements OnInit {
   ngOnInit() {
 	   
   }
-
+   
+ 
 }

From cdb34653b8021c71766d4920b37435f057fb29ce Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Wed, 1 Aug 2018 18:25:08 +0530
Subject: [PATCH 2/3] studymaterial

---
 .../allocatematerial/allocatematerial.component.html      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
index 7a25f67..c19a71c 100644
--- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
+++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
@@ -221,7 +221,7 @@
           <tr>
             <td><input type="checkbox" name="name1" />&nbsp;</td>
             <td>Center A</td>
-			<td>Batch A</td>
+			<td>1st Sem / 2018</td>
             <td>MCA</td>
             
 			<td>10</td>
@@ -232,7 +232,7 @@
           <tr>
             <td><input type="checkbox" name="name1" />&nbsp;</td>
             <td>Center B</td>
-			<td>Batch B</td>
+			<td>2nd Sem / 2018</td>
             <td>MBA</td>
             <td>15</td>
             <td>15</td>
@@ -242,7 +242,7 @@
           <tr>
             <td><input type="checkbox" name="name1" />&nbsp;</td>
             <td>Center C</td>
-			<td>Batch C</td>
+			<td>3rd Sem / 2019</td>
             <td>BE</td>
             <td>20</td>
             <td>18</td>
@@ -252,7 +252,7 @@
           <tr>
             <td><input type="checkbox" name="name1" />&nbsp;</td>
             <td>Center D</td>
-		     	<td>Batch D</td>
+		     	<td>4th Sem / 2019</td>
             <td>DE</td>
             
 			<td>34</td>

From b11fcce25a71c2aba081476eb008be0d24866bf1 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 1 Aug 2018 18:29:03 +0530
Subject: [PATCH 3/3] courier, student, document screeen changes : kdk

---
 .../courier/courier/courier.component.html     |  4 ++--
 .../courier/courier/courier.component.scss     |  6 ++++++
 .../enrolment/student/student.component.html   | 18 +++++++++---------
 .../enrolment/student/student.component.scss   |  6 ++++++
 .../answer-booklet.component.html              |  8 ++++----
 .../answer-booklet.component.scss              |  6 ++++++
 .../status/documents/documents.component.html  |  8 ++++----
 .../status/documents/documents.component.scss  |  6 ++++++
 8 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/app/views/courier/courier/courier.component.html b/src/app/views/courier/courier/courier.component.html
index 4aa3730..618fab5 100644
--- a/src/app/views/courier/courier/courier.component.html
+++ b/src/app/views/courier/courier/courier.component.html
@@ -22,7 +22,7 @@
                         </div>
                     </div>
                     <br>
-                    <table class="table table-bordered table-responsive">
+                    <table class="table table-bordered table-responsiv">
                         <thead>
                             <tr>
                                 <th>Courier Name</th>
@@ -48,7 +48,7 @@
                                 <td>{{cour.status}}</td>
                                 <td>
                                     <!--<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |-->
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(cour)"></i>
+                                    <i class="fa fa-eye line-height-table" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(cour)"></i>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/src/app/views/courier/courier/courier.component.scss b/src/app/views/courier/courier/courier.component.scss
index e69de29..12322a4 100644
--- a/src/app/views/courier/courier/courier.component.scss
+++ b/src/app/views/courier/courier/courier.component.scss
@@ -0,0 +1,6 @@
+.line-height {
+  line-height: 0.5;
+}
+.line-height-table {
+  line-height: 0.1;
+}
\ No newline at end of file
diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
index ea47bb9..c487aac 100644
--- a/src/app/views/enrolment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -5,7 +5,7 @@
     <tabset>
         <tab>
             <ng-template tabHeading>Student Enrolment</ng-template>
-            <div class="form-group">
+            <div class="form-group line-height">
                 <div class="row">
                     <div class="form-group col-md-4">
                         <label for="name"> Select Study Center</label>
@@ -21,7 +21,7 @@
             <tabset>
                 <tab>
                     <ng-template tabHeading>Student List</ng-template>
-                    <div class="card">
+                    <div class="card line-height">
                         <div class="card-header">
                             <i class="fa fa-align-justify"></i> Student Details List
                         </div>
@@ -86,7 +86,7 @@
                                 </div>
                             </div>
                             <br>
-                            <table class="table table-bordered table-responsive">
+                            <table class="table table-bordered table-responsive line-height-table">
                                 <thead>
                                     <tr>
                                         <th>Form Id</th>
@@ -110,11 +110,11 @@
                                         <td>{{app.sem}}</td>
                                         <td>{{app.batch}}</td>
                                         <td>
-                                            <span *ngIf="app.status == 1" class="badge badge-success">Active</span>
-                                            <span *ngIf="app.status == 0" class="badge badge-danger">In-Active</span>
+                                            <span *ngIf="app.status == 1"  style="line-height: 0.1;">Active</span>
+                                            <span *ngIf="app.status == 0"  style="line-height: 0.1;">In-Active</span>
                                         </td>
                                         <td>
-                                            <i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i>
+                                            <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
                                             <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
                                         </td>
                                     </tr>
@@ -141,7 +141,7 @@
                     </div>
                     <br>
                     <div *ngIf="!oldReg">
-                        <div class="card">
+                        <div class="card line-height">
                             <div class="card-header">
                                 Personal Details
                             </div>
@@ -225,7 +225,7 @@
                             <!--<div class="card-footer">
                         </div>-->
                         </div>
-                        <div class="card">
+                        <div class="card line-height">
                             <div class="card-header">
                                 Course Details
                             </div>
@@ -296,7 +296,7 @@
                 <tab>
                     <ng-template tabHeading>Re-registertion</ng-template>
                     <div>
-                        <div class="card">
+                        <div class="card line-height">
                             <div class="card-header">
                                 Re-registration
                             </div>
diff --git a/src/app/views/enrolment/student/student.component.scss b/src/app/views/enrolment/student/student.component.scss
index e69de29..12322a4 100644
--- a/src/app/views/enrolment/student/student.component.scss
+++ b/src/app/views/enrolment/student/student.component.scss
@@ -0,0 +1,6 @@
+.line-height {
+  line-height: 0.5;
+}
+.line-height-table {
+  line-height: 0.1;
+}
\ No newline at end of file
diff --git a/src/app/views/status/answer-booklet/answer-booklet.component.html b/src/app/views/status/answer-booklet/answer-booklet.component.html
index 5974360..9448ffb 100644
--- a/src/app/views/status/answer-booklet/answer-booklet.component.html
+++ b/src/app/views/status/answer-booklet/answer-booklet.component.html
@@ -5,7 +5,7 @@
     <tabset>
         <tab>
             <ng-template tabHeading>Answer Booklet Status</ng-template>
-            <div class="form-group">
+            <div class="form-group line-height">
                 <div class="row">
                     <div class="form-group col-md-4">
                         <label for="name"> Select Study Center</label>
@@ -18,7 +18,7 @@
                     </div>
                 </div>
             </div>
-            <div class="card">
+            <div class="card line-height">
                 <div class="card-header">
                     <i class="fa fa-align-justify"></i> Answer Booklet List
                 </div>
@@ -82,7 +82,7 @@
                         </div>
                     </div>
                     <br>
-                    <table class="table table-bordered table-responsive">
+                    <table class="table table-bordered table-responsive line-height-table">
                         <thead>
                             <tr>
                                 <th>Form Id</th>
@@ -108,7 +108,7 @@
                                 <td>{{app.status}}</td>
                                 <td>
                                     <!--<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> -->
-                                    <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
+                                    <i class="fa fa-eye line-height-table" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/src/app/views/status/answer-booklet/answer-booklet.component.scss b/src/app/views/status/answer-booklet/answer-booklet.component.scss
index 3f54f6e..8e61027 100644
--- a/src/app/views/status/answer-booklet/answer-booklet.component.scss
+++ b/src/app/views/status/answer-booklet/answer-booklet.component.scss
@@ -4,4 +4,10 @@
 }
 .backToList:hover {
     color: blue;
+}
+.line-height {
+  line-height: 0.5;
+}
+.line-height-table {
+  line-height: 0.1;
 }
\ No newline at end of file
diff --git a/src/app/views/status/documents/documents.component.html b/src/app/views/status/documents/documents.component.html
index c5bda59..67468f2 100644
--- a/src/app/views/status/documents/documents.component.html
+++ b/src/app/views/status/documents/documents.component.html
@@ -5,7 +5,7 @@
     <tabset>
         <tab>
             <ng-template tabHeading>Documents Status</ng-template>
-            <div class="form-group">
+            <div class="form-group line-height">
                 <div class="row">
                     <div class="form-group col-md-4">
                         <label for="name"> Select Study Center</label>
@@ -18,7 +18,7 @@
                     </div>
                 </div>
             </div>
-            <div class="card">
+            <div class="card line-height">
                 <div class="card-header">
                     <i class="fa fa-align-justify"></i> Documents Status List
                 </div>
@@ -82,7 +82,7 @@
                         </div>
                     </div>
                     <br>
-                    <table class="table table-bordered table-responsive">
+                    <table class="table table-bordered table-responsive line-height-table">
                         <thead>
                             <tr>
                                 <th>Form Id</th>
@@ -107,7 +107,7 @@
                                 <td>{{app.batch}}</td>
                                 <td>{{app.status}}</td>
                                 <td>
-                                    <i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> 
+                                    <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> 
                                     <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
                                 </td>
                             </tr>
diff --git a/src/app/views/status/documents/documents.component.scss b/src/app/views/status/documents/documents.component.scss
index 3f54f6e..8e61027 100644
--- a/src/app/views/status/documents/documents.component.scss
+++ b/src/app/views/status/documents/documents.component.scss
@@ -4,4 +4,10 @@
 }
 .backToList:hover {
     color: blue;
+}
+.line-height {
+  line-height: 0.5;
+}
+.line-height-table {
+  line-height: 0.1;
 }
\ No newline at end of file