From 67451fb08a00d0e3ea63874db74d6f8b669a9b7e Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Thu, 11 Jan 2018 15:02:20 +0530
Subject: [PATCH] naming changes and dasboard table entries count

---
 Apollo/assets/i18n/en.json                         | 2 +-
 Apollo/assets/views/dashboard.html                 | 5 ++++-
 Apollo/assets/views/daybook/daybook.html           | 6 +++---
 Apollo/assets/views/daybook/daybookadmin.html      | 4 ++--
 Apollo/assets/views/daybook/daybooksuperadmin.html | 4 ++--
 Apollo/assets/views/student/student_details.html   | 2 +-
 Apollo/assets/views/studentStatusUpdate.html       | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index da6279f8..069ade4c 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -67,7 +67,7 @@
         "EMPLOYEE": "EMPLOYEE DETAILS",
         "ANNOUNCEMENT": "ANNOUNCEMENT DETAILS",
         "STATUS": "STATUS DETAILS",
-        "STUDENTSTATUS": "DEFAULT STUDENT ACTIVITY",
+        "STUDENTSTATUS": "STUDENT ACTIVITY STATUS",
         "CERTIFICATETYPE": "CERTIFICATE TYPE",
         "DAYBOOKMASTER":"DAY BOOK DETAILS"
       },
diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index 57034c99..be1b8cb0 100755
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -32,6 +32,7 @@
 						<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false">
 							<table class="table table-hover">
 								<thead>
+								 <tr><td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>
 									<tr>
 										<th>Tracking ID</th>
 										<th>Lead Name</th>
@@ -42,7 +43,7 @@
 									</tr>
 								</thead>
 								<tbody ng-repeat="today in todayFolloupDetails">
-
+											
 									<tr>
 										<td>{{today.TrackingID}}</td>
 										<td>{{today.LeadName}}</td>
@@ -76,6 +77,7 @@
 						<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false">
 							<table class="table table-hover">
 								<thead>
+								 <tr><td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr>
 									<tr>
 										<th>Tracking ID</th>
 										<th>Lead Name</th>
@@ -121,6 +123,7 @@
 						<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
 							<table class="table table-hover">
 								<thead>
+								 <tr><td colspan="5" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr>
 									<tr>
 										<th>Tracking ID</th>
 										<th>Lead Name</th>
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index 9002526b..35b44148 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -110,7 +110,7 @@
                                             <th>Voucher Number
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                            <th>Paid To
+                                            <th>Paid To / Received From
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
                                             <th ng-click="sort('TypeName')">Type
@@ -300,9 +300,9 @@
                                     <label>
                                                 Paid To / Received To
                                             </label>
-                                    <input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received To" class="form-control" ng-model="myModelAdd.paidTo"
+                                    <input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModelAdd.paidTo"
                                     />
-                                    <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived To is required.</span>
+                                    <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
                                 </div>
                                 <div class="col-md-4">
                                     <label>
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index bc340191..a02e5d6a 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -154,7 +154,7 @@
                                                         <th>Voucher Number
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th ng-click="sort('PaidTo')">Paid To
+                                                        <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
                                                         <th>Description
@@ -252,7 +252,7 @@
                                                         <th>Voucher Number
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th ng-click="sort('PaidTo')">Paid To
+                                                        <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
                                                         <th>Description
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index c90b04d8..f9397a2b 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -161,7 +161,7 @@
                                                         <th>Voucher Number
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th ng-click="sort('PaidTo')">Paid To
+                                                        <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
                                                         <th>Description
@@ -257,7 +257,7 @@
                                                         <th>Voucher Number
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th ng-click="sort('PaidTo')">Paid To
+                                                        <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
                                                         <th>Description
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index a8e2ef49..d595f2c5 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -2,7 +2,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="View/Add Student Details">{{ mainTitle }}</h1>
+            <h1 class="mainTitle" translate="Student Details">{{ mainTitle }}</h1>
         </div>
         <div ncy-breadcrumb></div>
     </div>
diff --git a/Apollo/assets/views/studentStatusUpdate.html b/Apollo/assets/views/studentStatusUpdate.html
index beab8b2c..57f9eb89 100755
--- a/Apollo/assets/views/studentStatusUpdate.html
+++ b/Apollo/assets/views/studentStatusUpdate.html
@@ -11,7 +11,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="Default Student Activity Details"></h1>
+            <h1 class="mainTitle" translate="Student Activity Status"></h1>
             <!--
                         <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
             -->