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

mrir,igr dateformat and apporaval store no in aproval store screen and storestatus changes in stock details screen

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-22 17:45:49 +05:30
parent fb3846437b
commit e778f34fb9
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/dahsboard_model.php
View File

@ -331,7 +331,7 @@ group by Dept_Name";
function report_ccr(){ function report_ccr(){
$sql="SELECT Cost_Center_Budget.CostCenterCode as Cost_Center_Code, CostCenterName as Cost_Center_Name,Dept_Details.DepartmentName as Dept_Name,Cost_Center_Budget.BudgetType as BudgetType,Cost_Center_Budget.BudgetYear as BudgetYear, $sql="SELECT Cost_Center_Budget.CostCenterCode as Cost_Center_Code, CostCenterName as Cost_Center_Name,group_concat(distinct Dept_Details.DepartmentName) as Dept_Name,Cost_Center_Budget.BudgetType as BudgetType,Cost_Center_Budget.BudgetYear as BudgetYear,
case Cost_Center_Budget.BudgetType case Cost_Center_Budget.BudgetType
when 'IMPORT' when 'IMPORT'
@ -375,7 +375,7 @@ JOIN T_CostCenter_Departments CostCentDept on CostCentDept.CostCenterCode=Cost_M
JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode= CostCentDept.DEPCode JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode= CostCentDept.DEPCode
WHERE DATE(Cost_Center_Budget.CreatedDate) BETWEEN '2017-04-01' AND '2018-03-31' WHERE DATE(Cost_Center_Budget.CreatedDate) BETWEEN '2017-04-01' AND '2018-03-31'
group by group by
Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType,Cost_Center_Budget.BudgetYear
order by Cost_Center_Budget.CostCenterCode"; order by Cost_Center_Budget.CostCenterCode";
$query = $this->db->query($sql); $query = $this->db->query($sql);
return $query->result(); return $query->result();

6
application/views/Mrirprintpdf.php
View File

@ -49,17 +49,17 @@
$IGRNO=$MRIR->IGRNO; $IGRNO=$MRIR->IGRNO;
$IGRRAISEDBY=$MRIR->IGRRasiedbyName; $IGRRAISEDBY=$MRIR->IGRRasiedbyName;
$dt1=new DateTime($MRIR->IGRCreated,new DateTimeZone('Asia/Kolkata')); $dt1=new DateTime($MRIR->IGRCreated,new DateTimeZone('Asia/Kolkata'));
$IGRCREATEDON=$dt1->format('d-m-y'); $IGRCREATEDON=$dt1->format('d-m-Y');
$PONO=$MRIR->PONO; $PONO=$MRIR->PONO;
$dt=new DateTime($MRIR->PODate, new DateTimeZone('Asia/Kolkata')); $dt=new DateTime($MRIR->PODate, new DateTimeZone('Asia/Kolkata'));
$PODATE=$dt->format('d-m-Y'); $PODATE=$dt->format('d-m-Y');
$PORAISEDBY=$MRIR->PORasiedbyName; $PORAISEDBY=$MRIR->PORasiedbyName;
$DCINV=$MRIR->DeliveryChellanOrInvoiceNo; $DCINV=$MRIR->DeliveryChellanOrInvoiceNo;
$dt4=new DateTime($MRIR->DeliveryChellanDate,new DateTimeZone('Asia/Kolkata')); $dt4=new DateTime($MRIR->DeliveryChellanDate,new DateTimeZone('Asia/Kolkata'));
$DCINVDATE=$dt4->format('d-m-y'); $DCINVDATE=$dt4->format('d-m-Y');
$VECHICLENO=$MRIR->VehicleNo; $VECHICLENO=$MRIR->VehicleNo;
$dt3=new DateTime($MRIR->MRIRCreatedon,new DateTimeZone('Asia/Kolkata')); $dt3=new DateTime($MRIR->MRIRCreatedon,new DateTimeZone('Asia/Kolkata'));
$MRIRCREATEDON=$dt3->format('d-m-y'); $MRIRCREATEDON=$dt3->format('d-m-Y');
$MRIRRAISEDBY=$MRIR->MRIRRasiedbyName; $MRIRRAISEDBY=$MRIR->MRIRRasiedbyName;
$COSTCENTERCODE=$MRIR->CostCenterCode; $COSTCENTERCODE=$MRIR->CostCenterCode;
$COSTCENTERNAME=$MRIR->CostCenterName; $COSTCENTERNAME=$MRIR->CostCenterName;

4
application/views/approvalstorerequisitionslip.php
View File

@ -27,7 +27,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4> Store Requisition Details - REQNo</h4></center> <center><h4> Store Requisition Details - <span id="StReqno"></span></h4></center>
</div> </div>
<div align="left"> <div align="left">
@ -236,7 +236,7 @@ function Reset()
} }
$("#myModal").on("shown.bs.modal", function(e) { $("#myModal").on("shown.bs.modal", function(e) {
var ReqId = $(e.relatedTarget).data('userid'); var ReqId = $(e.relatedTarget).data('userid');
// alert(ReqId); $("#StReqno").html(ReqId);
$('#ReqNO').val(ReqId); $('#ReqNO').val(ReqId);
$("#CostCenter").val(''); $("#CostCenter").val('');
$("#tbleAppend").empty(); $("#tbleAppend").empty();

2
application/views/assetListing.php
View File

@ -52,7 +52,7 @@
<td><?php echo $record->SupplierName ?></td> <td><?php echo $record->SupplierName ?></td>
<td><?php <td><?php
$dtpurchase = new DateTime($record->DateOfPurchase); $dtpurchase = new DateTime($record->DateOfPurchase);
$DOPurchase = $dtpurchase ->format('d/m/Y'); $DOPurchase = $dtpurchase ->format('d-m-Y');
echo $DOPurchase ?></td> echo $DOPurchase ?></td>
<td><?php echo number_format($record->AssetValue, 2); ?></td> <td><?php echo number_format($record->AssetValue, 2); ?></td>
<td><?php echo $record->AssetStatus ?></td> <td><?php echo $record->AssetStatus ?></td>

4
application/views/inwardgateregister.php
View File

@ -10,7 +10,7 @@
$("#InvoiceDate").datepicker({ $("#InvoiceDate").datepicker({
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
}); });
@ -50,7 +50,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
} }
</style> </style>
<div class="content-wrapper" style="min-height:537px;""> <div class="content-wrapper" style="min-height:537px;">
<section class="content-header"> <section class="content-header">
<h1> <h1>
<center>Siddharth Industries - Inward Gate Register (IGR) Entry</center> <center>Siddharth Industries - Inward Gate Register (IGR) Entry</center>

8
application/views/requisitionlistapproval.php
View File

@ -1,4 +1,3 @@
<div class="content-wrapper"> <div class="content-wrapper">
@ -91,13 +90,13 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4> Requisition Details - REQ No</h4></center> <center><h4> Requisition Details - <span id="ReqNo"></span> </h4></center>
</div> </div>
<div align="left"> <div align="left">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-4">
<label>Requistion Type</label> <label>Requistion Type</lsabel>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ReqType','value' => set_value('ReqType'),'id'=>'ReqType', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'ReqType','value' => set_value('ReqType'),'id'=>'ReqType', 'class' => 'form-control' ,'readonly' => 'true');
@ -208,7 +207,7 @@
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr> <tr>
s
<th>Requisition Number</th> <th>Requisition Number</th>
<th>Requested By</th> <th>Requested By</th>
<th>Requested Date</th> <th>Requested Date</th>
@ -290,6 +289,7 @@ function Reset()
} }
$("#myModal").on("shown.bs.modal", function(e) { $("#myModal").on("shown.bs.modal", function(e) {
var ReqId = $(e.relatedTarget).data('userid'); var ReqId = $(e.relatedTarget).data('userid');
$('#ReqNo').html(ReqId);
$("#CostCenter").val(''); $("#CostCenter").val('');
$("#tbleAppend").empty(); $("#tbleAppend").empty();
$("#ReqType").val(''); $("#ReqType").val('');

4
application/views/storestatus.php
View File

@ -107,7 +107,7 @@
endforeach; endforeach;
} }
echo form_dropdown('StockAvail', $options,set_value('StockAvail'),'id="StockAvail"' ,'class="form-control"'); echo form_dropdown('StockAvail', $options,set_value('StockAvail','YES'),'id="StockAvail"' ,'class="form-control"');
?> ?>
</div> </div>
@ -539,7 +539,7 @@ function clearLineitemData()
$('#MaterialCode').val(''); $('#MaterialCode').val('');
$('#Description').val(''); $('#Description').val('');
$('#UOM').val(''); $('#UOM').val('');
$('#StockAvail').val(''); $('#StockAvail').val('YES');
$('#AddAvailableStock').val(''); $('#AddAvailableStock').val('');
$('#Remarks').val(''); $('#Remarks').val('');
} }

2
application/views/viewIGRDetails.php
View File

@ -57,7 +57,7 @@
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td> <td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php <td align="right"><?php
$date = new DateTime($record->DeliveryChellanDate); $date = new DateTime($record->DeliveryChellanDate);
echo $date->format('d/m/Y'); ?></td> echo $date->format('d-m-Y'); ?></td>
<td><?php echo $record->VehicleNo ?></td> <td><?php echo $record->VehicleNo ?></td>
<td><?php echo $record->CourierNo ?></td> <td><?php echo $record->CourierNo ?></td>

2
application/views/viewinwardgateregister.php
View File

@ -57,7 +57,7 @@
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td> <td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php <td align="right"><?php
$date = new DateTime($record->DeliveryChellanDate); $date = new DateTime($record->DeliveryChellanDate);
echo $date->format('d/m/Y'); ?></td> echo $date->format('d-m-Y'); ?></td>
<td><?php echo $record->VehicleNo ?></td> <td><?php echo $record->VehicleNo ?></td>
<td><?php echo $record->CourierNo ?></td> <td><?php echo $record->CourierNo ?></td>
<td> <td>

2
application/views/viewmaterialinspectionreport.php
View File

@ -61,7 +61,7 @@
<td align="right"><?php echo $d->DeliveryChellanOrInvoiceNo ?></td> <td align="right"><?php echo $d->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php <td align="right"><?php
$date = new DateTime($d->DeliveryChellanDate); $date = new DateTime($d->DeliveryChellanDate);
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->StatusName ?></td>