bterkuile/ember-panda
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Action list refresh dunlop style

Browse Source
This commit is contained in:
Benjamin ter Kuile
2018-05-09 15:42:28 -03:00
parent 29983594d5
commit 5ffb667d6b
5 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addon/controllers/action-list.coffee
+1 -3
View File
@@ -21,9 +21,7 @@ export default Ember.Controller.extend
"#{base_url}/export_technical.csv?#{filter_addition}" "#{base_url}/export_technical.csv?#{filter_addition}"
apply_filters: -> apply_filters: ->
@incrementProperty 'filters.filter_calls' @incrementProperty 'filters.filter_calls'
@set 'model.project_instance_actions.page', 1 @get('model.project_instance_actions')?.reload()
@set 'model.project_instance_actions.lastPage', null
@get('model.project_instance_actions').setOtherParam('q', @get('filter_query'))
false false
actions: actions:
refresh_list: -> @apply_filters() refresh_list: -> @apply_filters()
addon/controllers/action-list.js
+4 -3
View File
@@ -34,10 +34,11 @@ export default Ember.Controller.extend({
return base_url + "/export_technical.csv?" + filter_addition; return base_url + "/export_technical.csv?" + filter_addition;
}), }),
apply_filters: function() { apply_filters: function() {
var ref;
this.incrementProperty('filters.filter_calls'); this.incrementProperty('filters.filter_calls');
this.set('model.project_instance_actions.page', 1); if ((ref = this.get('model.project_instance_actions')) != null) {
this.set('model.project_instance_actions.lastPage', null); ref.reload();
this.get('model.project_instance_actions').setOtherParam('q', this.get('filter_query')); }
return false; return false;
}, },
actions: { actions: {
addon/routes/action-list.coffee
+30 -38
View File
@@ -1,5 +1,5 @@
import Ember from 'ember' import Ember from 'ember'
import PagedRemoteArray from 'ember-cli-pagination/remote/paged-remote-array' import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array'
export default_filter = Ember.Object.create export default_filter = Ember.Object.create
filter_calls: 0 filter_calls: 0
workflow_action_definition_id_in: [] workflow_action_definition_id_in: []
@@ -15,54 +15,46 @@ export default_filter = Ember.Object.create
s: 'target_date asc' s: 'target_date asc'
export default Ember.Route.extend export default Ember.Route.extend
queryParams: queryParams: {q: refreshModel: true}
q: modelName: 'panda/project-instance-action'
refreshModel: true
setupController: (controller) -> setupController: (controller) ->
controller.set 'filters', default_filter controller.set 'filters', default_filter
@_super arguments... @_super arguments...
model: (params) -> model: (params) ->
#@store.findAll('epots/migration-window-planning') #@store.findAll('epots/migration-window-planning')
otherParams = {q: default_filter.toProperties()} #includes = [
includes = [ # 'workflow_action_definition.~workflow_action_connections'
'workflow_action_definition.~workflow_action_connections' # 'workflow_action_definition.~pointing_workflow_action_connections'
'workflow_action_definition.~pointing_workflow_action_connections' # 'workflow_action_definition.~organization'
'workflow_action_definition.~organization' # 'workflow_action_definition.~workflow_action_offsets'
'workflow_action_definition.~workflow_action_offsets' # 'project_instance_group.~project'
'project_instance_group.~project' # 'project_instance_group.~project_instance'
'project_instance_group.~project_instance' # 'project_instance_group.~project_instance_actions'
'project_instance_group.~project_instance_actions' # 'project_instance_group.workflow_group'
'project_instance_group.workflow_group' # 'project_instance.~project'
'project_instance.~project' # 'project_instance.project_scenario.~project'
'project_instance.project_scenario.~project' # 'project_instance.project_scenario.~workflow_groups'
'project_instance.project_scenario.~workflow_groups' # 'project_instance.project_scenario.~workflow_action_definitions'
'project_instance.project_scenario.~workflow_action_definitions' # 'pointing_project_instance_action_connections.project_instance_action.~project'
'pointing_project_instance_action_connections.project_instance_action.~project' # 'pointing_project_instance_action_connections.project_instance_action.~project_instance'
'pointing_project_instance_action_connections.project_instance_action.~project_instance' # 'pointing_project_instance_action_connections.project_instance_action.~project_instance_group'
'pointing_project_instance_action_connections.project_instance_action.~project_instance_group' # 'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections'
'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections'
'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections'
'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization'
'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'
'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets' #]
].join(',')
#includes += ','
#includes += [
# 'project.users'
#].join(',')
includes = 'action-list'
otherParams.include = includes
Ember.RSVP.hash Ember.RSVP.hash
projects: @store.findAll('panda/project') projects: @store.findAll('panda/project')
organizations: @store.findAll('panda/organization') organizations: @store.findAll('panda/organization')
project_instance_actions: project_instance_actions:
PagedRemoteArray.create PagedRemoteArray.create
modelName: 'panda/project-instance-action' modelName: @modelName
store: @store store: @store
filters: default_filter
page: params.page || 1 page: params.page || 1
perPage: params.perPage || 30 perPage: params.perPage || 30
otherParams: otherParams otherParams:
paramMapping: #include: includes.join(',')
total_pages: 'total-pages' include: 'action-list'
total_count: 'total-count'
addon/routes/action-list.js
+6 -13
View File
@@ -1,7 +1,7 @@
// Generated by CoffeeScript 1.12.5 // Generated by CoffeeScript 1.12.5
import Ember from 'ember'; import Ember from 'ember';
import PagedRemoteArray from 'ember-cli-pagination/remote/paged-remote-array'; import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array';
export var default_filter = Ember.Object.create({ export var default_filter = Ember.Object.create({
filter_calls: 0, filter_calls: 0,
@@ -23,30 +23,23 @@ export default Ember.Route.extend({
refreshModel: true refreshModel: true
} }
}, },
modelName: 'panda/project-instance-action',
setupController: function(controller) { setupController: function(controller) {
controller.set('filters', default_filter); controller.set('filters', default_filter);
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
model: function(params) { model: function(params) {
var includes, otherParams;
otherParams = {
q: default_filter.toProperties()
};
includes = ['workflow_action_definition.~workflow_action_connections', 'workflow_action_definition.~pointing_workflow_action_connections', 'workflow_action_definition.~organization', 'workflow_action_definition.~workflow_action_offsets', 'project_instance_group.~project', 'project_instance_group.~project_instance', 'project_instance_group.~project_instance_actions', 'project_instance_group.workflow_group', 'project_instance.~project', 'project_instance.project_scenario.~project', 'project_instance.project_scenario.~workflow_groups', 'project_instance.project_scenario.~workflow_action_definitions', 'pointing_project_instance_action_connections.project_instance_action.~project', 'pointing_project_instance_action_connections.project_instance_action.~project_instance', 'pointing_project_instance_action_connections.project_instance_action.~project_instance_group', 'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'].join(',');
includes = 'action-list';
otherParams.include = includes;
return Ember.RSVP.hash({ return Ember.RSVP.hash({
projects: this.store.findAll('panda/project'), projects: this.store.findAll('panda/project'),
organizations: this.store.findAll('panda/organization'), organizations: this.store.findAll('panda/organization'),
project_instance_actions: PagedRemoteArray.create({ project_instance_actions: PagedRemoteArray.create({
modelName: 'panda/project-instance-action', modelName: this.modelName,
store: this.store, store: this.store,
filters: default_filter,
page: params.page || 1, page: params.page || 1,
perPage: params.perPage || 30, perPage: params.perPage || 30,
otherParams: otherParams, otherParams: {
paramMapping: { include: 'action-list'
total_pages: 'total-pages',
total_count: 'total-count'
} }
}) })
}); });
app/templates/action-list.emblem
+1 -3
View File
@@ -1,5 +1,6 @@
= page-title 'action_list.title' = page-title 'action_list.title'
= pagination-progress content=model.project_instance_actions class='between-brackets' = pagination-progress content=model.project_instance_actions class='between-brackets'
i.pointable.refresh.icon{action 'reload' model.project_instance_actions}
.ui.top-right.pagination.menu= page-numbers content=model.project_instance_actions showFL=true .ui.top-right.pagination.menu= page-numbers content=model.project_instance_actions showFL=true
.ui.attached.segment .ui.attached.segment
= ui-dropdown class='violet button pull-right' = ui-dropdown class='violet button pull-right'
@@ -12,9 +13,6 @@
a href=export_technical_url: span Technical a href=export_technical_url: span Technical
= action-list/project-filter apply_filters=(action 'refresh_list') filters=filters scope_project=scope_project scope_scenario=scope_scenario projects=model.projects = action-list/project-filter apply_filters=(action 'refresh_list') filters=filters scope_project=scope_project scope_scenario=scope_scenario projects=model.projects
= action-list/organization-filter apply_filters=(action 'refresh_list') filters=filters scope_organization=scope_organization organizations=model.organizations = action-list/organization-filter apply_filters=(action 'refresh_list') filters=filters scope_organization=scope_organization organizations=model.organizations
'
.ui.small.icon.button{action 'refresh_list'}
i.refresh.icon
table.ui.attached.stiped.table table.ui.attached.stiped.table
thead thead
tr tr