diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 80b5b6c9..f3ab84df 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -122,17 +122,19 @@ where BranchCode = '".$br."' and BatchName = '".$batch."'";
        
     
     }
-    public function markcard($bat=null,$br=null,$u=null){
+    public function markcard($bat=null,$br=null,$u=null,$st=null,$from=null,$to=null){
        
         $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,ifnull(appdate,'-') as appdate,ifnull(ansdate,'-') as ansdate  
-        ,scd.coursestatus as Course_Status,ifnull(andate.courierdetails,'-') as Courier_Details
+        ,scd.coursestatus as Course_Status,ifnull(andate.courierdetails,'-') as Courier_Details,IFNULL(sfs.batchname, '-') AS Batch_Name
         from 
         (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c
  left join T_PickListDetails p on p.ListCode=c.ListCode
 WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
 group by sid,sem,cid,lcode,branch) as sms
         left join 
-        (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status
+        (SELECT FeesID as fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName as batchname,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
+        FROM T_Students_Fees_Status
+        left join T_BatchMaster on T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
         group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
         left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
@@ -152,7 +154,7 @@ order by CourseID) as cm
         on cm.cid=cfd.ccid
         left join 
         (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,ifnull(Status,'-') as coursestatus FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.coursestatus not in ('Cancelled','Discontinued','Refund_issued')
+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.coursestatus != 'Cancelled' or scd.coursestatus != 'Discontinued' or scd.coursestatus != 'Refund_issued')
 left join (select ID,StudentID as sid,Sem,
 if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate,CourierDetails as courierdetails
 from T_AnswerBookletStatus abs
@@ -710,7 +712,7 @@ LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
 LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode =  APFS.ListCode  
 LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID 
 LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID 
-LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID and (STU_COUR.Status NOT IN ('Cancelled','Discontinued','Refund_issued') or STU_COUR.Status is null)
+LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID and (STU_COUR.Status  != 'Cancelled' or STU_COUR.Status  != 'Discontinued' or STU_COUR.Status  != 'Refund_issued')
 LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
 LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
 LEFT JOIN BalFees AS BALFEE ON BALFEE.student = STU.StudentID
diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html
index d41fb31e..f9f0f53b 100755
--- a/Apollo/assets/views/report_markcardstatus.html
+++ b/Apollo/assets/views/report_markcardstatus.html
@@ -126,7 +126,7 @@
                         <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.Batch_code}}</td>
+                        <td>{{p.Batch_Name}}</td>
                         <td>{{p.Courier_Details}}</td>
                         <td>{{p.Sem_year}}({{p.Sem}})</td>
                         <td>{{p.University}}</td>