CDPP / AMDA_IHM

Commit adcf07103eb5100522a7e3493789f51c59da8b63

Authored by Elena.Budnik
1 parent 7b514636
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

message for WS converssion

Showing 1 changed file with 9 additions and 7 deletions   Show diff stats
Inline Side-by-side
php/classes/UserWsTransfer.php
  Diff comments   View file @adcf071
... ... @@ -205,7 +205,7 @@ class UserWsTransfer {
205 205  
206 206 public function transferDerived()
207 207 {
208   - $msg = '<br/><b><i>Derived Params:</i></b><br/><br/>';
  208 + $msg = '<hr><br/><b><i>Derived Params:</i></b><br/><br/>';
209 209 $msg .= '<i>Note</i> : Parameters made from Remote Base parameters are not copied <br/><br/>';
210 210 if (!$this->oldWs->load($this->oldWsDir.'WsParams.xml')) {
211 211 error_log('cannot load WsParams.xml for '.TRANSFERUSER,1,email);
... ... @@ -231,7 +231,8 @@ class UserWsTransfer {
231 231 }
232 232  
233 233 $paramXml = new DomDocument("1.0");
234   - $msg .= 'Not copied derived parameters :<br/>';
  234 +
  235 + $msg .= 'Some expressions could have problems while being processed by new kernel <br/> - <b>feedback such cases.</b><br><br>Not copied derived parameters :<br/>';
235 236  
236 237 foreach ($wsParamsOld as $param) {
237 238 $id = $param->getAttribute('xml:id');
... ... @@ -328,7 +329,7 @@ class UserWsTransfer {
328 329 $this->newWs->save($this->newWsDir.'WsParams.xml');
329 330 $copied = $newParams->length - count($paramsToRemove);
330 331  
331   - $msg .= '<br/><i>Copied : </i>'.$copied.' derived parameters<br/><br/>';
  332 + $msg .= '<br/><i>Copied : </i>'.$copied.' derived parameters<br/><br/><hr>';
332 333 return array('success' => true, 'msg' => $msg);
333 334 }
334 335  
... ... @@ -352,7 +353,7 @@ class UserWsTransfer {
352 353 }
353 354  
354 355 $this->newWs->save($this->newWsDir.'Tt.xml');
355   - $msg .= '<i>Copied : </i>'.$timeTabs->length.' time tables<br/><br/>';
  356 + $msg .= '<i>Copied : </i>'.$timeTabs->length.' time tables<br/><br/><hr>';
356 357 return array('success' => true, 'msg' => $msg);
357 358 }
358 359  
... ... @@ -398,7 +399,8 @@ class UserWsTransfer {
398 399  
399 400 $deleted = $this->getObsolete();
400 401 $notready = $this->getNotready();
401   - $msg .= 'Not copied DataMining requests :<br/>';
  402 + $msg .= 'Some expressions could have problems while being processed by new kernel <br/> - <b>feedback such cases.</b><br/><br>
  403 + Not copied DataMining requests :<br/>';
402 404  
403 405 foreach ($condNodes as $condNode) {
404 406 $id = $condNode->getAttribute('xml:id');
... ... @@ -460,7 +462,7 @@ class UserWsTransfer {
460 462  
461 463 public function transferMyData()
462 464 {
463   - $msg = '<b><i>MyData Parameters / My Files:</i></b><br/><br/>';
  465 + $msg = '<hr><b><i>MyData Parameters / My Files:</i></b><br/><br/>';
464 466 $msg.= '<i>Note :</i> CEF format is not implemented<br/><br/>';
465 467  
466 468 if (!$this->oldWs->load($this->oldWsDir.'WsParams.xml')) {
... ... @@ -580,7 +582,7 @@ class UserWsTransfer {
580 582  
581 583 public function transferFilters()
582 584 {
583   - $msg = '<br/><br/><b><i>Filters:</i></b><br/><br/>';
  585 + $msg = '<hr><br/><br/><b><i>Filters:</i></b><br/><br/>';
584 586  
585 587 if (!curl_init($this->oldWsDir.'Filters.xml')) {
586 588 return array('success' => true, 'msg' => 'No filters at old AMDA');
... ...