Merge branch 'feature/eln_mods'.

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html

@@ -38,6 +38,7 @@
 	<link type="text/css" rel="stylesheet" href="./lib/drawingboard/css/drawingboard.min.css" />
 	<link type="text/css" rel="stylesheet" href="./lib/jquery-fancytree/js/skin-bootstrap/ui.fancytree.min.css" />
 	<link type="text/css" rel="stylesheet" href="./lib/font-awesome/css/font-awesome.min.css" />
+	<link type="text/css" rel="stylesheet" href="./lib/c3/c3.min.css"></script>
 	
 	
 	<!-- ELN UI Stylesheets -->
@@ -63,6 +64,7 @@
 	<script type="text/javascript" src="./lib/fuelux/js/fuelux.min.js"></script>
 	<script type="text/javascript" src="./lib/jquery-select2/js/select2.full.min.js"></script>
 	<script type="text/javascript" src="./lib/d3/js/d3.min.js"></script>
+	<script type="text/javascript" src="./lib/c3/c3.min.js"></script>
 	<script type="text/javascript" src="./lib/d3-dagre/js/dagre-d3.min.js"></script>
 	<script type="text/javascript" src="./lib/naturalsort/js/naturalSort.js"></script>
 	<script type="text/javascript" src="./lib/mozilla/js/infra.js"></script>
@@ -264,6 +266,7 @@
 	<script type="text/javascript" src="./js/plugins/GenericTechnology.js"></script>
 	<script type="text/javascript" src="./js/plugins/LifeSciencesTechnology.js"></script>
 	<script type="text/javascript" src="./js/plugins/MicroscopyTechnology.js"></script>
+	<script type="text/javascript" src="./js/plugins/FlowCytometryTechnology.js"></script>
 	
 	<script type="text/javascript">
 	

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js

@@ -133,7 +133,7 @@ $.extend(DefaultProfile.prototype, {
 //				"ADMIN-BS-MBPR28.D.ETHZ.CH-E96954A7" : "http://localhost:8080/download"
 		}
 		
-		this.plugins = [new GenericTechnology(), new LifeSciencesTechnology(), new MicroscopyTechnology()];
+		this.plugins = [new GenericTechnology(), new LifeSciencesTechnology(), new MicroscopyTechnology(), new FlowCytometryTechnology()];
 		this.sampleFormTop = function($container, model) {
 			for(var i = 0; i < this.plugins.length; i++) {
 				this.plugins[i].sampleFormTop($container, model);

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/plugins/MicroscopyTechnology.js

@@ -27,61 +27,7 @@ $.extend(MicroscopyTechnology.prototype, ELNLIMSPlugin.prototype, {
 						"TYPE": "ORGANIZATION_UNIT",
 						"ANNOTATION_PROPERTIES" : []
 					}]
-				},
-				"FACS_ARIA_EXPERIMENT" : {
-					"SAMPLE_PARENTS_HINT" : [{
-						"LABEL" : "Organization Units",
-						"TYPE": "ORGANIZATION_UNIT",
-						"ANNOTATION_PROPERTIES" : []
-					}]
-				},
-				"INFLUX_EXPERIMENT" : {
-					"SAMPLE_PARENTS_HINT" : [{
-						"LABEL" : "Organization Units",
-						"TYPE": "ORGANIZATION_UNIT",
-						"ANNOTATION_PROPERTIES" : []
-					}]
-				},
-				"LSR_FORTESSA_EXPERIMENT" : {
-					"SAMPLE_PARENTS_HINT" : [{
-						"LABEL" : "Organization Units",
-						"TYPE": "ORGANIZATION_UNIT",
-						"ANNOTATION_PROPERTIES" : []
-					}]
-				},
-				"MOFLO_XDP_EXPERIMENT" : {
-					"SAMPLE_PARENTS_HINT" : [{
-						"LABEL" : "Organization Units",
-						"TYPE": "ORGANIZATION_UNIT",
-						"ANNOTATION_PROPERTIES" : []
-					}]
-				},
-				"S3E_EXPERIMENT" : {
-					"SAMPLE_PARENTS_HINT" : [{
-						"LABEL" : "Organization Units",
-						"TYPE": "ORGANIZATION_UNIT",
-						"ANNOTATION_PROPERTIES" : []
-					}]
-				},
-				"FACS_ARIA_PLATE" : { "SHOW_ON_NAV" : true },
-				"FACS_ARIA_SPECIMEN" : { "SHOW_ON_NAV" : true },
-				"FACS_ARIA_TUBE" : { "SHOW_ON_NAV" : true },
-				"FACS_ARIA_TUBESET" : { "SHOW_ON_NAV" : true },
-				"FACS_ARIA_WELL" : { "SHOW_ON_NAV" : true },
-				"INFLUX_SPECIMEN" : { "SHOW_ON_NAV" : true },
-				"INFLUX_TUBE" : { "SHOW_ON_NAV" : true },
-				"INFLUX_TUBESET" : { "SHOW_ON_NAV" : true },
-				"LSR_FORTESSA_PLATE" : { "SHOW_ON_NAV" : true },
-				"LSR_FORTESSA_SPECIMEN" : { "SHOW_ON_NAV" : true },
-				"LSR_FORTESSA_TUBE" : { "SHOW_ON_NAV" : true },
-				"LSR_FORTESSA_TUBESET" : { "SHOW_ON_NAV" : true },
-				"LSR_FORTESSA_WELL" : { "SHOW_ON_NAV" : true },
-				"MOFLO_XDP_SPECIMEN" : { "SHOW_ON_NAV" : true },
-				"MOFLO_XDP_TUBE" : { "SHOW_ON_NAV" : true },
-				"MOFLO_XDP_TUBESET" : { "SHOW_ON_NAV" : true },
-				"S3E_TUBE" : { "SHOW_ON_NAV" : true },
-				"S3E_TUBESET" : { "SHOW_ON_NAV" : true },
-				"SE3_SPECIMEN" : { "SHOW_ON_NAV" : true }
+				}
 	},
 	dataSetTypeDefinitionsExtension : {
 			"MICROSCOPY_ACCESSORY_FILE" : {

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/c3/c3.min.css

+.c3 svg{font:10px sans-serif;-webkit-tap-highlight-color:transparent}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc rect{stroke:#fff;stroke-width:1}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:grey;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:1;fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-title{font:14px sans-serif}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #ccc}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#fff}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:#fff}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max{fill:#777}.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}.c3-chart-arc.c3-target g path{opacity:1}.c3-chart-arc.c3-target.c3-focused g path{opacity:1}
\ No newline at end of file