From 0e825450f07d4eb617c95491b2bcab571a0cf796 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 16 Mar 2018 14:27:55 +0530
Subject: [PATCH] complaint issues

---
 application/views/action_report.php     |   6 +-
 application/views/editaction_report.php | 102 +++++++++++++++++-------
 application/views/ncrlist.php           |  12 +--
 3 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/application/views/action_report.php b/application/views/action_report.php
index 888ea141..2b03b327 100644
--- a/application/views/action_report.php
+++ b/application/views/action_report.php
@@ -173,7 +173,7 @@ $(function() {
 <div align="right">
   
 
-  <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#myModal">Add Line Item</a>
+  <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#myModal">Add Disposition Action</a>
 <!-- Add line Item -->
   <div class="modal fade"  id="myModal" role="dialog">
         <div class="modal-dialog">
@@ -317,7 +317,7 @@ $(function() {
   <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
- <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Line Item</a><!-- Add line Item -->
+ <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Root Cause</a><!-- Add line Item -->
   <div class="modal fade" id="RootCausemodal" role="dialog">
         <div class="modal-dialog">
         
@@ -416,7 +416,7 @@ $(function() {
   <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
-   <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Counter">Add Line Item</a>
+   <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Counter">Add Counter Measure Action</a>
 <!-- Add line Item -->
   <div class="modal fade" id="Counter" role="dialog">
         <div class="modal-dialog">
diff --git a/application/views/editaction_report.php b/application/views/editaction_report.php
index 42b3ea0d..919512e9 100644
--- a/application/views/editaction_report.php
+++ b/application/views/editaction_report.php
@@ -71,7 +71,7 @@ $(function() {
 
         <div class="box">
             <div class="box-header">
-              <center><h3 class="box-title">Siddharth Industries - ACTION REPORT <?php echo "No ".$Id?></h3></center>
+              <center><h3 class="box-title">Siddharth Industries - ACTION REPORT <?php echo " - ActRef".$Id?></h3></center>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
@@ -209,7 +209,7 @@ $(function() {
 <div align="right">
   
 
-  <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#myModal">Add Line Item</a>
+  <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#myModal">Add Disposition Action</a>
 <!-- Add line Item -->
   <div class="modal fade"  id="myModal" role="dialog">
         <div class="modal-dialog">
@@ -331,7 +331,8 @@ $(function() {
    <div class="row" style="padding: 0px 15px 0px 10px;">
              <table id="mytable" class="table table-bordered table-hover editableTable"  style="background-color:#fff;font-size:12px;"> 
                 <thead style="background-color: #CFCFCF;">
-                    <th>S.No</th>                   
+                    <th>S.No</th> 
+                    <th></th>                  
                     <th>Action</th>
                     <th>Resp</th>
                     <th>Target</th>
@@ -345,14 +346,15 @@ $(function() {
 
                     //echo $index;
                     ?>
-                <tr id="<?php echo $index ; ?>">
+                <tr id="action_plan<?php echo $index ; ?>">
                 <td><?php echo $index;?></td>
+                <td id="ActionIdhid"><input type="hidden" name="Did" id="Did<?php echo $index?>" value="<?php echo "$dis->DispositionId"?>"></td>
                 <td><?php echo $dis->Action;?></td>
                 <td><?php echo $dis->Resp;?></td>
                 <td><?php echo $dis->Target;?></td>
                
 
-                <input type="hidden" name="<?php echo 'ActionId'.$index ?>" id="<?php echo 'ActionId'.$index ?>" value="<?php echo $dis->DispositionId ; ?>" />
+                <input type="hidden" name="<?php echo 'ActionId'.$index ?>" id="<?php echo 'ActionId'.$index ?>" value="<?php echo $dis->DispositionId ; ?>" readonly/>
 
                 <input type="hidden" name="<?php echo 'action'.$index ?>" id="<?php echo 'action'.$index ?>" value="<?php echo $dis->Action ; ?>" />
 
@@ -360,7 +362,7 @@ $(function() {
 
                 <input type="hidden" name="<?php echo 'target'.$index ?>" id="<?php echo 'target'.$index ?>" value="<?php echo $dis->Target ; ?>" />
 
-                 <td>    <a    data-target='#EditItem'    data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit;"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteActionRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a></td>
+                 <td>    <a    data-target='#EditItem'    data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit;"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteactionRow(<?php echo $index?>);" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a></td>
                 </tr>
 
                 <?php } }?>
@@ -376,7 +378,7 @@ $(function() {
   <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
- <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Line Item</a><!-- Add line Item -->
+ <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Root Cause</a><!-- Add line Item -->
   <div class="modal fade" id="RootCausemodal" role="dialog">
         <div class="modal-dialog">
         
@@ -462,7 +464,7 @@ $(function() {
                   $int=0;
                   foreach($RootcauseDetails as $rt){
                     $int=$int+1;?>
-                <tr id="<?php echo $int?>"> 
+                <tr id="root<?php echo $int?>"> 
                 <td><?php echo $int?></td>
                 <td id="rootcause<?php echo $int?>"><?php echo $rt->Root_cause;?></td>
                 <td>
@@ -486,7 +488,7 @@ $(function() {
   <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
-   <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Counter">Add Line Item</a>
+   <a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Counter">Add Counter Measure Action</a>
 <!-- Add line Item -->
   <div class="modal fade" id="Counter" role="dialog">
         <div class="modal-dialog">
@@ -619,7 +621,7 @@ $(function() {
                 $in=0;
                 foreach($CounteractionDetails as $cou){
                   $in=$in+1;?>
-                <tr id="<?php echo $in;?>">
+                <tr id="counter<?php echo $in;?>">
                 <td ><?php echo $in;?></td>
                 <td id="counteraction1<?php echo $in?>"><?php echo $cou->Action;?></td>
                 <td id="counterresp1<?php echo $in;?>"><?php echo $cou->Resp;?></td>
@@ -707,7 +709,7 @@ $(function() {
              </div>
 
 <script type="text/html" id="actionplan">
-<tr  id="<%=index%>">
+<tr  id="action_plan<%=index%>">
 <td align="left" ><%=index%></td>
 <td align="left" id="action<%=index%>"><%=Action%></td>
 <td align="left" id="resp<%=index%>"><%=Resp%></td>
@@ -724,7 +726,7 @@ $(function() {
 
 
 <script type="text/html" id="rootcause">
-<tr  id="<%=rootindex%>">
+<tr  id="root<%=rootindex%>">
 <td align="left"><%=rootindex%></td>
 <td align="left" id="rootcause<%=rootindex%>"><%=RootCause%></td>
  
@@ -737,7 +739,7 @@ $(function() {
 </script>
 
 <script type="text/html" id="counter">
-<tr  id="<%=counterindex%>">
+<tr  id="counter<%=counterindex%>">
 <td align="left"><%=counterindex%></td>
 <td align="left" id="counteraction1<%=counterindex%>"><%=Action%></td>
 <td align="left" id="counterresp1<%=counterindex%>"><%=Resp%></td>
@@ -991,18 +993,58 @@ $('.CounterEditItem').click(function()
 });
 
 
-function DeleteActionRow(rowId)
+// function DeleteActionRow(rowId)
+// {
+//   alert(rowId)
+//   var id=[];
+//   var tr = document.getElementById("action_plan"+rowId);
+  
+//   tr.parentNode.removeChild(tr);
+//   //var delactionId=$('#ActionId'+rowId).attr("name");
+
+//    var id= $('#Did'+rowId).val();
+
+//   alert(delactionId);
+//   //alert(tr);
+  
+
+//   // $('#action'+rowId).val('')
+//   // $('#resp'+rowId).val('')
+//   // $('#target'+rowId).val('')
+
+//   //alert(delactionId)
+  
+//    // $.ajax({ 
+
+//    //          data:{delactionId,delactionId},
+//    //          type:"POST",
+//    //          url:"<?php echo base_url() ?>purchaseorder/DeleteAction_Report", 
+//    //          success:function(data) {
+//    //          if(data)
+//    //          {
+//    //              alert(data);
+//    //          }
+//    //              else
+//    //              {
+//    //                  alert("Error"); 
+//    //              }           
+        
+//    //              }
+  
+//    //          });s
+// }
+function DeleteactionRow(rowId)
 {
   //alert(rowId)
   var id=[];
-  var tr = document.getElementById(rowId);
-  
-  tr.parentNode.removeChild(tr);
+  //trpopcountry.style.display = "block";
   var delactionId=$('#ActionId'+rowId).val();
+//alert(delactionId);
+  //$('#RootCause'+rowId).val('')
 
-  $('#action'+rowId).val('')
-  $('#resp'+rowId).val('')
-  $('#target'+rowId).val('')
+ $('#action'+rowId).val('')
+ $('#resp'+rowId).val('')
+ $('#target'+rowId).val('')
 
   //alert(delactionId)
   
@@ -1015,6 +1057,8 @@ function DeleteActionRow(rowId)
             if(data)
             {
                 alert(data);
+                var tr = document.getElementById("action_plan"+rowId);
+                tr.parentNode.removeChild(tr);
             }
                 else
                 {
@@ -1027,17 +1071,18 @@ function DeleteActionRow(rowId)
 }
 
 
-
 function DeleteRootRow(rowId)
 {
   //alert(rowId)
   var id=[];
-  var tr = document.getElementById(rowId);
   
-  tr.parentNode.removeChild(tr);
-  var delactionId=$('#RootCauseId'+rowId).val();
 
+  //trpopcountry.style.display = "block";
+  var delactionId=$('#RootCauseId'+rowId).val();
+//alert(delactionId);
   $('#RootCause'+rowId).val('')
+  var tr = document.getElementById("root"+rowId);
+  tr.parentNode.removeChild(tr);
 
  // alert(delactionId)
   
@@ -1050,6 +1095,7 @@ function DeleteRootRow(rowId)
             if(data)
             {
                 alert(data);
+                
             }
                 else
                 {
@@ -1067,10 +1113,10 @@ function DeleteCounterRow(rowId)
 {
   //alert(rowId)
   var id=[];
-  var tr = document.getElementById(rowId);
-  
-  tr.parentNode.removeChild(tr);
+  var tr = document.getElementById("counter"+rowId);
   var delactionId=$('#CounterId'+rowId).val();
+  
+  
   $('#counteraction'+rowId).val('');
   $('#counterresp'+rowId).val('');
   $('#countertarget'+rowId).val('');
@@ -1086,6 +1132,8 @@ function DeleteCounterRow(rowId)
             if(data)
             {
                 alert(data);
+                tr.parentNode.removeChild(tr);
+                
             }
                 else
                 {
diff --git a/application/views/ncrlist.php b/application/views/ncrlist.php
index 3d8c14a5..aa20dd02 100644
--- a/application/views/ncrlist.php
+++ b/application/views/ncrlist.php
@@ -14,7 +14,7 @@
         <div class="col-xs-12">
           <div class="box">
             <div class="box-header">
-              <center><h3 class="box-title">Siddharth Industries</h3></center>
+              <center><h3 class="box-title">Siddharth Industries-Complaint List</h3></center>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
@@ -52,7 +52,7 @@
                <tr id="<?php echo $index ; ?>">
 					<td align="left"><?php echo $index ; ?></td> 
           <!-- <td contenteditable="true"><?php echo $nc->CId?></td> -->
-          <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/EditComplaint?CId=<?php echo $nc->CId ?>"  data-id="<%=index%>" data-userid="<?php echo $nc->CId ?>" ><u><?php echo $nc->CId ?></u>&nbsp;&nbsp;&nbsp;&nbsp;</a> 
+          <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/EditComplaint?CId=<?php echo $nc->CId ?>"  data-id="<%=index%>" data-userid="<?php echo $nc->CId ?>" ><u><?php echo "COM".$nc->CId ?></u>&nbsp;&nbsp;&nbsp;&nbsp;</a> 
           </td>
 					<td contenteditable="true"><?php echo $dt?></td> 
 					<td contenteditable="true"><?php echo $nc->client_name?></td> 
@@ -64,11 +64,11 @@
 					<td contenteditable="true"><?php echo $nc->Remark;?></td> 
           <?php if($nc->Ncr_Id == ""){
             ?>
-          <td contenteditable="true"></td>  
+          <td contenteditable="true"><i class="fa fa-times-circle-o"  style="color:#3498DB  ;" data-toggle="tooltip" title="Action Report Is Not Entered"></i></td>  
           <?php }
           else{?> 
 
-          <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/EditNonconfirmative?Id=<?php echo $nc->Ncr_Id ?>"  data-id="<%=index%>" data-userid="<?php echo $nc->Ncr_Id ?>"  data-toggle="tooltip" title="Click here to View details" ><u><?php echo $nc->Ncr_Id ?></u>&nbsp;&nbsp;&nbsp;&nbsp;</a> 
+          <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/EditNonconfirmative?Id=<?php echo $nc->Ncr_Id ?>"  data-id="<%=index%>" data-userid="<?php echo $nc->Ncr_Id ?>"  data-toggle="tooltip" title="Click here to View details" ><u><?php echo "ActRef".$nc->Ncr_Id ?></u>&nbsp;&nbsp;&nbsp;&nbsp;</a> 
           </td>
           <?php }?>
           <!-- <td data-name="sel"   id="Action<?php echo $index ?>" onchange="saveToDatabase(this,'<?php echo $index ; ?>')">
@@ -77,11 +77,11 @@
 
             <?php if($nc->Ncr_Id ==""){?>
 
-            <td>   <a   data-toggle="tooltip" href="<?php echo base_url().'Addaction?CId='.$nc->CId ;?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $nc->CId; ?>  -  Click here to Enter details"></i></a></td>
+            <td>   <a   data-toggle="tooltip" href="<?php echo base_url().'Addaction?CId='.$nc->CId ;?>"><i class="fa fa-plus" data-toggle="tooltip" title="<?php echo $nc->CId; ?>  -  Click here to Enter details"></i></a></td>
             <?php } 
             else{?>
 
-            <td></td>
+            <td><i class="fa fa-times-circle-o"  style="color:#3498DB  ;" data-toggle="tooltip" title="Action Report has been Entered You Can Only Edit it"></i></td>
             <?php }?>
                                           
                     </tr>