diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 39187bd0..134279e5 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -129,8 +129,12 @@ $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['S $upperresult=strtoupper($getlastansbookstatus); -// echo $upperresult; -// die(); + $UpperstatusToMsg = strtoupper($upperresult); + +$WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg); + + // echo $WithoutspaceStatus; + // die(); if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0) { //echo "SEND SMS"; @@ -139,9 +143,10 @@ $upperresult=strtoupper($getlastansbookstatus); $studentName = $this->getStudentName($arr[0]['StudentID']); $CmntToMsg = $arr[0]['Comments']; $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); -//echo $latestappstatus;die(); + +//echo $statuToMsg;die(); // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); - if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $upperresult == 'RECEIVED'){ + if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $upperresult == 'RECEIVEDFROMSTUDENT'){ // echo 'if';die(); @@ -367,8 +372,15 @@ $upperresult=strtoupper($getlastansbookstatus); $this->updateBookletStatusInCallTrack($arr, $reqDetails); $studentName = $this->getStudentName($arr[0]['StudentID']); $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); + + + + $UpperstatusToMsg = strtoupper($statuToMsg); + + $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg); + //echo $WithoutspaceStatus;die(); // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); - if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){ + if( $WithoutspaceStatus = 'RECEIVEDFROMSTUDENT'){ $cerNamtToMsg = 'Answer booklet'; $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearANDType = "$getSemYearMsg"; diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index fece2006..f6ff8910 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -568,10 +568,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", " $scope.showRowLines = true; $scope.rowAlternationEnabled = true; $scope.adYeargrid = { + showBorders: true, columnAutoWidth: true, //columnWidth: 100, + caption: { + title: 'DAYBOOK DETAILS', + width: '300px', + style: 'font-size:50px;color:blue;' + }, + "export": { enabled: true, fileName: "AdmissionsYear",