diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 60f646e6..606a2096 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -760,13 +760,11 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can { //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='') //{ - $this->db->select('T_DayBookMaster.ID,Name,Type,Amount,Date,T_DayBookMaster.Description,VoucherNumber,PaidTo,T_DayBookMaster.ModeOfPayment,FeePaymentDetails,Firstname,ListName,T_DayBookMaster.ReceiptNo,T_Students_Fees_PaidDetails.IsActive as IsActive,T_Students_Fees_PaidDetails.ID as FID,T_DayBookMaster.Reason as Reason'); - $this->db->from('T_DayBookMaster'); - $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_DayBookMaster.StudentID','left'); - $this->db->join('T_PickListDetails','T_PickListDetails.ListCode=T_DayBookMaster.Name','left'); - $this->db->join('T_Students_Fees_PaidDetails','T_Students_Fees_PaidDetails.ID = T_DayBookMaster.FeesPaymentID'); - - if($search['MobileNumber']!='') + $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo'); + $this->db->from('T_Students_Fees_PaidDetails'); + $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left'); + + if($search['MobileNumber']!='') { $this->db->where('T_StudentDetails.MobileNumber',$search['MobileNumber']); } @@ -777,8 +775,8 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can } if($search['receipt']!='') { - $this->db->where('T_DayBookMaster.VoucherNumber',$search['receipt']); - $this->db->or_where('T_DayBookMaster.ReceiptNo',$search['receipt']); + $this->db->where('T_Students_Fees_PaidDetails.ReceiptNo',$search['receipt']); + } $searchDetails = $this->db->get(); @@ -819,35 +817,36 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can // echo $dateTime; // die(); - $daybookarr['ID'] = $up_details['ID']; + //$daybookarr['ID'] = $up_details['ID']; // $daybookarr['IsActive'] = $up_details['IsActive']; - $daybookarr['Reason'] = $up_details['Reason']; - $daybookarr['UpdatedOn'] = $dateTime; - $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; + // $daybookarr['Reason'] = $up_details['Reason']; + // $daybookarr['UpdatedOn'] = $dateTime; + // $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; - if($up_details['IsActive'] == 0) - { - $daybookarr['Status'] = 'Cancel'; - } + // if($up_details['IsActive'] == 0) + // { + // $daybookarr['Status'] = 'Cancel'; + // } - else - { - $daybookarr['Status'] = 'Approved'; - } + // else + // { + // $daybookarr['Status'] = 'Approved'; + // } - $this->db->where('ID', $daybookarr['ID']); - $this->db->update('T_DayBookMaster', $daybookarr); + // $this->db->where('ID', $daybookarr['ID']); + // $this->db->update('T_DayBookMaster', $daybookarr); - $feearr['ID'] = $up_details['FeesPaymentID']; + //$feearr['ID'] = $up_details['FeesPaymentID']; $feearr['IsActive'] = $up_details['IsActive']; + $feearr['InternalComments'] = $up_details['Reason']; $feearr['UpdatedOn'] = $dateTime; $feearr['UpdatedBy'] = $up_details['branchId']; - $this->db->where('ID', $feearr['ID']); + $this->db->where('ID', $up_details['ID']); $this->db->update('T_Students_Fees_PaidDetails', $feearr); return TRUE; diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index eeab03dc..b00957e5 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -181,7 +181,7 @@ else if(myModel.IsActive == false) mobileNumber: myModel.mobileNumber, receipt: myModel.receipt, ID : myModel.ID, - FID : myModel.FID, + FID : myModel.FeesID, Date :myModel.Date, Amount :myModel.Amount, Reason : myModel.Reason, diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index f1188339..3011c297 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -491,11 +491,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(14); - doc.text(140,50,$scope.universityNamePDF); + doc.setFontType("bold"); + doc.text(130,50,$scope.universityNamePDF); doc.setFontSize(10); - doc.text(140,75,$scope.universityAddressPDF); + doc.text(130,70,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(140,100,$scope.universityEmailPDF); + doc.text(130,90,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -722,11 +723,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(14); - doc.text(140,50,$scope.universityNamePDF); + doc.setFontType("bold"); + doc.text(130,50,$scope.universityNamePDF); doc.setFontSize(10); - doc.text(140,75,$scope.universityAddressPDF); + doc.text(130,70,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(140,100,$scope.universityEmailPDF); + doc.text(130,90,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -907,11 +909,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(14); - doc.text(140,50,$scope.universityNamePDF); + doc.setFontType("bold"); + doc.text(130,50,$scope.universityNamePDF); doc.setFontSize(10); - doc.text(140,75,$scope.universityAddressPDF); + doc.text(130,70,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(140,100,$scope.universityEmailPDF); + doc.text(130,90,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -1020,4 +1023,38 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun $modalInstance.dismiss('cancel'); }; + $scope.generatePDF = function(){ + var innerContents = document.getElementById("university_header").innerHTML; + + var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); + popupWinindow.document.open(); + popupWinindow.document.write(''); + popupWinindow.document.write(''); + popupWinindow.document.write(innerContents); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + //popupWinindow.document.write(innerContents); + popupWinindow.document.write(''); + popupWinindow.document.close(); + popupWinindow.focus(); + popupWinindow.print(); + popupWinindow.close(); + + + + + + + + + + } + + + }]); \ No newline at end of file diff --git a/Apollo/assets/views/data_correction.html b/Apollo/assets/views/data_correction.html index 5e6673b6..d1064439 100644 --- a/Apollo/assets/views/data_correction.html +++ b/Apollo/assets/views/data_correction.html @@ -135,12 +135,10 @@ - - + - - + @@ -148,13 +146,11 @@ - + + + - - - - - + diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html index 49c3874c..f8c28d90 100644 --- a/Apollo/assets/views/edit_daybookentries.html +++ b/Apollo/assets/views/edit_daybookentries.html @@ -11,19 +11,10 @@
- +
-
- - -
- - +
- @@ -54,7 +45,7 @@ - @@ -67,7 +58,7 @@ Amount - +
diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 51e3850e..ea520e26 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -1,6 +1,6 @@ @@ -9,49 +9,58 @@
- + +
-
TypeReceipt NoBill Number Paid To / Received From DateSemVoucher Number / Bill NumberReceipt No Amount Action
{{p.ListName}}{{p.BillNO}}{{p.Firstname}}{{p.BillDate}} {{p.ReceiptNo}}{{p.PaidTo}}{{p.Date}}{{p.FeePaymentDetails}}{{p.VoucherNumber}}{{p.Amount}}{{p.BillAmount}}
+ +
- - - - - - - + + + + + +
{{universityNamePDF}}
{{universityEmailPDF}}
{{universityAddressPDF}}
 + + + + + + + + + + + + +
{{universityNamePDF}}
{{universityEmailPDF}}
{{universityAddressPDF}}
+
- -
- +
- + - - - - -
ADMIT CARD : {{courseNamePDF}} EXAMINATION {{batchNamePDF}}
NAN
Enrollment No :   {{studentObj.EnrollmentID}}         Student Name  :  {{studentObj.Firstname}} {{studentObj.Lastname}}
Center Name    :    {{centerNamePDF}}		Enrollment No :   {{studentObj.EnrollmentID}}         Student Name  :  {{studentObj.Firstname}} {{studentObj.Lastname}}

Center Name    :    {{centerNamePDF}}
-
+ + - +
@@ -71,7 +80,7 @@ -
+
@@ -88,7 +97,7 @@ -
+
@@ -105,7 +114,7 @@ -
+
@@ -122,7 +131,7 @@ -
+
@@ -142,7 +151,7 @@ -
+
@@ -155,8 +164,8 @@ -
- + + diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 3e4d2679..9909bfd4 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1178,7 +1178,7 @@ -
  • +
  • DATA CORRECTION diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index bc77dd75..2e4562f4 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -413,7 +413,7 @@ - + diff --git a/Apollo/images/student/Dri_N4oys5EwM0jF.jpeg b/Apollo/images/student/Dri_N4oys5EwM0jF.jpeg new file mode 100644 index 00000000..600b2565 Binary files /dev/null and b/Apollo/images/student/Dri_N4oys5EwM0jF.jpeg differ diff --git a/Apollo/images/university/Dri_S3fkhY1VmHa6.jpeg b/Apollo/images/university/Dri_Qc8vzfu9W3qk.jpeg similarity index 100% rename from Apollo/images/university/Dri_S3fkhY1VmHa6.jpeg rename to Apollo/images/university/Dri_Qc8vzfu9W3qk.jpeg