Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gandhimathi 2018-09-12 16:03:34 +05:30
commit d06c2f544b
4 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/controllers/HallTickets_Controller.php
View File

@ -337,9 +337,6 @@ class HallTickets_Controller extends REST_Controller {
{ {
$maparray[]=$object->SubjectCode; $maparray[]=$object->SubjectCode;
} }
// $a1=$fileArray;
// $b1=$maparray;
// print_r($maparray);
$result=array_diff($fileArray,$maparray); $result=array_diff($fileArray,$maparray);
$unmatched= sizeof($result); $unmatched= sizeof($result);

2
Apollo/api/application/models/Calltracking_model.php
View File

@ -1398,7 +1398,7 @@ class Calltracking_model extends CI_Model {
}else{ }else{
if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002'){ if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002' ||$track_Details['StatusCode'] == 'S001'){
$lead_Details['UpdatedOn'] = date('Y-m-d H:i:s'); $lead_Details['UpdatedOn'] = date('Y-m-d H:i:s');
$lead_Details['UpdatedBy'] = $CreatedBy; $lead_Details['UpdatedBy'] = $CreatedBy;
$track_Details['UpdatedOn'] = date('Y-m-d H:i:s'); $track_Details['UpdatedOn'] = date('Y-m-d H:i:s');

21
Apollo/api/application/models/Data_correction.php
View File

@ -30,24 +30,17 @@ group by Student_id,cid";
Public function getMobile($deleteNo=null,$mergeNo=null) Public function getMobile($deleteNo=null,$mergeNo=null)
{ {
$sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@err_meesage,@suc_message); $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@re_message);
"; ";
$a=$this->db->query($sql); $a=$this->db->query($sql);
//To get error message $sp_res = $a->result();
$sql_err = " select @err_message as err_message;";
$b=$this->db->query($sql_err); if ($sp_res[0]->re_message = 1) {
$err_res = $b->result();
//To get success message
$sqlOut = " select @suc_message as suc_message;";
$c=$this->db->query($sqlOut);
$suc_res = $c->result();
//echo $batch[0]->err_message;
if ($suc_res[0]->suc_message != null) {
$results['MergeStatus'] = true; $results['MergeStatus'] = true;
$results['message'] = $suc_res[0]->suc_message; $results['message'] = 'Student merged Successfully';
} else { } else {
$results['MergeStatus'] = false; $results['MergeStatus'] = false;
$results['message'] = $err_res[0]->err_message; $results['message'] = 'Can not merge';
} }
return $results; return $results;
} }

7
Apollo/api/application/models/Hallticket_model.php
View File

@ -114,7 +114,7 @@ class Hallticket_model extends CI_Model
//////////// ////////////
public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID) public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
{ {
//echo $mapid;
$sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName $sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName
FROM T_SemSubMap_Child semchild FROM T_SemSubMap_Child semchild
LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID
@ -122,7 +122,7 @@ class Hallticket_model extends CI_Model
and bsm.CourseID=semmaster.CourseID and bsm.CourseID=semmaster.CourseID
LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID
LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID
WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."' WHERE semchild.isActive = '1' and bsc.SchId='".$mapid."'
group by semchild.SubjectID,semchild.MapID"; group by semchild.SubjectID,semchild.MapID";
$b=$this->db->query($sql); $b=$this->db->query($sql);
//print_r($b); //print_r($b);
@ -136,7 +136,8 @@ group by semchild.SubjectID,semchild.MapID";
$this->db->from('T_Batch_Schedule_Master SCM'); $this->db->from('T_Batch_Schedule_Master SCM');
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId'); $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
$this->db->where('SCM.BranchCode',$branchcode); $this->db->where('SCM.BranchCode',$branchcode);
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid); $this->db->where('SCM.CourseID',$CourseID);
// $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID); $this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
$existsheduledetails = $this->db->get(); $existsheduledetails = $this->db->get();
//print_r($existsheduledetails); //print_r($existsheduledetails);