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

dashboadunchange

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-01 15:35:02 +05:30
parent 4183bb6839
commit ffc7ec858d
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -129,24 +129,26 @@ $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['S
$upperresult=strtoupper($getlastansbookstatus); $upperresult=strtoupper($getlastansbookstatus);
$UpperstatusToMsg = strtoupper($upperresult); $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
$WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg); // echo $arr[0]['ListCode'];
// echo $WithoutspaceStatus;
// die(); // die();
if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0) if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
{ {
//echo "SEND SMS"; //echo "SEND SMS";
if ($this->get_ListCode_status($arr[0]['ListCode'])) { if ($this->get_ListCode_status($arr[0]['ListCode'])) {
//echo 'in';
$dateToMsg = $arr[0]['CDate']; $dateToMsg = $arr[0]['CDate'];
$studentName = $this->getStudentName($arr[0]['StudentID']); $studentName = $this->getStudentName($arr[0]['StudentID']);
$CmntToMsg = $arr[0]['Comments']; $CmntToMsg = $arr[0]['Comments'];
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
//echo $statuToMsg;die(); $issuecheck = strtoupper($statuToMsg);
$withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
//echo $withoutspaceissue;die();
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $upperresult == 'RECEIVEDFROMSTUDENT'){ if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
// echo 'if';die(); // echo 'if';die();
@ -161,9 +163,9 @@ $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
// echo $statuToMsg; // echo $statuToMsg;
// die(); // die();
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { } else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
echo 'else if';die(); /// echo 'else if';die();
$cerNamtToMsg = 'Mark Card'; $cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
@ -240,7 +242,7 @@ $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
$this->db->from(PICK_LIST_DETAILS); $this->db->from(PICK_LIST_DETAILS);
$this->db->where('ListCode', $listCode); $this->db->where('ListCode', $listCode);
$statusDetails = $this->db->get()->first_row(); $statusDetails = $this->db->get()->first_row();
if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED') { if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED TO STUDENT') {
return true; return true;
} else { } else {
return false; return false;
@ -349,6 +351,8 @@ $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
} }
public function get_status_name_ListCode($listCode) { public function get_status_name_ListCode($listCode) {
//echo $listCode;die();
$this->db->select('ListName'); $this->db->select('ListName');
$this->db->from(PICK_LIST_DETAILS); $this->db->from(PICK_LIST_DETAILS);
$this->db->where('ListCode', $listCode); $this->db->where('ListCode', $listCode);
@ -378,9 +382,11 @@ $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
$UpperstatusToMsg = strtoupper($statuToMsg); $UpperstatusToMsg = strtoupper($statuToMsg);
$WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg); $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
//echo $WithoutspaceStatus;die(); // echo $WithoutspaceStatus;
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( $WithoutspaceStatus = 'RECEIVEDFROMSTUDENT'){ if( $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
$cerNamtToMsg = 'Answer booklet'; $cerNamtToMsg = 'Answer booklet';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg"; $getSemYearANDType = "$getSemYearMsg";
@ -1093,14 +1099,17 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
join T_PickListDetails on T_AnswerBookletStatus.ListCode=T_PickListDetails.ListCode join T_PickListDetails on T_AnswerBookletStatus.ListCode=T_PickListDetails.ListCode
where T_AnswerBookletStatus.StudentID=? and where T_AnswerBookletStatus.StudentID=? and
T_AnswerBookletStatus.CreatedOn=(select max(CreatedOn) from T_AnswerBookletStatus T_AnswerBookletStatus.CreatedOn=(select max(CreatedOn) from T_AnswerBookletStatus
where StudentID= ?) and Sem=? and CourseID=?'; where StudentID= ? and Sem=?) and Sem=? and CourseID=?';
$query = $this->db->query($subQuery,array($StudentID,$StudentID,$Sem,$CourseID)); $query = $this->db->query($subQuery,array($StudentID,$StudentID,$Sem,$Sem,$CourseID));
$expense = $query->result(); $expense = $query->result();
// print_r($expense);die(); // print_r($expense);die();
// print_r($this->db->last_query());
$latestappstatus=''; $latestappstatus='';
if(!empty($expense)) if(!empty($expense))

7
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -568,17 +568,10 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$scope.showRowLines = true; $scope.showRowLines = true;
$scope.rowAlternationEnabled = true; $scope.rowAlternationEnabled = true;
$scope.adYeargrid = { $scope.adYeargrid = {
showBorders: true, showBorders: true,
columnAutoWidth: true, columnAutoWidth: true,
//columnWidth: 100, //columnWidth: 100,
caption: {
title: 'DAYBOOK DETAILS',
width: '300px',
style: 'font-size:50px;color:blue;'
},
"export": { "export": {
enabled: true, enabled: true,
fileName: "AdmissionsYear", fileName: "AdmissionsYear",