Merge branch 'SEL_11587' into amdadev

Benjamin Renard
2 parents 13b02085 ea219e9c
Showing 6 changed files with 66 additions and 26 deletions Show diff stats
generic_data/Functions/functions.xml
index.html
js/app/views/IntervalUI.js
js/app/views/TimeTableUI.js
js/resources/css/AccueilAmda.css
php/WebServices/WebServer.php
@@ -102,28 +102,28 @@
 	<prompts>
         	<prompt>input window time in secs</prompt>
 	</prompts>
-        <info_brief>covariance() function for two params</info_brief>
+        <info_brief>covariance() function for two params. The second parameter is resampled to the times of the first one.</info_brief>
         <new_kernel>#covariance</new_kernel>
     </function>
     <function name="pearson_(,,)" args="2" kind="sliding" group="stat">
 	<prompts>
         	<prompt>input window time in secs</prompt>
 	</prompts>
-        <info_brief>Pearson coefficient of two parameters</info_brief>
+        <info_brief>Pearson coefficient of two parameters. The second parameter is resampled to the times of the first one.</info_brief>
         <new_kernel>#pearson</new_kernel>
     </function>
     <function name="kendall_(,,)" args="2" kind="sliding" group="stat">
 	<prompts>
         	<prompt>input window time in secs</prompt>
 	</prompts>
-        <info_brief>Kendall coefficient of two parameters</info_brief>
+        <info_brief>Kendall coefficient of two parameters.  The second parameter is resampled to the times of the first one.</info_brief>
         <new_kernel>#kendall</new_kernel>
     </function>
     <function name="spearman_(,,)" args="2" kind="sliding" group="stat">
 	<prompts>
         	<prompt>input window time in secs</prompt>
 	</prompts>
-        <info_brief>Spearman coefficient of two parameters</info_brief>
+        <info_brief>Spearman coefficient of two parameters.  The second parameter is resampled to the times of the first one.</info_brief>
         <new_kernel>#spearman</new_kernel>
     </function>
     <!--  <function name="shiftN_(,)" args="1" kind="amda">
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Welcome on Amda</title>
-<link href="js/resources/css/AccueilAmda.css" rel="stylesheet" type="text/css">
+<link href="js/resources/css/AccueilAmda.css?v=4" rel="stylesheet" type="text/css">
 <!-- Login -->
 <link rel="stylesheet" type="text/css" href="js/resources/css/login.css" />
 <link rel="icon" href="favicon.ico" type="image/x-icon">
@@ -240,6 +240,21 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 				labelAlign: 'left',
 				labelWidth: 60,
 				listeners: {
+					afterrender: function (field) {
+						field.inputEl.on('paste', function (e) {
+	
+							var clipboardData = e.browserEvent.clipboardData || window.clipboardData;
+							var pastedData = clipboardData.getData('text');
+							var regex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})$/;
+							var match = pastedData.match(regex);
+	
+							if (match) {
+								e.preventDefault();
+								var formattedDate = `${match[1]}/${match[2]}/${match[3]} ${match[4]}:${match[5]}:${match[6]}.${match[7]}`;
+								field.setValue(formattedDate);
+							}
+						});
+					},
 					change: onChangeField,
 					focus: function(field) {
 							this.activeField = fieldId;
@@ -519,6 +519,24 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             ]
         };
         var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
+            listeners: {
+                beforeedit: function (editor, context) {
+                    context.column.getEditor().on('render', function (field) {
+                        field.inputEl.on('paste', function (e) {
+                            var clipboardData = e.browserEvent.clipboardData || window.clipboardData;
+                            var pastedData = clipboardData.getData('text');
+                            var regex = /^(\d{4})\/(\d{2})\/(\d{2}) (\d{2}):(\d{2}):(\d{2})\.(\d{3})$/;
+                            var match = pastedData.match(regex);
+        
+                            if (match) {
+                                e.preventDefault();
+                                var formattedDate = `${match[1]}-${match[2]}-${match[3]}T${match[4]}:${match[5]}:${match[6]}.${match[7]}`;
+                                field.setValue(formattedDate);
+                            }
+                        });
+                    });
+                }
+            },
             onEditComplete: function (ed, value, startValue) {
                 var me = this,
                         activeColumn = me.getActiveColumn(),
@@ -5,6 +5,27 @@ body{
 		text-align: left;
 		background-color: #FFF;
 }
+
+/*
+ content: "We're currently having problems accessing one of our storage bays. \A Most of MMS data and Solar Orbiter/EAS data are not currently available. \ASorry for the inconvenience";
+ content: "A maintenance will take place on Thursday 21 November from 12:00 CET to 14:00 CET on our network infrastructure. \A Access to AMDA will be interrupted during this period. \ASorry for the inconveniences.";
+ */
+
+
+/* body:before {
+    content: "A maintenance will take place on Thursday 21 November from 12:00 CET to 14:00 CET on our network infrastructure. \A Access to AMDA will be interrupted during this period. \ASorry for the inconveniences.";
+    background: rgba(255, 0, 0, 0.349);
+    color: white;
+    width: 100%;
+    display: block;
+    text-align: center;
+    position: absolute;
+    z-index: 10;
+       font-size: 10px;
+       font-weight: bold;
+       white-space: pre-wrap;
+} */
+
 /*•••••••••••••• couvercle et trou ••••••••••••*/
 #trou{
@@ -223,27 +223,7 @@ class WebServer
 		{
 			$param = new stdClass;
-			if (preg_match("#^ws_#",$paramId))
-			{
-				$res = $this->paramLoader->getDerivedParameterNameFromId($paramId);
-				
-				if (!$res["success"]) {
-					$this->throwError("serverError", "Not available derived parameter $paramId");
-				}
-				$param->paramid = "ws_".$res['name'];
-			}
-			else if (preg_match("#^wsd_#",$paramId))
-			{
-				$res = $this->paramLoader->getUploadedParameterNameFromId($paramId);
-				
-				if (!$res["success"]){
-					$this->throwError("serverError", "Not available parameter $paramId");
-				}
-				$param->paramid = "wsd_".$res['name'];
-			}
-			else {
-				$param->paramid = $paramId;
-			}
+			$param->paramid = $paramId;
 			$params[] = $param;
 		}
@@ -460,6 +440,7 @@ class WebServer
 			$dim_1 = empty($dim_1) ? 1 : intval($dim_1);
 			$dim_2 = $paramNode->getAttribute('dim_2');
 			$dim_2 = empty($dim_2) ? 1 : intval($dim_2);
+            $ws_id = "ws_".$paramNode->getAttribute('name');
 			$paramNode->setAttribute('size', $dim_1 * $dim_2);
 			$display_type = 'timeseries';
@@ -470,16 +451,21 @@ class WebServer
 				$display_type = 'spectrogram';
 			}
 			$paramNode->setAttribute('display_type', $display_type);
+            $paramNode->setAttribute('internal_id', $paramNode->getAttribute('xml:id'));
+            $paramNode->setAttribute('xml:id', $ws_id);
 		}
 		//  => In parameters from an uploaded file
 		$paramNodes = $dom->getElementsByTagName("mydata");
 		foreach ($paramNodes as $paramNode) {
 			// size already exists
+            $wsd_id = "wsd_".$paramNode->getAttribute('name');
 			$display_type = 'timeseries';
 			if ($paramNode->getAttribute('plottype') == 'Spectra') {
 				$display_type = 'spectrogram';
 			}
 			$paramNode->setAttribute('display_type', $display_type);
+            $paramNode->setAttribute('internal_id', $paramNode->getAttribute('xml:id'));
+            $paramNode->setAttribute('xml:id', $wsd_id);
 		}
 		$dom->save(WSConfigClass::getWsResultDir().$wsParamDst);