diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 2573d28b..b7898b18 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -76,12 +76,12 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'apollodec.com', - // 'username' => 'apollod4_SIT', - // 'password' => 'apollosit1234', - // 'database' => 'apollod4_ApolloDECNEWSIT', - 'username' => 'apollod4_DEV', - 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'username' => 'apollod4_SIT', + 'password' => 'apollosit1234', + 'database' => 'apollod4_ApolloDECNEWSIT', + // 'username' => 'apollod4_DEV', + // 'password' => 'apollo1234', + // 'database' => 'apollod4_ApolloDECDev', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 72b913bd..412ed4d0 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -415,13 +415,14 @@ class Call_Tracking_Controller extends REST_Controller { */ public function autoAddlead_post(){ $student = $this->post('student'); - //print_r($student);die; + $comments = $this->post('comments'); + //print_r($comments);die; if(!empty($student)){ $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); //store lead details $Student_Id = ''; - foreach($student as $student){ + foreach($student as $index =>$student){ $lead_details['LeadName'] = $student['Student_name']; @@ -444,11 +445,12 @@ class Call_Tracking_Controller extends REST_Controller { $tracking_details['CreatedBranch'] = $this->post('branchId'); //store tracking followup details $tracking_followup_details['FollowupOn'] = $this->post('date'); - $tracking_followup_details['FollowupComments'] = $this->post('comments'); + $tracking_followup_details['FollowupComments'] = $comments[$index]; $tracking_followup_details['StatusName'] = $this->post('status'); $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo'); //print_r(array($lead_details,$tracking_details,$tracking_followup_details)); + $leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL) diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 1ddb8a7d..099f77ce 100755 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -317,7 +317,8 @@ class HallTickets_Controller extends REST_Controller { { $schedulearray = $this->post('updatescheduledetails'); $updateBy = $this->post('createdBy'); - $res = $this->Hallticket_model->scheduleUpdate($schedulearray,$updateBy); + $scheduleID = $this->post('scheduleID'); + $res = $this->Hallticket_model->scheduleUpdate($schedulearray,$updateBy,$scheduleID); if(count($res) > 0 ) { diff --git a/Apollo/api/application/controllers/University_Controller.php b/Apollo/api/application/controllers/University_Controller.php index 84be2013..be738955 100755 --- a/Apollo/api/application/controllers/University_Controller.php +++ b/Apollo/api/application/controllers/University_Controller.php @@ -34,7 +34,7 @@ class University_Controller extends REST_Controller { $this->methods['updateDefaultActivityDetails_post']['limit'] = 100; // load the university model - $this->load->model('Universityfile_model', 'universityfile_model'); + $this->load->model('University_model', 'university_model'); } // get university details @@ -43,7 +43,7 @@ class University_Controller extends REST_Controller { $loginUserId = $reqData['localUserID']; $loginUserBranchId = $reqData['localBranchID']; $loginUserType = $reqData['localType']; - $getUniversityListDetails = $this->universityfile_model->get_university_list($loginUserBranchId);// Check if the employee exist + $getUniversityListDetails = $this->university_model->get_university_list($loginUserBranchId);// Check if the employee exist if ($getUniversityListDetails) { $getUniversityListDetails['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 9761e348..055c008c 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -791,11 +791,12 @@ class Hallticket_model extends CI_Model else if(strcasecmp($ind['Type'],'sem') == 0 && strcasecmp($ind['SubType'],'year') == 0) { //GET Year Based Semester + if($ind['SemID'] == 1)//First Year { - $i = 1; - // for($i = 1;$i <= 1; $i++) - // { + //$i = 1; + for($i = 1;$i <= 1; $i++) + { $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 @@ -808,7 +809,7 @@ class Hallticket_model extends CI_Model //array_push($id['FeeDetails'][$key2],$ind); - // } + } array_splice($id['FeeDetails'][$key2],0,6,$in1); } @@ -1248,9 +1249,9 @@ class Hallticket_model extends CI_Model } - public function scheduleUpdate($schedulearray,$up) + public function scheduleUpdate($schedulearray,$up,$scheduleID) { - + //print_r($schedulearray);die(); $MasterID = ""; foreach($schedulearray as $shed) { @@ -1259,7 +1260,7 @@ class Hallticket_model extends CI_Model $sudate = $shed['scheduleDate']; $SubDate = date("Y-m-d", strtotime($sudate)); $MasterID = $shed['SchId']; - //echo $SchId; + $SubjectID = $shed['SubjectID']; $scheduleStart = $shed['scheduleStart']; $scheduleEnd = $shed['scheduleEnd']; @@ -1268,17 +1269,19 @@ class Hallticket_model extends CI_Model { $schedulchildUpdate = array('ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd); - //print_r($schedulchild); + $this->db->trans_start(); $this->db->where('T_Batch_Schedule_Child.SchChildId',$ChildID); $this->db->where('T_Batch_Schedule_Child.SubjectID',$SubjectID); + $this->db->where('T_Batch_Schedule_Child.SchId',$MasterID); $this->db->update('T_Batch_Schedule_Child',$schedulchildUpdate); $this->db->trans_complete(); } else { - $schedulchildInsert = array('SchId'=>$MasterID,'SubjectID'=>$SubjectID,'ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd,'IsActive'=>$isactive); + + $schedulchildInsert = array('SchId'=>$scheduleID,'SubjectID'=>$SubjectID,'ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd,'IsActive'=>$isactive); $this->db->trans_start(); $this->db->insert('T_Batch_Schedule_Child',$schedulchildInsert); $this->db->trans_complete(); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index f116fba3..1fd15252 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -250,49 +250,46 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,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(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,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(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name from - (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, - CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts - FROM T_CertificationStatus - WHERE 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 ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname + (SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate +FROM T_CertificationStatus c + left join T_PickListDetails p on p.ListCode=c.ListCode + left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType +WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType) + and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') +group by sid,sem,cid,branch,ctype +union +SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType - where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) - group by sid,cid,lcode,branch) - as ams on ams.branch=sms.branch and ams.sid=sms.sid + left join T_PickListDetails p on p.ListCode=app.ListCode + where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') + group by sid,cid,lcode,branch,ctype) as sms + left join - (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status group by sid,fid,cid,batch) - as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype + as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid left join (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails where IsActive = 1 group by sid,fid,billno) - as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid left join - (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.cid=sms.cid -left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) - as list on list.lcode=sms.lcode -left join - (SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails) - as alist on alist.lcode=ams.lcode + (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID group by cid order by CourseID) - as cm on cm.cid=cfd.ccid + as cm on cm.cid=sms.cid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName 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 FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid - where std.active = 1 and sms.branch = '".$br."' +left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid + where std.active = 1 and sms.branch = '".$br."' "; if ($bat!= ''){ @@ -314,7 +311,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name"; $leadDet=$this->db->query($sql); @@ -498,19 +495,16 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.adate, - ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate from - (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app -left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType -left join T_PickListDetails list on list.ListCode=app.ListCode -where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) -group by sid,cid,lcode,branch) as sms + (select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status +from T_Student_DocumentTrack_Details +where StatusName not like 'CLOSED') as sms left join - (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch FROM T_Students_Fees_Status group by sid,fid,cid,batch) - as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid + as sfs on sfs.sid=sms.sid left join (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID) @@ -527,8 +521,8 @@ left join as cm on cm.cid=cfd.ccid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName 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 FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 and sms.branch = '".$br."' +left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid + where std.active = 1 and sfs.branch = '".$br."' "; @@ -542,7 +536,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } - $sql.="group by Student_id,Course_id,Batch_code,Branch_code,Sem_year "; + $sql.="group by Student_id,Course_id,Batch_code,Branch_code"; diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index e5fddb90..ec992a9b 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -222,7 +222,7 @@ class StatusUpdation_model extends CI_Model { $results['preStatusDetails'] = false; $results['message'] = 'No record found'; } - } else if ($reqDetailsFor == 'APPICATION_STATUS') { + } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') { $searchFor = 'A001'; $searchTableFor = APPLICATION_STATUS; $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); @@ -318,7 +318,8 @@ class StatusUpdation_model extends CI_Model { $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; - $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + $mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received."; $this->smssend($arr, $mesg); $this->mailsend($arr, $mesg, $cerNamtToMsg); $result['addStatus'] = true; @@ -590,11 +591,11 @@ class StatusUpdation_model extends CI_Model { $this->load->library('email'); //SMTP & mail configuration $config = array( - 'protocol' => 'ssmtp', - 'smtp_host' => 'ssl://smtp.example.com', + 'protocol' => 'smtp', + 'smtp_host' => 'smtp.sendgrid.net', 'smtp_port' => 465, - 'smtp_user' => 'noreply@apollodec.com', - 'smtp_pass' => 'Apollo@123', + 'smtp_user' => 'apikey', + 'smtp_pass' => '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', 'mailtype' => 'html', 'charset' => 'utf-8' ); @@ -611,7 +612,7 @@ class StatusUpdation_model extends CI_Model { $subj = $sub; $this->email->subject($subj); $this->email->message($htmlContent); - //Send email + //Send email 1 $result = $this->email->send(); // echo $this->email->print_debugger(); exit(); return $result; diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index a36e505b..aad81771 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -105,7 +105,8 @@ "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", "MARKCARD": "MARK CARD", - "CERTIFICATE" : "CERTIFICATE" + "CERTIFICATE" : "CERTIFICATE", + "APPLICATION": "APPLICATION" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 5fbe55ab..22c0a514 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -157,6 +157,10 @@ app.constant('JS_REQUIRES', { * student Certification status updation * */ 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', + /* + * student Application status updation + * */ + 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', /* * student Certification status updation * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 0760db6b..e74f2e4e 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -333,6 +333,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Certificate Status' }, // resolve: loadSequence('wizardCtrl') + }).state('app.student.status.application', { + url: '/application', + templateUrl: "assets/views/status-update/application_status.html", + title: 'Application Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + ncyBreadcrumb: { + label: 'Application Status' + }, + // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { url: '/application', templateUrl: "assets/views/form_elements.html", diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index fd2d9c0c..0f57192a 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -170,7 +170,7 @@ swal("Warning!", "Status are required", "warning"); var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE =='R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/announcementCtrl.js b/Apollo/assets/js/controllers/announcementCtrl.js index bf3239bd..a261a5d1 100755 --- a/Apollo/assets/js/controllers/announcementCtrl.js +++ b/Apollo/assets/js/controllers/announcementCtrl.js @@ -199,7 +199,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js new file mode 100644 index 00000000..1a46e68a --- /dev/null +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -0,0 +1,610 @@ +'use strict'; +/*** controller for Wizard Form example***/ +app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) { + + /** + * Application status update search / Document status update + * by : kdk + */ + + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.statusUpdationId = -1; + $scope.editId = P; + } + $scope.cancel = function () { + $scope.editId = -1; + } + + + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + const localUpdateStatus = 'APPLICATIONFORM_STATUS'; + $scope.localTypeSuperAdmin = false; + $scope.localBranchDetails = ''; + + $scope.init = function () { + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } + + if (localDetail != null) { + if (localDetails.localType === 'R004') { + $scope.localTypeSuperAdmin = true; + $scope.getUniversityList(); + $scope.getBranchList(); + getCertificateDetailsList(); + } else { + $scope.getUniversityList(); + getCertificateDetailsList(); + } + } else { + } + } + + $scope.getBranchList = function () { + $scope.loader = true; + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getBranchListDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.branDetailstatus) { + $scope.loader = false; + $scope.branchList_data = response.data.branch_details; + } else { + } + }); + } + + + + $scope.searchData = { + 'University': '', + 'Course': '', + 'Batch': '', + 'Mobile': '', + 'Name': '' + } + + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + + // get university list while page is loading + $scope.universityData = ''; + $scope.getUniversityList = function () { + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getUniveCourseBratch/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.univList) { + $scope.universityData = response.data.university_details; + } else { + } + }); + }; + + $scope.getUniveId = function (univ) { + let name = JSON.parse(univ); + $scope.searchData.University = name.UniversityID; + $scope.searchData.Course = ''; + $scope.searchData.Batch = ''; + $scope.courseData = name.Course; + $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end + $scope.OpenWindowStatus = false; + $scope.getSearch(); + }; + + $scope.getValueChange = function () { + $scope.getSearch(); + } + + $scope.searchResultDetails = ''; + $scope.searchLoading = false; + $scope.searchResultLength = 0; + // get student list From the searching data + $scope.getSearch = function () { + $scope.OpenWindowStatus = false; + $scope.searchLoading = true; + var getSearchDetails = { + method: 'POST', + url: apiPoint.url + 'getSearchAutoDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: $scope.searchData, + requestDetails: localDetails + } + }; + $http(getSearchDetails).then(function (response) { + if (response.data.searchResult) { + $scope.searchResultStatus = response.data.searchResult; + $scope.searchLoading = false; + let searchResultDetailsBef = response.data.search_result_details; + const filterAddSelect = searchResultDetailsBef.filter(val => { + val['Selected'] = false; + return val; + }); + $scope.searchResultDetails = filterAddSelect; + $scope.searchResultLength = Object.keys($scope.searchResultDetails).length; + } else { + $scope.searchLoading = false; + } + }); + } + + // mobile number search functionlity + $scope.mySearchChangeFunc = function (val) { + // if (val > 0) { + // $scope.allSelectedHide = true; + // $scope.allSelected('undefined'); + // $scope.OpenWindowStatus = false; + // } else { + // $scope.allSelected('undefined'); + // $scope.allSelectedHide = false; + // } + } + // End: mobile number search functionlity + + // select all or individual functionality + + // var getAllSelected = function () { + // var selectedItems = $scope.searchResultDetails.filter(function (item) { + // return item.Selected; + // }); + + // return selectedItems.length === $scope.searchResultDetails.length; + // } + + // var setAllSelected = function (value) { + // angular.forEach($scope.searchResultDetails, function (item) { + // item.Selected = value; + // }); + // } + + // $scope.allSelected = function (value) { + // if (value !== undefined) { + // return setAllSelected(value); + // } else { + // return getAllSelected(); + // } + // } + + // End: select all or individual functionality + + // Select one row in a table once + $scope.setOneSelect = function (value) { + // alert(); + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + $scope.editId = -1; + $scope.statusUpdationId = value.UNI_ID; + value.Selected = true; + $scope.OpenWindowStatus = true; + $scope.openUpdateWind(value); + } + + // unselect all the selected item + $scope.unSelect = function () { + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + $scope.statusUpdationId = -1; + $scope.openUpdateWind(); + } + + // open popup window onselct checkbox clicked or close popup window all the clicked items unchecked + $scope.OpenWindowStatus = false; + $scope.openUpdateWind = function (p) { + alert(JSON.stringify(p)); + var details = { + studId: p.StudentID, + courseId: p.CourseID + } + alert(JSON.stringify(details)); + var ItemsSelected = $scope.searchResultDetails.filter(function (item) { + if (item.Selected === true) { return true; } + }); + if (ItemsSelected.length !== 0) { + const courseLocal = $scope.searchData.Course; + $scope.getApplicationFromDetails(courseLocal); + $scope.getStatusList(); + $scope.OpenWindowStatus = true; + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + } else { + $scope.OpenWindowStatus = false; + } + } + + // get status list for this activity + $scope.getStatusList = function () { + var getStatusL = { + method: 'POST', + url: apiPoint.url + 'getStatusListForUpdate/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: 'studyMaterial', + data: localUpdateStatus, + reqBranch: localDetails.localBranchID + } + }; + $http(getStatusL).then(function (response) { + if (response.data.statusList) { + $scope.statusDetailsList = response.data.statusList_details; + } else { + // $scope.searchLoading = false; + } + }); + } + + // get Sem/Year based on the course select + $scope.getSemYearList = function (courseID) { + $scope.semYearList = ''; + if (courseID !== '' && courseID !== undefined) { + var getSemYear = { + method: 'POST', + url: apiPoint.url + 'getSemYearForCourse/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: courseID + } + }; + $http(getSemYear).then(function (response) { + if (response.data.semYearResult) { + $scope.semYearList = response.data.semYear_result_details; + } else { + $scope.semYearList = ''; + } + }); + + } else { + + } + } + + $scope.statusUpdate = { + submit: function (form, myStatusModel, localBranchDetails) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); + } else { + // alert(localDetail.localBranchID); + // alert(localBranchDetails); + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; + // alert(localDetail.localBranchID); + $scope.disableButton = true; + var studentForUpdate = []; + let formate = "dd-MM-yyyy"; + $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate); + var ItemsSelected = $scope.searchResultDetails.filter(function (item) { + if (item.Selected === true) { + let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.CourseID, item.BranchCode); + studentForUpdate.push(getStudentID); + return true; + } + }); + function getStudentForUpdateDetails(id, courseId, dCode) { + this.StudentID = id; + this.CourseID = courseId; + this.BranchCode = dCode; + this.ListCode = $scope.myStatusModel.staus; + this.SDate = $scope.myStatusModel.dateOn; + this.Coursedetail = id; + this.Comments = $scope.myStatusModel.comment; + this.CertificateType = $scope.myStatusModel.certificatetype; + this.CertificateNumber = $scope.myStatusModel.certificateNumber; + } + var updateStudyMaterial = { + method: 'POST', + url: apiPoint.url + 'updateApplicationStatus/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: studentForUpdate, + requestDetails: localDetails + } + }; + $http(updateStudyMaterial).then(function (response) { + if (response.data.addStatus) { + swal(" ","Updated successfully.", "success"); + $scope.disableButton = false; + // for success state + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + // $scope.OpenWindowStatus = false; + $scope.OpenWindowStatus = false; + } else { + swal(" ", response.data.message, "error"); + $scope.disableButton = false; + // for success state + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + // $scope.OpenWindowStatus = false; + $scope.OpenWindowStatus = false; + } + }); + } + }, + reset: function (form) { + form.$setPristine(true); + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + } + } + + + // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function (p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID }, + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } +}]); +/*modal controller + * */ +app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :studentDetails.MobileNumber, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","WordsService", function ($scope, $modalInstance, items1,WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.filter('unique', function() { + return function(collection, primaryKey, secondaryKey) { //optional secondary key + var output = [], + keys = []; + + angular.forEach(collection, function(item) { + var key; + secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey]; + + if(keys.indexOf(key) === -1) { + keys.push(key); + output.push(item); + } + }); + + return output; + }; +}); diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 18164da5..9e10e2d5 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -244,7 +244,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index bae7ad09..c97022e6 100755 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -357,7 +357,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index ca3949fb..fdad1233 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -408,7 +408,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { @@ -686,7 +686,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { @@ -889,7 +889,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/centerCtrl.js b/Apollo/assets/js/controllers/centerCtrl.js index 9bd307b1..1405e047 100755 --- a/Apollo/assets/js/controllers/centerCtrl.js +++ b/Apollo/assets/js/controllers/centerCtrl.js @@ -196,7 +196,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/certificateCtrl.js b/Apollo/assets/js/controllers/certificateCtrl.js index 071561ce..f240329c 100755 --- a/Apollo/assets/js/controllers/certificateCtrl.js +++ b/Apollo/assets/js/controllers/certificateCtrl.js @@ -115,7 +115,7 @@ $scope.certificateForm = { var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index 1f67b36c..ba1bcf06 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -22,7 +22,7 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter" var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js index 4544e1fd..6c40f5e9 100755 --- a/Apollo/assets/js/controllers/dayBookMasterCtrl.js +++ b/Apollo/assets/js/controllers/dayBookMasterCtrl.js @@ -123,7 +123,7 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index a109edf7..79229cb4 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -20,7 +20,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng $scope.init = function () { $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; - if(LOCALTYPE === 'R002') { + if(LOCALTYPE === 'R002' || LOCALTYPE == 'R005') { $scope.currentDate = new Date(); var d = new Date(); $scope.oneMonthBefore = d.setMonth(d.getMonth()-1); @@ -208,12 +208,19 @@ $scope.dayBookApprovalAccess = ''; } $scope.copyModel = function (p) { + + var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type); + console.log(inc); + $scope.incexp = inc[0]; + + console.log($scope.incexp.ID); + console.log(p); $scope.myModel = { "id": p.ID, "date": p.Date, "incomeExpense": p.Name, - "type": p.Type, + "type":$scope.incexp.ID, "amount": p.Amount, "status": p.Status, "description": p.Description, @@ -229,7 +236,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } //delete the income entry From the fees payable diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 8fd032e9..b607258e 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -232,7 +232,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason For Delete!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 7959cb62..2400ee6c 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -339,7 +339,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } //delete the income entry From the fees payable diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 27969230..8d911999 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -67,7 +67,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ // load when html page load $scope.init = function () { const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) { $scope.currentDate = new Date(); $scope.localUserListCode = localDetail.localType; $scope.localBranchID = localDetails.localBranchID; diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index ac5050bf..becec604 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2569,8 +2569,7 @@ $scope.open = function(coursefiltered,Subjects,sem){ var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' '); $scope.universityAddress = universityaddress.replace(" "," ");; - $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID+ - ",Website:-"; + $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID; $scope.Enroll = "Enrolment No: "; $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem @@ -2603,15 +2602,16 @@ $scope.open = function(coursefiltered,Subjects,sem){ doc.rect(10, 10, 190, 280); doc.text(70, 20, universityCap); + doc.text(80, 26,$scope.universityAddress); doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10); doc.setFontSize(14); doc.text(70,32,"RE-REGISTRATION FORM"); doc.setFontSize(12); - doc.text(35,35,$scope.universityAddress); - doc.text(20,42,$scope.universitydetails); + + doc.text(40,42,$scope.universitydetails); doc.setFontSize(10); doc.setFontSize(10); - var formdetails = "The from should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink."; + var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink."; var details = doc.splitTextToSize(formdetails,200); doc.text(15,50,details); diff --git a/Apollo/assets/js/controllers/incomeCtrl.js b/Apollo/assets/js/controllers/incomeCtrl.js index fbfc5941..44667ea9 100644 --- a/Apollo/assets/js/controllers/incomeCtrl.js +++ b/Apollo/assets/js/controllers/incomeCtrl.js @@ -18,7 +18,7 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { }else { if(localDetail != null) { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 8a4ef153..c81bf6b5 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -23,7 +23,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 90bc2c36..1f0e9b59 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,8 +82,24 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.ans_book_data = ''; $scope.message = ''; @@ -115,6 +131,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }); } + } var mystyle = { sheetid: 'ANSWER BOOKLET STATUS REPORT', headers: true, @@ -405,7 +422,12 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { - //console.log(selectedStudents); + //console.log(selectedStudents);return false; + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate; + } + if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -462,7 +484,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Answer Booklet Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 8cca0fef..626616b6 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -82,8 +82,24 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.app_pending_data = ''; $scope.message = ''; @@ -115,6 +131,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }); } + } var mystyle = { sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index aab98246..28a22b1f 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -91,8 +91,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }); } // response data - $scope.onSubmit = function () { - + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { $scope.balfee_data = ''; $scope.message = ''; var response_data = { @@ -154,7 +170,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } - + } //Export to excel var mystyle = { sheetid: 'BALANCE FEE STATUS REPORT', diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 81ffff7b..e3ca57f2 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -408,6 +408,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { //console.log(selectedStudents); + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date; + } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -464,7 +468,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Certificate Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index b646cb4f..a82e9624 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,8 +82,25 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.doc_pending_data = ''; $scope.message = ''; @@ -113,7 +130,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); - + } } var mystyle = { sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT', diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 35937f3b..66bca916 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -83,7 +83,24 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.examfee_data = ''; $scope.message = ''; @@ -120,7 +137,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", totalf += parseFloat(item.Amount); } return totalf; } - + } } var mystyle = { sheetid: 'EXAM WRITING FEE REPORT', diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index a70f785c..9a5d492b 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -63,7 +63,25 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$addDate; + firstError = form[field].$toDate; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[toDate=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.expense_data = ''; $scope.message = ''; @@ -95,6 +113,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }); } + } var mystyle = { sheetid: 'EXPENSE REPORT', diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index ea0c30ca..c5716651 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -101,7 +101,25 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$addDate; + firstError = form[field].$toDate; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[toDate=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.lead_data = ''; $scope.message = ''; @@ -132,6 +150,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A }); } + } var mystyle = { sheetid: 'Lead REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index d4e31322..af4fe036 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -407,6 +407,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { //console.log(selectedStudents); + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate; + } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -463,7 +467,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report MarkCard-Certificate Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index d76fc58e..0c588387 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -83,7 +83,24 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.markcard_data = ''; $scope.message = ''; @@ -114,6 +131,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }); } + } var mystyle = { sheetid: 'MARKCARD STATUS REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index f17415b7..ab3ec6ac 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -72,35 +72,26 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc } }); } - //dropdown values for batch - $scope.getBatch = function(Form,filters){ - $scope.batchValue= filters.university; - - var filterBatch = { - method: 'POST', - url: apiPoint.url + 'report_BatchName/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - batch : $scope.batchValue - } - - }; - //console.log($scope.batchValue); - $scope.batchName = ""; - $http(filterBatch).then(function (response) { - if (response.data) { - - $scope.batchName = response.data.batchName; - console.log($scope.batchName); - } else { - } - }); - } + - $scope.onSubmit = function() { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.study_mat_data = ''; $scope.message = ''; @@ -130,7 +121,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }); - } + } + } //Export to excel var mystyle = { sheetid: 'STUDY MATERIAL STATUS REPORT', diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index a7daf5f4..d668ee2e 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -50,7 +50,24 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.waiver_referal_data = ''; $scope.message = ''; @@ -95,6 +112,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } return totalf; } } + } var mystyle = { sheetid: 'WAIVER AND REFERAL REPORT', diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index e93aba84..555194ad 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -50,7 +50,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP $scope.editId = pid; $scope.courseCode = cid; - var mappingid = schid; + $scope.mappingid = schid; //alert(mappingid+'n'); var getsheduledetails = { method: 'POST', @@ -60,7 +60,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP }, data: { //requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - mapid:mappingid, + mapid:$scope.mappingid, subid:subid, branchcode:branchid, @@ -449,7 +449,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP updatescheduledetails : $scope.UpdatescheduledDetails, //status: myModel.IsActive, - createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID + createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + scheduleID:$scope.mappingid } }; $http(update).then(function (response) { @@ -527,7 +528,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js index 08fcdb3b..bb220c68 100755 --- a/Apollo/assets/js/controllers/semcoursemapCtrl.js +++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js @@ -69,7 +69,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js index 536b3465..dfbe75a6 100755 --- a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js @@ -19,7 +19,7 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = localDetail.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index b0819b76..2b261e15 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -15,7 +15,7 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { @@ -540,7 +540,7 @@ $scope.disableSendButton = true; swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + //$state.go($state.current, {}, { reload: true }); } else { @@ -897,7 +897,8 @@ if(group == '') swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + myModel.GroupName = ''; + // $state.go($state.current, {}, { reload: true }); } else { swal(" ", response.data.message, "error"); diff --git a/Apollo/assets/js/controllers/sessionCtrl.js b/Apollo/assets/js/controllers/sessionCtrl.js index 667d9ecc..181bb4f5 100755 --- a/Apollo/assets/js/controllers/sessionCtrl.js +++ b/Apollo/assets/js/controllers/sessionCtrl.js @@ -76,6 +76,8 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', if (inlocalDetails != null) { if (inlocalDetails.localType == 'R003' && inlocalDetailss.localType == 'R003') { + + // console.log('if') } else { if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') { ipCookie.remove('cookiechk'); @@ -100,15 +102,22 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', $scope.checkStaff = function () { var inlocalDetails = JSON.parse(localStorage.getItem('localObj')); var inlocalDetailss = ipCookie('cookiechk'); + console.log(inlocalDetails); + if (inlocalDetails != null) { if ((inlocalDetails.localType == 'R002' && inlocalDetailss.localType == 'R002') || (inlocalDetails.localType == 'R005' && inlocalDetailss.localType == 'R005')) { + console.log('if'); } else { + if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') { + console.log('else if'); ipCookie.remove('cookiechk'); $window.localStorage.clear(); $state.go('login.signin'); } else { + + console.log('else else') $location.url('/dashboard').replace(); $window.location.reload(); $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 2460393f..1f69b904 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -200,7 +200,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sessionScheduleCtrl.js b/Apollo/assets/js/controllers/sessionScheduleCtrl.js index 93b8d7f6..12ee13c2 100755 --- a/Apollo/assets/js/controllers/sessionScheduleCtrl.js +++ b/Apollo/assets/js/controllers/sessionScheduleCtrl.js @@ -273,10 +273,10 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter $rootScope.init = function () { - var logcheck = JSON.parse(localStorage.getItem('localObj')); + var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/statusCtrl.js b/Apollo/assets/js/controllers/statusCtrl.js index 67d63d9a..6263a3b7 100755 --- a/Apollo/assets/js/controllers/statusCtrl.js +++ b/Apollo/assets/js/controllers/statusCtrl.js @@ -18,7 +18,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) { }else { if(localDetail != null && LOCALTYPE != 'R001') { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 04bf8eba..368406f3 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -56,7 +56,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js index bcb2cbe3..dec3ee2f 100755 --- a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js +++ b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js @@ -13,7 +13,7 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_ $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) { }else { if(localDetail != null && LOCALTYPE !='R001') { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 839212f0..4dca3eed 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -35,7 +35,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/subjectCtrl.js b/Apollo/assets/js/controllers/subjectCtrl.js index 3e1fff9e..9cc1466d 100755 --- a/Apollo/assets/js/controllers/subjectCtrl.js +++ b/Apollo/assets/js/controllers/subjectCtrl.js @@ -200,7 +200,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index 74974cb9..50fdf386 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -31,7 +31,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams $scope.init = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { $scope.getUniversityList(); }else { if(localDetail != null && LOCALTYPE != 'R001') { diff --git a/Apollo/assets/views/addcontact.html b/Apollo/assets/views/addcontact.html index 3328eb80..f62c6603 100644 --- a/Apollo/assets/views/addcontact.html +++ b/Apollo/assets/views/addcontact.html @@ -26,7 +26,7 @@ Phone Number - + Phone number required diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 6c68ec50..6d05da34 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -76,7 +76,9 @@ Type is Required diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 657ea079..4a4a2241 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -83,7 +83,9 @@ Type is Required diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 4e6e0485..525a296b 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -255,12 +255,22 @@ - + + + + Type is Required @@ -344,7 +354,9 @@ Type is Required @@ -386,10 +398,23 @@ - + + + + + + + + + Type is Required diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 53f7f83f..f9e72a7f 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -358,7 +358,9 @@ Type is Required @@ -400,10 +402,22 @@ - + + + + + + + + Type is Required diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index b5a0d5e4..f1e44992 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -208,6 +208,11 @@ Certificate + diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index a9e0e5a6..eca1e330 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -28,7 +29,7 @@ td,th {
-
+
@@ -40,18 +41,20 @@ td,th { University - + Please select University.
- + Please select Batch.
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 5f07d8da..9b43233e 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -15,6 +15,7 @@ th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -30,7 +31,7 @@
- +
@@ -42,18 +43,20 @@ University - + Please select University.
- + Please select Batch.
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index b7bf6f22..00ecb0b1 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -7,6 +7,7 @@
- +
@@ -38,7 +37,8 @@ + show-button-bar="true" required/> + Please select FromDate.
@@ -49,9 +49,10 @@ To Date + show-button-bar="true" required/> + Please select ToDate.
@@ -80,10 +81,11 @@
+
-
+
@@ -102,7 +104,7 @@ - + diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html index 3325460b..ff7fbf09 100644 --- a/Apollo/assets/views/report_lead.html +++ b/Apollo/assets/views/report_lead.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -28,7 +29,7 @@ td,th {
- +
@@ -44,7 +45,8 @@ td,th { + show-button-bar="true" required/> + Please select FromDate.
@@ -55,9 +57,10 @@ td,th { To Date + show-button-bar="true" required/> + Please select ToDate.
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 945b94a2..9b03961b 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -131,8 +132,6 @@ td,th { - - @@ -153,21 +152,19 @@ td,th { - - - + - - - - - + + + + + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index dbcb0ab4..f9ac019a 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -13,13 +13,14 @@ th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; }
- +
@@ -31,18 +32,20 @@ University - + Please select University.
- + Please select Batch.
+
+
+
+

{{ mainTitle }}

+ Update application status. +
+
+
+
+ + +
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ + + +
+ +
+
+
+ +
+ +
+ +
+
+
+ + + + +
+
+
+
+
+
+
+
+ + + +
+ +
+ +
+

fetching...

+
+ +
+ +
+
+

No + records found...

+
+ +
+
+

No + records found...

+
+ +
+ +
+
+
+ + + + +

+
+
+
+
{{p.SL_NO}} {{p.Expense_name}}{{p.Amount}}{{p.Amount}}
SL.NoDocument Fee Paid DateEnrollment ID Student Name Father Name Course
{{p.SL_NO}}{{p.Document_fee_paid_date}}{{p.Enrollment_id}} {{p.Student_name}} {{p.Father_name}} {{p.course_name}} {{p.Sem_year}} {{p.Phone_number}} {{p.University}}{{p.Balance_fee}}{{p.Balance_fee}} {{p.Certificate_name}}{{p.received_status}}{{p.received_date}}{{p.issued_status}}{{p.issued_date}}{{p.issued_comments}}{{p.rstatus}}{{p.rdate}}{{p.istatus}}{{p.idate}}{{p.cmnts}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + First Name + + Last Name + + MobileNumber + + Email ID + + Course + +
+ + {{p.Firstname}}{{p.Lastname}}{{p.MobileNumber}}{{p.EmailID}}{{p.CourseName}}({{p.CourseCode}}) + +
+ +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + + + + +
StatusCommentsDocument NameDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.CertificateName}}{{s.AppDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + Update Status + +
+ + + +
+
+
+ + + + Certificate Type is Required + +
+
+ + + Certificate Number is Required +
+
+
+
+ + + + Status is Required + +
+
+
+ + + Date is required. + Enter a Valid Date +
+
+
+
+
+ + +