diff --git a/application/logs/log-2017-09-05.php b/application/logs/log-2017-09-05.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-09-11.php b/application/logs/log-2017-09-11.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-09-12.php b/application/logs/log-2017-09-12.php new file mode 100644 index 00000000..aef6f41f --- /dev/null +++ b/application/logs/log-2017-09-12.php @@ -0,0 +1,6 @@ + + +ERROR - 2017-09-12 09:32:30 --> Severity: Notice --> Undefined property: stdClass::$Loan_Balance /opt/lampp/htdocs/12sept222/siddharth_application/application/views/monthlyListing.php 84 +ERROR - 2017-09-12 09:32:30 --> Severity: Notice --> Undefined property: stdClass::$Loan_Balance /opt/lampp/htdocs/12sept222/siddharth_application/application/views/monthlyListing.php 84 +ERROR - 2017-09-12 09:32:30 --> Severity: Notice --> Undefined property: stdClass::$Loan_Balance /opt/lampp/htdocs/12sept222/siddharth_application/application/views/monthlyListing.php 84 +ERROR - 2017-09-12 09:32:30 --> Severity: Notice --> Undefined property: stdClass::$Loan_Balance /opt/lampp/htdocs/12sept222/siddharth_application/application/views/monthlyListing.php 84 diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php index e82facb4..87baddff 100755 --- a/application/views/addemppaydate.php +++ b/application/views/addemppaydate.php @@ -17,7 +17,11 @@ $("#due_started").datepicker({ - +
@@ -31,7 +35,7 @@ $("#due_started").datepicker({
- Back + Back

@@ -68,9 +72,9 @@ $("#due_started").datepicker({ -
+
- * + Employee ID*
-
+
- * + Total Salary*
'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '([0-9]{1,8}([.][0-9]{1,2})?)', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();'); + $data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '([0-9]{1,8}([.][0-9]{1,2})?)', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();'); echo form_input($data); ?>
-
+
- * + Basic Pay*
'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number','readonly'=>'readonly'); + $data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number','readonly'=>'readonly'); + echo form_input($data); + ?> +
+
+
+
+
+ HRA Rate(%)* + +
+ 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();','onchange'=>'calculalteHRA();'); echo form_input($data); ?>
@@ -120,111 +137,90 @@ $("#due_started").datepicker({
- - - - - -
+
-
+ +
- * + HRA Amount*
'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();','onchange'=>'calculalteHRA();'); - echo form_input($data); - ?> -
-
-
-
-
- * - -
- 'HRA_Amount','id'=>'HRA_Amount','value' => set_value('HRA_Amount'), 'class' => 'form-control','style'=>'text-transform:uppercase;','readonly'=>'readonly'); + $data = array('name' => 'HRA_Amount','id'=>'HRA_Amount','value' => set_value('HRA_Amount'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','readonly'=>'readonly'); echo form_input($data); ?>
-
+
- * + OT Rate(Per Hour)*
'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern="([0-9]{1,3}([.][0-9]{1,2})?' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 2 digit'); + $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern="([0-9]{1,3}([.][0-9]{1,2})?' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 2 digit'); echo form_input($data); ?>
+
+
+ Allowances* +
+ 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit '); + echo form_input($data); + ?> +
+
+
- +
+
+ PF Rate(%)* + +
+ 'PF_Rate','value' => set_value('PF_Rate'),'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the valid PF Rate,Minimum 1 digit,Maximum 2 digit'); + echo form_input($data); + ?> +
+
+
- - - -
+
-
+ +
- * + ESI Rate(%)*
'Allowances','value' => set_value('Allowances'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit '); - echo form_input($data); - ?> -
-
-
- -
-
- * - -
- 'PF_Rate','value' => set_value('PF_Rate'),'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the valid PF Rate,Minimum 1 digit,Maximum 2 digit'); - echo form_input($data); - ?> -
-
-
-
-
- * -
- 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)','title'=>'Enter the Valid ESI Rate,Minimum 1 digit,Maximum 2 digit'); + $data = array('name' => 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)','title'=>'Enter the Valid ESI Rate,Minimum 1 digit,Maximum 2 digit'); echo form_input($data); ?>
-
+
- * + Food Allowances(Per Day)*
'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control','pattern'=>'([0-9]{1,3}([.][0-9]{1,2})?)','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 4 Digit'); + $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control num','pattern'=>'([0-9]{1,3}([.][0-9]{1,2})?)','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 4 Digit'); echo form_input($data); ?>
@@ -245,7 +241,7 @@ $("#due_started").datepicker({ Loan Amount - +
@@ -257,7 +253,7 @@ $("#due_started").datepicker({
Loan Issue(d) Date - +
@@ -267,7 +263,7 @@ $("#due_started").datepicker({
Monthly Due - +
@@ -275,7 +271,7 @@ $("#due_started").datepicker({
Due Started - +
@@ -283,7 +279,7 @@ $("#due_started").datepicker({
No Of Due(s) - +
@@ -291,7 +287,7 @@ $("#due_started").datepicker({
Paid Amount - +
@@ -299,8 +295,8 @@ $("#due_started").datepicker({
- - + +
diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php index e4af1517..7132272a 100755 --- a/application/views/editOldemppay.php +++ b/application/views/editOldemppay.php @@ -121,6 +121,11 @@ if(!empty($emppay)) ?> +
@@ -134,7 +139,7 @@ if(!empty($emppay))
- Back + Back

@@ -166,7 +171,7 @@ if(!empty($emppay)) -
+
Employee ID @@ -175,7 +180,7 @@ if(!empty($emppay))
-
+
Employee Name @@ -184,57 +189,61 @@ if(!empty($emppay))
-
+
Total Salary* - +
- - - - -
- - -
- - - -
+
Basic Pay* - +
- -
+
+ + +
+
HRA_Rate(%)* - +
-
+
HRA_Amount* - + +
+
+
+
+
+
+ OT_Rate(Per Hour)* + +
+
+
+ +
+
+
+ Allowances* +
- - - - -
@@ -244,56 +253,34 @@ if(!empty($emppay)) -
-
-
- OT_Rate(Per Hour)* - -
-
-
- -
-
-
- Allowances* - -
-
-
-
+ +
PF_Rate(%)* - +
-
-
- - - -
+
ESI_Rate(%)* - +
-
+
Food Allowances(Per Day)* - +
- - -
+
+
Loan Details
@@ -306,7 +293,7 @@ if(!empty($emppay)) Loan Amount - +
@@ -318,7 +305,7 @@ if(!empty($emppay))
Loan Issue(d) Date - +
@@ -328,7 +315,7 @@ if(!empty($emppay))
Monthly Due - +
@@ -336,7 +323,7 @@ if(!empty($emppay))
Due Started - +
@@ -344,7 +331,7 @@ if(!empty($emppay))
No Of Due(s) - +
@@ -353,7 +340,7 @@ if(!empty($emppay))
Paid Amount - +
@@ -416,8 +403,8 @@ if(!empty($emppay))
- - + +
diff --git a/application/views/editOldmonthly.php b/application/views/editOldmonthly.php index 2483ec84..57b97549 100755 --- a/application/views/editOldmonthly.php +++ b/application/views/editOldmonthly.php @@ -155,6 +155,11 @@ function validateLOP(){ // } +
@@ -168,7 +173,7 @@ function validateLOP(){
- Back + Back

@@ -182,65 +187,73 @@ function validateLOP(){
-
+
- Month Year: + Month Year - +
- - - - -
+
- Employee ID: + Employee ID
-
+
- Employee Name: + Employee Name
-
- -
- -
+ +
- LOP Days: - + LOP Days +
- - - - -
+
+ +
+
- OverTime Hours Worked: - + OverTime Hours Worked +
-
+
- Loan Recovered: - + Loan Recovered + +
+
+
+
+
+
+ Incentives + +
+
+
+
+
+
+ Other Deductions +
@@ -253,22 +266,7 @@ function validateLOP(){
-
-
-
- Incentives: - -
-
-
-
-
-
- Other Deductions: - -
-
-
+
@@ -314,8 +312,8 @@ function validateLOP(){
- - + +
diff --git a/application/views/editdepartment.php b/application/views/editdepartment.php old mode 100644 new mode 100755 diff --git a/application/views/emppayListing.php b/application/views/emppayListing.php index 13a1668a..547296f4 100755 --- a/application/views/emppayListing.php +++ b/application/views/emppayListing.php @@ -20,7 +20,7 @@
-
+
-
- - - - - - - - - - - - - - - - - +
+
Employee IDEmployee NameTotal Salary in ₹Basic Pay in ₹HRA Rate in %HRA Amount in ₹OT Rate in ₹Allowances in ₹PF Ratein %ESI Rate in %Food Allowances in ₹Action
+ + + + + + + + + + + + + + + - - - - - + + + - + - - - - - - - + -
+
@@ -100,13 +90,26 @@ \ No newline at end of file diff --git a/application/views/monthlyListing.php b/application/views/monthlyListing.php index a1524ba9..908ddda3 100755 --- a/application/views/monthlyListing.php +++ b/application/views/monthlyListing.php @@ -1,5 +1,5 @@ - --> +
@@ -33,20 +38,21 @@ speed:500
-
+
-
-
Emp IDEmp Name Total Sal in ₹Basic Pay in ₹HRA Rate in %HRA Amt in ₹OT Rate in ₹Allowances in ₹PF Ratein %ESI Rate in %Food Allow in ₹Action
EmpID ?>FirstName ." ". $record->LastName?>TotalSalary; ?>EmpID ?>FirstName ." ". $record->LastName?>TotalSalary; ?> Basic_Pay ?> HRA_Rate ?>HRA_Amount; ?>HRA_Amount; ?> OT_Rate ?> Allowances ?> PF_Rate ?> ESI_Rate ?>Food_Allowances ?> - - EDIT - + Food_Allowances ?> + EDIT
- +
+
+ + @@ -58,6 +64,7 @@ speed:500 + - + - - - + + + - - + + + -
+
@@ -102,13 +110,26 @@ speed:500 \ No newline at end of file diff --git a/uploads/images/Aadhar.jpg b/uploads/images/Aadhar.jpg old mode 100644 new mode 100755 diff --git a/uploads/images/Aadhar1.jpg b/uploads/images/Aadhar1.jpg old mode 100644 new mode 100755 diff --git a/uploads/images/documents.jpg b/uploads/images/documents.jpg old mode 100644 new mode 100755 diff --git a/uploads/images/images.jpg b/uploads/images/images.jpg old mode 100644 new mode 100755 diff --git a/uploads/images/photo.jpg b/uploads/images/photo.jpg old mode 100644 new mode 100755 diff --git a/uploads/images/photo1.jpg b/uploads/images/photo1.jpg old mode 100644 new mode 100755
Month Year Employee Id Employee NameOther Deductions in ₹ Action
Month_Year ?>Month_Year ?> EmpID ?> FirstName ." ". $record->LastName ?>LOP_Days ?>OT_Hrs_Worked ?>Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.','');}else {echo $record->Loan_Recovered;} ?>LOP_Days ?>OT_Hrs_Worked ?>Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.','');}else {echo $record->Loan_Recovered;} ?> Incentives ?>Other_Deductions ?>Incentives ?>Other_Deductions ?> - EDIT + EDIT