diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index ea5cf886..00ff9447 100644 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -324,6 +324,7 @@ echo ""; print_r($query); } + function pageNotFound() { $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found'; diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index 559fbabc..2064b0bf 100644 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -326,6 +326,12 @@ function getEmployee() } + function updatepayroll() + { + $this->global['pageTitle'] = 'Update Payroll'; + + $this->loadViews("payslipeditable", $this->global, NULL , NULL); + } function pageNotFound() { diff --git a/application/logs/log-2017-05-04.php b/application/logs/log-2017-05-04.php new file mode 100644 index 00000000..d60995ba --- /dev/null +++ b/application/logs/log-2017-05-04.php @@ -0,0 +1,23 @@ + + +ERROR - 2017-05-04 12:39:43 --> Severity: Warning --> mysqli_connect(): (HY000/2002): A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond. + C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77 +ERROR - 2017-05-04 12:39:43 --> Unable to connect to the database +ERROR - 2017-05-04 12:40:17 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:40:17 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:40:17 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:41:09 --> Severity: Warning --> mysqli_connect(): (HY000/2002): A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond. + C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_driver.php 77 +ERROR - 2017-05-04 12:41:09 --> Unable to connect to the database +ERROR - 2017-05-04 12:42:33 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:33 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:33 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:37 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:37 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:37 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:50 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:50 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:42:50 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:49:04 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:49:04 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 +ERROR - 2017-05-04 12:49:04 --> Severity: Notice --> Undefined index: PayOn C:\xampp\htdocs\siddharth_application\application\views\payslipgenerate.php 86 diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index 9950c462..702d6a4a 100644 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -1,5 +1,3 @@ - -
@@ -77,12 +75,13 @@
Selected Department - +
+

@@ -179,7 +178,7 @@
- +
@@ -394,5 +393,25 @@ alert("Before remove please select any position."); } }); - + + +$(function () { + $("td").dblclick(function () { + var OriginalContent = $(this).text(); + $(this).addClass("cellEditing"); + $(this).html(""); + $(this).children().first().focus(); + $(this).children().first().keypress(function (e) { + if (e.which == 13) { + var newContent = $(this).val(); + $(this).parent().text(newContent); + $(this).parent().removeClass("cellEditing"); + } }); + $(this).children().first().blur(function(){ + $(this).parent().text(OriginalContent); + $(this).parent().removeClass("cellEditing"); + }); + }); + }); + \ No newline at end of file diff --git a/application/views/costListing.php b/application/views/costListing.php index 397646fa..5cdde288 100644 --- a/application/views/costListing.php +++ b/application/views/costListing.php @@ -18,7 +18,7 @@
-

Cost List

+
diff --git a/application/views/includes/header.php b/application/views/includes/header.php index b64ab31a..634167e1 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -137,6 +137,7 @@ +
  • Master Details
    • + +$(function() { + + + //Initialize Select2 Elements + $(".select2").select2(); +//$('#content').html(''); + $('#All').click(function(){ + //alert('clicked'); + if ($('#All').prop('checked')) + { + $('#Employee').attr('disabled', 'true'); + + } + else + { + $('#Employee').removeAttr('disabled'); + + } + + }); + + $('#PayOn').change(function() { + + var id = $('#PayOn').val(); + if(id != '-1') + { + $('#content').loader('show'); + + $.ajax({ + data:{id:id}, + + type:"POST", + url:"payslip/getEmployee", + success:function(result) { + if(result) + { +$("#Employee").empty(); + $('#content').loader('hide'); + $("#Employee").append(result); + + } + + } + }); + } + else + { + alert('Please select the PayOn'); + return false; + } + +}); + + + }); + + $(function () { + $("td").dblclick(function () { + var OriginalContent = $(this).text(); + $(this).addClass("cellEditing"); + $(this).html(""); + $(this).children().first().focus(); + $(this).children().first().keypress(function (e) { + if (e.which == 13) { + var newContent = $(this).val(); + $(this).parent().text(newContent); + $(this).parent().removeClass("cellEditing"); + } }); + $(this).children().first().blur(function(){ + $(this).parent().text(OriginalContent); + $(this).parent().removeClass("cellEditing"); + }); + }); + }); + +
    + +
    +

    +
    Siddharth Industries - PaySlip Create and Update
    + +

    +
    +
    +
    + +
    +
    + + Select Month + +
    +
    +
    + + + Employee ID + +
    + Select All
    +
    +
    + + + Employee Name +
    + 'emp_name','value' => set_value('emp_name'),'id'=>'emp_name', 'class' => 'form-control' ,'required' => 'true' , 'readonly' => 'true'); + echo form_input($data); + ?> +
    + +
    + + +
    + + + +
    + + + + +
    + +
    Budget Type Budget Year
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Employee IDOT in HoursIncentiveLoan recoveriesMode Of PaymentRemarksAction
    Emp0014020005000ChequePending Loan amount 25000 + +
    Emp0022015000.00AccountGood + +
    Emp003019000.00AccountGood + +
    Emp0042515490.00On HoldGood + +
    + +
    +
    + + +
    +
    + + + + load->helper('form'); + $error = $this->session->flashdata('error'); + if($error) + { + ?> +
    + + session->flashdata('error'); ?> +
    + + session->flashdata('success'); + if($success) + { + ?> +
    + + session->flashdata('success'); ?> +
    + + +
    +
    + ', '
    '); ?> +
    +
    +
    +
    + + + + + diff --git a/application/views/payslipgenerate.php b/application/views/payslipgenerate.php index a11ff5d6..83522b24 100644 --- a/application/views/payslipgenerate.php +++ b/application/views/payslipgenerate.php @@ -115,6 +115,7 @@ $("#Employee").empty();
    +