diff --git a/application/views/dashboard.php b/application/views/dashboard.php index 42f218ae..fe4fcf92 100755 --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -7,10 +7,10 @@ if(!empty($EmpCount)) { foreach ($EmpCount as $Emp) { - $Empcnt = $Emp->EmpCount; - } - - + $Empcnt = $Emp->EmpCount; + } + + } ?> @@ -18,23 +18,23 @@ if(!empty($EmpCount))
- - + +
-

Accounts Department Dashboard

+

Accounts Department Dashboard

-
+
-
+
@@ -45,17 +45,12 @@ if(!empty($EmpCount))
-
-
-

Guidelines:

# PaySlip menu in header has two sub menu ( 1.Upload Salary , 2.PaySlip Generator)

- # Upload salary menu is used to upload the Salary Excel file into the database

- # Payslip generator menu is to generate the salary slip for individual Employess or All Employees

-
-
-
+ + +
- @@ -505,12 +500,12 @@ $("#monthabs").val(''); - - -
+ + +

Admin Dashboard

@@ -538,32 +533,32 @@ $("#monthabs").val('');
- +
- - - - + + + +
-

Manager Department Dashboard

+

Manager Department Dashboard

-
+
-
+
@@ -574,19 +569,17 @@ $("#monthabs").val('');
-
-
- Hi This Is Manager Login -
-
+ + +
- + if($DEPCode == MANAGEMENT) + { + ?> @@ -595,7 +588,7 @@ $("#monthabs").val(''); - - + - - - - + + + + @@ -1174,34 +1167,34 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: var capital = ; var revenue = ; // alert(service.PONO); - var serviceValues = []; - // var arr = new Array(); - $.each (service,function(idx,obj){ - serviceValues.push(obj[0].totalService); - }); - var ImportValues = []; - // var arr = new Array(); - $.each (Import,function(idx,obj){ - ImportValues.push(obj[0].totalImport); - }); - var capitalValues = []; - // var arr = new Array(); - $.each (capital,function(idx,obj){ - capitalValues.push(obj[0].totalcapital); - }); - var revenueValues = []; - // var arr = new Array(); - $.each (revenue,function(idx,obj){ - revenueValues.push(obj[0].totalrevenue); - }); - - //console.log(serviceValues); - //alert(arr.total2); + var serviceValues = []; + // var arr = new Array(); + $.each (service,function(idx,obj){ + serviceValues.push(obj[0].totalService); + }); + var ImportValues = []; + // var arr = new Array(); + $.each (Import,function(idx,obj){ + ImportValues.push(obj[0].totalImport); + }); + var capitalValues = []; + // var arr = new Array(); + $.each (capital,function(idx,obj){ + capitalValues.push(obj[0].totalcapital); + }); + var revenueValues = []; + // var arr = new Array(); + $.each (revenue,function(idx,obj){ + revenueValues.push(obj[0].totalrevenue); + }); + + //console.log(serviceValues); + //alert(arr.total2); var salesChartData = { labels: [ "April", "May", "June", "July", "August", "September", "October", "November", "December","January", "February", "March"], - + datasets: [ - + { label: "Electronics", fillColor: "rgba(0, 192, 239, 0.2)", @@ -1210,10 +1203,10 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: pointStrokeColor: "rgba(60,141,188,1)", pointHighlightFill: "#fff", pointHighlightStroke: "rgba(60,141,188,1)", - data:[serviceValues[3],serviceValues[4],serviceValues[5],serviceValues[6],serviceValues[7],serviceValues[8],serviceValues[9],serviceValues[10],serviceValues[11],serviceValues[0],serviceValues[1],serviceValues[2]] - + data:[serviceValues[3],serviceValues[4],serviceValues[5],serviceValues[6],serviceValues[7],serviceValues[8],serviceValues[9],serviceValues[10],serviceValues[11],serviceValues[0],serviceValues[1],serviceValues[2]] + }, - + { label: "Digital Goods", fillColor: "rgba(221, 75, 57,0.2)", @@ -1378,12 +1371,12 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: - - - - + + + + \ No newline at end of file diff --git a/application/views/permission.php b/application/views/permission.php index 7ca53066..09cec796 100644 --- a/application/views/permission.php +++ b/application/views/permission.php @@ -1235,7 +1235,9 @@
format('d-m-Y'); + $data = array('name' => 'date','value' => set_value('date',$date),'id'=>'date', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>