Merge pull request #483 from antolinos/issue_482

It fixes #482
ispyb · Nov 27, 2018 · 1370642 · 1370642
2 parents 627b230 + bf03aa7
commit 1370642
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 40 deletions.
diff --git a/csv/example3.csv b/csv/example3.csv
@@ -1,38 +1,13 @@
-pacelA3,containerA3,SPINEpuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,30,1.6,comments
-pacelA3,containerA3,SPINEpuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,31,1.6,comments
-pacelA3,containerA3,SPINEpuck,3,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,32,1.6,comments
-pacelA3,containerA3,SPINEpuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,33,1.6,comments
-pacelA3,containerA3,SPINEpuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,34,1.6,comments
-pacelA3,containerA3,SPINEpuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,35,1.6,comments
-pacelA3,containerA3,SPINEpuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,36,1.6,comments
-pacelA3,containerA3,SPINEpuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,37,1.6,comments
-pacelA3,containerA3,SPINEpuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,38,1.6,comments
-pacelA3,containerA3,SPINEpuck,10,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,39,1.6,comments
-pacelA3,containerA4,Unipuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,40,1.6,comments
-pacelA3,containerA4,Unipuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,41,1.6,comments
-pacelA3,containerA4,Unipuck,3,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,42,1.6,comments
-pacelA3,containerA4,Unipuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,10,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,11,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,12,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,13,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,14,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,15,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA3,containerA4,Unipuck,16,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA5,Unipuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA6,SPINEpuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA6,SPINEpuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA6,SPINEpuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA6,SPINEpuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
-pacelA4,containerA6,SPINEpuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,90,1.6,comments
+# For more information go to https://github.com/ispyb/EXI/wiki/Fill-shipment-from-CSV
+pacelA3,containerA3,SPINEpuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,30,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,31,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,3,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,32,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,33,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,34,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,35,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,36,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,37,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,38,0,1.6,comments
+pacelA3,containerA3,SPINEpuck,10,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,39,0,1.6,comments
+pacelA3,containerA4,Unipuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,40,0,1.6,comments
+pacelA3,containerA4,Unipuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,41,0,1.6,comments
diff --git a/js/core/view/shipping/containerspreadsheet.js b/js/core/view/shipping/containerspreadsheet.js
@@ -249,6 +249,7 @@ ContainerSpreadSheet.prototype.getSamplesData = function(puck) {
 						diffraction.radiationSensitivity, 
 						sample.smiles, 
 						diffraction.axisRange,
+						diffraction.minOscWidth,
 						getValue(diffraction["observedResolution"]),  
 						sample.comments
                     ]
@@ -336,7 +337,8 @@ ContainerSpreadSheet.prototype.getHeader = function() {
             }, 
             { text :'Radiation<br /> Sensitivity', id :'Radiation Sensitivity', column : {width : 80}}, 
             { text :'Smiles', id :'Smiles', column : {width : 140}}, 
-			{ text :'Tot Rot. <br />Angle', id :'axisRange',column : {width : 60}},		
+			{ text :'Tot Rot. <br />Angle', id :'axisRange',column : {width : 60}},
+			{ text :'Min Osc.<br />Angle', id :'minOscWidth',column : {width : 60}},		
             { text :'Observed <br />resolution', id : 'Pre-observed resolution', column : {width : 80}}, 
             { text :'Comments', id :'Comments', column : {width : 200}}
             ];
@@ -423,6 +425,8 @@ ContainerSpreadSheet.prototype.getPuck = function() {
 		sample["diffractionPlanVO"]["experimentKind"]= rows[i]["Experiment Type"];
 		sample["diffractionPlanVO"]["numberOfPositions"]= this.convertToNumberIfNotEmpty(rows[i]["Number Of positions"]);
 		sample["diffractionPlanVO"]["axisRange"]= rows[i]["axisRange"];
+
+		sample["diffractionPlanVO"]["minOscWidth"]= rows[i]["minOscWidth"];		
 
 		aux.push(sample);
 

diff --git a/js/core/view/shipping/csvcontainerspreadsheet.js b/js/core/view/shipping/csvcontainerspreadsheet.js
@@ -307,7 +307,7 @@ CSVContainerSpreadSheet.prototype.getParcels = function() {
 			preferredBeamDiameter 	: _this.emptyToNull(row["Beam Diameter"]),
 			numberOfPositions	 	: _this.emptyToNull(row["Number Of positions"]),
 			axisRange	 			: _this.emptyToNull(row["axisRange"]),
-
+			minOscWidth				: _this.emptyToNull(row["minOscWidth"])
 
 
 		};		
@@ -775,6 +775,7 @@ CSVContainerSpreadSheet.prototype.getHeader = function() {
 
             { text :'SMILES', id :'Smiles', column : {width : 60}}, 
 			{ text :'Tot Rot. <br />Angle', id :'axisRange',column : {width : 60, renderer:numericParameterRenderer}},
+			{ text :'Min Osc.<br />Angle', id :'minOscWidth',column : {width : 60, renderer:numericParameterRenderer}},
 			{ text :'Observed <br />Resolution', id :'Observed Resolution',column : {width : 60, renderer:numericParameterRenderer}},
             { text :'Comments', id :'Comments', column : {width : 200}}
             ];