From c033446b2e5fea661a7ff4e0e6d6a958235c0fbe Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 22 Aug 2018 15:14:08 +0530
Subject: [PATCH 1/3] new reg report field order

---
 Apollo/assets/views/newreg_report.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html
index d9564c94..6dc076f9 100644
--- a/Apollo/assets/views/newreg_report.html
+++ b/Apollo/assets/views/newreg_report.html
@@ -164,13 +164,12 @@
       <table  id="datatable"   class="table table-hover">
          <thead>
             <tr >
+              <th style="font-size: 12px;">Date Of Registration</th>
                <th style="font-size: 12px;">Student Name</th>
                <th style="font-size: 12px;">Father Name</th>
-               <th style="font-size: 12px;">Course</th>
-               <th style="font-size: 12px;">Batch</th>
-            
                <th style="font-size: 12px">University</th>
-               <th style="font-size: 12px;">Date Of Registration</th>
+                <th style="font-size: 12px;">Batch</th>
+               <th style="font-size: 12px;">Course</th>       
                <th style="font-size: 12px;">Mobile</th>
               <!-- <th style="font-size: 12px;">Amount</th>
                <th style="font-size: 12px;">Action</th> -->
@@ -178,13 +177,12 @@
          </thead>
          <tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
             <tr>
+                 <td>{{p.DOJ}}</td>
                 <td>{{p.Firstname}}</td>
                 <td>{{p.Fathername}}</td>
-                <td>{{p.CourseName}}</td>
-                <td>{{p.BatchName}}</td>
-            
                 <td>{{p.UniversityName}}</td>
-                <td>{{p.DOJ}}</td>
+                <td>{{p.BatchName}}</td>
+                <td>{{p.CourseName}}</td>          
                  <td>{{p.MobileNumber}}</td>
                 
             </tr>

From 4c6215827fabcdc3e0723158815612aafee2733b Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Wed, 22 Aug 2018 15:43:24 +0530
Subject: [PATCH 2/3] ReRegister Issues Fixed By Sriram

---
 .../views/reregistration/reregistrationformpdf.html       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html
index 1bf0516f..7068ef50 100755
--- a/Apollo/assets/views/reregistration/reregistrationformpdf.html
+++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html
@@ -6,10 +6,10 @@
     <table style="height: 341px;background-color: white;border-collapse: collapse; color: black;" border="1" width="100%">
         <tbody>
         <tr>
-        <td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td>
-        <td style="width: 150px;border-bottom-style: hidden;" colspan="2">
-        <h3 style="color:blue; margin-left: -150px;"><strong>{{Course.UniversityName}}</strong></h3>
-        <p style="color:blue; margin-left: -96px; margin-top: -9px;">{{Course.Address}}</p>
+        <td style="width:154px;text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 40%;"></td>
+        <td style="border-bottom-style: hidden;" colspan="2">
+        <h3 style="color:blue; text-align:center;margin-left:-20%;"><strong>{{Course.UniversityName}}</strong></h3>
+        <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-30%;">{{Course.Address}}</p>
         </td>
         </tr>
         <tr>

From ac66f6b676187a47f8d4f8e87c8f2baf51d650e7 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 22 Aug 2018 16:10:19 +0530
Subject: [PATCH 3/3] status updation changes : kdk

---
 Apollo/api/application/models/StatusUpdation_model.php | 2 +-
 Apollo/assets/js/controllers/certificateStatusCtrl.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php
index cdaba979..92ed8081 100755
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -610,7 +610,7 @@ class StatusUpdation_model extends CI_Model {
         $htmlContent = $msg;
         // Email body load the html template
         // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
-        $this->email->to('dineshkumar.k@venbainfotech.com');
+        $this->email->to($list);
         $this->email->from('noreply@apollodec.com','Apollo');
         $subj = $sub;
         $this->email->subject($subj);
diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js
index 4f632fed..6dfa68e3 100644
--- a/Apollo/assets/js/controllers/certificateStatusCtrl.js
+++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js
@@ -28,7 +28,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
     var localDetails = ipCookie('cookiechk');
     
-    const localUpdateStatus = 'CERTIFICATE_STATUS';
+    const localUpdateStatus = 'APPICATION_STATUS';
      $scope.localTypeSuperAdmin = false;
         $scope.localBranchDetails = '';