Merge pull request #272 from finnlabs/fix/24139-cannot–edit-unit-costs-in-log-unit-form

[24139] Cannot edit unit costs in log unit form
pull/6827/head
Oliver Günther 8 years ago committed by GitHub
commit 20f99d797d
  1. 2
      app/views/costlog/edit.html.erb
  2. 107
      frontend/app/components/budget/cost-unit-subform.directive.ts

@ -93,6 +93,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<div class="form--field"> <div class="form--field">
<label for="cost_entry_costs_edit" class="form--label"><%= CostEntry.human_attribute_name(:costs) %></label> <label for="cost_entry_costs_edit" class="form--label"><%= CostEntry.human_attribute_name(:costs) %></label>
<span class="form--field-container"> <span class="form--field-container">
<cost-unit-subform obj-id="cost_entry_costs" obj-name="cost_entry[overridden_costs]">
<% if User.current.allowed_to? :view_cost_rates, @cost_entry.project %> <% if User.current.allowed_to? :view_cost_rates, @cost_entry.project %>
<a href="javascript:;" id="cost_entry_costs" class="icon-context icon-edit" title="<%= t(:help_click_to_edit) %>"> <a href="javascript:;" id="cost_entry_costs" class="icon-context icon-edit" title="<%= t(:help_click_to_edit) %>">
<%= number_to_currency(@cost_entry.calculated_costs) %> <%= number_to_currency(@cost_entry.calculated_costs) %>
@ -103,6 +104,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</span> </span>
<br /><em><%= t(:help_override_rate) %></em> <br /><em><%= t(:help_override_rate) %></em>
<% end %> <% end %>
</cost-unit-subform>
</span> </span>
</div> </div>

@ -0,0 +1,107 @@
// -- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
// ++
export class CostUnitSubformController {
public objId: string;
public objName: string;
constructor(public $element) {
// Add new row handler
$element.find('#'+this.objId).click(() => {
this.makeEditable('#'+this.objId, this.objName);
});
}
private getCurrencyValue(str) {
var result = str.match(/^\s*(([0-9]+[.,])+[0-9]+) (.+)\s*/);
return result ? new Array(result[1], result[3]) : new Array(str, "");
}
public makeEditable(id, name){
var obj = jQuery(id);
jQuery(id).on('click', this.edit_and_focus(obj, name));
}
private edit_and_focus(obj, name) {
this.edit(obj, name);
jQuery('#'+obj[0].id+'_edit').focus();
jQuery('#'+obj[0].id+'_edit').select();
}
private edit(obj, name, obj_value) {
obj.hide();
var obj_value = typeof(obj_value) != 'undefined' ? obj_value : obj[0].innerHTML;
var parsed = this.getCurrencyValue(obj_value);
var value = parsed[0];
var currency = parsed[1];
var form_start = '<section class="form--section" id="'+obj[0].id+
'_section"><div class="form--field"><div class="form--field-container">';
var button = '<div id="'+obj[0].id+
'_cancel" class="form--field-affix -transparent icon icon-close"></div>';
var span = '<div id="'+obj[0].id+'_editor" class="form--text-field-container">';
span += '<input id="'+obj[0].id+'_edit" class="form--text-field" name="'+name+'" value="'+value+'" class="currency" type="text" /> ';
span += '</div>';
var affix = '<div class="form--field-affix" id="'+obj[0].id+'_affix">' +
currency +
'</div>';
var form_end = '</div></div></section>';
jQuery(form_start + button + span + affix + form_end).insertAfter(obj);
var that = this;
jQuery('#'+obj[0].id+'_cancel').on('click', function() {
that.cleanUp(obj)
});
}
private cleanUp(obj){
jQuery('#'+obj[0].id+'_section').remove();
obj.show();
}
}
function costUnitSubform() {
return {
restrict: 'E',
scope: {
objId: '@',
objName: '@'
},
bindToController: true,
controller: CostUnitSubformController,
controllerAs: '$ctrl'
};
}
angular.module('openproject').directive('costUnitSubform', costUnitSubform);
Loading…
Cancel
Save