From 1525c98ccd32d13af55736cf7b5b51f805e81b78 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Tue, 21 Aug 2018 18:13:34 +0530 Subject: [PATCH 01/27] application status updation functionalities new chnages : kdk --- Apollo/api/application/config/routes.php | 4 + .../controllers/StatusUpdation_Controller.php | 37 +++++- .../models/StatusUpdation_model.php | 87 ++++++++++++-- .../js/controllers/applicationStatusCtrl.js | 76 ++++++------ .../status-update/application_status.html | 109 ++++++++++++++++-- 5 files changed, 260 insertions(+), 53 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index eff15fac..09952634 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -332,3 +332,7 @@ $route['report_balfee'] = 'Report/balfee'; $route['report_lead'] = 'Report/lead'; $route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile'; +//Application Form Details +$route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails'; +$route['updateApplicationFormStatus'] = 'StatusUpdation_Controller/updateApplicationFormStatus'; +$route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicationFormStatusList'; \ No newline at end of file diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 604ad50c..5c079ef0 100755 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -232,7 +232,6 @@ class StatusUpdation_Controller extends REST_Controller { public function getApplicationFromDetails_post(){ $reqData = $this->post('data'); $reqBranch = $this->post('reqBranch'); - // print_r($reqData);exit(); $getApplicationFormDetails = $this->statusupdation_model->get_applicationFrom_details($reqData, $reqBranch); // Check if the employee exist if ($getApplicationFormDetails) { $getApplicationFormDetails['status'] = REST_Controller::HTTP_OK; @@ -245,4 +244,38 @@ class StatusUpdation_Controller extends REST_Controller { } } -} \ No newline at end of file + + public function updateApplicationFormStatus_post(){ + $reqData = $this->post('data'); + $reqBranch = $this->post('requestDetails'); + $updateApplicationFormStatus = $this->statusupdation_model->update_applicationForm_status($reqData, $reqBranch); // Check if the employee exist + if ($updateApplicationFormStatus) { + $updateApplicationFormStatus['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($updateApplicationFormStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } else { + // Set the response and exit + $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + + public function getApplicationFormStatusList_post(){ + $reqData = $this->post('data'); + $reqBranch = $this->post('reqBranch'); + $getApplicationFormStatusList = $this->statusupdation_model->get_ApplicationFormStatusDetails($reqData, $reqBranch); // Check if the employee exist + if ($getApplicationFormStatusList) { + $getApplicationFormStatusList['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getApplicationFormStatusList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } else { + // Set the response and exit + $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + + + } \ No newline at end of file diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 65345536..a8e6a0fd 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -316,7 +316,7 @@ class StatusUpdation_model extends CI_Model { if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){ $cerNamtToMsg = 'Answer booklet'; $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); - $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; + $getSemYearANDType = "$getSemYearMsg"; // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; $mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received."; @@ -593,7 +593,7 @@ class StatusUpdation_model extends CI_Model { $config = array( 'protocol' => 'smtp', 'smtp_host' => 'smtp.sendgrid.net', - 'smtp_port' => 465, + 'smtp_port' => 587, 'smtp_user' => 'apikey', 'smtp_pass' => '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', 'mailtype' => 'html', @@ -602,12 +602,13 @@ class StatusUpdation_model extends CI_Model { $this->email->initialize($config); $this->email->set_mailtype("html"); $this->email->set_newline("\r\n"); + // print_r($this->email);exit(); //Email content // $htmlContent = '

Sending email via SMTP server

'; $htmlContent = $msg; // Email body load the html template // $body = $this->load->view('emails/anillabs.php',$data,TRUE); - $this->email->to($list); + $this->email->to('dineshkumar.k@venbainfotech.com'); $this->email->from('noreply@apollodec.com','Apollo'); $subj = $sub; $this->email->subject($subj); @@ -883,8 +884,80 @@ class StatusUpdation_model extends CI_Model { //get application form details public function get_applicationFrom_details($reqData, $reqBranch) { -echo $reqData['studId']; -echo $reqData['courseId']; - + $studentId = $reqData['studId']; + $courseId = $reqData['courseId']; + // $searchTableFor = APPLICATION_FORM; + $this->db->select('t1.ID, t1.Student_Fee_Status_Id, t1.BatchCode, t1.FeeType as SemID, CFD.Sem_Year as Sem_Year, t1.RegistrationMode, t1.RegistrationType'); + $this->db->from('T_Registration_Details as t1'); + $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t1.FeeType'); + $this->db->where('t1.StudentID', $studentId); + $this->db->where('t1.CourseID', $courseId); + $fromTypes = $this->db->get(); + $formTypeDetails = $fromTypes->result(); + if($formTypeDetails){ + // print_r($formTypeDetails);exit(); + $resultArr['formTypeDetails'] = $formTypeDetails; + $resultArr['formTypeStatus'] = true; + $resultArr['message'] = "Successfully data generated"; + } else { + // print_r($formTypeDetails);exit(); + $resultArr['formTypeDetails'] = []; + $resultArr['formTypeStatus'] = false; + $resultArr['message'] = "No record found"; + } + return $resultArr; } -} \ No newline at end of file + + public function update_applicationForm_status($reqData, $reqBranch){ + + $arr['Registration_Details_ID'] = $reqData[0]['register_details_id']; + $arr['ListCode'] = $reqData[0]['ListCode']; + $arr['Comments'] = $reqData[0]['Comments']; + $arr['AppFormDate'] = $reqData[0]['SDate']; + + $arr['BranchCode'] = $reqBranch['localBranchID']; + $arr['CreatedBy'] = $reqBranch['localUserID']; + $time = date('Y-m-d H:i:s'); + $dateTime = $time; + $arr['CreatedOn'] = $dateTime; +// print_r($arr);exit(); + $this->db->insert('T_ApplicationFormStatus', $arr); + if ($this->db->affected_rows() >= 1) { + $result['addStatus'] = true; + $result['message'] = "Successfully Application Form Status Updated"; + } else { + $result['addStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + return $result; + } + + public function get_ApplicationFormStatusDetails($reqData, $reqBranch){ + $studentId = $reqData['studId']; + $courseId = $reqData['courseId']; + // echo $studentId;exit(); + // $searchTableFor = APPLICATION_FORM; + $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName '); + $this->db->from('T_ApplicationFormStatus as t1'); + $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID'); + $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT'); + + $this->db->where('t2.StudentID', $studentId); + $this->db->where('t2.CourseID', $courseId); + $fromTypes = $this->db->get(); + $formTypeDetails = $fromTypes->result(); + if($formTypeDetails){ + // print_r($formTypeDetails);exit(); + $resultArr['formTypeDetails'] = $formTypeDetails; + $resultArr['formTypeStatus'] = true; + $resultArr['message'] = "Successfully data generated"; + } else { + // print_r($formTypeDetails);exit(); + $resultArr['formTypeDetails'] = []; + $resultArr['formTypeStatus'] = false; + $resultArr['message'] = "No record found"; + } + return $resultArr; + } +} \ No newline at end of file diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index c2ffef6c..e62c6eab 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -22,13 +22,15 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.editId = -1; } + // Student Form type list + $scope.studentFormTypeList = ""; // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - const localUpdateStatus = 'APPLICATIONFORM_STATUS'; + const localUpdateStatus = 'APPICATION_STATUS'; $scope.localTypeSuperAdmin = false; $scope.localBranchDetails = ''; @@ -97,14 +99,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl 'Name': '' } - $scope.myStatusModel = { - 'semYear': '', - 'staus': '', - 'dateOn': '', - 'comment': '', - 'certificatetype': '', - 'certificateNumber': '' - } + // get university list while page is loading $scope.universityData = ''; @@ -276,8 +271,6 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl } $scope.getApplicationFromDetails = function(frm_details){ -alert(JSON.stringify(frm_details)); - var getStatusL = { method: 'POST', url: apiPoint.url + 'getApplicationFromDetails/', @@ -290,8 +283,8 @@ alert(JSON.stringify(frm_details)); } }; $http(getStatusL).then(function (response) { - if (response.data.statusList) { - $scope.statusDetailsList = response.data.statusList_details; + if (response.data.formTypeStatus) { + $scope.studentFormTypeList = response.data.formTypeDetails; } else { // $scope.searchLoading = false; } @@ -349,8 +342,29 @@ alert(JSON.stringify(frm_details)); } } + $scope.editStatus = false; + $scope.editStatusID = ''; + + $scope.statusUpdateView = function(id){ +$scope.editStatus = true; +$scope.editStatusID = id; + $scope.myStatusModel = { + 'id': '', + 'staus': '', + 'dateOn': '', + 'comment': '' + } + } + + $scope.myStatusModel = { + 'staus': '', + 'dateOn': '', + 'comment': '' + } + $scope.statusUpdate = { - submit: function (form, myStatusModel, localBranchDetails) { + submit: function (form, localBranchDetails, id) { + alert(id); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -378,25 +392,20 @@ alert(JSON.stringify(frm_details)); $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); + let getStudentID = new getStudentForUpdateDetails(id); studentForUpdate.push(getStudentID); return true; } }); - function getStudentForUpdateDetails(id, courseId, dCode) { - this.StudentID = id; - this.CourseID = courseId; - this.BranchCode = dCode; + function getStudentForUpdateDetails(id) { 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; + this.register_details_id = id } var updateStudyMaterial = { method: 'POST', - url: apiPoint.url + 'updateApplicationStatus/', + url: apiPoint.url + 'updateApplicationFormStatus/', headers: { 'Content-Type': 'application/json' }, @@ -430,13 +439,10 @@ alert(JSON.stringify(frm_details)); }, reset: function (form) { form.$setPristine(true); - $scope.myStatusModel = { - 'semYear': '', + $scope.myStatusModel = { 'staus': '', 'dateOn': '', - 'comment': '', - 'certificatetype': '', - 'certificateNumber': '' + 'comment': '' } } } @@ -452,20 +458,22 @@ alert(JSON.stringify(frm_details)); $scope.prevStatusListForStudentCourse = ''; var getPrevStatus = { method: 'POST', - url: apiPoint.url + 'getPrevStatusDetailsForStu/', + url: apiPoint.url + 'getApplicationFormStatusList/', headers: { 'Content-Type': 'application/json' }, data: { - statusFor: localUpdateStatus, - getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID }, - data: localDetail + data: { + studId: p.StudentID, + courseId: p.CourseID + }, + reqBranch: localDetails.localBranchID } }; $http(getPrevStatus).then(function (response) { - if (response.data.preStatusDetails) { + if (response.data.formTypeStatus) { $scope.prevStatusListForStudentCourseLoading = false; - $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevStatusListForStudentCourse = response.data.formTypeDetails; $scope.prevNoRecordFound = false; } else { $scope.prevStatusListForStudentCourseLoading = false; diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index 5bc63532..49a3dd69 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -183,17 +183,20 @@ Status Comments - Document Name + Batch Date - Updated By + Sem/Year + Form Type {{s.ListName}} {{s.Comments}} - {{s.CertificateName}} - {{s.AppDate}} - {{s.Firstname}} + {{s.BatchCode}} + {{s.StatusUpdateDate}} + {{s.Sem_Year}} + {{s.RegistrationType}} + @@ -238,7 +241,8 @@ -
+ { {studentFormTypeList | json}} +
@@ -325,7 +329,7 @@
-
+
- - -
@@ -26,26 +23,32 @@
- +
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
+ + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 02d43f09..efefaf4f 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -38,25 +38,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index ce388210..61ca29e3 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -30,27 +30,31 @@
-
+
- - - - Please select University. + + + + + Please select University.
+
- - - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index 614a6270..196735c2 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -36,25 +36,31 @@ td,th {
-
+
- - - Please select University. + + + + + Please select University.
+
- - Please select Batch. + + Please select Batch.
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index 0f3e1135..d5b73131 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -36,25 +36,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index 263e52b8..9306517b 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -86,6 +86,7 @@
+

Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}

diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 9b03961b..6444ce49 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -41,18 +41,26 @@ td,th { University - - + + + + + Please select University. +
- - + + + + Please select Batch.
@@ -96,7 +104,7 @@ td,th {
- diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 7307d27c..0937e42b 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -34,25 +34,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
From 9067637d4d6dfb54959ebfa906fb3cf1fdcc9946 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 10:53:56 +0530 Subject: [PATCH 15/27] drop down issues in report --- .../js/controllers/report_ans_bookletCtrl.js | 13 ++++++++++ .../js/controllers/report_app_pendingCtrl.js | 14 ++++++++++ .../js/controllers/report_balfeeCtrl.js | 13 ++++++++++ .../js/controllers/report_doc_pendingCtrl.js | 14 ++++++++++ .../js/controllers/report_examfeeCtrl.js | 13 ++++++++++ .../report_markcard_certificateCtrl.js | 26 ------------------- .../controllers/report_waiver_referalCtrl.js | 12 +++++++++ 7 files changed, 79 insertions(+), 26 deletions(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 1f0e9b59..21ed7cad 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,6 +82,19 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 4a860046..8d68f3e1 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 01ed7ef8..f8a92377 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -90,6 +90,19 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); // response data $scope.show = false; $scope.returnResultData = []; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 13e268ad..b1b0906e 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,6 +82,20 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 66bca916..a66e6e88 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index cd1bc23e..af4fe036 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,32 +83,6 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } - /* watch university model for bind batch objects*/ - - $scope.$watchCollection('univModel.university', function (newValue,oldValue) { - if(newValue==undefined || newValue==''){ - $scope.filterBatchDetails=""; - $scope.disableSubmit=true; - } - else{ - if(angular.isString(newValue)){ - $scope.filterBatchDetails=angular.fromJson(newValue); - $scope.disableSubmit=false; - } - } - - }); - // disable submit - $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { - if(newValue==undefined || newValue=='' || newValue==null){ - $scope.disableSubmit=true; - } - else{ - $scope.disableSubmit=false; - - } - - }); $scope.onSubmit = function () { //alert($scope.batch.name); diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index d668ee2e..8d1ff908 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + }); $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; From eb0c4ed749fb8f3bcc970fc1089b1dd0a98f0af7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 05:35:55 +0000 Subject: [PATCH 16/27] report_markcard_certificateCtrl.js edited online with Bitbucket --- .../report_markcard_certificateCtrl.js | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index af4fe036..740b6bb6 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,7 +83,32 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } + /* watch university model for bind batch objects*/ + $scope.$watchCollection('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + $scope.disableSubmit=true; + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + $scope.disableSubmit=false; + } + } + + }); + // disable submit + $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { + if(newValue==undefined || newValue=='' || newValue==null){ + $scope.disableSubmit=true; + } + else{ + $scope.disableSubmit=false; + + } + + }); $scope.onSubmit = function () { //alert($scope.batch.name); $scope.mark_cert_data = ''; From ef78090513a38bd8ad127a5ddc02ec2dd0b30fce Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Aug 2018 11:15:51 +0530 Subject: [PATCH 17/27] receiptnumber active deacive --- Apollo/api/application/models/Fees_status_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 4b6896d3..9b330645 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model $this->db->select('ReceiptNo'); $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']); + $this->db->where('IsActive', '1'); if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){ $result['paidStatus'] = false; $result['message'] = "This receipt number is already exist!"; From 9b5b877adb215807f82b7dd87620fe7f1108c044 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:26 +0530 Subject: [PATCH 18/27] report changes --- Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index b1b0906e..c0b254c7 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -98,7 +98,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //Response data $scope.show = false; $scope.onSubmit = function (form) { - + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -126,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } From 283e6b62fd56e8556d88f2910f4b1e17a2dd82f0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:34 +0530 Subject: [PATCH 19/27] report changes --- Apollo/assets/js/controllers/report_ans_bookletCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 21ed7cad..2ab1a193 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -97,6 +97,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -124,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } From 6a4d9facc5f4bb56713ffe6e804a7f3bf0ee46a5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:43 +0530 Subject: [PATCH 20/27] report changes --- Apollo/assets/js/controllers/report_balfeeCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index f8a92377..1d018b55 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -107,6 +107,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.show = false; $scope.returnResultData = []; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); $scope.returnResultData.length=0; var firstError = null; if (form.$invalid) { @@ -134,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } From 9e8b83b6eb56509010683604bf8d8afc6cfc503f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:55 +0530 Subject: [PATCH 21/27] report changes --- .../assets/js/controllers/report_study_material_statusCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index ff76c9af..0794ccee 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }, data: { branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - university : $scope.univModel.university.universityID, + university : $scope.filterUniv.universityID, batch : $scope.univModel.batch } From c39096e8c865f188a7d5b8117d83cfce1117ab67 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:03 +0530 Subject: [PATCH 22/27] report changes --- Apollo/assets/js/controllers/report_certificateCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index ab4cd9c0..93fe25ad 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.cert_data = ''; $scope.message = ''; @@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date From 4236dd12a1abaf7a9eae35296193ab997aa465b4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:20 +0530 Subject: [PATCH 23/27] report changes --- .../assets/js/controllers/report_markcard_certificateCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 740b6bb6..62636564 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -110,6 +110,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }); $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.mark_cert_data = ''; $scope.message = ''; @@ -121,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date From d1e9715e564b0382a717590a91cb25a36e124eec Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:31 +0530 Subject: [PATCH 24/27] report changes --- Apollo/assets/js/controllers/report_markcard_statusCtrl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 93bf760d..477c6bee 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.show = false; $scope.onSubmit = function (form) { + + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } From b093c73615fac34c5efc958242bb81572efa0e20 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 22 Aug 2018 12:00:12 +0530 Subject: [PATCH 25/27] 1314,1320 ISSUES FIXED --- .../js/controllers/examAttendanceCtrl.js | 43 ++++++++++++++++--- .../js/controllers/generateHallTicketCtrl.js | 26 +++++------ .../views/hallticket/hallTicketPDF.html | 10 ++--- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index 6145664a..f1882ca4 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -297,11 +297,30 @@ $scope.isLoaderTxt = "Loading..."; var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; doc1.setFontSize(9); doc1.setFontStyle('bold'); - doc1.text(60,30,heading); - //doc1.textAlign('CENTER',50,30,heading); + //doc1.text(60,30,heading); + var heading_length = heading.length; + var heading_start_point = 0; + var heading1_start_point = 0; + if(heading_length <= 100) + { + var heading_start_point = 200; + var heading1_start_point = 225; + } + else + { + var heading_start_point = 100; + var heading1_start_point = 150; + } + // console.log(heading_length); + // console.log((doc1.internal.pageSize.width/2)); + // console.log((doc1.internal.pageSize.width/2)-(heading_length)); + + + doc1.text(heading_start_point,30,heading); doc1.setFontSize(9); doc1.setFontStyle('bold'); - doc1.text(70,45,heading1); + //doc1.text(70,45,heading1); + doc1.text(heading1_start_point,45,heading1); }; // ctx.textAlign = "right"; @@ -312,11 +331,23 @@ $scope.isLoaderTxt = "Loading..."; var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; doc2.setFontSize(9); doc2.setFontStyle('bold'); - - doc2.text(50,30,heading); + var heading_length = heading.length; + var heading_start_point = 0; + var heading1_start_point = 0; + if(heading_length <= 100) + { + var heading_start_point = 200; + var heading1_start_point = 225; + } + else + { + var heading_start_point = 100; + var heading1_start_point = 150; + } + doc2.text(heading_start_point,30,heading); doc2.setFontSize(9); doc2.setFontStyle('bold'); - doc2.text(70,45,heading1); + doc2.text(heading1_start_point,45,heading1); }; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 8007c128..0550476f 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -357,6 +357,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun console.log('child'); $scope.localPdfUniverityDetails = pdfitems.universityDetails; $scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName; + $scope.length_of_universityNamePDF = $scope.universityNamePDF.length/2; + console.log('$scope.length_of_universityNamePDF'+$scope.length_of_universityNamePDF); $scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address; $scope.universityEmailPDF = $scope.localPdfUniverityDetails[0].EmailID; $scope.universityLogoPDF = $scope.localPdfUniverityDetails[0].ProfilePicPath; @@ -473,7 +475,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); @@ -482,11 +484,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -697,7 +699,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); @@ -706,11 +708,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -874,7 +876,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); @@ -883,11 +885,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 45633dc3..51e3850e 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -71,7 +71,7 @@ -
+
@@ -88,7 +88,7 @@ -
+
@@ -105,7 +105,7 @@ -
+
@@ -122,11 +122,11 @@ -
+
- + From e577bd3b2caaa11652ebfa0795970635f1dc3373 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 22 Aug 2018 13:30:26 +0530 Subject: [PATCH 26/27] HALL ALIGN ISSUE FIXED --- .../js/controllers/generateHallTicketCtrl.js | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 0550476f..c477ebcf 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -482,9 +482,16 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); @@ -706,9 +713,16 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); @@ -884,8 +898,16 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); From c033446b2e5fea661a7ff4e0e6d6a958235c0fbe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Aug 2018 15:14:08 +0530 Subject: [PATCH 27/27] new reg report field order --- Apollo/assets/views/newreg_report.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html index d9564c94..6dc076f9 100644 --- a/Apollo/assets/views/newreg_report.html +++ b/Apollo/assets/views/newreg_report.html @@ -164,13 +164,12 @@
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
+ - - - - + + @@ -178,13 +177,12 @@ + - - - - + +
Date Of Registration Student Name Father NameCourseBatchUniversityDate Of RegistrationBatchCourse Mobile
{{p.DOJ}} {{p.Firstname}} {{p.Fathername}}{{p.CourseName}}{{p.BatchName}}{{p.UniversityName}}{{p.DOJ}}{{p.BatchName}}{{p.CourseName}} {{p.MobileNumber}}