0001596: Student View

Apollo/api/application/models/Dashboard_model.php

@@ -798,6 +798,9 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
 			   
 				$sql.=" ORDER BY BDate  DESC";
              
+			 
+			 //print_r($sql); die();
+			 
             $ltd=$this->db->query($sql);
             $tlead = $ltd->result();
             if (count($tlead) > 0) {

Apollo/api/application/models/Studentview_model.php

@@ -18,12 +18,19 @@ class Studentview_model extends CI_Model
     // get student list based on login user
     public function getStudentInfo($requestedBy=null,$requestFrom=null,$requestedBranch=null, $accessFrom=null)
     {
+		
+		
         if($requestFrom =='2'){
-            $this->db->select('ST.*');
+			//echo '2';
+            //$this->db->select('ST.*');
+			$this->db->select('LO.ID,ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ');
             $this->db->from( LOGIN . ' as LO');
             $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
+			$this->db->join (STAFF .' as SF', 'SF.StaffID = ST.AdmittedBy','left');
+			$this->db->join( STUDENTCOURSE . ' as STC', 'STC.StudentID = ST.StudentID');
             $this->db->where('LO.ID', $requestedBy);
             $studentDetails  = $this->db->get()->first_row();
+			
             if($studentDetails){
                 $result['studentStatus'] = true;
                 $result['studentDetails'] = $studentDetails;
@@ -36,9 +43,11 @@ class Studentview_model extends CI_Model
             }
         }
         else if($requestFrom =='1'){
-            $this->db->select('ST.*');
+				//echo '1';die();
+            $this->db->select('ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ');
             $this->db->from( LOGIN . ' as LO');
-            $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
+            $this->db->join( STUDENTS .' as ST', 'LO.StaffID = ST.StudentID');
+			$this->db->join (STAFF .' as SF', 'SF.StaffID = ST.AdmittedBy');
             $this->db->join( STUDENTCOURSE . ' as STC', 'STC.StudentID = ST.StudentID');
             $this->db->where('ST.StudentID', $requestedBy);
             $this->db->where('STC.BranchID', $requestedBranch);
@@ -55,6 +64,7 @@ class Studentview_model extends CI_Model
             }
         }
        else if ($requestFrom =='3'){
+		   //	echo '3';
            $this->db->select('ST.*');
            $this->db->from( LOGIN . ' as LO');
            $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
@@ -75,6 +85,7 @@ class Studentview_model extends CI_Model
        }
        // requestedFrom 4 for based on form get student details
        else if ($requestFrom =='4'){
+		   	//echo '4';
            $this->db->select('ST.*');
            $this->db->from( LOGIN . ' as LO');
            $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');

Apollo/assets/css/themes/theme-5.css

@@ -144,7 +144,7 @@ header .dropdown-off-sidebar {
   color: #81B441 !important;
 }
 #sidebar nav > ul > li > a .item-inner {
-  color: rgba(255, 255, 255, 0.5) !important;
+  color: rgba(255, 255, 255, 1) !important;
   border-bottom-color: #394557;
 }
 #sidebar nav > ul > li.hover {
@@ -192,7 +192,7 @@ header .dropdown-off-sidebar {
   background: #222932 !important;
 }
 #sidebar nav > ul .sub-menu > li a {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(255, 255, 255, 1);
 }
 #sidebar nav > ul .sub-menu > li.active a {
   background: #13171d !important;

Apollo/assets/views/student/studentDetailsModal.html

@@ -102,6 +102,14 @@
                        <span style="white-space:pre-wrap;">{{items.studentDetails.PermanentAddress}}</span>
                     </td>
                 </tr>
+					 <tr>
+                        <td>Admitted BY</td>
+                        <td>{{items.studentDetails.fname}}</td>
+                    </tr>
+					 <tr>
+                        <td>Admission Date</td>
+                        <td>{{items.studentDetails.DOJ}}</td>
+                    </tr>
                 </tbody>
             </table>
         </div>

Apollo/assets/views/student/studentView.html

@@ -86,7 +86,7 @@
                 <table class="table table-condensed">
                     <thead>
                     <tr>
-                        <th colspan="3"> <span class="text-azure">Contact Information</span></th>
+                        <th colspan="3"> <span class="text-azure">Contact  Information</span></th>
                     </tr>
                     </thead>
                     <tbody>
@@ -125,6 +125,11 @@
                             <span style="white-space:pre-wrap;">{{studentDetails.PermanentAddress}}</span>
                         </td>
                     </tr>
+					  <tr>
+                        <td>Admitted BY</td>
+                        <td>{{studentDetails.fname}}</td>
+                    </tr>
+					
                     </tbody>
                 </table>
             </div>
@@ -166,6 +171,10 @@
                             <td>Designation</td>
                             <td>{{studentDetails.Designation}}</td>
                         </tr>
+						  <tr>
+                        <td>Admission Date</td>
+                        <td>{{studentDetails.DOJ}}</td>
+                    </tr>
 
                         </tbody>
                     </table>