application status tbl courier : ps

Apollo/api/application/models/Reports_model.php

@@ -316,7 +316,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
         // (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 // left join 
        // (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
-       $sql1 ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') AS initialPaid,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,cm.uid AS univID,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,sfs.batch as Batch,IFNULL(sfs.batchname, '-') AS Batch_Name,scd.coursestatus as Course_Status,IFNULL(certiSt.courierdetails, '-') AS Courier_Details
+       $sql1 ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') AS initialPaid,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,cm.uid AS univID,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,sfs.batch as Batch,IFNULL(sfs.batchname, '-') AS Batch_Name,scd.coursestatus as Course_Status
 FROM 
 (  
 SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE(AppDate, '%d-%m-%Y' 
@@ -352,12 +352,6 @@ LEFT JOIN
 LEFT JOIN 
        (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(Status,'-') as coursestatus 
           FROM T_Student_CourseDetails) AS scd ON scd.sid=sms.sid AND scd.cid=sms.cid And (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))
-LEFT JOIN
-    (SELECT StudentID AS sid, CourierDetails AS courierdetails FROM T_CertificationStatus cs
-     WHERE CDate IS NOT NULL AND ID IN (SELECT MAX(ID) FROM T_CertificationStatus WHERE CDate IS NOT NULL GROUP BY StudentID , Sem)
-     GROUP BY sid , Sem) AS certiSt ON certiSt.sid = sms.sid
-
-       
 	   where sms.branch = '".$br."'";
         
 $sql = "SELECT 
@@ -382,7 +376,7 @@ $sql = "SELECT
     sfs.batch AS Batch,
     IFNULL(sfs.batchname, '-') AS Batch_Name,
     scd.coursestatus AS Course_Status,
-    IFNULL(certiSt.courierdetails, '-') AS Courier_Details
+    IFNULL(sms.courierdetails, '-') AS Courier_Details
 FROM
 (SELECT 
         FeesID AS fid,
@@ -411,7 +405,8 @@ LEFT JOIN
             app.Comments AS acmts,
             CertificationType AS ctype,
             app.CertificationType AS certname,
-            SUM(bal.balpayable) AS balance
+            SUM(bal.balpayable) AS balance,
+            app.CourierDetails AS courierdetails 
     FROM
         T_ApplicationStatus AS app
     LEFT JOIN T_PickListDetails p ON p.ListCode = app.ListCode
@@ -476,21 +471,6 @@ LEFT JOIN
     FROM
         T_Student_CourseDetails) AS scd ON scd.sid = sfs.sid AND scd.cid = sfs.cid
         AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))
-        LEFT JOIN
-    (SELECT 
-        StudentID AS sid, CourierDetails AS courierdetails
-    FROM
-        T_CertificationStatus cs
-    WHERE
-        CDate IS NOT NULL
-            AND ID IN (SELECT 
-                MAX(ID)
-            FROM
-                T_CertificationStatus
-            WHERE
-                CDate IS NOT NULL
-            GROUP BY StudentID , Sem)
-    GROUP BY sid , Sem) AS certiSt ON certiSt.sid = sfs.sid
     where sfs.branch = '".$br."'";
 
        

Apollo/api/application/models/StatusUpdation_model.php

@@ -56,6 +56,9 @@ class StatusUpdation_model extends CI_Model {
 
     // update Application status
     public function update_applicationStatus($arr, $reqDetails) {
+        // echo "I am Here";
+        // echo APPLICATION_STATUS;
+        // print_r($arr);die();
         $this->db->insert_batch(APPLICATION_STATUS, $arr);
         if ($this->db->affected_rows() >= 1) {
             if ($this->get_ListCode_status($arr[0]['ListCode'])) {

Apollo/assets/js/controllers/certificateStatusCtrl.js

@@ -128,6 +128,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         'staus': '',
         'dateOn': '',
         'comment': '',
+        'CourierDetails': '',
         'certificatetype': '',
         'certificateNumber': ''
     }
@@ -298,6 +299,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
+                'CourierDetails': '',
                 'certificatetype': '',
                 'certificateNumber': ''
             }
@@ -398,6 +400,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                     this.SDate = $scope.myStatusModel.dateOn;
                     this.Coursedetail = id;
                     this.Comments = $scope.myStatusModel.comment;
+                    this.CourierDetails = $scope.myStatusModel.CourierDetails;
                     this.CertificateType = $scope.myStatusModel.certificatetype;
                     this.CertificateNumber = $scope.myStatusModel.certificateNumber;
                 }
@@ -442,6 +445,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
+                'CourierDetails': '',
                 'certificatetype': '',
                 'certificateNumber': ''
             }

Apollo/assets/views/status-update/certificate_status.html

@@ -295,15 +295,15 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
-                                                        <label>
+                                                        <label>Comments</label>
-                                               Comments
+                                                        <textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"/>
-                                            </label>
-
-                                                        <textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
-                                                        />
                                                         <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
                                                     </div>
-                                      
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.courier_details.$dirty && Form.courier_details.$invalid}">
+                                                        <label>Courier Details</label>
+                                                        <textarea type="text" placeholder="Enter Courier Details" tabindex="8" class="form-control" name="courier_details" ng-model="myStatusModel.CourierDetails"/>
+                                                        <span class="error text-small block" ng-if="Form.courier_details.$dirty && Form.courier_details.$error.pattern">Invalid Details</span>
+                                                    </div>
                                                 </div>
                                                 <div class="row">
                                                     <div class="col-md-12">
@@ -416,6 +416,13 @@
                                                         />
                                                         <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
                                                     </div>
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.courier_details.$dirty && Form.courier_details.$invalid}">
+                                                        <label>Courier Details</label>
+                                                        <textarea type="text" placeholder="Enter Courier Details" tabindex="8" class="form-control" name="courier_details" ng-model="myStatusModel.CourierDetails"/>
+                                                        <span class="error text-small block" ng-if="Form.courier_details.$dirty && Form.courier_details.$error.pattern">Invalid Details</span>
+                                                    </div>
+
+
                                                    
                                                 </div>
                                                 <div class="row">