diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 99886843..e3798594 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -608,7 +608,7 @@ echo ""; $this->load->model('employeedetails_model'); $EmpId = $this->input->post('employeeid'); - $PictureName = $this->input->post('Image'); + $PictureName = $this->input->post('photo'); if ($PictureName != '') { diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index 869d0889..e42bd83b 100755 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -126,7 +126,7 @@ $(function() {
'Select Department'); + $options = array("0"=>'Select Department'); //print_r( $options); if(!empty($Department)) @@ -714,6 +714,12 @@ function CountRows() { $('#addPop').click(function () { if ($('#distriList option:selected').val() != null) { + if($('#distriList option:selected').val()==0 ){ + alert('please select Department'); + } + else + { + var tempSelect = $('#distriList option:selected').val(); var tempText = $('#distriList option:selected').text(); @@ -743,6 +749,7 @@ function CountRows() { tempSelect = ''; tempText = ''; Selectedval = ''; + } } else { alert("Before add please select any position."); } @@ -750,6 +757,12 @@ function CountRows() { $('#removePop').click(function () { if ($('#selectDistriList option:selected').val() != null) { + if($('#selectDistriList option:selected').val() == 0){ + //alert('cannot removed'); + } + else + { + Selectedval =''; $('#txtSelectedDepartment').val(Selectedval); @@ -761,7 +774,9 @@ function CountRows() { $("#distriList").val(tempSelect); tempSelect = ''; - } else { + } + } + else { alert("Before remove please select any position."); } }); diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index 68ed4a48..643a0e1b 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -315,13 +315,13 @@ function Validate() //corrected $(document).ready(function(){ - $("#MaterialType").select2(); +// $("#MaterialType").select2(); - $("#MaterialCategory").select2(); - $("#UOM").select2(); - $("#Assetcode").select2(); - $("#Costcenter").select2(); - $("#conversionfactorUOM").select2(); + // $("#MaterialCategory").select2(); + // $("#UOM").select2(); + // $("#Assetcode").select2(); + // $("#Costcenter").select2(); + // $("#conversionfactorUOM").select2(); }); diff --git a/application/views/addasset.php b/application/views/addasset.php index 4b751820..1c5b71cf 100755 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -10,9 +10,9 @@ $(function() { var mindt = year-70; var maxdt = year-15; - $("#PONO").select2(); - $("#SelectMaterialCode").select2(); - $("#AssetStatus").select2(); + // $("#PONO").select2(); + // $("#SelectMaterialCode").select2(); + //$("#AssetStatus").select2(); $("#DateOfCommission").datepicker({ minDate : new Date(year-SIAStartYear,1,1), diff --git a/application/views/addemployee.php b/application/views/addemployee.php index 03111444..3c5fec39 100755 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -1,11 +1,11 @@