Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/controllers/Report.php

@@ -446,7 +446,7 @@ class Report extends REST_Controller {
       $det['from'] = $this->post('from');
       $det['to'] = $this->post('to');
       $det['university'] = $this->post('university');
-     // print_r($det);
+    // print_r($det);
 
       $newlist = $this->report_model->GetNewRegList($det);
 

Apollo/api/application/models/Reports_model.php

@@ -980,23 +980,45 @@ from T_Lead_Tracking_Followup as ltf
          $fromd= date("Y-m-d",strtotime($fdate));
          $tod=date("Y-m-d",strtotime($tdate));
          $university = $det['university'];
+         $regconst='New Registration';
 
          // echo 'f'.$fromd.'t'.$tod;
          // die();
 
 
-$subQuery='SELECT T_StudentDetails.StudentID,DOJ,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, Firstname,T_StudentDetails. MobileNumber, Fathername, UniversityName,CourseName FROM T_Student_CourseDetails 
+$subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername, UniversityName,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year FROM T_Student_CourseDetails 
 JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID 
 JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID 
 left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID 
 left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
-WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=? group by T_Registration_Details.StudentID';  
+left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy
+left JOIN T_Course_Fees_Details on T_Course_Fees_Details.ID=T_Registration_Details.FeeType and T_Course_Fees_Details.CourseID=T_Registration_Details.CourseID 
+WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='".'1'."'";  
 
-$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$university));
+      if ($fromd != ''){
+           // $fromd= date("Y-m-d",strtotime($from));
+           //and str_to_date(DOJ,?)>=?
+           
+            $subQuery.=" and str_to_date(T_Student_CourseDetails.DOJ,'%d-%m-%Y')>='".$fromd."'";
+        
+        }
+        if ($tod != ''){
+           // $tod=date("Y-m-d",strtotime($to));
+           
+            $subQuery.="and str_to_date(T_Student_CourseDetails.DOJ,'%d-%m-%Y')<='".$tod."'";
+        
+        }
+
+        if($university !='')
+        {
+              $subQuery.="and T_Student_CourseDetails.UniversityID='".$university."'";
+        }
+
+$query = $this->db->query($subQuery,array());
 
 
           $searchDetails =$query->result(); 
-//print_r( $this->db->last_query());  
+//sprint_r( $this->db->last_query());  
 //die();
 
       //print_r($searchDetails);die();

Apollo/assets/js/controllers/newreg_reportCtrl.js

@@ -19,7 +19,7 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
          var localDetails = JSON.parse(localStorage.getItem('localObj'));
          //var localDetails = ipCookie('cookiechk');
 
-        console.log(localDetails);
+       // console.log(localDetails);
 
 
        // $scope.initHead = function() {
@@ -91,12 +91,20 @@ $scope.tod='';
       {
         // alert('in')
 
-         //console.log(form.$dirty);
+        // console.log(myModel);
-          var from =  $scope.filters.from_date;
+        var from =  $scope.filters.from_date;
           var to  = $scope.filters.to_date;
+         if(myModel != undefined)
+         {
+          
           var university = myModel.myUnivSearch  ;  
           // console.log(from)
+          }
 
+          else
+          {
+             var university = '';
+          }
 
 
 
@@ -156,6 +164,8 @@ $scope.tod = to_dt;
               $scope.newreglist = response.data.details;
               $scope.isShow=true;
               $scope.isLoaderShow=false;
+               for(var i=0;i<$scope.newreglist.length;i++)
+                    $scope.newreglist[i].SL_NO = i+1;
 
             }
 
@@ -198,7 +208,7 @@ $scope.tod = to_dt;
             },
            
         };
-        console.log(mystyle);
+       // console.log(mystyle);
             
         
 

Apollo/assets/views/newreg_report.html

@@ -112,7 +112,7 @@
                             <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
                                         ng-click="getEmployeeList()">
                         
-                           <option value="" disabled selected>Select University</option>
+                           <option value="" selected>Select University</option>
                            <option  ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
                             
 
@@ -164,26 +164,49 @@
       <table  id="datatable"   class="table table-hover">
          <thead>
             <tr >
-              <th style="font-size: 12px;">Date Of Registration</th>
+              <!-- <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">University</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;">Mobile</th> -->
-              <!-- <th style="font-size: 12px;">Amount</th>
+              
-               <th style="font-size: 12px;">Action</th> -->
+              <th style="font-size: 12px;">S.No</th>
+              <th style="font-size: 12px;">Initial Payment Paid Date</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;">Sem/Year</th>
+              <th style="font-size: 12px;">Phone No</th>
+              <th style="font-size: 12px;">University</th>
+              <th style="font-size: 12px;">Refered By</th>
+              <th style="font-size: 12px;">Refer's Mobile No</th>
+              <th style="font-size: 12px;">Admitted BY</th>
+
             </tr>
          </thead>
          <tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
             <tr>
-                 <td>{{p.DOJ}}</td>
+             <td>{{p.SL_NO}}</td>
-                <td>{{p.Firstname}}</td>
+             <td>{{p.DOJ}}</td>
-                <td>{{p.Fathername}}</td>
+             <td>{{p.Firstname}} {{p.Lastname}}</td>
-                <td>{{p.UniversityName}}</td>
+             <td>{{p.Fathername}}</td>
+             <td>{{p.CourseName}}</td> 
+             <td>{{p.Sem_Year}}</td>
+             <td>{{p.MobileNumber}}</td>
+             <td>{{p.UniversityName}}</td> 
+             <td>{{p.ReferredBy}}</td>
+             <td>{{p.ReferersMobileNumber}}</td>
+             <td>{{p.Fname}} {{p.Lname}}</td>
+
+                 <!-- <td>{{p.DOJ}}</td>
+                
+               
+                
                 <td>{{p.BatchName}}</td>
-                <td>{{p.CourseName}}</td>          
+                        
-                 <td>{{p.MobileNumber}}</td>
+                  -->
                 
             </tr>
             
@@ -200,8 +223,8 @@
 <!-- <div ng-if="load=0">
 <b><h1 style="color:black;"><center> No Records Found</h1></center></b>
 </div> -->
-     <!--    <dir-pagination-controls  direction-links="true" boundary-links="true">
+        <dir-pagination-controls  direction-links="true" boundary-links="true">
-        </dir-pagination-controls> -->
+        </dir-pagination-controls>
     </div>
 </div>