From 9ba8c46c51872b0c19f10a545a56f82fd6f0e09f Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Fri, 7 Jul 2017 17:45:52 +0530 Subject: [PATCH] 'Newscreenaddedandissuefixed' --- application/views/addstorerequisitionslip.php | 5 +- .../views/approvalstorerequisitionslip.php | 121 +---- application/views/issueStoreRequistion.php | 414 ++++++++++++++++++ application/views/storerequisitionlisting.php | 120 ++--- application/views/storestatus.php | 230 ++++++---- application/views/viewIGRDetails.php | 242 ++++++++++ application/views/viewmrirforbilling.php | 403 +++++++++++++++++ 7 files changed, 1294 insertions(+), 241 deletions(-) create mode 100644 application/views/issueStoreRequistion.php create mode 100644 application/views/viewIGRDetails.php create mode 100644 application/views/viewmrirforbilling.php diff --git a/application/views/addstorerequisitionslip.php b/application/views/addstorerequisitionslip.php index b6973792..6dafe16c 100755 --- a/application/views/addstorerequisitionslip.php +++ b/application/views/addstorerequisitionslip.php @@ -322,6 +322,7 @@ $(function() {
+ @@ -675,7 +676,7 @@ else $.ajax({ data:$('.requistion').serialize(), type:"POST", - url:"storerequisitionlist/addNewRequistion?ID="+id+"&RequestedBy="+RequestedBy+"&CostCenter="+CostCenter+"&DEPCode="+DEPCode+"&txtRowCount="+txtRowCount, + url:"storerequisitionlist/addNewRequistion", success:function(data) { if(data) @@ -685,7 +686,7 @@ else $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); - window.location = "addstorerequisitionlist"; + window.location = "addstore"; } else diff --git a/application/views/approvalstorerequisitionslip.php b/application/views/approvalstorerequisitionslip.php index b2e64781..d8112eef 100755 --- a/application/views/approvalstorerequisitionslip.php +++ b/application/views/approvalstorerequisitionslip.php @@ -15,68 +15,7 @@ echo form_open($this->config->base_url().'storerequisitionlist/SearchRequistLists',$attributes); ?>
-
-
-
- -
- - -
-
-
-
- - -
-
- -
- -
- -
-
-
- -
- - - - - Clear -
- - -
-
-
@@ -90,7 +29,7 @@
-

Store Requisition Details - STORE REQNo

+

Store Requisition Details - REQNo

@@ -272,20 +211,7 @@ } } ?> - - STREQ0001 - Kasiraman - 20/6/2017 - Pending Approval - - - - - + @@ -312,12 +238,13 @@ function Reset() } $("#myModal").on("shown.bs.modal", function(e) { var ReqId = $(e.relatedTarget).data('userid'); + // alert(ReqId); + $('#ReqNO').val(ReqId); $("#CostCenter").val(''); $("#tbleAppend").empty(); - $("#Requestedby").val(''); - $("#ReqDate").val(''); + $("#ReqDate").val(''); $("#Desigination").val(''); - $("#AvlBudgetAmount").val(''); + $('#content').loader('show'); $.ajax({ data:{id:ReqId}, @@ -325,16 +252,18 @@ function Reset() dataType: 'json', url:"storerequisitionlist/ViewRequest", success:function(json) { + //success:function(data) { $('#content').loader('hide'); - //alert(); + //alert(json.Requist); + if(json.Requist != '') + { + //alert(json.Requist[0]['Requestedby']) ; $("#Requestedby").val(json.Requist[0]['Requestedby']); $("#ReqDate").val(json.Requist[0]['ReqDate']); $("#Desigination").val(json.Requist[0]['DepartmentName']); $("#CostCenter").val(json.Requist[0]['CostCenterName']); - - //$("#AvlBudgetAmount").val(json.Requist[0]['BudgetAmount']); - $("#AvlBudgetAmount").val(json.AvilBudAmount); - $("#tbleAppend").append(json.Items); + $("#tbleAppend").append(json.Items); + } } @@ -346,36 +275,28 @@ function Reset() function saveToDatabase(ReqId,Index,option,com) { - // alert(ReqId); - // alert(Index); - // alert(option); - // alert(com); var newcomments=document.getElementById('newcomments'+Index+'').innerHTML; var id=ReqId; var Status= ''; - //alert(newcomments); - if (option == -1 ) + if (option == -1 ) { - alert("Please Select Option"); - - + alert("Please Select Approve/Reject option"); + return false; } else if (option == 1 ) { - alert(' The Approval '); - Status='' ; + // alert(' The Approval '); + Status=''; var strMsg='Do YOu want to Approve this requisition?'; } else { - alert('The Rejects' ); - - - Status='' ; + + Status=''; var strMsg='Do You want to Reject this requisition?'; } @@ -393,7 +314,7 @@ function saveToDatabase(ReqId,Index,option,com) { $('#content').loader('hide'); alert(data); - window.location = "storerequisitionlisting"; + location.reload(); } else { diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php new file mode 100644 index 00000000..57556540 --- /dev/null +++ b/application/views/issueStoreRequistion.php @@ -0,0 +1,414 @@ +format('d-m-y'); + +// print_r($cost);die(); + + + + +$CostCenterCode=''; +$CostCenterName=''; +$StoreReqNo=''; +$ReqDate=''; +$DepartmentName=''; +$DEPCode = ''; +$RowCount = 0; +if(!empty($ReqListDetails)) +{ +foreach ($ReqListDetails as $Req ) { + + $CostCenterCode = $Req->CostCenterCode; + $CostCenterName=$Req->CostCenterName; + $StoreReqNo=$Req->StoreReqNo; + $dt = new DateTime($Req->ReqDate); + $ReqDate = $dt->format('d-m-y'); + $DEPCode = $Req->DEPCode; + $DepartmentName=$Req->DepartmentName; +} +} + ?> + + + +
+ +
+

+
Siddharth Industries - Store Requisition -
+ +

+
+
+
+ 'form-label-left requistion ','name' => 'requistion','id' => 'requistion'); + + echo form_open($this->config->base_url().'storerequisitionlist/UpdateIssueRequistion',$attributes); + + + ?> + + +
+ + + +
+ + 'RequestedBy','value' => set_value('RequestedBy',$name), 'id'=>'RequestedBy','class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + + ?> +
+
+ + 'DepartmentName','value' => set_value('DepartmentName',$DEPCode . " - ".$DepartmentName), 'id'=>'DepartmentName','class' => 'form-control ' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+ + + +
+ + 'Date','value' => set_value('Date',$ReqDate), 'id' =>"Date", 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> + + +
+
+ + + 'CostCenter','value' => set_value('CostCenter',$CostCenterCode . " - ".$CostCenterName),'id'=>"CostCenter", 'class' => 'form-control','readonly' => 'true' ); + echo form_input($data); + ?> +
+ + +
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SNOItem CodeDescriptionUOMRequested QuantityRequester RemarksIssued QuantityComments
MaterialCode ?>MaterialName ?>UOM ?>QuantityRequired ?>Remarks ?> + +
+
+ + + +
+
+ + + + + + + + + + +
+ +
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php index 579947d8..67feb35c 100755 --- a/application/views/storerequisitionlisting.php +++ b/application/views/storerequisitionlisting.php @@ -30,53 +30,24 @@ span.highlight {
- +
- +
- - -
-
- -
- -
- +
@@ -85,12 +56,12 @@ span.highlight {
- + - Clear +
@@ -105,18 +76,27 @@ span.highlight {
-

Store Requisition Details - REQ No

+

Store Requisition Number Details

-
+
+ +
+ 'ReqNO','value' => set_value('ReqNO'),'id'=>'ReqNO', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
'Requestedby','value' => set_value('Requestedby'),'id'=>'Requestedby', 'class' => 'form-control' ,'readonly' => 'true'); + $data = array('name' => 'ReqBy','value' => set_value('ReqBy'),'id'=>'ReqBy', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>
@@ -181,7 +161,8 @@ span.highlight { Item Code Item Description UOM - Quantity + Requested Quantity + Issued Quantity Remarks @@ -217,9 +198,9 @@ span.highlight { Store Requisition No - Requested Date - Requested Quantity - Issued Quantity + Requested Department + Requested By + Requested Date Status Requester Comments @@ -238,15 +219,16 @@ span.highlight { $index = $index +1; ?> - StoreReqNo ?> - - + StoreReqNo ?> + + DepartmentName ?> + Requestedby ?> ReqDate) ; $ReqDate = $rdate->format('d-m-Y'); echo $ReqDate; ?> - QuantityRequired ?> - QuantityIssued ?> + + StatusName ?> Remarks ?> @@ -263,6 +245,7 @@ span.highlight { +
@@ -274,6 +257,25 @@ span.highlight { var startDate = ''; var endDate = ''; + function SaveIssueQuantity(rowid) + { + var IssueQty = $("#IssuedQuantity"+RowId).val(); + + if( IssueQty != '') + { + $('#content').loader('show'); + $.ajax({ + data:{id:IssueQty}, + type:"POST", + url:"storerequisitionlist/SaveIssuedQuantity", + success:function(data) { + $('#content').loader('hide'); + alert(data); + location.reload(); + } + }); + } + } function Reset() { $('#RequisitionStatus').val("-1"); @@ -281,29 +283,27 @@ function Reset() } $("#storereqdetail").on("shown.bs.modal", function(e) { var ReqId = $(e.relatedTarget).data('userid'); + $('#ReqNO').val(ReqId); $("#CostCenter").val(''); $("#tbleAppend").empty(); - $("#Requestedby").val(''); - $("#ReqDate").val(''); + $("#ReqDate").val(''); $("#Desigination").val(''); - $("#AvlBudgetAmount").val(''); - //$('#content').loader('show'); + + $('#content').loader('show'); $.ajax({ data:{id:ReqId}, type:"POST", dataType: 'json', url:"storerequisitionlist/ViewRequest", success:function(json) { + // success:function(data) { $('#content').loader('hide'); - //alert(); - $("#Requestedby").val(json.Requist[0]['Requestedby']); + // alert(data) ; + $("#ReqBy").val(json.Requist[0]['Requestedby']); $("#ReqDate").val(json.Requist[0]['ReqDate']); $("#Desigination").val(json.Requist[0]['DepartmentName']); $("#CostCenter").val(json.Requist[0]['CostCenterName']); - - //$("#AvlBudgetAmount").val(json.Requist[0]['BudgetAmount']); - $("#AvlBudgetAmount").val(json.AvilBudAmount); - $("#tbleAppend").append(json.Items); + $("#tbleAppend").append(json.Items); } diff --git a/application/views/storestatus.php b/application/views/storestatus.php index 68c21a49..06014fbb 100755 --- a/application/views/storestatus.php +++ b/application/views/storestatus.php @@ -13,10 +13,119 @@

Siddharth Industries - Stock Details

+
+ + +
+ + + - - + @@ -32,86 +141,40 @@ - - - - - - + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - + + +
1Sand001Dry Silica SandKgs - 'AvalQuantity','value' => set_value('AvalQuantity'),'id'=>'AvalQuantity', 'class' => 'form-control num' ,'required' => 'true'); - echo form_input($data); - ?> + + +
MaterialCode ; ?>MaterialName ; ?>UOM ; ?> + - - 02/07/2017 - 'Remarks','value' => set_value('Remarks'),'id'=>'Remarks', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> + Status == 1 ) { + $St = 'Out of Stock'; + } echo $St ; ?>updatedOn ); +$updatedOn = $dt->format('d-m-y'); + echo $updatedOn ; ?> +
2Sand002Wast SandKgs 'AvalQuantity','value' => set_value('AvalQuantity'),'id'=>'AvalQuantity', 'class' => 'form-control num' ,'required' => 'true'); - echo form_input($data); - ?> - - - 04/07/2017 - 'Remarks','value' => set_value('Remarks'),'id'=>'Remarks', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
3Resin002ResinLiter - 'AvalQuantity','value' => set_value('AvalQuantity'),'id'=>'AvalQuantity', 'class' => 'form-control num' ,'required' => 'true'); - echo form_input($data); - ?> - - - 03/07/2017 - 'Remarks','value' => set_value('Remarks'),'id'=>'Remarks', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
@@ -119,7 +182,7 @@
- +
@@ -128,6 +191,15 @@
+ +Add Comment \ No newline at end of file diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php new file mode 100644 index 00000000..69fcbbdd --- /dev/null +++ b/application/views/viewmrirforbilling.php @@ -0,0 +1,403 @@ + + + + +
+ +
+

+
Siddharth Industries - Billing For MRIR
+

+
+

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IGR NOMRIR NOPONODepartmentMaterial CodeMaterial NameUOMReceived QuantityAccepted QuantityStatus of MRIRRemarksQuality InchargeStore Incharge
IGRNO ?>MRIRNO ?> PONO ?>QualityInchargeID ?>StoreInchargeID ?>
+
+
+
+
+ +
+ + +
+ + +