Commit951b623

authored

OBPIH-6991 Add multi-select product filter to consumption report (#5560)

1 parentffc48be commit951b623Copy full SHA for 951b623

File tree

+28

-0

lines changed

+28

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,12 @@ class ConsumptionController {`
`239`	`239`	`if (command.fromLocations) {`
`240`	`240`	`products= command.rows.keySet().asList()`
`241`	`241`
	`242`	`+// Filter products by selected products`
	`243`	`+if (command.selectedProducts) {`
	`244`	`+List<String> selectedIds= command.selectedProducts*.id`
	`245`	`+ command.rows.keySet().removeAll {row->!(row.idin selectedIds) }`
	`246`	`+ }`
	`247`	`+`
`242`	`248`	`// Filter products by tags`
`243`	`249`	`if (command.selectedTags) {`
`244`	`250`	`def productsToRemove= products.findAll {product->`
`@@ -478,6 +484,7 @@ class ShowConsumptionCommand implements Validateable {`
`478`	`484`	`List<String> selectedDates=LazyList.decorate(newArrayList(),FactoryUtils.instantiateFactory(String.class))`
`479`	`485`	`List<Location> selectedLocations=LazyList.decorate(newArrayList(),FactoryUtils.instantiateFactory(Location.class))`
`480`	`486`	`List<Category> selectedCategories=LazyList.decorate(newArrayList(),FactoryUtils.instantiateFactory(Category.class))`
	`487`	`+List<Product> selectedProducts=LazyList.decorate(newArrayList(),FactoryUtils.instantiateFactory(Product.class))`
`481`	`488`	`List<Tag> selectedTags=LazyList.decorate(newArrayList(),FactoryUtils.instantiateFactory(Tag.class))`
`482`	`489`
`483`	`490`	`Boolean includeLocationBreakdown=Boolean.TRUE`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ consumption.beforeDate.label=Consumed on or before`
`149`	`149`	`consumption.filters.label=Filters`
`150`	`150`	`consumption.categories.label=Categories`
`151`	`151`	`consumption.toLocations.label=Destinations(s)`
	`152`	`+consumption.products.label=Products`
`152`	`153`	`consumption.renderOptions.label=Render Options`
`153`	`154`	`consumption.additionalColumns.label=Additional columns (CSV only)`
`154`	`155`	`consumption.format.label=Format`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,22 @@ class SelectTagLib {`
`100`	`100`	`String searchParameter= attrs.searchParameter?:"name"`
`101`	`101`	`boolean multiple= attrs.multiple?.asBoolean()?:false`
`102`	`102`	`String placeholder="${g.message(code: 'default.selectOptions.label', default: 'Select Options')}"`
	`103`	`+Object values= attrs.value`
	`104`	`+String selectedOptionsHtml=""`
	`105`	`+`
	`106`	`+if (values&& values.any { it?.hasProperty('id') }) {`
	`107`	`+ selectedOptionsHtml= values.collect {val->`
	`108`	`+String text= val.name?: val.toString()`
	`109`	`+"<option value='${val.id}' selected='true'>${text.encodeAsHTML()}</option>"`
	`110`	`+ }.join("\n")`
	`111`	`+ }`
`103`	`112`
`104`	`113`	`def html="""`
`105`	`114`	`<select id="${id}"`
`106`	`115`	`name="${name}"`
`107`	`116`	`${multiple ? "multiple" : ""}`
`108`	`117`	`type="text">`
	`118`	`+${selectedOptionsHtml}`
`109`	`119`	`</select>`
`110`	`120`
`111`	`121`	`<script type=\'text/javascript\'>`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,16 @@`
`86`	`86`	`data-placeholder="${g.message(code:'default.selectOptions.label',default:'Select Options')}"`
`87`	`87`	`/>`
`88`	`88`	`</div>`
	`89`	`+ <divclass="filter-list-item">`
	`90`	`+ <label>`
	`91`	`+ <g:messagecode="consumption.products.label"default="Products"/>`
	`92`	`+ </label>`
	`93`	`+ <g:selectProductAjax`
	`94`	`+id="selectedProducts"`
	`95`	`+value="${command?.selectedProducts}"`
	`96`	`+multiple="true"`
	`97`	`+ />`
	`98`	`+ </div>`
`89`	`99`	`<g:iftest="${!command?.toLocations}">`
`90`	`100`	`<divclass="filter-list-item">`
`91`	`101`	`<label>`

Comments

(0)