Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACAS-834: Provide appropriate inputs for bulk loader default values #1203

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 62 additions & 2 deletions modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,20 @@ class AssignedPropertyController extends AbstractFormController
events:
"change .bv_dbProperty": "handleDbPropertyChanged"
"keyup .bv_defaultVal": "handleDefaultValChanged"
"change .bv_defaultVal": "handleDefaultValChanged"
"change .bv_defaultValSelect": "handleDefaultValChanged"
"click .bv_deleteProperty": "clear"

dbPropertyUrls:
"Lot Chemist": "scientists"
"Parent Stereo Category": "stereoCategories"
"Project": "projects"
"Lot Physical State": "physicalStates"
"Lot Purity Measured By": "purityMeasuredBys"
"Lot Purity Operator": "operators"
"Lot Solution Amount Units": "solutionUnits"
"Units": "units"

initialize: (options) ->
@options = options
unless @model?
Expand All @@ -248,7 +260,11 @@ class AssignedPropertyController extends AbstractFormController
$(@el).html @template(@model.attributes)
@$('.bv_sdfProperty').html(@model.get('sdfProperty'))
@setupDbPropertiesSelect()
@$('.bv_defaultVal').val @model.get('defaultVal')
@setupInput()
if @dbPropertyUrl?
@selectListController.setSelectedCode @model.get('defaultVal')
else
@$('.bv_defaultVal').val @model.get('defaultVal')
if @model.get('dbProperty') is "none"
@$('.bv_defaultVal').attr 'disabled', 'disabled'

Expand Down Expand Up @@ -297,15 +313,59 @@ class AssignedPropertyController extends AbstractFormController
else
@model.set required: false
@model.set dbProperty: dbProp
@setupInput()

@trigger 'assignedDbPropChanged'

handleDefaultValChanged: ->
@model.set defaultVal: UtilityFunctions::getTrimmedInput @$('.bv_defaultVal')
if @dbPropertyUrl?
@model.set defaultVal: @selectListController.getSelectedCode()
else
@model.set defaultVal: UtilityFunctions::getTrimmedInput @$('.bv_defaultVal')

clear: =>
@model.destroy()
@trigger 'modelRemoved'

setupSelect: ->
@selectList = new PickListList()
@selectList.url = "/cmpdreg/" + @dbPropertyUrl
@selectListController = new PickListSelect2Controller
el: @$('.bv_defaultValSelect')
collection: @selectList
insertFirstOption: new PickList
code: ""
name: "Select"
selectedCode: ""
backendSearch: false

setupInput: =>
# Alter input depending on dbProperty
dbProp = @model.get('dbProperty')
if @dbPropertyUrls[dbProp]? || dbProp.includes("Units")
@dbPropertyUrl = @dbPropertyUrls[dbProp]
if !@dbPropertyUrl?
@dbPropertyUrl = @dbPropertyUrls["Units"]
@setupSelect()
@$('.bv_defaultValSelect').show()
@$('.bv_defaultVal').hide()
else
@dbPropertyUrl = null
@$('.bv_defaultValSelect').hide()
if @selectListController?
@$('.bv_defaultValSelect').select2('destroy')
@selectListController.remove()
@selectListController.unbind()
@selectListController = null
@$('.bv_defaultVal').show()
# Show date picker if dbProperty is a date
if dbProp.includes("Lot Synthesis Date")
@$('.bv_defaultVal').datepicker();
@$('.bv_defaultVal').datepicker( "option", "dateFormat", "yy-mm-dd" );
@$('.bv_defaultVal').attr('placeholder', 'YYYY-MM-DD')
else
@$('.bv_defaultVal').datepicker('destroy');
@$('.bv_defaultVal').attr('placeholder', '')

class AssignedPropertiesListController extends AbstractFormController
template: _.template($("#AssignedPropertiesListView").html())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ <h4 class="modal-title bv_saveErrorTitle" style="color:red;"></h4>
</span>
<span class="control-group bv_group_defaultVal">
<input class="bv_defaultVal span2" style="margin-left:20px;width:270px;" type="text"/>
<select class="bv_defaultValSelect hide" style="width:300px;margin-left:6px;">
</span>
<button class="close bv_deleteProperty hide" style="margin-top:1px;">&times;</button>
</div>
Expand Down
6 changes: 4 additions & 2 deletions modules/Components/src/client/PickList.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,10 @@ class PickListSelect2Controller extends PickListSelectController
allowClear: true
width: @width

# Conditionally add the ajax property
if @collection.url?
# Conditionally add the ajax property to enable backend searching
# If a url is provided, backend search is enabled by default but
# can be toggled off by setting the 'backendSearch' option to false
if @collection.url? && (!@options.backendSearch? || @options.backendSearch is true)
select2Options.ajax =
url: (params) =>
if !params.term?
Expand Down