From 40c9eec9ffac9155109116df7f86cf0738e78a46 Mon Sep 17 00:00:00 2001 From: Brian Frost Date: Tue, 4 Mar 2025 10:08:14 -0800 Subject: [PATCH 1/3] ACAS-834 provideo calendar dropdown for Date input in bulk loader --- .../src/client/CmpdRegBulkLoader.coffee | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee index a85eb931f..7ee3101f4 100644 --- a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee +++ b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee @@ -251,6 +251,7 @@ class AssignedPropertyController extends AbstractFormController @$('.bv_defaultVal').val @model.get('defaultVal') if @model.get('dbProperty') is "none" @$('.bv_defaultVal').attr 'disabled', 'disabled' + @showDatePicker() @ @@ -297,6 +298,7 @@ class AssignedPropertyController extends AbstractFormController else @model.set required: false @model.set dbProperty: dbProp + @showDatePicker() @trigger 'assignedDbPropChanged' @@ -306,6 +308,15 @@ class AssignedPropertyController extends AbstractFormController clear: => @model.destroy() @trigger 'modelRemoved' + + showDatePicker: => + if @model.get('dbProperty').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()) From 97c6c92c672791721b81bedc73236099603e1f72 Mon Sep 17 00:00:00 2001 From: Brian Frost Date: Tue, 4 Mar 2025 11:17:25 -0800 Subject: [PATCH 2/3] Provide dropdowns for defaultValue of constrained fields --- .../src/client/CmpdRegBulkLoader.coffee | 58 +++++++++++++++++-- .../src/client/CmpdRegBulkLoader.html | 1 + 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee index 7ee3101f4..d2b7d42f5 100644 --- a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee +++ b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee @@ -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? @@ -248,10 +260,13 @@ 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' - @showDatePicker() @ @@ -298,18 +313,51 @@ class AssignedPropertyController extends AbstractFormController else @model.set required: false @model.set dbProperty: dbProp - @showDatePicker() + @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' - showDatePicker: => + setupSelect: -> + @selectList = new PickListList() + @selectList.url = "/cmpdreg/" + @dbPropertyUrl + @selectListController = new PickListSelect2Controller + el: @$('.bv_defaultValSelect') + collection: @selectList + insertFirstOption: new PickList + code: "" + name: "Select" + selectedCode: "" + + setupInput: => + # Alter input depending on dbProperty + dbProp = @model.get('dbProperty') + if @dbPropertyUrls[dbProp]? || dbProp.includes("Units") + @dbPropertyUrl = @dbPropertyUrls[@model.get('dbProperty')] + 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 @model.get('dbProperty').includes("Lot Synthesis Date") @$('.bv_defaultVal').datepicker(); @$('.bv_defaultVal').datepicker( "option", "dateFormat", "yy-mm-dd" ); diff --git a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.html b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.html index b4f96cd7a..7b0ae2552 100644 --- a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.html +++ b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.html @@ -216,6 +216,7 @@

+