Merge pull request #316 from dhanasingh/dev

v4.7.4

README.rdoc

@@ -111,14 +111,9 @@ For more information on features, please refer to the user guide
 
     rake redmine:plugins:migrate NAME=redmine_wktime VERSION=0 RAILS_ENV=production
 
-=== Release Notes for v4.7.1
+=== Release Notes for v4.7.4
 
-    - Redmine 5.1 compatibility.
-
-* *Bug* *fixes*
-
-    - Cannot update clock-in/clock-out in timesheet header.
-    - Conflict with redmine_dmsf plugin.
+    - Minor changes.
 
 === Customization
 
@@ -163,7 +158,7 @@ For more information on features, please refer to the user guide
 		https://www.youtube.com/watch?v=ik4jgTMtbvU
 
 		https://www.youtube.com/watch?v=weZk70ReZXA
-		
+
 
 	*For* *more*:
 

app/views/wkattendance/clockedit.html.erb

@@ -37,7 +37,6 @@
 					<th class="lbl-txt-align"><%= l(:label_clock_out) %></th>
 					<th class="lbl-txt-align"><%= l(:field_hours) %></th>
 					</tr>
-					<tr></tr>
 				</thead>
 				<% entry_id = Array.new %>
 				<% start_time = Array.new %>

app/views/wkcrmactivity/_activity_list.html.erb

@@ -39,7 +39,7 @@
 						<% end %>
 						<% if !show_on_map && controller.is_referral %><td class="lbl-txt-align"><%= entry&.interview_type&.name %></td><% end %>
 						<td class="lbl-txt-align"><%=h entry.name %></td>
-						<td class="lbl-txt-align">
+						<td class="lbl-txt-align colorcode-bg-setup col-status-<%=(controller.is_referral ? entry.status: (['M', 'C'].include?(entry.activity_type) ? entry.status : entry.status)) %>">
 							<%= controller.is_referral ? rf_status[entry.status] : (["M", "C"].include?(entry.activity_type) ? meetCallStatusHash[entry.status] : taskStatusHash[entry.status]) %>
 						</td>
 						<% if !show_on_map %>

app/views/wkdelivery/_delivery_list.html.erb

@@ -16,7 +16,7 @@
 		    <td class="lbl-txt-align"><%= entry.serial_number  %></td>
 				<td class="lbl-txt-align"><%= entry.parent.name  %></td>
 				<td class="lbl-txt-align"><%= entry.shipment_date  %></td>
-				<td class="lbl-txt-align"><%= getDeliveryStatus[entry.current_status] %></td>
+				<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.current_status %>"><%= getDeliveryStatus[entry.current_status] %></td>
 				<td class="lbl-txt-align"><%= entry.delivery_items[0].currency unless entry.delivery_items[0].blank?%> <%= html_hours("%.2f" % entry.delivery_items.sum('total_quantity * selling_price'))  %></td>
 				<td class="lbl-txt-align">
 				<%= link_to image_tag('edit.png'), {:controller => controller.controller_name, :action => 'edit', :delivery_id => entry.id, id: entry.id, :tab => controller.controller_name},

app/views/wkgeolocation/_show_on_map.html.erb

@@ -37,7 +37,7 @@
 %>
 <div id="mapheader" style="width: <%=width%>; height: <%=height%>;float: left;padding-left: 5px;min-height: 600px;">
   <div style="text-align: right;padding-top:5px;">
-    <%= link_to_function l(:button_close), '$("#show_on_map").prop("checked", false);$("#query_form").submit()', :class => 'icon fa-close' %>
+    <%= link_to_function l(:button_close), '$("#show_on_map").prop("checked", false);$("#query_form").submit()', :class => 'fa fa-close' %>
   </div>
   <div id='mapContainer'style="width: inherit; height: inherit;"></div>
 </div>

app/views/wkgltransaction/_graph.html.erb

@@ -1,4 +1,4 @@
-<div style="padding-right: 20px;width:55%;float: right">
+<div style="padding-right: 20px;width:50%;float: right">
 	<canvas id="ledger_graph" height="250"></canvas>
 </div>
 

app/views/wkgltransaction/_trans_list.html.erb

@@ -41,7 +41,7 @@
 			end
 			%>
 			<tr class="trlist" data-toggle="tooltip" data-container="body" data-placement="bottom" title="<%=entry.comment%>">
-				<td class="lbl-txt-align"><%=h transTypeHash[entry.trans_type]  %></td>
+				<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.trans_type %>"><%=h transTypeHash[entry.trans_type]  %></td>
 				<td class="lbl-txt-align"><%=h entry.trans_date %></td>
 				<td class="lbl-txt-align"><%=h @partLedgerName %></td>
 				<td class="lbl-txt-align"><%=h  "%.2f" % @dbAmount unless @dbAmount.blank? %></td>

app/views/wklead/_lead_list.html.erb

@@ -33,7 +33,7 @@
 					<% if controller.is_referral %>
 						<td class="lbl-txt-align"><%=h entry.contact.location_id.blank? ? "" : entry.contact&.location&.name %></td>
 						<td class="lbl-txt-align"><%=h entry.contact&.name %></td>
-						<td class="lbl-txt-align"><%=h getLeadStatusHash[entry.status] %></td>
+						<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.status %>"><%=h getLeadStatusHash[entry.status] %></td>
 						<td class="lbl-txt-align"><%= entry&.candidate&.degree %></td>
 						<td class="lbl-txt-align"><%= entry&.candidate&.pass_out %></td>
 						<td class="lbl-txt-align"><%= entry&.referred&.name %></td>
@@ -44,7 +44,7 @@
 						<% end %>
 					<% else %>
 						<td class="lbl-txt-align"><%=h entry.contact&.name %></td>
-						<td class="lbl-txt-align"><%=h getLeadStatusHash[entry.status] %></td>
+						<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.status %>"><%=h getLeadStatusHash[entry.status] %></td>
 						<td class="lbl-txt-align"><%=h entry.account.blank? ? "" : entry.account.name %></td>
 						<td class="lbl-txt-align"><%=h entry.contact.location_id.blank? ? "" : entry.contact&.location&.name %></td>
 						<td class="lbl-txt-align"><%=h entry.contact.address.blank? ? "" : entry.contact&.address&.work_phone %></td>

app/views/wkleaverequest/_leaverequest_list.html.erb

@@ -19,7 +19,7 @@
 				<td class="lbl-txt-align"><%= entry.startDate %></td>
 				<td class="lbl-txt-align"><%= entry.endDate %></td>
 				<td class="lbl-txt-align"><%= (entry.created_at)&.to_date %></td>
-				<td class="lbl-txt-align"><%= status %></td>
+				<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.try(:status) %>"><%= status %></td>
 				<td align="center">
 					<%= link_to image_tag('edit.png'), {:controller => controller_name, :action => 'edit', :id => entry.id,
 						:tab => controller_name}, :title => l(:button_edit) %>

app/views/wkleaverequest/index.html.erb

@@ -14,18 +14,28 @@
 		<%= hidden_field_tag("searchlist", controller_name) %>
 		<%= hidden_field_tag('tab', controller_name) %>
 		<% period = session[:wkleaverequest].try(:[], :period) %>
-		<% if isLeaveReqAdmin %>
-			<label><%=l(:label_group_plural)%></label>&nbsp;
-			<%= select_tag('group_id', options_for_select( [["", 0]] + (@groups.collect {|p| [p.name, p.id ]}),
-						:selected => group_id), :onchange => "grpChanged(this, #{User.current.id}, true);", :style=> "width:300px;") %>&nbsp;
-			<label><%=l(:label_member)%></label>&nbsp;
-			<%= select_tag('user_id', options_for_select( [[l(:all_users_for_select), 0]] + @members, :selected => userID),
-						:style=> "width:200px;") %>&nbsp;
-		<% end %>
-		<label><%= l(:label_leave_type) %></label>&nbsp;
-		<%= select_tag('leave_type', options_for_select(get_leave_type.unshift(['','']), session[controller_name].try(:[], :leave_type))) %>&nbsp;
-		<label><%= l(:field_status) %></label>&nbsp;
-		<%= select_tag('lveStatus', options_for_select(statusList.invert, session[controller_name].try(:[], :lveStatus))) %>&nbsp;
+		<div style="display:flex; flex-wrap:wrap;">
+			<% if isLeaveReqAdmin %>
+			<div>
+				<label><%=l(:label_group_plural)%></label>&nbsp;
+				<%= select_tag('group_id', options_for_select( [["", 0]] + (@groups.collect {|p| [p.name, p.id ]}),
+							:selected => group_id), :onchange => "grpChanged(this, #{User.current.id}, true);", :style=> "width:300px;") %>&nbsp;
+			</div>
+			<div>	
+				<label><%=l(:label_member)%></label>&nbsp;
+				<%= select_tag('user_id', options_for_select( [[l(:all_users_for_select), 0]] + @members, :selected => userID),
+							:style=> "width:200px;") %>&nbsp;
+			</div>
+			<% end %>
+			<div>
+				<label><%= l(:label_leave_type) %></label>&nbsp;
+				<%= select_tag('leave_type', options_for_select(get_leave_type.unshift(['','']), session[controller_name].try(:[], :leave_type))) %>&nbsp;
+			</div>
+			<div>
+				<label><%= l(:field_status) %></label>&nbsp;
+				<%= select_tag('lveStatus', options_for_select(statusList.invert, session[controller_name].try(:[], :lveStatus))) %>&nbsp;
+		  </div>
+		</div>
 		<fieldset id="date-range" class="collapsible">
 			<legend onclick="toggleFieldset(this);" class="icon icon-expanded"><%= l(:label_date_range) %></legend>
 			<div>

app/views/wkopportunity/_opportunity_list.html.erb

@@ -34,7 +34,7 @@
 		    <td class="lbl-txt-align"><%=h entry.name  %></td>
 		<!--	<td class="lbl-txt-align"><%#=h entry.parent.name unless entry.parent.blank? %></td> -->
 			<td class="lbl-txt-align"><%=h relatedHash[entry.parent_type] %></td>
-			<td class="lbl-txt-align"><%=h opportunityHelper.get_sales_stage(entry).blank? ? "" : salestagehash[opportunityHelper.get_sales_stage(entry)] %></td>
+			<td class="lbl-txt-align colorcode-bg-setup col-status-<%= opportunityHelper.get_sales_stage(entry).blank? ? '' : opportunityHelper.get_sales_stage(entry) %>"><%=h opportunityHelper.get_sales_stage(entry).blank? ? "" : salestagehash[opportunityHelper.get_sales_stage(entry)] %></td>
 			<td class="lbl-txt-align"><%=h entry.currency + " "  %><%=h html_hours("%.2f" % entry.amount) %></td>
 			<td class="lbl-txt-align"><%=h entry.close_date.localtime.strftime("%Y-%m-%d") %></td>
 			<td class="lbl-txt-align"><%=h entry.assigned_user.name(:firstname_lastname)  unless entry.assigned_user.blank? %></td>

app/views/wkorderentity/_order_list.html.erb

@@ -57,7 +57,7 @@
 							<td class="lbl-txt-align"><%=h entry.parent.name  %></td>
 							<td class="lbl-txt-align"><%=h projectName %></td>
 
-							<td class="lbl-txt-align"><%=h helperObj.getSIStatus.invert[entry.status]  %></td>
+							<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.status %>"><%=h helperObj.getSIStatus.invert[entry.status]  %></td>
 							<td class="lbl-txt-align"><%=h format_date(entry.invoice_date)  %></td>
 							<td class="lbl-txt-align"><%=h format_date(entry.start_date)  %></td>
 							<td class="lbl-txt-align"><%=h format_date(entry.end_date)  %></td>
@@ -88,12 +88,12 @@
 								toCurrency = Setting.plugin_redmine_wktime['wktime_currency']
 								amount = getExchangedAmount(@currency, value['amount'])
 							%>
-							<tr class="<%= cycle("odd", "even") %>">
+							<tr class="<%= cycle("odd", "even") %> col-status-<%=(value['status'] == 'o' ? 'open' : 'closed').capitalize%>">
 								<td class="lbl-txt-align"><%=h l(:label_unbilled)  %></td>
 								<!-- <td class="lbl-txt-align"><%#=h value['parent_type'] == 'WkAccount' ? 'Account' : 'Contact'  %></td> -->
 								<td class="lbl-txt-align"><%=h value['name']  %></td>
 								<td class="lbl-txt-align"><%=h value['project'] %></td>
-								<td class="lbl-txt-align"><%=h (value['status'] == 'o' ? 'open' : 'closed')  %></td>
+								<td class="lbl-txt-align col-status"><%=h (value['status'] == 'o' ? 'open' : 'closed')  %></td>
 								<td class="lbl-txt-align"><%=h Date.today  %></td>
 								<td class="lbl-txt-align"><%=h value['start_date']  %></td>
 								<td class="lbl-txt-align"><%=h value['end_date']  %></td>

app/views/wkpaymententity/_payment_list.html.erb

@@ -20,7 +20,7 @@
 			<td class="lbl-txt-align"><%=h personTypeLabelHash[entry.entity_type] %></td>
 			<td class="lbl-txt-align"><%=h entry&.parent&.name %></td>
 			<td class="lbl-txt-align"><%=h entry.payment_date.strftime("%Y-%m-%d") %></td>
-			<td class="lbl-txt-align"><%=h getPayTypeHash[entry.payment_type_id] %></td>
+			<td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.payment_type_id %>"><%=h getPayTypeHash[entry.payment_type_id] %></td>
 			<td class="lbl-txt-align"><%= entry.payment_items[0].original_currency unless entry.payment_items[0].blank?%> <%=h html_hours("%.2f" % entry.payment_original_amount) unless entry.payment_original_amount.blank?   %></td>
 			<td class="lbl-txt-align"><%= entry.payment_items[0].currency unless entry.payment_items[0].blank?%> <%=h html_hours("%.2f" % entry.payment_amount) unless entry.payment_amount.blank?   %></td>
 			<td class="lbl-txt-align">

app/views/wkrfq/_rfq_list.html.erb

@@ -16,7 +16,7 @@
           <tr>
 			  <td class="lbl-txt-align"><%=h entry.id %></td>
 		      <td class="lbl-txt-align"><%=h entry.name %></td>
-			  <td class="lbl-txt-align"><%=h getRfqStatusHash[entry.status]  %></td>
+			  <td class="lbl-txt-align colorcode-bg-setup col-status-<%= entry.status %>"><%=h getRfqStatusHash[entry.status]  %></td>
 			  <td class="lbl-txt-align"><%=h entry.start_date %></td>
 			  <td class="lbl-txt-align"><%=h entry.end_date  %></td>
 			  <td align="center">

app/views/wkskill/edit.html.erb

@@ -14,8 +14,8 @@ th{
 
 <%= form_with model: @skills, method: "post", url: {action: "save", project_id: params[:project_id]} do |f| %>
 	<%= f.hidden_field :id  %>
-	<%= f.hidden_field :source_id, value: @skills&.source_id || isProjSkill ? get_project_id : user_id, id: "source_id" %>
-	<%= f.hidden_field :source_type, value: @skills&.source_type || isProjSkill ? "Project" : "User" %>
+	<%= f.hidden_field :source_id, value: (@skills&.source_id || (isProjSkill ? get_project_id : user_id)), id: "source_id" %>
+	<%= f.hidden_field :source_type, value: @skills&.source_type || (isProjSkill ? "Project" : "User") %>
 	<fieldset class="box tabular">
 		<table>
 			<tr>

app/views/wksurvey/_survey_list.html.erb

@@ -35,7 +35,7 @@ end
                     <%=h link_to entry.name, url_for(helperObj.get_survey_url(urlhash, params, "survey")) %>
                 <% end %>
             </td>
-            <td><%=h helperObj.getSurveyStatus.invert[entry.status] %></td>
+            <td class="colorcode-bg-setup col-status-<%= entry.status %>"><%=h helperObj.getSurveyStatus.invert[entry.status] %></td>
             <td class="lbl-txt-align">
                 <% if !entry.hide_response && (["O","C"].include? entry.status) %>
                     <%= link_to image_tag("withoutcommant.png", :plugin => "redmine_wktime"),

app/views/wksurvey/_survey_result.html.erb

@@ -20,7 +20,7 @@
         <tr><th align="left"><%= entry.question_name %></th></tr>
         <tr>
           <td><%= render :partial => 'graph', :locals => { :entry => entry } if (validateTrendingChart(entry.survey_id, entry.id) || params[:groupName] != 'trendChart') %></td>
-          <th style="padding-left: 300px; font-size: 96px;" id="avgScore_<%= entry.id %>"></th>
+          <th style="width: 50%; font-size: 96px; text-align: center" id="avgScore_<%= entry.id %>"></th>
         <tr>
       </table>
     </fieldset>

app/views/wktime/_edit_issues2.html.erb

@@ -122,11 +122,11 @@
 	%>
 
 	<% if controller.showActivityDD %>
-		<td class="issue" align="left" width="75px">
+		<td class="issue" align="left" width="150px">
 		<% if @editable %>
 			<%=h select_tag(isTemplate ? '__template__time_entry[][activity_id]' : 'time_entry[][activity_id]',
 			activities.blank? ? nil : options_for_select(activities, :selected => entry.nil? ? defActivity : entry.activity_id),
-			:style=> "width:75px" ) %>
+			:style=> "width:150px" ) %>
 		<% else %>
 			<%= activity.blank? ? entry.activity_id : activity.name unless entry.nil?%>
 		<% end %>

app/views/wktime/_list.html.erb

@@ -32,7 +32,7 @@
 						<td class="lbl-txt-align"><%=h entry.user.supervisor.blank? ? "" : entry.user.supervisor.name %></td>
 					<% end %>
 					<td ><%= controller.getUnit(entry) %>&nbsp;<%=h html_hours("%.2f" % (entry.hours || entry.amount || 0)) %></td>
-					<td class="status"><%=h statusString(entry.status) unless entry.status.blank? %></td>
+					<td class="status colorcode-bg-setup col-status-<%= entry.status %>"><%=h statusString(entry.status) unless entry.status.blank? %></td>
 					<td class="lbl-txt-align"><%=h entry.status_updater %></td>
 					<td align="center">
 					<%  #if entry.editable_by?(User.current) %>

assets/javascripts/edit.js

@@ -88,12 +88,12 @@ $(document).ready(function() {
 					}
 					updateCustomField();
 					custFldToolTip = getCustFldToolTip();
-					if(	!commentInRow && e_comments.val() != "")
+					if(	edits.length > 0 && !commentInRow && e_comments.val() != "")
 					{
-						edits[comment_col-1].title = e_comments.val() + "," +custFldToolTip;
+						edits[comment_col-1].title = (e_comments.val() || '') + "," +(custFldToolTip || '');
 
 					}
-					else
+					else if(	edits.length > 0)
 					{
 						edits[comment_col-1].title = custFldToolTip;
 

assets/javascripts/index.js

@@ -11,6 +11,39 @@ var userList = new Array();
 var rSubEmailUrl = "";
 var rAppEmailUrl = "";
 
+//For Colorcode in Sidebar-white theme
+var colorcode_statuses = {
+  Empty: 1,
+  New: 0,
+  Rejected: 2,
+  Submitted: 4,
+  Approved: 3,
+  Cancelled: 1,
+  Assigned: 4,
+  In_Process: 5,
+  Converted: 3,
+  Recycled: 1,
+  Dead: 2,
+  Planned: 0,
+  Not_Held: 2,
+  Held: 3,
+  Open: 6,
+  Closed: 1,
+  Contra: 0,
+  Payment: 1,
+  Receipt: 2,
+  Journal: 3,
+  Sales: 4,
+  Credit_Note: 5,
+  Purchase: 6,
+  Debit_Note: 7,
+  Fulfilled: 4,
+  Delivered: 3,
+  Archived: 2,
+  In_Transit: 5,
+  Loading: 4
+};
+
 $(document).ready(function() {
 	$( "#reminder-email-dlg" ).dialog({
 		autoOpen: false,

init.rb

@@ -588,7 +588,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, Dashboards and Survey'
-  version '4.7.3'
+  version '4.7.4'
   url 'https://www.redmine.org/plugins/wk-time'
   author_url 'http://www.adhisoftware.co.in/'