diff --git a/plasmid/source/core-plugins/weismigration/1/as/definitions.py b/plasmid/source/core-plugins/weismigration/1/as/definitions.py index eeb7df9d41be3c3eb4ac67bc0ec40eec104a8e33..59c4afc47c02c58bc3dd95410a8d7b6a3e104ec2 100644 --- a/plasmid/source/core-plugins/weismigration/1/as/definitions.py +++ b/plasmid/source/core-plugins/weismigration/1/as/definitions.py @@ -31,30 +31,13 @@ antibodynameScriptName="ANTIBODY_NAME" chemicalrefnumScriptName="CHEMICAL_REFNUM" oligonameScriptName="OLIGO_NAME" oligorefnumScriptName="OLIGO_REFNUM" +oligosysnameScriptName = "SYS_NAME" plasmidnameScriptName="PLASMID_NAME" plasmidrefnumScriptName="PLASMID_REFNUM" strainnameScriptName="STRAIN_NAME" strainglycerolScriptName="STRAIN_GLYCEROL_STOCK_NUM" -# -# Storage -# -# numberOfRepetitions = 5 -# -# def getRepetitionPropertyCodes(): -# propertyCodes = []; -# for property in getRepetitionDefinition(): -# propertyCodes.append(property[0]); -# return propertyCodes; -# -# def getRepetitionDefinition(): -# return [ -# ["DISRUPTIONS", "Genotype", "disruptions", DataType.VARCHAR, None, "", None, None, False], -# ["MARKERS", "Genotype", "markers", DataType.VARCHAR, None, "", None, None, False], -# ["UNMARKED_MUTATIONS", "Genotype", "unmarked mutations", DataType.VARCHAR, None, "", None, None, False], -# ]; - # # Experiment Types # @@ -150,7 +133,7 @@ oligoDefinition = [ ["BY", "General", "By", DataType.CONTROLLEDVOCABULARY, "LAB_MEMBERS", "", None, None, False], ["+ANNOTATIONS_STATE", "Comments", "Annotations State", DataType.XML, None, "Annotations State", annotationsScriptName, None, False], ["+XMLCOMMENTS", "Comments", "Comments List", DataType.XML, None, "Several comments can be added by different users", commentsScriptName, None, False], - ["SYS_NAME", "Information", "SysName", DataType.REAL, None, "", None, None, False], + ["+SYS_NAME", "Information", "SysName", DataType.VARCHAR, None, "", None, oligosysnameScriptName, False], ["OLIGO_TYPE", "Information", "Type", DataType.VARCHAR, None, "", None, None, False], ["STANDARD_TM", "Information", "StandardTm", DataType.REAL, None, "", None, None, False], ["AT", "Information", "AT%", DataType.INTEGER, None, "", None , atScriptName, False], @@ -202,7 +185,7 @@ plasmidDefinition = [ ["PCR_3_OLIGO", "Cloning Information", "PCR 3' oligo", DataType.VARCHAR, None, "", None, None, False], ["PCR_5_OLIGO", "Cloning Information", "PCR 5' oligo", DataType.VARCHAR, None, "", None, None, False], ["MUTAGENIC_OLIGO", "Cloning Information", "Mutagenic oligo", DataType.VARCHAR, None, "", None, None, False], - ["-REF_NUM", "Storage", "Ref. N.", DataType.INTEGER, None, "", None, plasmidrefnumScriptName, False], + ["-REF_NUM", "Storage", "Ref. N.", DataType.INTEGER, None, "", None, None, False], ["+PL_REF_NUM", "Storage", "Ref. N.", DataType.INTEGER, None, "", None, plasmidrefnumScriptName, False], ["MUTATION", "General", "Mutation", DataType.VARCHAR, None, "", None, None, False], ]; diff --git a/plasmid/source/core-plugins/weismigration/1/as/initialize-master-data.py b/plasmid/source/core-plugins/weismigration/1/as/initialize-master-data.py index 974acf4cd0080eec3f76801d10e6fbf7e5ed0151..f566f104368d33cf97260502695c5724c0b22bed 100644 --- a/plasmid/source/core-plugins/weismigration/1/as/initialize-master-data.py +++ b/plasmid/source/core-plugins/weismigration/1/as/initialize-master-data.py @@ -99,13 +99,14 @@ def addProperty(entity, propertyCode, section, propertyLabel, dataType, vocabula propertyAssignment = tr.assignPropertyType(entity, property); propertyAssignment.setSection(section); propertyAssignment.setMandatory(isMandatory); + propertyAssignment.setShownEdit(True); + if managedScript != None: propertyAssignment.setManaged(True); - propertyAssignment.setShownEdit(True); propertyAssignment.setScriptName(managedScript); if dynamicScript != None: propertyAssignment.setDynamic(True); - propertyAssignment.setShownEdit(True); + propertyAssignment.setShownEdit(False); propertyAssignment.setScriptName(dynamicScript); def createProperty(propertyCode, dataType, propertyLabel, propertyDescription, vocabularyCode): @@ -207,7 +208,13 @@ oligorefnumScriptName = createScript(PATH_TO_MANAGE_PROPERTIES_SCRIPTS + "oligo_ "Oligo ref num from code", "DYNAMIC_PROPERTY", "SAMPLE"); - + +oligosysnameScriptName = createScript(PATH_TO_MANAGE_PROPERTIES_SCRIPTS + "sysname_calculation.py", + definitions.oligosysnameScriptName, + "Oligo sys name calculation", + "DYNAMIC_PROPERTY", + "SAMPLE"); + plasmidnameScriptName = createScript(PATH_TO_MANAGE_PROPERTIES_SCRIPTS + "plasmid_name.py", definitions.plasmidnameScriptName, "Plasmid name from code",