From 594666cda44226e3856f5db6f3928a6ba93a9adf Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 15 Jan 2018 08:48:15 -0300 Subject: [PATCH] More specialized exports --- addon/controllers/action-list.coffee | 4 ++-- addon/controllers/action-list.js | 4 ++-- addon/routes/action-list.coffee | 3 ++- addon/routes/action-list.js | 2 +- .../show/project-instance-action/index.coffee | 13 +++++++++++++ app/templates/action-list.emblem | 2 +- .../show/project-instance-action/index.emblem | 15 ++++++++++++--- 7 files changed, 33 insertions(+), 10 deletions(-) diff --git a/addon/controllers/action-list.coffee b/addon/controllers/action-list.coffee index 82c5cc9..dacb27f 100644 --- a/addon/controllers/action-list.coffee +++ b/addon/controllers/action-list.coffee @@ -9,12 +9,12 @@ export default Ember.Controller.extend scope_organization: null filter_query: Ember.computed 'filters.filter_calls', -> @get('filters')?.toProperties() || {} - export_human_url: Ember.computed 'filters.filter_calls', -> + export_human_url: Ember.computed 'filter_query', -> model_name = 'panda/project-instance-action' base_url = @store.adapterFor(model_name).buildURL(model_name) filter_addition = Ember.$.param q: @get('filter_query') "#{base_url}/export_human.csv?#{filter_addition}" - export_technical_url: Ember.computed 'filters.filter_calls', -> + export_technical_url: Ember.computed 'filter_query', -> model_name = 'panda/project-instance-action' base_url = @store.adapterFor(model_name).buildURL(model_name) filter_addition = Ember.$.param q: @get('filter_query') diff --git a/addon/controllers/action-list.js b/addon/controllers/action-list.js index fb2c4ce..d51f339 100644 --- a/addon/controllers/action-list.js +++ b/addon/controllers/action-list.js @@ -13,7 +13,7 @@ export default Ember.Controller.extend({ var ref; return ((ref = this.get('filters')) != null ? ref.toProperties() : void 0) || {}; }), - export_human_url: Ember.computed('filters.filter_calls', function() { + export_human_url: Ember.computed('filter_query', function() { var base_url, filter_addition, model_name; model_name = 'panda/project-instance-action'; base_url = this.store.adapterFor(model_name).buildURL(model_name); @@ -22,7 +22,7 @@ export default Ember.Controller.extend({ }); return base_url + "/export_human.csv?" + filter_addition; }), - export_technical_url: Ember.computed('filters.filter_calls', function() { + export_technical_url: Ember.computed('filter_query', function() { var base_url, filter_addition, model_name; model_name = 'panda/project-instance-action'; base_url = this.store.adapterFor(model_name).buildURL(model_name); diff --git a/addon/routes/action-list.coffee b/addon/routes/action-list.coffee index 4206389..cc9aaa7 100644 --- a/addon/routes/action-list.coffee +++ b/addon/routes/action-list.coffee @@ -7,7 +7,8 @@ export default_filter = Ember.Object.create project_id: '' project_instance_project_scenario_id: '' workflow_action_definition_organization_id: '' - workflow_action_definition_offset_type_not_eq: 'attached' + #workflow_action_definition_offset_type_not_eq: 'attached' + target_date_not_null: 1 # only target date actions state_in: [] target_date_gteq: null target_date_lteq: null diff --git a/addon/routes/action-list.js b/addon/routes/action-list.js index c526a3e..6164727 100644 --- a/addon/routes/action-list.js +++ b/addon/routes/action-list.js @@ -10,7 +10,7 @@ export var default_filter = Ember.Object.create({ project_id: '', project_instance_project_scenario_id: '', workflow_action_definition_organization_id: '', - workflow_action_definition_offset_type_not_eq: 'attached', + target_date_not_null: 1, state_in: [], target_date_gteq: null, target_date_lteq: null, diff --git a/app/controllers/project/show/project-instance-action/index.coffee b/app/controllers/project/show/project-instance-action/index.coffee index 7844d9d..a7422eb 100644 --- a/app/controllers/project/show/project-instance-action/index.coffee +++ b/app/controllers/project/show/project-instance-action/index.coffee @@ -23,6 +23,19 @@ export default Ember.Controller.extend base.sort date_sort filtered_project_instance_actions: Ember.computed.alias 'model' + filter_query: Ember.computed 'filters.filter_calls', -> + @get('filters')?.toProperties() || {} + export_human_url: Ember.computed 'project.id', 'filter_query', -> + model_name = 'panda/project-instance-action' + base_url = @store.adapterFor(model_name).buildURL(model_name) + filter_addition = Ember.$.param q: @get('filter_query') + "#{base_url}/export_human.csv?#{filter_addition}" + export_technical_url: Ember.computed 'project.id', 'filter_query', -> + model_name = 'panda/project-instance-action' + base_url = @store.adapterFor(model_name).buildURL(model_name) + filter_addition = Ember.$.param q: @get('filter_query') + "#{base_url}/export_technical.csv?#{filter_addition}" + #date_filter_active: Ember.computed.or 'filter.{date_gteq,date_lteq}' #date_filter_text: Ember.computed 'filter.date_gteq', 'filter.date_lteq', -> # if gteq = @get('filter.date_gteq') diff --git a/app/templates/action-list.emblem b/app/templates/action-list.emblem index c9e8583..9b08f3e 100644 --- a/app/templates/action-list.emblem +++ b/app/templates/action-list.emblem @@ -1,6 +1,6 @@ -.ui.top-right.pagination.menu= page-numbers content=model.project_instance_actions showFL=true = page-title 'action_list.title' = pagination-progress content=model.project_instance_actions class='between-brackets' + .ui.top-right.pagination.menu= page-numbers content=model.project_instance_actions showFL=true .ui.top.attached.segment = ui-dropdown class='violet button pull-right' .default.text Export diff --git a/app/templates/project/show/project-instance-action/index.emblem b/app/templates/project/show/project-instance-action/index.emblem index 500a7fc..418b304 100644 --- a/app/templates/project/show/project-instance-action/index.emblem +++ b/app/templates/project/show/project-instance-action/index.emblem @@ -7,9 +7,17 @@ d-breadcrumbs as |breadcrumb| = link-to 'project.show' project: span= project.name breadcrumb.item active=true span= t 'models.plural.project_instance_action' -.ui.right.floated.pagination.menu= page-numbers content=filtered_project_instance_actions showFL=true = page-title 'models.plural.project_instance_action' = pagination-progress content=filtered_project_instance_actions class='between-brackets' + .ui.top-right.pagination.menu= page-numbers content=filtered_project_instance_actions showFL=true + = ui-dropdown class='violet button pull-right' + .default.text Export + i.dropdown.icon + .menu + .item + a href=export_human_url: span Human + .item + a href=export_technical_url: span Technical table.ui.stiped.table thead tr @@ -35,7 +43,7 @@ table.ui.stiped.table .menu each project.sorted_workflow_groups as |workflow_group| ui-checkbox class='item' label=workflow_group.name onChange=(action 'toggle_filter' 'project_instance_group_workflow_group_id_in' workflow_group.id) - th class=filters.workflow_action_definition_id_in.length:active-filter + /th class=filters.workflow_action_definition_id_in.length:active-filter ui-dropdown class='right basic labeled icon' action='nothing' fullTextSearch=true /i.dropdown.icon /== workflow_action_definitions_filter_html @@ -55,9 +63,10 @@ table.ui.stiped.table ui-checkbox class='item' checked=(contains workflow_action_definition.id filters.workflow_action_definition_id_in) label=workflow_action_definition.title onChange=(action 'toggle_filter' 'workflow_action_definition_id_in' workflow_action_definition.id) if filters.workflow_action_definition_id_in.length i.remove.icon{action 'clear_filter' 'workflow_action_definition_id_in'} + = filter.dropdown-select-multiple key='workflow_action_definition_id_in' options=project.sorted_workflow_action_definitions labelPath='title' = filter.input key='project_instance_client_identifier_cont' = filter.dropdown-select-multiple key='state_in' options=globals.project_instance_action.states translationPath='attributes.state' - filter.date-range key='target_date' + = filter.date-range key='target_date' expandingTime=true weekSelector=true /th class=date_filter_active:active-filter ui-dropdown class='right basic labeled top right pointing icon' action='nothing' = date_filter_text