diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js index 6cfa9cdd1a42e173b9e84ba1c758b7c62c5b1227..75934aa7f17a5a0e38322cb2deb7c2533e5d6ce1 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js @@ -481,6 +481,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) { $component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType)); } else if(propertyType.dataType === "TIMESTAMP") { $component.on("dp.change", changeEvent(propertyType)); + $component.change(changeEvent(propertyType)); } else { $component.change(changeEvent(propertyType)); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js index cfaa9119ddc9d4d8250adf0833330dc5ef365ee6..20e7a51af4fc47037713a4753518977924454f30 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js @@ -352,6 +352,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) { $component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType)); } else if(propertyType.dataType === "TIMESTAMP") { $component.on("dp.change", changeEvent(propertyType)); + $component.change(changeEvent(propertyType)); } else { $component.change(changeEvent(propertyType)); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js index 3b202b0ab3dec1fd85ec66acab9c480c6caebc64..cf0c23c61d7d17abc40b5e6c2553b18b7378d79e 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js @@ -551,6 +551,7 @@ function SampleFormView(sampleFormController, sampleFormModel) { $component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType)); } else if(propertyType.dataType === "TIMESTAMP") { $component.on("dp.change", changeEvent(propertyType)); + $component.change(changeEvent(propertyType)); } else { $component.change(changeEvent(propertyType)); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py index 1d3c7ce3dbd9b84ac9d78dda779ccb4efc3b9bd4..06dc8de9bcad9bc14e932a0de9e6c52099ea312f 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py @@ -693,12 +693,13 @@ def insertUpdateSample(tr, parameters, tableBuilder): if sampleProperties != None: properties = getProperties(tr, parameters); for key in sampleProperties.keySet(): - propertyValue = sampleProperties[key]; + propertyValue = unicode(sampleProperties[key]); if propertyValue == "": propertyValue = None; else: propertyValue = updateIfIsPropertyRichText(properties, key, propertyValue); - sample.setPropertyValue(key, unicode(propertyValue)); + sample.setPropertyValue(key, propertyValue); + #Add sample parents if sampleParents != None: sample.setParentSampleIdentifiers(sampleParents);