SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI issues Requisition Form

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-23 19:55:24 +05:30
parent 58a8b07925
commit 98d7bc2ce4
8 changed files with 95 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/logs/log-2017-08-23.php Normal file
View File

@ -0,0 +1,33 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
ERROR - 2017-08-23 16:02:01 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/23checkin/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
ERROR - 2017-08-23 16:02:11 --> Severity: Notice --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/23checkin/siddharth_application/application/views/editimportpo.php 2365
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:36 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:03:46 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:10:12 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/23checkin/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:11:41 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/23checkin/siddharth_application/application/views/requisitionlistapproval.php 33
ERROR - 2017-08-23 16:17:18 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/23checkin/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
ERROR - 2017-08-23 16:17:29 --> Severity: Notice --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/23checkin/siddharth_application/application/views/editimportpo.php 2365
ERROR - 2017-08-23 16:18:02 --> Severity: Notice --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/23checkin/siddharth_application/application/views/editimportpo.php 2365
ERROR - 2017-08-23 16:18:22 --> Severity: Notice --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/23checkin/siddharth_application/application/views/editimportpo.php 2365

2
application/views/Report_Material_Master_ItemWise.php
View File

@ -43,7 +43,7 @@ if(!empty($mmi))
<div class="box-body"> <div class="box-body">
<div> <div>
<table class="table table-bordered table-hover" id="cc"> <table class="table table-bordered table-hover" style="font-size: 12px;" id="cc">
<thead> <thead>
<tr> <tr>

2
application/views/Report_costcenter.php
View File

@ -48,7 +48,7 @@ if(!empty($ccrpt))
<div class="input-group input-daterange input"> <div class="input-group input-daterange input">
<div class="input-group-addon"><b>Budget Year:</b></div> <div class="input-group-addon"><b>Budget Year:</b></div>
<select id="mySelect" > <select id="mySelect" >
<option value="" ></option> <option value="" >Select Year</option>
<option value="2017 - 2018">2017 - 2018</option> <option value="2017 - 2018">2017 - 2018</option>
<option value="2018 - 2019">2018 - 2019</option> <option value="2018 - 2019">2018 - 2019</option>
<option value="2019 - 2020">2019 - 2020</option> <option value="2019 - 2020">2019 - 2020</option>

20
application/views/editimportpo.php
View File

@ -109,6 +109,7 @@ $Import_DispatchDetails='';
$Import_PlaceofOrgin=''; $Import_PlaceofOrgin='';
$DeliveryOption=''; $DeliveryOption='';
$Orderedsum=''; $Orderedsum='';
$PaymentTermsCode='';
if(!empty($POMaster)) if(!empty($POMaster))
{ {
@ -146,6 +147,7 @@ if(!empty($POMaster))
$DeliveryOption=$Req->DeliveryOption; $DeliveryOption=$Req->DeliveryOption;
$ServiceDescription=$Req->ServiceDescription; $ServiceDescription=$Req->ServiceDescription;
$Orderedsum=$Req->TotalOrderValue; $Orderedsum=$Req->TotalOrderValue;
$PaymentTermsCode=$Req->PaymentOtherDescription;
} }
} }
//echo $ServiceDescription; //echo $ServiceDescription;
@ -459,7 +461,7 @@ if(!empty($RequistionDetails))
</div> </div>
</div>--> </div>-->
</div> </div>
<div class="col-md-4"> <div class="col-md-4" style="padding: 0px;">
<div class="col-md-12"> <div class="col-md-12">
<b><u>Select Delivery By</u></b><br/> <b><u>Select Delivery By</u></b><br/>
@ -473,7 +475,7 @@ if(!empty($RequistionDetails))
</tr> </tr>
</div> </div>
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/> <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;"">
<label >Schedule By </label> <label >Schedule By </label>
<?php <?php
@ -482,7 +484,7 @@ if(!empty($RequistionDetails))
?> ?>
</div> </div>
<div class="col-md-12" id="Deliverydtdiv"><br/> <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;"">
<label>Dispatch Instruction</label> <label>Dispatch Instruction</label>
<?php <?php
@ -584,7 +586,7 @@ if(!empty($RequistionDetails))
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true'); $data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment',$PaymentTermsCode),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -2766,6 +2768,14 @@ var NilType = '<?php echo NILTYPE;?>';
}; };
var paymentoption=<?php echo json_encode($PaymentTerms,JSON_PRETTY_PRINT)?>;
//alert(paymentoption);
if(paymentoption=='PT08')
{
$('#otheroptiondiv').show();
}
var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>; var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
if(delivery==1) if(delivery==1)
{ {
@ -5298,4 +5308,4 @@ if(validate()&&Budgetcheck())
}); });
</script> </script>

31
application/views/importpo.php
View File

@ -347,7 +347,7 @@ function vaildateBeforeOpenModal()
</div> </div>
</div>--> </div>-->
</div> </div>
<div class="col-md-4"> <div class="col-md-4" style="padding: 0px;">
<div class="col-md-12"> <div class="col-md-12">
<b><u>Select Delivery By</u></b><br/> <b><u>Select Delivery By</u></b><br/>
@ -361,7 +361,7 @@ function vaildateBeforeOpenModal()
</tr> </tr>
</div> </div>
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/> <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;">
<label >Schedule By </label> <label >Schedule By </label>
<?php <?php
@ -370,7 +370,7 @@ function vaildateBeforeOpenModal()
?> ?>
</div> </div>
<div class="col-md-12" id="Deliverydtdiv"><br/> <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;">
<label>Dispatch Instruction</label> <label>Dispatch Instruction</label>
<?php <?php
@ -3908,6 +3908,27 @@ $('#Deliverydt').change(function(){
function Budgetcheck()
{
//alert();
//die();
var totalorderedamount=parseFloat($('#txtToatlOrder').val());
// console.log(totalorderedamount) var Exchange=parseFloat($('#ExchangeRate').val());
//console.log(Exchange);
var totordring=totalorderedamount*Exchange;
var TotalSum=avalbudAmte; if(totordring>TotalSum)
{
alert('You are Exceeding The Budget');
return false;
} else
{
return true;
}}
function Save(status) function Save(status)
{ {
@ -3931,7 +3952,7 @@ var txtDeletedRow = $('#txtDeletedRow').val();
//alert(stat); //alert(stat);
//alert(JSON.stringify(txtStatus)); //alert(JSON.stringify(txtStatus));
//exit(); //exit();
if(validate()) if(validate()&&Budgetcheck())
{ {
if(document.getElementById('ImportTax').rows.length <= 0) if(document.getElementById('ImportTax').rows.length <= 0)
{ {
@ -4020,4 +4041,4 @@ console.log($('#PaymentTerms').val().trim());
}); });
</script> </script>

4
application/views/importpopdf.php
View File

@ -148,7 +148,7 @@
</td> </td>
<td colspan="3" style="text-align: center;"><?php echo $SuplierName?><br /><?php echo $SuplierAddress ?> </td> <td colspan="3" style="text-align: center;"><?php echo $SuplierName?><br /><?php echo $SuplierAddress ?> </td>
<td colspan="1">DELIVERY DATE / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule;?><br /><br /></td> <td colspan="1">DISPATCH INSTRUCTION / SCHEDULE BY: <?php echo $DeliveryDate.$DeliverySchedule;?><br /><br /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -417,4 +417,4 @@
<p>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Material to be delivered to our stores before 3pm &nbsp;</p> <p>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Material to be delivered to our stores before 3pm &nbsp;</p>
<p>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Please refer order number and item code in your challan/invoice&nbsp; &nbsp; &nbsp; &nbsp;</p> <p>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Please refer order number and item code in your challan/invoice&nbsp; &nbsp; &nbsp; &nbsp;</p>
<p>&nbsp;</p> <p>&nbsp;</p>
</div> </div>

2
application/views/poapproval_view.php
View File

@ -369,7 +369,7 @@ $(function () {
"paging": true, "paging": true,
"lengthChange": true, "lengthChange": true,
"searching": true, "searching": true,
"ordering": false, "ordering": true,
"info": true, "info": true,
"autoWidth": true "autoWidth": true

23
application/views/requisitionform.php
View File

@ -16,6 +16,12 @@ if(!empty($Emp))
} }
} }
?> ?>
<style type="text/css">
.select2
{
width: 100% ! important;
}
</style>
<div class="content-wrapper" style="min-height:537px;"> <div class="content-wrapper" style="min-height:537px;">
@ -194,7 +200,7 @@ if(!empty($Emp))
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header" style="background-color: #3c8dbc;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Line Item </h4></center> <center><h4>Add Line Item </h4></center>
</div> </div>
@ -217,7 +223,7 @@ if(!empty($Emp))
endforeach; endforeach;
} }
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"'); echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control select2"');
?> ?>
</div> </div>
@ -256,8 +262,8 @@ if(!empty($Emp))
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-info font addClick" ID="addClick" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a> <a class="btn btn-primary font addClick" ID="addClick" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-info" data-dismiss="modal" value="Cancel">cancel</a> <a class="btn btn-primary" data-dismiss="modal" value="Cancel">cancel</a>
</div> </div>
</div> </div>
@ -270,7 +276,7 @@ if(!empty($Emp))
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header" style="background-color: #3c8dbc;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Edit Line Item </h4></center> <center><h4>Edit Line Item </h4></center>
</div> </div>
@ -319,8 +325,8 @@ if(!empty($Emp))
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-info font EditClick" ID="EditClick" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a> <a class="btn btn-primary font EditClick" ID="EditClick" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -382,6 +388,9 @@ $(function() {
//Initialize Select2 Elements //Initialize Select2 Elements
$(".select2").select2(); $(".select2").select2();
$("#CostCenter").select2();
$("#RequestType").select2();
$("#MaterialCode").select2();
$('#CostCenter').change(function() { $('#CostCenter').change(function() {