From 1ebb475ef441c53de8ef5319d621074bcb1a3502 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 14 Aug 2018 16:08:39 +0530
Subject: [PATCH] screen changes and report changes

---
 Apollo/assets/css/styles.css                       |  2 +-
 .../assets/views/report_application_pending.html   |  6 ++++--
 Apollo/assets/views/report_certificate_status.html |  4 ++--
 Apollo/assets/views/report_document_pending.html   | 14 +++++++-------
 Apollo/assets/views/report_exam_writing_fee.html   |  8 ++++----
 .../views/report_mark_certificate_status.html      |  2 +-
 .../assets/views/report_studymaterialstatus.html   |  6 ++++--
 Apollo/assets/views/report_waiver_referal.html     |  4 ++--
 Apollo/assets/views/sendSMS/sendSMSsuperadmin.html |  2 +-
 Apollo/assets/views/student/student_details.html   |  2 +-
 .../views/student/student_details_SuperAdmin.html  |  2 +-
 11 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Apollo/assets/css/styles.css b/Apollo/assets/css/styles.css
index 82be7514..dd86ef6b 100755
--- a/Apollo/assets/css/styles.css
+++ b/Apollo/assets/css/styles.css
@@ -5821,7 +5821,7 @@ input[type="radio"], input[type="checkbox"] {
   color: #8e8e93 !important;
 }
 .btn-default:active, .btn-default.active, .btn-default.active:focus, .btn-default:active:focus, .btn-default:active:hover {
-  background-color: #f8f8f8;
+  background-color: #007AFF;
   border-color: #d5d4d8;
   color: #5b5b60 !important;
 }
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html
index 634d57ab..ec146e3b 100755
--- a/Apollo/assets/views/report_application_pending.html
+++ b/Apollo/assets/views/report_application_pending.html
@@ -1,7 +1,9 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">Application Pending Student List Report</h1>
+            <!-- <h1 class="mainTitle">Application Pending Student List Report</h1> -->
+
+            <h1 class="mainTitle">New & Re-Reg Form Status Report</h1>
         </div>
         <!-- <div ncy-breadcrumb></div>   -->
     </div>
@@ -91,7 +93,7 @@
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Admission Date</th>
+                        <th>Initital Payment Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 021e4790..46c15679 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -101,7 +101,7 @@ td,th {
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
-                        <th>Sem/Year</th>
+                       <!--  <th>Sem/Year</th> -->
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
@@ -120,7 +120,7 @@ td,th {
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
                         <td>{{p.course_name}}</td>
-                        <td>{{p.Sem_year}}</td>
+                       <!--  <td>{{p.Sem_year}}</td> -->
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.Balance_fee}}</td>
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html
index ae72fec6..2a7bbd37 100755
--- a/Apollo/assets/views/report_document_pending.html
+++ b/Apollo/assets/views/report_document_pending.html
@@ -1,7 +1,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">Document Pending Student List Report</h1>
+            <h1 class="mainTitle">Student Documents Pending Report</h1>
         </div>
         <!-- <div ncy-breadcrumb></div>   -->
     </div>
@@ -96,12 +96,12 @@ td,th {
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
-                        <th>Sem/Year</th>
+                        <!-- <th>Sem/Year</th> -->
                         <th>Phone No</th>
                         <th>University</th>
 						<th>Document Applied Date</th>
-						<th>Document Name</th>
-                        <th>Document Status</th>
+						<!-- <th>Document Name</th>
+                        <th>Document Status</th> -->
                         
                         
                  
@@ -116,12 +116,12 @@ td,th {
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
-                        <td>{{p.Sem_year}}</td>
+                        <!-- <td>{{p.Sem_year}}</td> -->
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
 						 <td>{{p.adate}}</td>
-						  <td>{{p.certname}}</td>
-                        <td>{{p.Status}}</td>
+						  <!-- <td>{{p.certname}}</td>
+                        <td>{{p.Status}}</td> -->
                         
                         
                     </tr>
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index fece4864..d3d12c41 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -75,10 +75,10 @@
                     <div class="col-md-4">
                     <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                     </div>
-                    <div class="col-md-6">
+                   <!--  <div class="col-md-6">
                             <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
                                 </div>
-                    <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
+ -->                    <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
                 
             </div>
             <div class="table-responsive">
@@ -94,7 +94,7 @@
                         </tr>
                        
                         <tr>
-                                <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
+                               <!--  <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th> -->
                             <th>SL.No</th>
                             <th>Enrollment ID</th>
                             <th>Student Name</th>
@@ -113,7 +113,7 @@
                     </thead>
                     <tbody dir-paginate="p in examfee_data|filter:search:strict|itemsPerPage:10">
                         <tr>
-                                <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
+                                <!-- <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td> -->
                             <td>{{p.SL_NO}}</td>
                             <td>{{p.Enrollment_id}}</td>
                             <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 6d73da76..90e76c4b 100755
--- a/Apollo/assets/views/report_mark_certificate_status.html
+++ b/Apollo/assets/views/report_mark_certificate_status.html
@@ -1,7 +1,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">Markcard/Certificate Issued Status Report</h1>
+            <h1 class="mainTitle">Marks Card/ Certificates - received/ Issued Status Report</h1>
         </div>
         <!-- <div ncy-breadcrumb></div>   -->
     </div>
diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html
index 6808c2d5..f8cdc72a 100755
--- a/Apollo/assets/views/report_studymaterialstatus.html
+++ b/Apollo/assets/views/report_studymaterialstatus.html
@@ -99,8 +99,9 @@
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Study Material Status</th>
-                        <th>Balance Fee</th>
                         <th>Date</th>
+                        <th>Balance Fee</th>
+                        
                  
                     </tr>
                 </thead>
@@ -117,8 +118,9 @@
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.Status}}</td>
+                         <td>{{p.Date}}</td>
                         <td>{{p.Balance_fee}}</td>
-                        <td>{{p.Date}}</td>
+                       
                     </tr>
                 
                 </tbody>
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 8acc6c0b..ca6aef60 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -94,8 +94,8 @@
                         <th></th>
                         <th></th>
 						<th></th>
-                        <th colspan="2">Sum of Waiver Fee</th>
-                        <th colspan="2">Sum of Referal Fee</th>
+                        <th colspan="2"></th>
+                        <th colspan="2"></th>
                         <th></th>
                     </tr>
                    
diff --git a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
index b88272a8..954a5732 100755
--- a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
+++ b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
@@ -302,7 +302,7 @@
 
                                     <textarea type="text" placeholder="Enter Message Details" tabindex="3" class="form-control inputCls" name="addMessage"
                                      ng-model="mobileNumList.message"
-                                     required   maxlength="100" />
+                                     required   maxlength="300" />
                                     <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
                                                                       <span class="error text-small block" ng-if="Form.addMessage.$dirty && Form.addMessage.$error.required">Message is Required </span>
                                 </div>
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 6264a779..36bf1167 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -256,7 +256,7 @@
             </style>
 
 
-            <tab heading="Add Student" id="addstudent" ng-click="addStudentView()">
+            <tab heading="New/Re-Reg Forms" id="addstudent" ng-click="addStudentView()">
                 <div ng-hide="inActiveBranchStatus == true">
                     <div ng-if="existingStudentView == false">
                         <form name="Form" id="form" novalidate ng-submit="studentFORM.submit(Form, myModel)" method="post">
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index 4f0f0dd8..3e263f49 100755
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -292,7 +292,7 @@
             </style>
 
 
-            <tab tabindex="6"   active="tabactive2" ng-click="tabActive('tabactive1');addStudentView()" heading="Add Student" id="addstudent">
+            <tab tabindex="6"   active="tabactive2" ng-click="tabActive('tabactive1');addStudentView()" heading="New/Re-Reg Forms" id="addstudent">
                  <!--<button ng-click="tabActive('0')" value="Tab1">Tab1</button>-->
                 <div ng-if="existingStudentView == false">
                 <!--<button ng-click="myActivateDiv()">Click Me</button>-->