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

User Creation changes

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-05-15 12:27:28 +05:30
parent f6310f4dc6
commit 1b5fcf70bf
4 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/views/editOld.php
View File

@ -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 <?php
$EmpId = ''; $EmpId = '';
@ -8,12 +13,13 @@ $EmailId = '';
$Role = ''; $Role = '';
$Department = ''; $Department = '';
$Designation = ''; $Designation = '';
$RoleName = '';
if(!empty($EmpRole)) if(!empty($EmpRole))
{ {
foreach ($EmpRole as $Er) foreach ($EmpRole as $Er)
{ {
$Role = $Er->role; $Role = $Er->roleId;
$RoleName = $Er->role;
} }
} }
@ -130,7 +136,7 @@ if(!empty($EmpList))
<div class="form-group"> <div class="form-group">
<label for="role">Role</label> <label for="role">Role</label>
<select class="form-control required" id="role" name="role"> <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 <?php
if(!empty($roles)) if(!empty($roles))
{ {
@ -202,4 +208,4 @@ if(!empty($EmpList))
</section> </section>
</div> </div>
<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>

9
application/views/editrequisitionform.php
View File

@ -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 <?php
$ReqNo = ''; $ReqNo = '';
$ReqType = ''; $ReqType = '';
@ -40,7 +45,7 @@ if(!empty($ReqDetails))
<?php <?php
$attributes = array('class' => 'form-label-left requistion ','name' => 'requistion','id' => 'requistion'); $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="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="row" align="right"> <div class="row" align="right">
@ -748,4 +753,4 @@ $('.EditClick').click(function(){
}); });
</script> </script>

20
application/views/requisitionlistapproval.php
View File

@ -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 <?php
//print_r($AppList); //print_r($AppList);
?> ?>
@ -391,9 +396,11 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
var id = $('#Remarks'+Index).val(); var id = $('#Remarks'+Index).val();
var Status = $('#status'+Index).val(); var Status = $('#status'+Index).val();
var StatusCode = '<?php echo REQ_APPROVED; ?>'; var StatusCode = '<?php echo REQ_APPROVED; ?>';
var strMsg = 'Do you want to Approve the Requisition?';
if(Status == '3') if(Status == '3')
{ {
StatusCode = '<?php echo REQ_REJECTED; ?>'; StatusCode = '<?php echo REQ_REJECTED; ?>';
strMsg = 'Do you want to Reject the Requisition?'
} }
var Remarks = $('#Remarks'+Index).val(); var Remarks = $('#Remarks'+Index).val();
if(Remarks == '') if(Remarks == '')
@ -403,7 +410,10 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
return; return;
} }
var answer = confirm(strMsg);
if (answer)
{
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:id}, data:{id:id},
@ -422,9 +432,15 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
} }
} }
}); });
}
else
{
return;
}
} }
@ -470,4 +486,4 @@ function(start, end, label) {
}); });
</script> </script>

10
application/views/users.php
View File

@ -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"> <div class="content-wrapper">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
@ -57,7 +62,7 @@
<td><?php echo $record->DepartmentName ?></td> <td><?php echo $record->DepartmentName ?></td>
<td><?php echo $record->role ?></td> <td><?php echo $record->role ?></td>
<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> <a onclick="deleteUser(<?php echo $record->userId;?>)"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
</td> </td>
</tr> </tr>
@ -103,7 +108,7 @@ speed:500
$.ajax({ $.ajax({
data:{id:userid}, data:{id:userid},
type:"POST", type:"POST",
url:"<?php echo base_url() ?>User/deleteUser", url:"<?php echo base_url() ?>user/deleteUser",
success:function(data) { success:function(data) {
if(data) if(data)
{ {
@ -123,3 +128,4 @@ speed:500
} }
} }
</script> </script>