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-11 18:54:02 +05:30
commit c5c5f81218
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ class HallTickets_Controller extends REST_Controller {
{ {
$fileArray[]=$filedetailsarray['SubjectID']; $fileArray[]=$filedetailsarray['SubjectID'];
} }
// print_r( $fileArray);
$data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId); $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
// print_r( $data['subjectDetails']); // print_r( $data['subjectDetails']);
if($data['subjectDetails'] == 1 ) if($data['subjectDetails'] == 1 )
@ -337,7 +337,13 @@ class HallTickets_Controller extends REST_Controller {
{ {
$maparray[]=$object->SubjectCode; $maparray[]=$object->SubjectCode;
} }
if ($fileArray == $maparray) // $a1=$fileArray;
// $b1=$maparray;
// print_r($maparray);
$result=array_diff($fileArray,$maparray);
$unmatched= sizeof($result);
if ($unmatched == 0 )
{ {
foreach($courseArray as $CourseDatialArray) foreach($courseArray as $CourseDatialArray)

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

@ -30,20 +30,24 @@ 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."',@countRow); $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@err_meesage,@suc_message);
"; ";
$a=$this->db->query($sql); $a=$this->db->query($sql);
$sqlOut = " select @countRow as counts;"; //To get error message
$b=$this->db->query($sqlOut); $sql_err = " select @err_message as err_message;";
$batch = $b->result(); $b=$this->db->query($sql_err);
//echo $batch[0]->counts; $err_res = $b->result();
if ($batch[0]->counts > 0) { //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['after_Merge'] = $batch; $results['message'] = $suc_res[0]->suc_message;
$results['message'] = 'Student details successfully merged';
} else { } else {
$results['MergeStatus'] = false; $results['MergeStatus'] = false;
$results['message'] = 'Can not Merge'; $results['message'] = $err_res[0]->err_message;
} }
return $results; return $results;
} }

4
Apollo/assets/views/hallticket/batchshedule.html
View File

@ -167,8 +167,8 @@
<fieldset> <fieldset>
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls> <js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
<br> <br>
<!-- <a href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a>-->
<a target="_blank" href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a> <a href="images/Batchschedule.xlsx">Sample Format</a>
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button> <button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
</fieldset> </fieldset>