SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mrir status display changes done

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-11 16:23:09 +05:30
parent 695459c341
commit 09e6875dd0
6 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/mrir_model.php
View File

@ -77,7 +77,7 @@ function ViewDistributionList()
function view_mrir() function view_mrir()
{ {
$this->db->distinct(); $this->db->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.CreatedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as CreatedByName'); $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.MRIRStatus,ST.StatusName,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.CreatedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as CreatedByName');
$this->db->from ('T_MRIR_Master TMM'); $this->db->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO=TMD.MRIRNO'); $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO=TMD.MRIRNO');
$this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO'); $this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO');
@ -87,6 +87,8 @@ function ViewDistributionList()
$this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID','left'); $this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID','left');
$this->db->join ('tbl_users user1','user1.userid = POM.CreatedBy','left'); $this->db->join ('tbl_users user1','user1.userid = POM.CreatedBy','left');
$this->db->join ('T_Employee_Details ED1','ED1.EmpID = user1.EmpID','left'); $this->db->join ('T_Employee_Details ED1','ED1.EmpID = user1.EmpID','left');
$this->db->join ('T_Status ST','ST.StatusCode = TMM.MRIRStatus');
$this->db->order_by ('TMM.MRIRNO','desc'); $this->db->order_by ('TMM.MRIRNO','desc');
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();

6
application/views/EditservicePurchaseorder.php
View File

@ -54,11 +54,11 @@ if(!empty($POMaster))
$SupName = $Req->SupplierName; $SupName = $Req->SupplierName;
$Address = $Req->Address; $Address = $Req->Address;
$pdt = new DateTime($Req->PODate); $pdt = new DateTime($Req->PODate);
$PODate = $pdt->format('Y-m-d'); $PODate = $pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('d-m-Y');
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
@ -80,7 +80,7 @@ if(!empty($RequistionDetails))
{ {
// $Reqon=$ReqDet->ReqDate; // $Reqon=$ReqDet->ReqDate;
$Reqonn=new DateTime($ReqDet->ReqDate); $Reqonn=new DateTime($ReqDet->ReqDate);
$Reqon=$Reqonn->format('Y-m-d'); $Reqon=$Reqonn->format('d-m-Y');
$Requestedby=$ReqDet->Requestedby; $Requestedby=$ReqDet->Requestedby;
$RequesterName=$ReqDet->FirstName; $RequesterName=$ReqDet->FirstName;
//$Status=$ReqDet->Status; //$Status=$ReqDet->Status;

29
application/views/advancerequest.php
View File

@ -112,7 +112,7 @@ $(function() {
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'CostCenterCode','value' => set_value('CostCenterCode'),'id'=>'CostCenterCode' ,'class' => 'form-control num' ,'required' => 'true' , 'readonly'=>'true','style'=>'text-align:right;'); $data = array('name' => 'CostCenterCode','value' => set_value('CostCenterCode'),'id'=>'CostCenterCode' ,'class' => 'form-control' ,'required' => 'true' , 'readonly'=>'true','style'=>'text-align:left;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -202,13 +202,34 @@ var PONUM=$('#PurchaseOrderNumber').val();
$('#PurchaseOrderType').val(obj.POType); $('#PurchaseOrderType').val(obj.POType);
var credt=obj.CreatedDate; var credt=obj.CreatedDate;
credt=credt.split(' ')[0] credt=credt.split(' ')[0];
$('#PoCreatedDate').val(credt);
var splitDate = credt.split('-');
if(splitDate.count == 0){
return null;
}
var year = splitDate[0];
var month = splitDate[1];
var day = splitDate[2];
var convertCredt= day + '-' + month + '-' + year;
$('#PoCreatedDate').val(convertCredt);
var reldt=obj.ReleasedOn; var reldt=obj.ReleasedOn;
//console.log(reldt); //console.log(reldt);
reldt=reldt.split(' ')[0]; reldt=reldt.split(' ')[0];
var splitDaterel = reldt.split('-');
if(splitDaterel.count == 0){
return null;
}
$('#ReleasedOn').val(reldt); var Ryear = splitDaterel[0];
var Rmonth = splitDaterel[1];
var Rday = splitDaterel[2];
var convertReldt= Rday + '-' + Rmonth + '-' + Ryear;
$('#ReleasedOn').val(convertReldt);
$('#TotalOrderValue').val(obj.TotalOrderValue); $('#TotalOrderValue').val(obj.TotalOrderValue);
$('#PaymenyTerms').val(obj.PaymentTerms); $('#PaymenyTerms').val(obj.PaymentTerms);
$('#Department').val(obj.DepartmentName); $('#Department').val(obj.DepartmentName);

11
application/views/editCapitalPo.php
View File

@ -94,12 +94,12 @@ if(!empty($POMaster))
$SupName = $Req->SupplierName; $SupName = $Req->SupplierName;
$Address = $Req->Address; $Address = $Req->Address;
$pdt = new DateTime($Req->PODate); $pdt = new DateTime($Req->PODate);
$PODate = $pdt->format('Y-m-d'); $PODate = $pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('d-m-Y');
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
@ -108,12 +108,15 @@ if(!empty($POMaster))
$PONO = $Req->PONO; $PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$ExchangeRateOn=$Req->ExchangeRateCalculatedon; $Exchangedt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateOn=$Exchangedt->format('d-m-Y');
$PaymentTerms=$Req->PaymentTerms; $PaymentTerms=$Req->PaymentTerms;
$otherPayment = $Req->PaymentOtherDescription; $otherPayment = $Req->PaymentOtherDescription;
$UpdatedOn=$Req->UpdatedOn; $Updateddt = new DateTime($Req->UpdatedOn);
$UpdatedOn=$Updateddt->format('d-m-Y');
$CapitalRange=$Req->CapitalRange; $CapitalRange=$Req->CapitalRange;
$Import_DispatchDetails=$Req->Import_DispatchDetails; $Import_DispatchDetails=$Req->Import_DispatchDetails;
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;

6
application/views/editRevenuepurchaseorder.php
View File

@ -74,12 +74,12 @@ if(!empty($POMaster))
$Address = $Req->Address; $Address = $Req->Address;
$Pdt = new DateTime($Req->PODate); $Pdt = new DateTime($Req->PODate);
$PODate = $Pdt->format('Y-m-d'); $PODate = $Pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('d-m-Y');
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
@ -100,7 +100,7 @@ if(!empty($RequistionDetails))
foreach ($RequistionDetails as $ReqDet) foreach ($RequistionDetails as $ReqDet)
{ {
$Reqonn=new DateTime($ReqDet->ReqDate); $Reqonn=new DateTime($ReqDet->ReqDate);
$Reqon=$Reqonn->format('Y-m-d'); $Reqon=$Reqonn->format('d-m-Y');
// $Pdt = new DateTime($Req->PODate); // $Pdt = new DateTime($Req->PODate);
// $PODate = $Pdt->format('Y-m-d'); // $PODate = $Pdt->format('Y-m-d');

9
application/views/viewmaterialinspectionreport.php
View File

@ -34,6 +34,7 @@
<th>Invoice Date</th> <th>Invoice Date</th>
<th>Vehicle No</th> <th>Vehicle No</th>
<th>Courier No</th> <th>Courier No</th>
<th>MRIR Status</th>
<th>Updated By</th> <th>Updated By</th>
<th>Action</th> <th>Action</th>
@ -63,11 +64,15 @@
echo $date->format('d/m/Y'); ?></td> echo $date->format('d/m/Y'); ?></td>
<td><?php echo $d->VehicleNo ?></td> <td><?php echo $d->VehicleNo ?></td>
<td><?php echo $d->CourierNo ?></td> <td><?php echo $d->CourierNo ?></td>
<td><?php echo $d->StatusName ?></td>
<td><?php echo $d->UpdatedbyName ?></td> <td><?php echo $d->UpdatedbyName ?></td>
<td> <td>
<?php if($d->MRIRStatus== MRIR_CREATED){ ?>
<a href="<?php echo base_url().'EditMRIR?MRIRNO='.$d->MRIRNO; ?>"><button style="font-size:12px" id="generated" name="generated">Edit MRIR <i class="fa fa-pencil"></i></button></a>&nbsp;&nbsp;&nbsp; <a href="<?php echo base_url().'EditMRIR?MRIRNO='.$d->MRIRNO; ?>"><button style="font-size:12px" id="generated" name="generated">Edit MRIR <i class="fa fa-pencil"></i></button></a>&nbsp;&nbsp;&nbsp;
<?php }
else{ ?>
<a href="<?php echo base_url().'EditMRIR?MRIRNO='.$d->MRIRNO; ?>"><button style="font-size:12px" id="generated" name="generated">View MRIR <i class="fa fa-eye"></i></button></a>&nbsp;&nbsp;&nbsp;
<?php } ?>
<a href="<?php echo base_url().'MRIRcontroller/MrirDetailsPrintPdf?MRIRNO='.$d->MRIRNO;?>"<i class="fa fa-print" data-toggle="tooltip" target="_blank" title=" Click here to Print the MRIR details"></i>&nbsp;&nbsp;&nbsp;</a> <a href="<?php echo base_url().'MRIRcontroller/MrirDetailsPrintPdf?MRIRNO='.$d->MRIRNO;?>"<i class="fa fa-print" data-toggle="tooltip" target="_blank" title=" Click here to Print the MRIR details"></i>&nbsp;&nbsp;&nbsp;</a>
</td> </td>
</tr> </tr>