From 1b5fcf70bfa7da864524edaad6a6b5351a3cf24e Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Mon, 15 May 2017 12:27:28 +0530
Subject: [PATCH] User Creation changes

---
 application/views/editOld.php                 | 14 +++++++++----
 application/views/editrequisitionform.php     |  9 +++++++--
 application/views/requisitionlistapproval.php | 20 +++++++++++++++++--
 application/views/users.php                   | 10 ++++++++--
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/application/views/editOld.php b/application/views/editOld.php
index f0388e68..5c7e2805 100644
--- a/application/views/editOld.php
+++ b/application/views/editOld.php
@@ -1,3 +1,8 @@
+
+Currently editing:  
+/home/kasiram9/public_html/sidd_uat/application/views/editOld.php
+ Encoding:    Reopen  Switch to Code Editor     Close  Save
+
 <?php
 
 $EmpId = '';
@@ -8,12 +13,13 @@ $EmailId = '';
 $Role = '';
 $Department = '';
 $Designation = '';
-
+ $RoleName = '';
 if(!empty($EmpRole))
 {
     foreach ($EmpRole as $Er)
     {
-		$Role =  $Er->role;
+		$Role =  $Er->roleId;
+                $RoleName =  $Er->role;
 	}
 }
 
@@ -130,7 +136,7 @@ if(!empty($EmpList))
                                     <div class="form-group">
                                         <label for="role">Role</label>
                                         <select class="form-control required" id="role" name="role">
-                                            <option value="<?php echo $Role ?>"><?php echo $Role ?></option>
+                                            <option value="<?php echo $Role ?>"><?php echo $RoleName ?></option>
                                             <?php
                                             if(!empty($roles))
                                             {
@@ -202,4 +208,4 @@ if(!empty($EmpList))
     </section>
 </div>
 
-<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
\ No newline at end of file
+<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 02f9f260..55632251 100644
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -1,3 +1,8 @@
+
+Currently editing:  
+/home/kasiram9/public_html/sidd_uat/application/views/editrequisitionform.php
+ Encoding:    Reopen  Switch to Code Editor     Close  Save
+
 <?php
         $ReqNo = '';
         $ReqType = '';
@@ -40,7 +45,7 @@ if(!empty($ReqDetails))
 		   <?php
                       $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
                         
-                        echo form_open($this->config->base_url().'UpdateRequist',$attributes); ?>
+                        echo form_open($this->config->base_url().'requisitionform/EditRequistion',$attributes); ?>
 	 <div class="row">
 	 <div class="col-md-12">
 	   <div class="row" align="right">
@@ -748,4 +753,4 @@ $('.EditClick').click(function(){
     
  });
  
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php
index 21908d02..3dcf71b6 100644
--- a/application/views/requisitionlistapproval.php
+++ b/application/views/requisitionlistapproval.php
@@ -1,3 +1,8 @@
+
+Currently editing:  
+/home/kasiram9/public_html/sidd_uat/application/views/requisitionlistapproval.php
+ Encoding:    Reopen  Switch to Code Editor     Close  Save
+
 <?php 
  //print_r($AppList); 
 ?>
@@ -391,9 +396,11 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
 	var id = $('#Remarks'+Index).val();
 	var Status = $('#status'+Index).val();
 	var StatusCode = '<?php echo REQ_APPROVED; ?>';
+        var strMsg = 'Do you want to Approve the Requisition?';
 	if(Status == '3')
 	{
 		StatusCode = '<?php echo REQ_REJECTED; ?>';
+                strMsg = 'Do you want to Reject the Requisition?'
 	}
 	var Remarks = $('#Remarks'+Index).val();
 	if(Remarks == '')
@@ -403,7 +410,10 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
 		return;	
 		
 	}
-		
+
+		  var answer = confirm(strMsg);
+		if (answer) 
+		{ 	
 			$('#content').loader('show');
 		    $.ajax({ 
 			data:{id:id},
@@ -422,9 +432,15 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
 			}			
 		
 		}
+
   
 }); 
 
+}
+else
+{
+return;
+}
 
 }
 	
@@ -470,4 +486,4 @@ function(start, end, label) {
 
 	
 });
-	</script>
\ No newline at end of file
+	</script>
diff --git a/application/views/users.php b/application/views/users.php
index bdbaa67e..fbcc0470 100644
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -1,3 +1,8 @@
+
+Currently editing:  
+/home/kasiram9/public_html/sidd_uat/application/views/users.php
+ Encoding:    Reopen  Switch to Code Editor     Close  Save
+
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -57,7 +62,7 @@
 					  	  <td><?php echo $record->DepartmentName ?></td>
 					  <td><?php echo $record->role ?></td>
                       <td>
-                          <a href="<?php echo base_url().'User/editOld?UID='.$record->userId;?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
+                          <a href="<?php echo base_url().'user/editOld?UID='.$record->userId;?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
                           <a  onclick="deleteUser(<?php echo $record->userId;?>)"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
                       </td>
                     </tr>
@@ -103,7 +108,7 @@ speed:500
 		$.ajax({ 
 			data:{id:userid},
 			type:"POST",
-			url:"<?php echo base_url() ?>User/deleteUser", 
+			url:"<?php echo base_url() ?>user/deleteUser", 
 			success:function(data) {
 			if(data)
 			{
@@ -123,3 +128,4 @@ speed:500
 		}
 	}
 </script>
+