From 3f985d76a123c7c3d56ecd350fd0b4fde294cb1a Mon Sep 17 00:00:00 2001 From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch> Date: Thu, 14 Nov 2019 14:17:56 +0100 Subject: [PATCH] SSDM-8947 : Code/Description swap places --- .../js/views/ProjectForm/ProjectFormView.js | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js index 2853784334f..3dd7c3d729c 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js @@ -193,7 +193,46 @@ function ProjectFormView(projectFormController, projectFormModel) { var $header = views.header; $header.append($formTitle); $header.append(FormUtil.getToolbar(toolbarModel)); - + + // + // Identification info + // + $formColumn.append($("<legend>").append("Identification Info")); + + $formColumn.append(FormUtil.getFieldForLabelWithText("Space", this._projectFormModel.project.spaceCode)); + + if(this._projectFormModel.mode === FormMode.CREATE) { + var $textField = FormUtil._getInputField('text', null, "Project Code", null, true); + $textField.keyup(function(event){ + var textField = $(this); + var caretPosition = this.selectionStart; + textField.val(textField.val().toUpperCase()); + this.selectionStart = caretPosition; + this.selectionEnd = caretPosition; + _this._projectFormModel.project.code = textField.val(); + _this._projectFormModel.isFormDirty = true; + }); + $formColumn.append(FormUtil.getFieldForComponentWithLabel($textField, "Code")); + } else { + $formColumn.append(FormUtil.getFieldForLabelWithText("Code", this._projectFormModel.project.code)); + } + + if(this._projectFormModel.mode !== FormMode.CREATE) { + var registrationDetails = this._projectFormModel.project.registrationDetails; + + var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId); + $formColumn.append($registrator); + + var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", Util.getFormatedDate(new Date(registrationDetails.registrationDate))); + $formColumn.append($registationDate); + + var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId); + $formColumn.append($modifier); + + var $modificationDate = FormUtil.getFieldForLabelWithText("Modification Date", Util.getFormatedDate(new Date(registrationDetails.modificationDate))); + $formColumn.append($modificationDate); + } + // // Metadata Fields // @@ -241,46 +280,7 @@ function ProjectFormView(projectFormController, projectFormModel) { var sampleTableController = new SampleTableController(this._projectFormController, null, null, this._projectFormModel.project.permId, true); sampleTableController.init(views); } - - // - // Identification info - // - $formColumn.append($("<legend>").append("Identification Info")); - - $formColumn.append(FormUtil.getFieldForLabelWithText("Space", this._projectFormModel.project.spaceCode)); - - if(this._projectFormModel.mode === FormMode.CREATE) { - var $textField = FormUtil._getInputField('text', null, "Project Code", null, true); - $textField.keyup(function(event){ - var textField = $(this); - var caretPosition = this.selectionStart; - textField.val(textField.val().toUpperCase()); - this.selectionStart = caretPosition; - this.selectionEnd = caretPosition; - _this._projectFormModel.project.code = textField.val(); - _this._projectFormModel.isFormDirty = true; - }); - $formColumn.append(FormUtil.getFieldForComponentWithLabel($textField, "Code")); - } else { - $formColumn.append(FormUtil.getFieldForLabelWithText("Code", this._projectFormModel.project.code)); - } - - if(this._projectFormModel.mode !== FormMode.CREATE) { - var registrationDetails = this._projectFormModel.project.registrationDetails; - - var $registrator = FormUtil.getFieldForLabelWithText("Registrator", registrationDetails.userId); - $formColumn.append($registrator); - - var $registationDate = FormUtil.getFieldForLabelWithText("Registration Date", Util.getFormatedDate(new Date(registrationDetails.registrationDate))); - $formColumn.append($registationDate); - - var $modifier = FormUtil.getFieldForLabelWithText("Modifier", registrationDetails.modifierUserId); - $formColumn.append($modifier); - - var $modificationDate = FormUtil.getFieldForLabelWithText("Modification Date", Util.getFormatedDate(new Date(registrationDetails.modificationDate))); - $formColumn.append($modificationDate); - } - + $container.append($form); }; -- GitLab