From 858baee9a4daa420e508c5574a0e40272309be53 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 14 Aug 2017 14:51:49 +0530 Subject: [PATCH] date format for employee,supplier and asset screen --- application/controllers/assetdetails.php | 18 +- application/controllers/employeedetails.php | 98 +++++----- application/controllers/supplier.php | 191 +++++++++++-------- application/models/employeedetails_model.php | 4 +- application/models/supplier_model.php | 6 +- application/views/addasset.php | 26 ++- application/views/addemployee.php | 50 +++-- application/views/addsupplier.php | 41 +--- application/views/assetListing.php | 4 +- application/views/editEmployee.php | 45 +++-- application/views/editOldasset.php | 34 +++- application/views/editSupplier.php | 46 ++--- 12 files changed, 295 insertions(+), 268 deletions(-) diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 7dfd3700..f2fe04c1 100755 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -408,29 +408,18 @@ class assetdetails extends BaseController array('horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,) ); - $this->excel->getActiveSheet()->setTitle('Asset Details'); - - - - - - - - - - + $this->excel->getActiveSheet()->setTitle('Asset Details'); $this->excel->getActiveSheet()->setCellValue('G3', 'SIDDHARTH INDUSTRIES Asset Details'); $this->excel->getActiveSheet()->setCellValue('C5', 'AssetCode'); $this->excel->getActiveSheet()->setCellValue('D5', 'AssetName'); - $this->excel->getActiveSheet()->setCellValue('E5', 'Description'); + $this->excel->getActiveSheet()->setCellValue('E5', 'AssetDescription'); $this->excel->getActiveSheet()->setCellValue('F5', 'DepartmentName'); $this->excel->getActiveSheet()->setCellValue('G5', 'Location'); $this->excel->getActiveSheet()->setCellValue('H5', 'PONO'); $this->excel->getActiveSheet()->setCellValue('I5', 'POLineItem'); $this->excel->getActiveSheet()->setCellValue('J5', 'MaterialName'); $this->excel->getActiveSheet()->setCellValue('K5', 'Quanity'); - $this->excel->getActiveSheet()->setCellValue('L5', 'UserName'); $this->excel->getActiveSheet()->setCellValue('M5', 'SupplierName'); $this->excel->getActiveSheet()->setCellValue('N5', 'DateOfPurchase'); @@ -442,9 +431,6 @@ class assetdetails extends BaseController $this->excel->getActiveSheet()->setCellValue('T5', 'CreatedBy'); $this->excel->getActiveSheet()->setCellValue('U5', 'UpdatedBy'); - - - $this->excel->getActiveSheet()->getStyle('G3')->getFont()->setSize(14); $this->excel->getActiveSheet()->getStyle('G3')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12); diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 7f877fdd..08801e4c 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -179,7 +179,7 @@ class employeedetails extends BaseController /* To Check the Pan Number is exists in the database or not */ function Aadhar_validate() { - alert('validation aadhar validation'); + $AadharNo = $this->input->post('aadharno'); $this->load->model('employeedetails_model'); $query = $this->employeedetails_model->checkAadharExists($AadharNo); @@ -707,8 +707,8 @@ echo ""; $this->excel->getActiveSheet()->setCellValue('L3', 'SIDDHARTH INDUSTRIES Employee Details'); $this->excel->getActiveSheet()->setCellValue('A5', 'EmpID'); $this->excel->getActiveSheet()->setCellValue('B5', 'FirstName-LastName'); - $this->excel->getActiveSheet()->setCellValue('c5', 'FatherName'); - $this->excel->getActiveSheet()->setCellValue('d5', 'Gender'); + $this->excel->getActiveSheet()->setCellValue('C5', 'FatherName'); + $this->excel->getActiveSheet()->setCellValue('D5', 'Gender'); $this->excel->getActiveSheet()->setCellValue('E5', 'Date of Birth'); $this->excel->getActiveSheet()->setCellValue('F5', 'ContactNumber'); $this->excel->getActiveSheet()->setCellValue('G5', 'EmailId'); @@ -724,28 +724,28 @@ echo ""; $this->excel->getActiveSheet()->setCellValue('Q5', 'EmergencyContactNumber'); $this->excel->getActiveSheet()->setCellValue('R5', 'Edu_Qualification'); $this->excel->getActiveSheet()->setCellValue('S5', 'Additional_Qualification'); - $this->excel->getActiveSheet()->setCellValue('T5', 'AadharNo'); - $this->excel->getActiveSheet()->setCellValue('U5', 'PANNo'); + $this->excel->getActiveSheet()->setCellValue('T5', 'Reference_Name'); + $this->excel->getActiveSheet()->setCellValue('U5', 'Reference_ContactNumber'); $this->excel->getActiveSheet()->setCellValue('V5', 'BankStatemant'); - $this->excel->getActiveSheet()->setCellValue('W5', 'PassportNo'); - $this->excel->getActiveSheet()->setCellValue('X5', 'Passport_Valid_till'); - $this->excel->getActiveSheet()->setCellValue('Y5', 'IsActive'); - $this->excel->getActiveSheet()->setCellValue('Z5', 'Reference_Name'); - $this->excel->getActiveSheet()->setCellValue('AA5', 'Reference_ContactNumber'); - $this->excel->getActiveSheet()->setCellValue('AB5', 'PFNO'); - $this->excel->getActiveSheet()->setCellValue('AC5', 'ESI'); - $this->excel->getActiveSheet()->setCellValue('AD5', 'UANO'); - $this->excel->getActiveSheet()->setCellValue('AE5', 'Remarks'); - $this->excel->getActiveSheet()->setCellValue('AF5', 'Reference_Name'); - $this->excel->getActiveSheet()->setCellValue('AG5', 'Reference_Name'); - $this->excel->getActiveSheet()->setCellValue('AH5', 'CreatedBy'); - $this->excel->getActiveSheet()->setCellValue('AI5', 'UpdatedBY'); - $this->excel->getActiveSheet()->setCellValue('AJ5', 'PF_Balance'); - $this->excel->getActiveSheet()->setCellValue('AK5', 'PF_Bal_On'); - $this->excel->getActiveSheet()->setCellValue('AL5', 'Official Email ID'); - $this->excel->getActiveSheet()->setCellValue('AM5', 'Driving License'); - $this->excel->getActiveSheet()->setCellValue('AN5', 'Driving License Expiry Date'); - $this->excel->getActiveSheet()->setCellValue('AO5', 'Voter ID'); + $this->excel->getActiveSheet()->setCellValue('W5', 'AadharNo'); + $this->excel->getActiveSheet()->setCellValue('X5', 'PANNo'); + $this->excel->getActiveSheet()->setCellValue('Y5', 'PassportNo'); + $this->excel->getActiveSheet()->setCellValue('Z5', 'Passport_Valid_till'); + $this->excel->getActiveSheet()->setCellValue('AA5', 'Voter ID'); + $this->excel->getActiveSheet()->setCellValue('AB5', 'Driving License'); + $this->excel->getActiveSheet()->setCellValue('AC5', 'Driving License Expiry Date'); + $this->excel->getActiveSheet()->setCellValue('AD5', 'Official Email ID'); + $this->excel->getActiveSheet()->setCellValue('AE5', 'IsActive'); + $this->excel->getActiveSheet()->setCellValue('AF5', 'PFNO'); + $this->excel->getActiveSheet()->setCellValue('AG5', 'ESI'); + $this->excel->getActiveSheet()->setCellValue('AH5', 'UANO'); + $this->excel->getActiveSheet()->setCellValue('AI5', 'PF_Balance'); + $this->excel->getActiveSheet()->setCellValue('AJ5', 'PF_Bal_On'); + $this->excel->getActiveSheet()->setCellValue('AK5', 'Remarks'); + $this->excel->getActiveSheet()->setCellValue('AL5', 'CreatedBy'); + $this->excel->getActiveSheet()->setCellValue('AM5', 'UpdatedBY'); + + @@ -837,10 +837,6 @@ echo ""; $this->excel->getActiveSheet()->getStyle('AL5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('AM5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AM5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AN5')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('AN5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AO5')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('AO5')->getFont()->setBold(true); @@ -858,7 +854,7 @@ echo ""; $this->excel->getActiveSheet()->setCellValue('B'. $i,$data['FirstName'].'-'.$data['LastName']); $this->excel->getActiveSheet()->setCellValue('C'. $i,$data['FatherName']); $this->excel->getActiveSheet()->setCellValue('D'. $i,$data['Gender']); - $this->excel->getActiveSheet()->setCellValue('E'. $i,$data['DateofBirth']); + $this->excel->getActiveSheet()->setCellValue('E'. $i,$data['DateofBirth'],PHPExcel_Cell_DataType::TYPE_STRING); $this->excel->getActiveSheet()->setCellValue('F'. $i,$data['ContactNumber']); $this->excel->getActiveSheet()->setCellValue('G'. $i,$data['EmailId']); $this->excel->getActiveSheet()->setCellValue('H'. $i,$data['BloodGroup']); @@ -873,28 +869,30 @@ echo ""; $this->excel->getActiveSheet()->setCellValue('Q'. $i,$data['EmergencyContactNumber']); $this->excel->getActiveSheet()->setCellValue('R'. $i,$data['Edu_Qualification']); $this->excel->getActiveSheet()->setCellValue('S'. $i,$data['Additional_Qualification']); - $this->excel->getActiveSheet()->setCellValue('T'. $i,$data['AadharNo']); - $this->excel->getActiveSheet()->setCellValue('U'. $i,$data['PANNo']); + $this->excel->getActiveSheet()->setCellValue('T'. $i,$data['Reference_Name']); + $this->excel->getActiveSheet()->setCellValue('U'. $i,$data['Reference_ContactNumber']); $this->excel->getActiveSheet()->setCellValue('V'. $i,$data['BankAccountNo'].'-'.$data['IFSCCode'].'-'.$data['BankBranchName'].$data['BankAddress']); - $this->excel->getActiveSheet()->setCellValue('W'. $i,$data['PassportNo']); - $this->excel->getActiveSheet()->setCellValue('X'. $i,$data['Passport_Valid_till']); - $this->excel->getActiveSheet()->setCellValue('Y'. $i,$data['IsActive']); - $this->excel->getActiveSheet()->setCellValue('Z'. $i,$data['Reference_Name']); - $this->excel->getActiveSheet()->setCellValue('AA'. $i,$data['Reference_ContactNumber']); - $this->excel->getActiveSheet()->setCellValue('AB'. $i,$data['PFNO']); - $this->excel->getActiveSheet()->setCellValue('AC'. $i,$data['ESI']); - $this->excel->getActiveSheet()->setCellValue('AD'. $i,$data['UANO']); - $this->excel->getActiveSheet()->setCellValue('AE'. $i,$data['Remarks']); - $this->excel->getActiveSheet()->setCellValue('AF'. $i,$data['Reference_Name']); - $this->excel->getActiveSheet()->setCellValue('AG'. $i,$data['Reference_Name']); - $this->excel->getActiveSheet()->setCellValue('AH'. $i,$data['firstname']); - $this->excel->getActiveSheet()->setCellValue('AI'. $i,$data['UpdatedBY']); - $this->excel->getActiveSheet()->setCellValue('AJ'. $i,$data['PF_Balance']); - $this->excel->getActiveSheet()->setCellValue('AK'. $i,$data['PF_Bal_On']); - $this->excel->getActiveSheet()->setCellValue('AL'. $i,$data['personalEmailId']); - $this->excel->getActiveSheet()->setCellValue('AM'. $i,$data['DriverLicense']); - $this->excel->getActiveSheet()->setCellValue('AN'. $i,$data['LicenseValidtill']); - $this->excel->getActiveSheet()->setCellValue('AO'. $i,$data['VoterID']); + $this->excel->getActiveSheet()->setCellValue('W'. $i,$data['AadharNo']); + $this->excel->getActiveSheet()->setCellValue('X'. $i,$data['PANNo']); + $this->excel->getActiveSheet()->setCellValue('Y'. $i,$data['PassportNo']); + $this->excel->getActiveSheet()->setCellValue('Z'. $i,$data['Passport_Valid_till']); + $this->excel->getActiveSheet()->setCellValue('AA'. $i,$data['VoterID']); + $this->excel->getActiveSheet()->setCellValue('AB'. $i,$data['DriverLicense']); + $this->excel->getActiveSheet()->setCellValue('AC'. $i,$data['LicenseValidtill']); + $this->excel->getActiveSheet()->setCellValue('AD'. $i,$data['personalEmailId']); + $this->excel->getActiveSheet()->setCellValue('AE'. $i,$data['IsActive']); + $this->excel->getActiveSheet()->setCellValue('AF'. $i,$data['PFNO']); + $this->excel->getActiveSheet()->setCellValue('AG'. $i,$data['ESI']); + $this->excel->getActiveSheet()->setCellValue('AH'. $i,$data['UANO']); + $this->excel->getActiveSheet()->setCellValue('AI'. $i,$data['PF_Balance']); + $this->excel->getActiveSheet()->setCellValue('AJ'. $i,$data['PF_Bal_On']); + $this->excel->getActiveSheet()->setCellValue('AK'. $i,$data['Remarks']); + $this->excel->getActiveSheet()->setCellValue('AL'. $i,$data['CreatedByName']); + $this->excel->getActiveSheet()->setCellValue('AM'. $i,$data['UpdatedByName']); + + + + diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index da6dd788..d355cf90 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -214,12 +214,15 @@ class supplier extends BaseController $CSTDt = $this->input->post('dateofCST'); - if($CSTDt != '') - { - $CSTDate = $this->getDateformat($CSTDt); + if($CSTDt != '' ){ + if($CSTDt == '30/11/-0001'){ + $CSTDate = null; + } + else{ + $CSTDate = $this->getDateformat($CSTDt); + } } - else - { + else{ $CSTDate = null; } @@ -234,7 +237,7 @@ class supplier extends BaseController $bankaddress = $this->input->post('bankaddress'); $Createdby = $this->session->userdata ( 'userId' ); $date = new DateTime('now', new DateTimeZone('Asia/Kolkata')); - $createddate = $date->format('Y-m-d H:i:s'); + $createddate = $date->format('d-m-Y H:i:s'); $service = $this->input->post('service'); $rawmaterial =$this->input->post('rawmaterial'); $maintenance = $this->input->post('maintanance'); @@ -242,7 +245,6 @@ class supplier extends BaseController $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'Createdby'=>$Createdby,'IsService'=>$service,'IsMaintanance'=>$maintenance,'IsRawMaterial'=>$rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT); - //print_r($supplier);die(); $result = $this->supplier_model->addNewsupplier($supplier); @@ -331,7 +333,7 @@ class supplier extends BaseController if($CSTDt != '') { - $CSTDate = $this->getDateformat($CSTDt); + $CSTDate = $this->getDateformat($CSTDt); } else { @@ -403,78 +405,109 @@ class supplier extends BaseController $this->load->library('excel'); - $this->excel->setActiveSheetIndex(0); + $this->excel->setActiveSheetIndex(0)->mergeCells('J3:R3'); - $this->excel->getActiveSheet()->setTitle('supplier details'); - $this->excel->getActiveSheet()->setCellValue('A1', 'SupplierID'); - $this->excel->getActiveSheet()->setCellValue('B1', 'SupplierName'); - $this->excel->getActiveSheet()->setCellValue('C1', 'Address'); - $this->excel->getActiveSheet()->setCellValue('D1', 'ContactNumber'); - $this->excel->getActiveSheet()->setCellValue('E1', 'AlternateContactNumber'); - $this->excel->getActiveSheet()->setCellValue('F1', 'EmailAddress'); - $this->excel->getActiveSheet()->setCellValue('G1', 'Exiseregistration'); - $this->excel->getActiveSheet()->setCellValue('H1', 'TIN'); - $this->excel->getActiveSheet()->setCellValue('I1', 'PAN'); - $this->excel->getActiveSheet()->setCellValue('J1', 'CSTNO'); - $this->excel->getActiveSheet()->setCellValue('K1', 'CST Date'); - $this->excel->getActiveSheet()->setCellValue('L1', 'GST NO'); - $this->excel->getActiveSheet()->setCellValue('M1', 'GST Range'); - $this->excel->getActiveSheet()->setCellValue('N1', 'Collectrate Address'); - $this->excel->getActiveSheet()->setCellValue('O1', 'UANumber'); - $this->excel->getActiveSheet()->setCellValue('P1', 'PaymentTerms'); - - $this->excel->getActiveSheet()->setCellValue('Q1', 'Createdby'); - $this->excel->getActiveSheet()->setCellValue('R1', 'UpdatedBy'); - $this->excel->getActiveSheet()->setCellValue('S1', 'IsActive'); + $this->excel->getActiveSheet()->setTitle('Supplier details'); + + $this->excel->getActiveSheet()->setCellValue('J3', 'SIDDHARTH INDUSTRIES Supplier Details'); + + $this->excel->getActiveSheet()->setCellValue('A5', 'SupplierID'); + $this->excel->getActiveSheet()->setCellValue('B5', 'SupplierName'); + // $this->execl->getActiveSheet()->setCellValue( '' , ''); + $this->excel->getActiveSheet()->setCellValue('C5', 'Address'); + $this->excel->getActiveSheet()->setCellValue('D5', 'ContactNumber'); + $this->excel->getActiveSheet()->setCellValue('E5', 'AlternateContactNumber'); + $this->excel->getActiveSheet()->setCellValue('F5', 'EmailAddress'); + $this->excel->getActiveSheet()->setCellValue('G5', 'Exiseregistration'); + $this->excel->getActiveSheet()->setCellValue('H5', 'TIN'); + $this->excel->getActiveSheet()->setCellValue('I5', 'PAN'); + $this->excel->getActiveSheet()->setCellValue('J5', 'CSTNO'); + $this->excel->getActiveSheet()->setCellValue('K5', 'CST Date'); + $this->excel->getActiveSheet()->setCellValue('L5', 'GST NO'); + $this->excel->getActiveSheet()->setCellValue('M5', 'GST Range'); + $this->excel->getActiveSheet()->setCellValue('N5', 'Collectrate Address'); + $this->excel->getActiveSheet()->setCellValue('O5', 'UANumber'); + $this->excel->getActiveSheet()->setCellValue('P5','EMS Number'); + $this->excel->getActiveSheet()->setCellValue('Q5','TS Number'); + $this->excel->getActiveSheet()->setCellValue('R5','IMS Number'); + $this->excel->getActiveSheet()->setCellValue('S5','ISO Number'); + $this->excel->getActiveSheet()->setCellValue('T5','OHSAS Number'); + $this->excel->getActiveSheet()->setCellValue('U5', 'BankStatemant'); + $this->excel->getActiveSheet()->setCellValue('V5', 'PaymentTerms'); + $this->excel->getActiveSheet()->setCellValue('W5', 'IsService'); + $this->excel->getActiveSheet()->setCellValue('X5', 'IsMaintanance'); + $this->excel->getActiveSheet()->setCellValue('Y5', 'IsRawMaterial'); + $this->excel->getActiveSheet()->setCellValue('Z5', 'Createdby'); + $this->excel->getActiveSheet()->setCellValue('AA5', 'UpdatedBy'); + $this->excel->getActiveSheet()->setCellValue('AB5', 'IsActive'); - $this->excel->getActiveSheet()->getStyle('A1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('A1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('B1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('B1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('C1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('C1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('D1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('D1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('E1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('E1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('F1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('F1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('G1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('G1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('H1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('H1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('I1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('I1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('J1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('J1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('K1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('K1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('L1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('L1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('M1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('M1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('N1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('N1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('O1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('O1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('P1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('P1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('Q1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('Q1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('R1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('R1')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('S1')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('S1')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('A5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('A5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('B5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('B5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('E5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('E5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('F5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('F5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('G5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('G5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('H5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('H5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('I5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('I5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('J5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('J5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('K5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('K5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('L5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('L5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('M5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('M5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('N5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('N5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('R5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('R5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('S5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('S5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('T5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('T5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('U5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('U5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('V5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('V5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('W5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('W5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('X5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('X5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('Y5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Y5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('Z5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Z5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('AA5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AA5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('AB5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AB5')->getFont()->setBold(true); + $exportData = $this->supplier_model->export_excel(); if ($exportData) { - $i = 2; + $i = 6; $s = 1; foreach ($exportData as $data) { @@ -493,18 +526,26 @@ class supplier extends BaseController $this->excel->getActiveSheet()->setCellValue('M' . $i,$data['GSTRange']); $this->excel->getActiveSheet()->setCellValue('N' . $i,$data['CollectrateAddress']); $this->excel->getActiveSheet()->setCellValue('O' . $i,$data['UANumber']); - $this->excel->getActiveSheet()->setCellValue('P' . $i,$data['PaymentTerms']); - - $this->excel->getActiveSheet()->setCellValue('Q' . $i,$data['firstname']); - $this->excel->getActiveSheet()->setCellValue('R' . $i,$data['Update_by']); - $this->excel->getActiveSheet()->setCellValue('S' . $i,$data['IsActive']); + $this->excel->getActiveSheet()->setCellValue('P' . $i,$data['Cert_EMS']); + $this->excel->getActiveSheet()->setCellValue('Q' . $i,$data['Cert_TS']); + $this->excel->getActiveSheet()->setCellValue('R' . $i,$data['Cert_IMS']); + $this->excel->getActiveSheet()->setCellValue('S' . $i,$data['Cert_ISO']); + $this->excel->getActiveSheet()->setCellValue('T' . $i,$data['Cert_OSHAS']); + $this->excel->getActiveSheet()->setCellValue('U' . $i,$data['BankAcNumber'].'-'.$data['IFSCCode'].'-'.$data['BranchName'].$data['BankAddress']); + $this->excel->getActiveSheet()->setCellValue('V' . $i,$data['PaymentTerms']); + $this->excel->getActiveSheet()->setCellValue('W' . $i,$data['IsService']); + $this->excel->getActiveSheet()->setCellValue('X' . $i,$data['IsMaintanance']); + $this->excel->getActiveSheet()->setCellValue('Y' . $i,$data['IsRawMaterial']); + $this->excel->getActiveSheet()->setCellValue('Z' . $i,$data['firstname']); + $this->excel->getActiveSheet()->setCellValue('AA' . $i,$data['Update_by']); + $this->excel->getActiveSheet()->setCellValue('AB' . $i,$data['IsActive']); $i++; $s++; } } - $filename = 'supplierdetails' .' '. '.xls'; //save our workbook as this file name + $filename = 'Supplierdetails' .' '. '.xls'; //save our workbook as this file name header('Content-Type: application/vnd.ms-excel'); //mime type header('Content-Disposition: attachment;filename="' . $filename . '"'); //tell browser what's the file name header('Cache-Control: max-age=0'); //no cache diff --git a/application/models/employeedetails_model.php b/application/models/employeedetails_model.php index a9c3148a..6e8cc20d 100755 --- a/application/models/employeedetails_model.php +++ b/application/models/employeedetails_model.php @@ -191,8 +191,8 @@ function getEmployeeCount( ) function export_excel(){ - $this->db->select(' det.*,Dep.DepartmentName as DepartmentName,det.firstname,emp1.firstname as UpdatedBy'); - $this->db->join('T_DepartmentDetails Dep', 'det.Departmentcode = Dep.DEPCode','left'); + $this->db->select(' det.*,Dep.DepartmentName as DepartmentName,det.firstname,emp1.firstname as UpdatedByName,emp1.firstname as CreatedByName'); + $this->db->join('T_DepartmentDetails Dep', 'det.Departmentcode = Dep.DEPCode','left'); $this->db->join('tbl_users as tbl',' det.createdby = tbl.userid','left'); $this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid','left'); $this->db->join('tbl_users as tbl1',' det.UpdatedBy = tbl1.userid','left'); diff --git a/application/models/supplier_model.php b/application/models/supplier_model.php index ae74d492..1c57e8c3 100755 --- a/application/models/supplier_model.php +++ b/application/models/supplier_model.php @@ -12,7 +12,7 @@ class supplier_model extends CI_Model */ function supplierListing() { - $this->db->select('BaseT.SupplierID, BaseT.SupplierName, BaseT.Address, BaseT.ContactNumber, BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration, BaseT.TIN, BaseT.PAN,,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.CreatedOn,BaseT.PaymentID,pmt.PaymentTerms');//,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT,pmt.Details'); + $this->db->select('BaseT.SupplierID, BaseT.SupplierName, BaseT.Address, BaseT.ContactNumber, BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration, BaseT.TIN, BaseT.PAN,,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.CreatedOn,BaseT.PaymentID,pmt.PaymentTerms,BaseT.CSTDate');//,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT,pmt.Details'); $this->db->from('T_SupplierDetailsN as BaseT'); $this->db->join('T_PaymentTerms as pmt', 'pmt.PaymentID = BaseT.PaymentID','left'); @@ -166,7 +166,9 @@ function addNewsupplier($supplier) function export_excel(){ $this->db->select('det.SupplierID,SupplierName,det.Address,det.ContactNumber,det.AlternateContactNumber,det.EmailAddress,det.Exiseregistration,det.TIN, - det.PAN,det.CSTNO,det.CSTDate,det.GSTNO,det.GSTRange,det.CollectrateAddress,det.UANumber,pmt.PaymentTerms,emp.firstname ,emp1.firstname as Update_by,,det.IsActive'); + det.PAN,det.CSTNO,det.CSTDate,det.GSTNO,det.GSTRange,det.CollectrateAddress,det.UANumber,pmt.PaymentTerms,emp.firstname ,emp1.firstname as Update_by,det.IsActive, + det.Cert_EMS,det.Cert_TS,det.Cert_OSHAS,det.Cert_ISO,det.Cert_IMS,det.BankAcNumber,det.IFSCCode,det.BranchName,det.BankAddress, + det.IsService,det.IsMaintanance,det.IsRawMaterial'); $this->db->join('tbl_users as tbl',' det.createdby = tbl.userid','left'); $this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid','left'); $this->db->join('tbl_users as tbl1',' det.UpdatedBy = tbl1.userid','left'); diff --git a/application/views/addasset.php b/application/views/addasset.php index 85590949..553f2884 100755 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -17,7 +17,7 @@ $(function() { $("#DateOfCommission").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true, @@ -25,7 +25,7 @@ $(function() { $("#DateOfPurchase").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true, @@ -410,10 +410,24 @@ $(function() { $('#DateOfPurchase').val(item.PODate); - if(item.DeliveryDate != null) + if(item.DeliveryDate != null ) { - $('#DeliveryDate').val(item.DeliveryDate); + var date = new Date(item.DeliveryDate); + var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); + if(item.DeliveryDate == '0000-00-00' || item.DeliveryDate == '30-11--0001') + { + $('#DeliveryDate').val(''); + } + else + { + //alert(item.DeliveryDate+ ',' + date1); + $("#DeliveryDate").val(date1); + } + + //var correctDate = [DDate.getDate(),DDate.getMonth()+1,DDate.getFullYear()].join("/"); + //alert(correctDate); + } else { @@ -431,10 +445,6 @@ $(function() { //alert(item.TotalValue); $('#Assetvalue').val(item.TotalValue); - var date = new Date(item.DeliveryDate); - - var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); - //$("#DeliveryDate").val(date1); var date = new Date(item.PODate); var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); $("#DateOfPurchase").val(date3); diff --git a/application/views/addemployee.php b/application/views/addemployee.php index 1e139720..a0c76bef 100755 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -239,19 +239,35 @@ function validateDriverLicense() { } function getAge() { - - var dateString = $("#DateofBirth").val(); - - var today = new Date(); - var birthDate = new Date(dateString); - - var age = today.getFullYear() - birthDate.getFullYear(); - var m = today.getMonth() - birthDate.getMonth(); - if (m < 0 || (m === 0 && today.getDate() < birthDate.getDate())) { - age--; - } - $("#age").val(age); - + + var dateString = $("#DateofBirth").val(); + + var today = new Date(); + + var dd = today.getDate(); + var mm = today.getMonth()+1; + var yyyy = today.getFullYear(); + + if(dd<10){ + dd='0'+dd; + } + if(mm<10){ + mm='0'+mm; + } + + var today = dd+'/'+mm+'/'+yyyy; + + var ageyear = yyyy - dateString.split("/")[2]; + var agemonth = mm - dateString.split("/")[1]; + var agedate = dateString.split("/")[0]; + + if (agemonth < 0 || (agemonth == 0 && dd < agedate )) { + ageyear--; + + } + +$("#age").val(ageyear); + } $(function() { @@ -267,22 +283,22 @@ $(function() { $("#DateofBirth").datepicker({ minDate : new Date(mindt,1,1), maxDate : new Date(maxdt,1,1), - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#dateofjoining").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true, }); - $("#ValidTill").datepicker({dateFormat: 'mm/dd/yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-0:+100' + $("#ValidTill").datepicker({dateFormat: 'dd/mm/yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-0:+100' }); $("#LicenseExpiryDate").datepicker({ - dateFormat: 'mm/dd/yy', + dateFormat: 'dd/mm/yy', minDate :'now', changeMonth: true, changeYear: true, diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 3c26a099..6371bc9b 100755 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -196,35 +196,6 @@ function getValidAlternateNumber() { return false; } } - -// function getContactNumberValidation() { -// var contactNumber = $('#ContactNumber').val().length; -// if(contactNumber < 10) -// { -// alert('Please Enter valid Contact Number'); -// return false; -// } -// else -// { -// return true; -// } -// } -// function getValidAlternateNumber() -// { -// var contactNumber = $('#AlternateContactNumber').val().length; -// if(!empty($('#AlternateContactNumber').val())) -// { -// if(contactNumber < 10) -// { -// alert('Please Enter valid Alternate Contact Number'); -// return false; -// } -// else -// { -// return true; -// } -// } -// } function validateEmail() { var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; @@ -284,18 +255,12 @@ $(function() { $("#dateofCST").datepicker({ minDate : new Date(mindt,1,1), maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); }); -//$("#dateofCST").datepicker({ - //minDate : new Date(year-30,1,1), - // maxDate :'now', - // dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' - -//}); $(document).ready(function(){ $("#Payment").select2(); @@ -512,9 +477,9 @@ $(function() { } } ?> + - @@ -619,7 +584,7 @@ if(!validateGST()) $('#GSTNo').focus(); return false; } -} + if(!validateEmail()) { $('#emailid').focus(); diff --git a/application/views/assetListing.php b/application/views/assetListing.php index b64b249c..f44277e3 100755 --- a/application/views/assetListing.php +++ b/application/views/assetListing.php @@ -23,7 +23,7 @@ Asset Code Asset Name - Description + Asset Description Department Name Location Asset User @@ -52,7 +52,7 @@ SupplierName ?> DateOfPurchase); - $DOPurchase = $dtpurchase ->format('Y-m-d'); + $DOPurchase = $dtpurchase ->format('d/m/Y'); echo $DOPurchase ?> AssetValue, 2); ?> AssetStatus ?> diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php index 81828362..a72e10ef 100755 --- a/application/views/editEmployee.php +++ b/application/views/editEmployee.php @@ -55,7 +55,7 @@ if(!empty($EmpDetails)) $from = new DateTime($DateofBirth); $to = new DateTime('today'); $Age = $from->diff($to)->y; - $DOB = $from ->format('Y-m-d'); + $DOB = $from ->format('d/m/Y'); $ContactNumber = $Emp->ContactNumber; $EmailId = $Emp->EmailId; //$comEmailId = $Emp->comEmailId; @@ -63,7 +63,7 @@ if(!empty($EmpDetails)) $MartialStatus =$Emp->MartialStatus; $DateofJoining = $Emp->DateofJoining; $dtDOJ = new DateTime($DateofJoining); - $DOJ = $dtDOJ ->format('Y-m-d'); + $DOJ = $dtDOJ ->format('d/m/Y'); $PreviousYearsOfExp = $Emp->PreviousYearsOfExp; $Designation = $Emp->Designation; $Departmentcode = $Emp->Departmentcode; @@ -85,7 +85,7 @@ if(!empty($EmpDetails)) if($Passport_Valid_till != '') { $dtpassport = new DateTime($Passport_Valid_till); - $DOPassport = $dtpassport ->format('Y-m-d'); + $DOPassport = $dtpassport ->format('d/m/Y'); } $isactive = $Emp->IsActive; //print_r($isactive); @@ -101,7 +101,7 @@ if(!empty($EmpDetails)) if($Emp->LicenseValidtill != '') { $License = new DateTime($Emp->LicenseValidtill); - $LicenseValidtill = $License ->format('Y-m-d'); + $LicenseValidtill = $License ->format('d/m/Y'); } //$chk = $uf->IsActive; if($isactive == 1) @@ -434,19 +434,34 @@ function validatecomEmail() { } function getAge() { - var dateString = $("#DateofBirth").val(); - - var today = new Date(); - var birthDate = new Date(dateString); + var dateString = $("#DateofBirth").val(); + var today = new Date(); + + var dd = today.getDate(); + var mm = today.getMonth()+1; + var yyyy = today.getFullYear(); + + if(dd<10){ + dd='0'+dd; + } + if(mm<10){ + mm='0'+mm; + } + + var today = dd+'/'+mm+'/'+yyyy; + + var ageyear = yyyy - dateString.split("/")[2]; + var agemonth = mm - dateString.split("/")[1]; + var agedate = dateString.split("/")[0]; + + if (agemonth < 0 || (agemonth == 0 && dd < agedate )) { + ageyear--; + + } + +$("#age").val(ageyear); - var age = today.getFullYear() - birthDate.getFullYear(); - var m = today.getMonth() - birthDate.getMonth(); - if (m < 0 || (m === 0 && today.getDate() < birthDate.getDate())) { - age--; - } - $("#age").val(age); - } $(function() { diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php index 9cc8424d..a0c34716 100755 --- a/application/views/editOldasset.php +++ b/application/views/editOldasset.php @@ -39,11 +39,11 @@ if(!empty($assetList)) $SupplierCode = $Asset->SupplierCode; $DateOfPurchase = $Asset->DateOfPurchase;//print_r($Asset->DateOfPurchase); $PODate = new DateTime($DateOfPurchase); - $DateOfPurchase = $PODate->format('Y-m-d'); + $DateOfPurchase = $PODate->format('d/m/Y'); //print_r($Asset->DateOfCommison); //$assetDate = new DateTime($DateOfCommison); $DateOfCommission= new DateTime($Asset->DateOfCommison, new DateTimeZone('Asia/Kolkata')); - $DateOfCommison = $DateOfCommission->format('Y-m-d'); + $DateOfCommison = $DateOfCommission->format('d/m/Y'); $AssetValue = $Asset->AssetValue; $AssetStatus = $Asset->AssetStatus; $MaterialCode = $Asset->MaterialCode; @@ -54,7 +54,7 @@ if(!empty($assetList)) $UOM = $Asset->UOM; $DDate = new DateTime($Asset->DeliveryDate, new DateTimeZone('Asia/Kolkata')); //$PODelivery = new DateTime($DeliveryDate);//print_r($Asset->DeliveryDate); - $DeliveryDate = $DDate ->format('Y-m-d'); + $DeliveryDate = $DDate ->format('d/m/Y'); //print_r($DateOfPurchase);print_r($DateOfCommison);print_r($DeliveryDate); $Remarks = $Asset->Remarks; $chk = $Asset->IsActive; @@ -71,7 +71,7 @@ if(!empty($assetList)) if($DateOfPurchase != '') { $dtpurchase = new DateTime($DateOfPurchase); - $DOPurchase = $dtpurchase ->format('Y-m-d'); + $DOPurchase = $dtpurchase ->format('d/m/Y'); } // if($DateOfCommission != '') // { @@ -102,7 +102,7 @@ $(function() { $("#DateOfCommission").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, + dateFormat: 'dd/mm//yy',changeMonth: true, changeYear: true, @@ -110,7 +110,7 @@ $(function() { $("#DateOfPurchase").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true, @@ -482,10 +482,24 @@ $(function() { if(id == item.LineItemNo){ $('#DateOfPurchase').val(item.PODate); - if(item.DeliveryDate != null) + if(item.DeliveryDate != null ) { - $('#DeliveryDate').val(item.DeliveryDate); + var date = new Date(item.DeliveryDate); + var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); + if(item.DeliveryDate == '0000-00-00' || item.DeliveryDate == '30-11--0001') + { + $('#DeliveryDate').val(''); + } + else + { + //alert(item.DeliveryDate+ ',' + date1); + $("#DeliveryDate").val(date1); + } + + //var correctDate = [DDate.getDate(),DDate.getMonth()+1,DDate.getFullYear()].join("/"); + //alert(correctDate); + } else { @@ -504,9 +518,9 @@ $(function() { $('#Assetvalue').val(item.TotalValue); - var date = new Date(item.DeliveryDate); + //var date = new Date(item.DeliveryDate); - var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); + // var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); var date = new Date(item.PODate); var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php index c5c467be..bf6574d8 100755 --- a/application/views/editSupplier.php +++ b/application/views/editSupplier.php @@ -57,10 +57,17 @@ if(!empty($supplier)) if($CSTDt != '') { - $dtCST = new DateTime($CSTDt); - $CSTDate = $dtCST ->format('Y-m-d'); - + if ($CSTDt == "0000-00-00 00:00:00" ) + { + $CSTDate = ""; + } + else + { + $dtCST = new DateTime($CSTDt); + $CSTDate = $dtCST ->format('d/m/Y'); + } } + $chk = $uf->IsActive; if($chk == 1) @@ -276,34 +283,6 @@ function getContactNumberValidation(){ } } -// function getContactNumberValidation() { -// var contactNumber = $('#ContactNumber').val().length; -// if(contactNumber < 10) -// { -// alert('Please Enter valid Contact Number'); -// return false; -// } -// else -// { -// return true; -// } -// } -// function getValidAlternateNumber() -// { -// var contactNumber = $('#AlternateContactNumber').val().length; -// if(!empty($('#AlternateContactNumber').val())) -// { -// if(contactNumber < 10) -// { -// alert('Please Enter valid Alternate Contact Number'); -// return false; -// } -// else -// { -// return true; -// } -// } -// } function validateEmail() { @@ -383,7 +362,7 @@ function onlyAlphabets(evt) { $("#dateofCST").datepicker({ //minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); }); @@ -602,9 +581,10 @@ function onlyAlphabets(evt) { } } ?> + - +