Merge pull request #170 from dhanasingh/dev

v3.4.1

Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
 
-gem "rufus-scheduler", "3.2.0"
+gem "rufus-scheduler", "3.5.2"
 gem 'svg-graph', '~> 2.1', '>= 2.1.3'
 

README.rdoc

@@ -66,14 +66,11 @@ If an apache passenger module is used then make sure the following settings are
 	b) RailsAppSpawnerIdleTime 0
 	c) PassengerPreStart http://rails-app-url/	
 
-Release Notes for 3.4
+Release Notes for 3.4.1
 
-Features:
-	   - Dashboards are introduced
-
-	   - Redmine-4.0 compatible 
-
-We would like to thank Addison for partially sponsored this release.
+Bug Fixing:
+	   - CSV does not contain Currency and Amount columns in expense detail
+	   - Dashboards is visible for all users
 
 Customization:
 	For any Customization/Support, please contact us, our consulting team will be happy to help you

app/controllers/wkdashboard_controller.rb

@@ -15,8 +15,9 @@ class WkdashboardController < WkbaseController
 include WkpayrollHelper
 
   def index
-	if Setting.plugin_redmine_wktime['wktime_enable_dashboards_module'].blank? ||
-	   Setting.plugin_redmine_wktime['wktime_enable_dashboards_module'].to_i == 0
+	# if Setting.plugin_redmine_wktime['wktime_enable_dashboards_module'].blank? ||
+	   # Setting.plugin_redmine_wktime['wktime_enable_dashboards_module'].to_i == 0
+	if !showDashboard || !hasSettingPerm
 	   redirect_to :controller => 'wktime',:action => 'index' , :tab => 'wktime'
 	else
 	  set_filter_session

assets/javascripts/wkstatus.js

@@ -19,13 +19,15 @@ $(document).ready(function(){
 		var spentTypeDD = '<table><tr><td><label for="select" style="text-transform:   none;">Spent Type</label></td>'
             +'<td><select name="spent_type" id="spent_type" onchange="spentTypeValue(this);">'           
             +'</select></td></tr></table>';
+		var spentTypeHF = '<input type="hidden" name="spent_type" id="spent_typeHF" value="">'
 	}
 
 	if(document.querySelector("h2") && document.querySelector("h2").innerHTML == "Spent time")	
 	{
 		if(document.getElementById('spent_type') == null)
 		{	
 			$("#query_form_content").append(spentTypeDD);
+			$("#csv-export-form").append(spentTypeHF);
 		}
 		var spentDD = document.getElementById('spent_type');
 		var userid = document.getElementById('spent_time_user_id').value;
@@ -88,7 +90,10 @@ $(document).ready(function(){
 				}
 			}, 500);		
 		});	
-	}	
+	}
+	$(".time-entries.selected,.icon.icon-reload").click(function(){
+		sessionStorage.clear();
+	});
 });
 
 function spentTypeValue(elespent)
@@ -101,6 +106,7 @@ function spentTypeValue(elespent)
 function spentTypeSelection()
 {
 	var spcheck = sessionStorage.getItem("spent_type") == null ? "T" : sessionStorage.getItem("spent_type");
+	$("#spent_typeHF").val(spcheck);
 	if(document.getElementById('spent_type') != null) {
 		var ddl = document.getElementById('spent_type');
 		var opts = ddl.options.length;
@@ -250,4 +256,4 @@ function signAttendance(str)
 	data: {startdate : datevalue, str: str},
 	success: function(data){ }   
 	});
-}
+}

init.rb

@@ -538,7 +538,7 @@ def getSupervisorCondStr
   name 'ERPmine'
   author 'Adhi Software Pvt Ltd'
   description 'ERPmine is an ERP for Service Industries. It has the following modules: Time & Expense, Attendance, Payroll, CRM, Billing, Accounting, Purchasing, Inventory, Asset , Reports and Dashboards'
-  version '3.4'
+  version '3.4.1'
   url 'http://www.redmine.org/plugins/wk-time'
   author_url 'http://www.adhisoftware.co.in/'
 
@@ -650,7 +650,8 @@ def getSupervisorCondStr
 
 
   Redmine::MenuManager.map :wktime_menu do |menu|
-	  menu.push :wkdashboard, { :controller => 'wkdashboard', :action => 'index' }, :caption => :label_dashboards, :if => Proc.new { Object.new.extend(WkdashboardHelper).checkViewPermission && Object.new.extend(WkdashboardHelper).showDashboard }
+	  #menu.push :wkdashboard, { :controller => 'wkdashboard', :action => 'index' }, :caption => :label_dashboards, :if => Proc.new { Object.new.extend(WkdashboardHelper).checkViewPermission && Object.new.extend(WkdashboardHelper).showDashboard }
+	  menu.push :wkdashboard, { :controller => 'wkdashboard', :action => 'index' }, :caption => :label_dashboards, :if => Proc.new { Object.new.extend(WkdashboardHelper).checkViewPermission && Object.new.extend(WkdashboardHelper).showDashboard && Object.new.extend(WktimeHelper).hasSettingPerm}
 	  menu.push :wktime, { :controller => 'wktime', :action => 'index' }, :caption => :label_te, :if => Proc.new { Object.new.extend(WktimeHelper).checkViewPermission && Object.new.extend(WktimeHelper).showTimeExpense }
 	  menu.push :wkattendance, { :controller => 'wkattendance', :action => 'index' }, :caption => :label_hr, :if => Proc.new { Object.new.extend(WktimeHelper).checkViewPermission && (Object.new.extend(WktimeHelper).showAttendance || Object.new.extend(WktimeHelper).showPayroll || Object.new.extend(WktimeHelper).showShiftScheduling)}	  
 	  menu.push :wklead, { :controller => 'wklead', :action => 'index' }, :caption => :label_crm, :if => Proc.new { Object.new.extend(WktimeHelper).checkViewPermission && Object.new.extend(WktimeHelper).showCRMModule }