From b70b530e2a1167a84784edf47beaef784bad695e Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 6 Feb 2017 00:15:28 +0100 Subject: [PATCH] Fixed issue #705 - Time accounting works only with dot. Fixed issue #670 - Auto Focus on "Time Accounting" Popupbox. --- .../_application_controller.coffee | 2 + .../ticket_zoom/time_accounting.coffee | 35 +++- .../javascripts/app/views/modal.jst.eco | 8 +- script/build/test_slice_tests.sh | 6 + .../agent_ticket_time_accounting_test.rb | 156 ++++++++++++++++++ 5 files changed, 202 insertions(+), 5 deletions(-) create mode 100644 test/browser/agent_ticket_time_accounting_test.rb diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 8a598e2d6..f973d0e79 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -678,6 +678,7 @@ class App.ControllerModal extends App.Controller container: null buttonClass: 'btn--success' centerButtons: [] + leftButtons: [] buttonClose: true buttonCancel: false buttonCancelClass: 'btn--text btn--subtle' @@ -729,6 +730,7 @@ class App.ControllerModal extends App.Controller buttonSubmit: @buttonSubmit buttonClass: @buttonClass centerButtons: @centerButtons + leftButtons: @leftButtons ) modal.find('.modal-body').html content if !@initRenderingDone diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee index ae7df3cda..87f1307bb 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee @@ -1,20 +1,47 @@ class App.TicketZoomTimeAccounting extends App.ControllerModal buttonClose: true - buttonCancel: 'skip' + buttonCancel: false buttonSubmit: 'Account Time' buttonClass: 'btn--success' + leftButtons: [{ + className: 'btn--text btn--subtle js-skip', + text: 'skip' + }] head: 'Time Accounting' small: true + events: + 'submit form': 'submit' + 'click .js-submit:not(.is-disabled)': 'submit' + 'click .js-cancel': 'cancel' + 'click .js-close': 'cancel' + 'click .js-skip': 'skip' + content: -> App.view('ticket_zoom/time_accounting')() + onShown: => + @$('[name="time_unit"]').focus() + + skip: (e) => + return if !@submitCallback + @submitCallback({}) + @close(e) + onCancel: => - if @cancelCallback - @cancelCallback() + return if !@cancelCallback + @cancelCallback() onSubmit: => + @$('[name="time_unit"]').removeClass('has-error') + params = @formParams() + if params.time_unit + params.time_unit = params.time_unit.replace(',', '.') + + if isNaN(parseFloat(params.time_unit)) || params.time_unit.match(/[A-z]|\s/) + @$('[name="time_unit"]').addClass('has-error') + return + @close() if @submitCallback - params = @formParams() @submitCallback(params) diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index 67d0145b3..b3d12f4b8 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -15,8 +15,14 @@
<% if @buttonCancel: %>
- <%- @T(@buttonCancel) %> + <%- @T(@buttonCancel) %>
+ <% else if @leftButtons: %> + <% for button in @leftButtons: %> +
+
<%- @T(button.text) %>
+
+ <% end %> <% end %> <% for button in @centerButtons: %>
diff --git a/script/build/test_slice_tests.sh b/script/build/test_slice_tests.sh index 1422ff8dc..00f5b7e2f 100755 --- a/script/build/test_slice_tests.sh +++ b/script/build/test_slice_tests.sh @@ -31,6 +31,7 @@ if [ "$LEVEL" == '1' ]; then rm test/browser/agent_ticket_overview_tab_test.rb rm test/browser/agent_ticket_tag_test.rb rm test/browser/agent_ticket_text_module_test.rb + rm test/browser/agent_ticket_time_accounting_test.rb rm test/browser/agent_ticket_update1_test.rb rm test/browser/agent_ticket_update2_test.rb rm test/browser/agent_ticket_update3_test.rb @@ -87,6 +88,7 @@ elif [ "$LEVEL" == '2' ]; then rm test/browser/agent_ticket_overview_tab_test.rb rm test/browser/agent_ticket_tag_test.rb # test/browser/agent_ticket_text_module_test.rb + # test/browser/agent_ticket_time_accounting_test.rb # test/browser/agent_ticket_update1_test.rb # test/browser/agent_ticket_update2_test.rb # test/browser/agent_ticket_update3_test.rb @@ -143,6 +145,7 @@ elif [ "$LEVEL" == '3' ]; then rm test/browser/agent_ticket_overview_tab_test.rb # test/browser/agent_ticket_tag_test.rb rm test/browser/agent_ticket_text_module_test.rb + rm test/browser/agent_ticket_time_accounting_test.rb rm test/browser/agent_ticket_update1_test.rb rm test/browser/agent_ticket_update2_test.rb rm test/browser/agent_ticket_update3_test.rb @@ -199,6 +202,7 @@ elif [ "$LEVEL" == '4' ]; then # test/browser/agent_ticket_overview_tab_test.rb rm test/browser/agent_ticket_tag_test.rb rm test/browser/agent_ticket_text_module_test.rb + rm test/browser/agent_ticket_time_accounting_test.rb rm test/browser/agent_ticket_update1_test.rb rm test/browser/agent_ticket_update2_test.rb rm test/browser/agent_ticket_update3_test.rb @@ -254,6 +258,7 @@ elif [ "$LEVEL" == '5' ]; then rm test/browser/agent_ticket_overview_tab_test.rb rm test/browser/agent_ticket_tag_test.rb rm test/browser/agent_ticket_text_module_test.rb + rm test/browser/agent_ticket_time_accounting_test.rb rm test/browser/agent_ticket_update1_test.rb rm test/browser/agent_ticket_update2_test.rb rm test/browser/agent_ticket_update3_test.rb @@ -312,6 +317,7 @@ elif [ "$LEVEL" == '6' ]; then rm test/browser/agent_ticket_overview_tab_test.rb rm test/browser/agent_ticket_tag_test.rb rm test/browser/agent_ticket_text_module_test.rb + rm test/browser/agent_ticket_time_accounting_test.rb rm test/browser/agent_ticket_update1_test.rb rm test/browser/agent_ticket_update2_test.rb rm test/browser/agent_ticket_update3_test.rb diff --git a/test/browser/agent_ticket_time_accounting_test.rb b/test/browser/agent_ticket_time_accounting_test.rb new file mode 100644 index 000000000..983355938 --- /dev/null +++ b/test/browser/agent_ticket_time_accounting_test.rb @@ -0,0 +1,156 @@ +# encoding: utf-8 +require 'browser_test_helper' + +class AgentTicketTimeAccountingTest < TestCase + def test_macro + @browser = browser_instance + login( + username: 'master@example.com', + password: 'test', + url: browser_url, + ) + tasks_close_all() + + # enable time accounting + click( + css: 'a[href="#manage"]', + ) + click( + css: '.content.active a[href="#manage/time_accounting"]', + ) + switch( + css: '.content.active .js-timeAccountingSetting', + type: 'on', + ) + + ticket1 = ticket_create( + data: { + customer: 'nico', + group: 'Users', + title: 'some subject - time accounting#1', + body: 'some body - time accounting#1', + }, + ) + + ticket_update( + data: { + body: 'some note', + }, + do_not_submit: true, + ) + click( + css: '.active .js-submit', + ) + + watch_for( + css: '.content.active .modal', + value: 'Time Accounting', + ) + set( + css: '.content.active .modal [name=time_unit]', + value: '4', + ) + click( + css: '.content.active .modal .js-submit', + ) + watch_for_disappear( + css: '.content.active .modal', + value: 'Time Accounting', + ) + watch_for( + css: '.content.active .js-timeUnit', + value: '4', + ) + + ticket2 = ticket_create( + data: { + customer: 'nico', + group: 'Users', + title: 'some subject - time accounting#2', + body: 'some body - time accounting#2', + }, + ) + + ticket_update( + data: { + body: 'some note', + }, + do_not_submit: true, + ) + click( + css: '.active .js-submit', + ) + + watch_for( + css: '.content.active .modal', + value: 'Time Accounting', + ) + set( + css: '.content.active .modal [name=time_unit]', + value: '4,6', + ) + click( + css: '.content.active .modal .js-submit', + ) + watch_for_disappear( + css: '.content.active .modal', + value: 'Time Accounting', + ) + watch_for( + css: '.content.active .js-timeUnit', + value: '4.6', + ) + + ticket_update( + data: { + body: 'some note2', + }, + do_not_submit: true, + ) + click( + css: '.active .js-submit', + ) + + watch_for( + css: '.content.active .modal', + value: 'Time Accounting', + ) + set( + css: '.content.active .modal [name=time_unit]', + value: '4abc', + ) + click( + css: '.content.active .modal .js-submit', + ) + watch_for( + css: '.content.active .modal [name=time_unit].has-error', + ) + set( + css: '.content.active .modal [name=time_unit]', + value: '4 ', + ) + click( + css: '.content.active .modal .js-submit', + ) + watch_for_disappear( + css: '.content.active .modal', + value: 'Time Accounting', + ) + watch_for( + css: '.content.active .js-timeUnit', + value: '8.6', + ) + + # disable time accounting + click( + css: 'a[href="#manage"]', + ) + click( + css: '.content.active a[href="#manage/time_accounting"]', + ) + switch( + css: '.content.active .js-timeAccountingSetting', + type: 'off', + ) + end +end