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] 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() {
 	   
   }
-
+   
+ 
 }