Redone HPLC form

Gruntfile.js

@@ -28,11 +28,13 @@ module.exports = function(grunt) {
 			  files : {
 
 		 'min/exi.js' 		                : [ "js/dust/**/*js", "js/core/**/*js"],  
-                 'min/exi.mx.js' 		        : ["js/mx/**/*js"], 
-                 'min/exi.saxs.js' 		        : ["js/saxs/**/*js"],
-                 'min/exi.test.js' 		        : ["js/test/**/*js"],               				
-		 'min/bower_components.min.js'  : [ 
-						                            "bower_components/jquery/dist/jquery.min.js",
+         'min/exi.mx.js' 		            : ["js/mx/**/*js"], 
+         'min/exi.saxs.js' 		            : ["js/saxs/**/*js"],
+         'min/exi.test.js' 		            : ["js/test/**/*js"],               				
+         'min/exi.tracking.js' 		        : ["js/tracking/**/*js"],
+		 'min/bower_components.min.js'      : [ 
+
+                                                    "bower_components/jquery/dist/jquery.min.js",
                                                     "bower_components/lightbox2/dist/js/lightbox.min.js",
                                                     "bower_components/jquery-lazy/jquery.lazy.min.js", 
                                                     "bower_components/dustjs-linkedin/dist/dust-full.min.js",
@@ -50,7 +52,8 @@ module.exports = function(grunt) {
                                                     "bower_components/exi-ui-utils/min/exi-ui-utils.min.js",
                                                     "bower_components/ispyb-js-api/min/ispyb-js-api.min.js",
                                                     "bower_components/exi-ui-viz/min/exi-ui-viz.min.js",
-                                                    " bower_components/three/build/three.min.js"                                                      								  								    								 
+                                                    "bower_components/three/build/three.min.js",
+                                                    "bower_components/notifyjs/dist/notify.js"                                                      								  								    								 
                 ]
 			  }
 		  }
@@ -71,7 +74,13 @@ module.exports = function(grunt) {
                                             'min/exi.test.js',
 				                   		    'min/precompiled.templates.min.js'
 				                   		   ],
-                  'min/lightbox.js' 		: [				 
+                    'min/exi.tracking.min.js' 		: [				 
+				                   		    'min/exi.js', 
+                                            'min/exi.tracking.js',
+                                            'min/exi.test.js',
+				                   		    'min/precompiled.templates.min.js'
+				                   		   ],
+                   'min/lightbox.js' 		: [				 
 				                   		    'bower_components/lightbox2/dist/js/lightbox.js'
 
 				                   		   ],                            
@@ -108,7 +117,7 @@ module.exports = function(grunt) {
  		      reporter: require('jshint-stylish'),
 		      jshintrc : '.jshintrc'
 		 },
-		 prod: [ 'js/core/**/*.js', 'js/mx/**/*.js', 'js/saxs/**/*.js', 'js/viewer/**/*.js']
+		 prod: [ 'js/core/**/*.js', 'js/mx/**/*.js', 'js/saxs/**/*.js', 'js/tracking/**/*.js', 'js/viewer/**/*.js']
 	},
     plato: {
                   all : {
@@ -136,6 +145,19 @@ module.exports = function(grunt) {
                     files: {
                             'reports/mx': ['js/mx/**/*.js'],                           
                     }
+                },
+                 tracking: {
+                    options : {
+                    complexity : {
+                        logicalor : true,
+                        switchcase : true,
+                        forin : true,
+                        trycatch : true
+                    }
+                    },
+                    files: {
+                            'reports/tracking': ['js/tracking/**/*.js'],                           
+                    }
                 },
                 saxs: {
                     options : {
@@ -178,6 +200,8 @@ module.exports = function(grunt) {
 		    	  		'saxs/dev.html': 'saxs/index.tpl.html'
 		      },{
 		    	  		'mx/dev.html'  : 'mx/index.tpl.html'
+		      },{
+		    	  		'tracking/dev.html'  : 'tracking/index.tpl.html'
 		      }]
 		}
 	},
@@ -192,7 +216,7 @@ module.exports = function(grunt) {
 	},
 	 wiredep: {
 	      target: {
-	                    src: ['mx/dev.html', 'saxs/dev.html'], // point to your HTML file.
+	                    src: ['mx/dev.html', 'saxs/dev.html', 'tracking/dev.html'], // point to your HTML file.
 	      }
 	},
 	dustjs: {

bower.json

@@ -41,14 +41,15 @@
     "lightbox2": "2.8.2",
     "bootstrap": "^3.3.7",
     "exi-ui-utils": "*",
-    "bootstrap-year-calendar": "^1.1.0",
-    "notifyjs": "^0.4.2",
-    "three": "*"
+    "bootstrap-year-calendar": "^1.1.0",    
+    "three": "*",
+    "notifyjs": "*"
   },
   "devDependencies": {
     "uglymol": "^0.1.0"
   },
   "resolutions": {
-    "lightbox2": "2.8.2"
+    "lightbox2": "2.8.2",
+    "jquery": "1.9.1 - 3"
   }
 }

css/exi.css

@@ -1,5 +1,20 @@
+
+
+.unselectable-text {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    userf-select: none;
+}
+
 /** Shipment **/
 
+.handsontable td.htInvalid {
+     background-color: #ffffff!important; 
+}
+
 .container-widget {
 	fill:#CCCCCC;
 	stroke:black;
@@ -8,16 +23,18 @@
 }
 
 .stock-solution {
-    border-radius: 5px;
-	padding: 5px; 
+    border-radius: 0px;
+	padding: 0px; 
     background: #ffffff;
 	opacity: 1;
 	font-size: 10px;
-	border : 2px solid #000000;
+	border : 0px solid #000000;
 }
 
 .stock-solution-selected {
-	border : 2px solid #99ff66;
+	border-color:#99ff66 !important;
+	border-style: solid !important;
+    border-width: 2px !important;
 }
 
 .table.borderless tbody>tr>td {
@@ -50,6 +67,16 @@
 
 /** SAXS queue grid **/
 
+.plate-square {
+	stroke : black;
+	stroke-width : 1
+}
+
+.plate-square-selected {
+	stroke : #23eeff;
+	stroke-width : 2
+}
+
 .blue-bottom-border-row {
 	border-bottom: 2px solid #3892d3 !important;
 }
@@ -414,7 +441,7 @@ overflow-x: hidden;
 }
 
 .selected-region:hover{
-    //cursor: pointer;
+    /*//cursor: pointer;*/
 
     overflow:auto;
 
@@ -424,11 +451,7 @@ overflow-x: hidden;
 }
 .selected-region{
     height:300px;
-    //overflow:auto;
-
-
-
-
+    /*overflow:auto;*/
 }
 
 .result-autoprocessing-anchor{
@@ -569,7 +592,7 @@ overflow-x: hidden;
 
 .summary_datacollection_parameter{
 	font-size : 10px;
-    #background-color:#FFFFFF;
+    /*background-color:#FFFFFF;*/
 
 }
 
@@ -869,13 +892,13 @@ img.smalllazy {
 	border-radius : 3px;
 	height: 20px;
 	moz-border-radius : 3px;
-	#-webkit-box-shadow : 0px 2px 2px rgba(0,0,0,0.4);
-	#-moz-box-shadow : 0px 2px 2px rgba(0,0,0,0.4);
-	#box-shadow : 0px 2px 2px rgba(0,0,0,0.4);
+	/*#-webkit-box-shadow : 0px 2px 2px rgba(0,0,0,0.4);*/
+	/*#-moz-box-shadow : 0px 2px 2px rgba(0,0,0,0.4);
+	#box-shadow : 0px 2px 2px rgba(0,0,0,0.4);*/
 	font-size : 9px;
 	color : #ffffff;
 	padding : 1px 17px;
-#	background : #c20000;
+/*#	background : #c20000;*/
 	background : #F5A9A9;
 	background : -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c20000), color-stop(100%,#ff0055));
 	background : -moz-linear-gradient(top, #c20000 0%, #ff0055 100%);
@@ -989,8 +1012,8 @@ img.smalllazy {
 .option-bar-menu{
 	margin: auto;
     width: 50%;
-    #border:3px solid #8AC007;
-    #padding: 10px;
+    /*#border:3px solid #8AC007;
+    #padding: 10px;*/
 }
 
 
@@ -1103,7 +1126,7 @@ img.smalllazy {
 
 .sample-row-grid{
 	color : #157fcc;
-	#background-color : #157fcc;
+	/*#background-color : #157fcc;*/
 }
 
 .selected-row-grid{
@@ -1125,8 +1148,6 @@ img.smalllazy {
 	font-size : 9px;
 	padding : 1px 1px;
 	background : #F5F5F5;
-
-
 }
 
 
@@ -1138,7 +1159,7 @@ img.smalllazy {
 }
 
 .btn-blue:hover{
-	#background : #A9D0F5;
+	/*#background : #A9D0F5;*/
 	cursor	: pointer;
 	color : black;
 

js/core/app/proposalmanager.js

@@ -22,7 +22,7 @@ ProposalManager.prototype.get = function(forceUpdate) {
 			localStorage.setItem("proposals", JSON.stringify(proposals));
             _this.onActiveProposalChanged.notify();
 		};
-		EXI.getDataAdapter({async : true, onSuccess : onSuccess}).proposal.proposal.getProposalsInfo();
+		EXI.getDataAdapter({async : false, onSuccess : onSuccess}).proposal.proposal.getProposalsInfo();
 	}	
 
 	return JSON.parse(localStorage.getItem("proposals"));

js/core/controller/labcontactexicontroller.js

@@ -43,14 +43,14 @@ LabContactExiController.prototype.init = function() {
 			adapter.proposal.labcontacts.getLabContacts();
 
 			/** Loading welcome page **/
-			EXI.addMainPanel(new AddressWelcomeMainView());
+			// EXI.addMainPanel(new AddressWelcomeMainView());
 
 		}).enter(this.setPageBackground);
 
-		Path.map("#/proposal/address/:lacontactId/main").to(function() {
+		Path.map("#/proposal/address/:labcontactId/main").to(function() {
 			var mainView = new AddressMainView();
 			EXI.addMainPanel(mainView);
-			mainView.load(this.params['lacontactId']);
+			mainView.load(this.params['labcontactId']);
 		}).enter(this.setPageBackground);
 
 };

js/core/controller/shippingexicontroller.js

@@ -73,24 +73,37 @@ ShippingExiController.prototype.init = function() {
 
 		Path.map("#/proposal/shipping/nav").to(function() {
 			loadShipmentNavigationList();
-			EXI.addMainPanel(new ShippingWelcomeMainView());
+			// EXI.addMainPanel(new ShippingWelcomeMainView());
 		});
 
 		Path.map("#/shipping/:shippingId/main").to(function() {
-			var mainView = new ShippingMainViewTest();
+			var mainView = new ShippingMainView();
 			EXI.addMainPanel(mainView);
 			mainView.load(this.params['shippingId']);
 		}).enter(this.setPageBackground);
 
-		Path.map("#/shipping/main").to(function() {
-			var mainView = new ShippingMainViewTest();
+		Path.map("#/shipping/main").to(function() { 
+
+			var mainView = new ShippingMainView();
 			EXI.addMainPanel(mainView);
 			mainView.load();
 		}).enter(this.setPageBackground);
 
-
-		Path.map("#/shipping/edv").to(function() {
-			var mainView = new ElectronDensityViewer();
+		Path.map("#/shipping/:shippingId/:shippingStatus/containerId/:containerId/edit").to(function() {
+			var mainView = new PuckFormView();
+			EXI.addMainPanel(mainView);
+			mainView.load(this.params['containerId'],this.params['shippingId'],this.params['shippingStatus']);
+		}).enter(this.setPageBackground);
+
+		Path.map("#/shipping/:shippingId/containerId/:containerId/sampleId/:sampleId/editCrystalForm").to(function() {
+			var mainView = new CrystalFormView();
 			EXI.addMainPanel(mainView);
+			mainView.load(this.params['containerId'],this.params['sampleId'],this.params['shippingId']);
 		}).enter(this.setPageBackground);
+
+		// Path.map("#/shipping/edv").to(function() {
+		// 	var mainView = new ElectronDensityViewer();
+		// 	EXI.addMainPanel(mainView);
+		// }).enter(this.setPageBackground);
+
 };